From 2362fad72942f26e5619dcc6f5e2ee80ee49b58c Mon Sep 17 00:00:00 2001
From: Tim Kurdov <tim.kurdov@gmail.com>
Date: Fri, 13 Dec 2024 08:40:14 +0000
Subject: [PATCH] silenced non-normalised element name warnings for SVG
 elements (#3769)

---
 packages/yew-macro/src/derive_props/field.rs  |  2 +-
 .../yew-macro/src/html_tree/html_element.rs   | 43 ++++++++++++++++++-
 packages/yew-macro/tests/html_macro_test.rs   |  2 +-
 packages/yew/src/dom_bundle/blist.rs          |  2 +-
 packages/yew/src/dom_bundle/mod.rs            |  1 -
 5 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/packages/yew-macro/src/derive_props/field.rs b/packages/yew-macro/src/derive_props/field.rs
index 91e2ba08fad..9654a6e25d2 100644
--- a/packages/yew-macro/src/derive_props/field.rs
+++ b/packages/yew-macro/src/derive_props/field.rs
@@ -200,7 +200,7 @@ pub struct PropFieldCheck<'a> {
     check_arg: GenericParam,
 }
 
-impl<'a> PropFieldCheck<'a> {
+impl PropFieldCheck<'_> {
     pub fn to_fake_prop_decl(&self) -> proc_macro2::TokenStream {
         let Self { this, .. } = self;
         if !this.is_required() {
diff --git a/packages/yew-macro/src/html_tree/html_element.rs b/packages/yew-macro/src/html_tree/html_element.rs
index ee588305de6..c5db2121f26 100644
--- a/packages/yew-macro/src/html_tree/html_element.rs
+++ b/packages/yew-macro/src/html_tree/html_element.rs
@@ -11,6 +11,45 @@ use crate::props::{ElementProps, Prop, PropDirective};
 use crate::stringify::{Stringify, Value};
 use crate::{is_ide_completion, non_capitalized_ascii, Peek, PeekValue};
 
+fn is_normalised_element_name(name: &str) -> bool {
+    match name {
+        "animateMotion"
+        | "animateTransform"
+        | "clipPath"
+        | "feBlend"
+        | "feColorMatrix"
+        | "feComponentTransfer"
+        | "feComposite"
+        | "feConvolveMatrix"
+        | "feDiffuseLighting"
+        | "feDisplacementMap"
+        | "feDistantLight"
+        | "feDropShadow"
+        | "feFlood"
+        | "feFuncA"
+        | "feFuncB"
+        | "feFuncG"
+        | "feFuncR"
+        | "feGaussianBlur"
+        | "feImage"
+        | "feMerge"
+        | "feMergeNode"
+        | "feMorphology"
+        | "feOffset"
+        | "fePointLight"
+        | "feSpecularLighting"
+        | "feSpotLight"
+        | "feTile"
+        | "feTurbulence"
+        | "foreignObject"
+        | "glyphRef"
+        | "linearGradient"
+        | "radialGradient"
+        | "textPath" => true,
+        _ => !name.chars().any(|c| c.is_ascii_uppercase()),
+    }
+}
+
 pub struct HtmlElement {
     pub name: TagName,
     pub props: ElementProps,
@@ -310,9 +349,9 @@ impl ToTokens for HtmlElement {
             TagName::Lit(dashedname) => {
                 let name_span = dashedname.span();
                 let name = dashedname.to_ascii_lowercase_string();
-                if name != dashedname.to_string() {
+                if !is_normalised_element_name(&dashedname.to_string()) {
                     emit_warning!(
-                        dashedname.span(),
+                        name_span.clone(),
                         format!(
                             "The tag '{dashedname}' is not matching its normalized form '{name}'. If you want \
                              to keep this form, change this to a dynamic tag `@{{\"{dashedname}\"}}`."
diff --git a/packages/yew-macro/tests/html_macro_test.rs b/packages/yew-macro/tests/html_macro_test.rs
index 69d62934bfa..7b410d8aa63 100644
--- a/packages/yew-macro/tests/html_macro_test.rs
+++ b/packages/yew-macro/tests/html_macro_test.rs
@@ -35,7 +35,7 @@ fn dynamic_tags_catch_non_ascii() {
 #[test]
 fn html_nested_macro_on_html_element() {
     let _node = html_nested! {
-        <div/>
+        <feBlend/>
     };
     let _node = html_nested! {
         <input/>
diff --git a/packages/yew/src/dom_bundle/blist.rs b/packages/yew/src/dom_bundle/blist.rs
index 5824b8daa70..ecdd015ec40 100644
--- a/packages/yew/src/dom_bundle/blist.rs
+++ b/packages/yew/src/dom_bundle/blist.rs
@@ -54,7 +54,7 @@ struct NodeWriter<'s> {
     slot: DomSlot,
 }
 
-impl<'s> NodeWriter<'s> {
+impl NodeWriter<'_> {
     /// Write a new node that has no ancestor
     fn add(self, node: VNode) -> (Self, BNode) {
         test_log!("adding: {:?}", node);
diff --git a/packages/yew/src/dom_bundle/mod.rs b/packages/yew/src/dom_bundle/mod.rs
index d35225a0a7d..bf4e1b86469 100644
--- a/packages/yew/src/dom_bundle/mod.rs
+++ b/packages/yew/src/dom_bundle/mod.rs
@@ -49,7 +49,6 @@ pub(crate) struct Bundle(BNode);
 
 impl Bundle {
     /// Creates a new bundle.
-
     pub const fn new() -> Self {
         Self(BNode::List(BList::new()))
     }