Allow all Into<AttributeValue> instead of just Into<CowStr> for t…

…he untyped `Element::attr` method for more convenient use with untyped attrs
linebender · Aug 6, 2023 · 130c5e3 · 130c5e3
1 parent fb9721a
commit 130c5e3
Showing 1 changed file with 6 additions and 10 deletions.
diff --git a/crates/xilem_html/src/element/elements.rs b/crates/xilem_html/src/element/elements.rs
@@ -472,10 +472,6 @@ impl From<&'static str> for AttributeValue {
 type Attrs = VecMap<CowStr, AttributeValue>;
 
 impl Attrs {
-    fn insert_untyped(&mut self, name: impl Into<CowStr>, value: impl Into<CowStr>) {
-        self.insert(name.into(), AttributeValue::String(value.into()));
-    }
-
     fn insert_attr(&mut self, name: impl Into<CowStr>, value: impl Into<AttributeValue>) {
         self.insert(name.into(), value.into());
     }
@@ -924,8 +920,8 @@ pub trait Element<T, A>: Node + crate::view::View<T, A> {
     // TODO should this be in its own trait? (it doesn't have much to do with the DOM Node interface)
     fn raw_attrs(&self) -> &Attrs;
     // TODO should this be in Node?
-    fn attr<K: Into<CowStr>, V: Into<CowStr>>(self, key: K, value: V) -> Self;
-    fn set_attr<K: Into<CowStr>, V: Into<CowStr>>(&mut self, key: K, value: V);
+    fn attr<K: Into<CowStr>, V: Into<AttributeValue>>(self, key: K, value: V) -> Self;
+    fn set_attr<K: Into<CowStr>, V: Into<AttributeValue>>(&mut self, key: K, value: V);
 
     // TODO generate all this event listener boilerplate with macros
     fn on_click<EH>(self, handler: EH) -> Self
@@ -1049,17 +1045,17 @@ macro_rules! impl_element {
                 &self.attrs
             }
 
-            fn attr<K: Into<CowStr>, V: Into<CowStr>>(
+            fn attr<K: Into<CowStr>, V: Into<AttributeValue>>(
                 mut self,
                 key: K,
                 value: V,
             ) -> $ty_name<T, A, VS> {
-                self.attrs.insert_untyped(key, value);
+                self.attrs.insert_attr(key, value);
                 self
             }
 
-            fn set_attr<K: Into<CowStr>, V: Into<CowStr>>(&mut self, key: K, value: V) {
-                self.attrs.insert_untyped(key, value);
+            fn set_attr<K: Into<CowStr>, V: Into<AttributeValue>>(&mut self, key: K, value: V) {
+                self.attrs.insert_attr(key, value);
             }
 
             fn on_click<EH>(self, handler: EH) -> $ty_name<T, A, VS>