rx-html (feature): Reduce tag/attr name conflicts with SVG (#3076)

wvlet · Jul 28, 2023 · 9c55c5b · 9c55c5b
1 parent a4d4fa6
commit 9c55c5b
Show file tree

Hide file tree

Showing 6 changed files with 106 additions and 85 deletions.
diff --git a/airframe-rx-html/src/main/scala/wvlet/airframe/rx/html/Attrs.scala b/airframe-rx-html/src/main/scala/wvlet/airframe/rx/html/Attrs.scala
@@ -386,7 +386,7 @@ trait WindowEventAttrs extends SharedEventAttrs {
   /**
     * Script to be run when a user navigates to a page
     */
-  lazy val onpageshow = attr("onpageshow")
+  lazy val onpageshow: HtmlAttributeOf = attr("onpageshow")
 
   /**
     * Script to be run when the window's history changes

diff --git a/airframe-rx-html/src/main/scala/wvlet/airframe/rx/html/SvgAttrs.scala b/airframe-rx-html/src/main/scala/wvlet/airframe/rx/html/SvgAttrs.scala
@@ -520,14 +520,16 @@ trait SvgAttrs {
   /**
     * MDN
     */
-  lazy val height = attr("height")
+  // Conflicts with Attr.height
+  // lazy val height = attr("height")
 
   /**
     * MDN
     */
   lazy val imageRendering = attr("imageRendering")
 
-  lazy val id = attr("id")
+  // id is already available in Attrs
+  // lazy val id = attr("id")
 
   /**
     * MDN
@@ -995,7 +997,8 @@ trait SvgAttrs {
    *
    * MDN
    */
-  lazy val width = attr("width")
+  // width conflicts with Attr.width
+  // lazy val width = attr("width")
 
   /*
    *