xilem_web: Update dependencies, and support style for `MathMlElemen…

…t`s (#765) As noted in #621 (comment), rustwasm/wasm-bindgen#4143 is now added in wasm_bindgen 0.2.96. This PR updates all the dependencies of xilem_web and finally correctly supports `style` for `MathMlElement`.
linebender · Dec 1, 2024 · 1eaff8f · 1eaff8f
1 parent e9edd38
commit 1eaff8f
Show file tree

Hide file tree

Showing 11 changed files with 41 additions and 34 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/xilem_web/Cargo.toml b/xilem_web/Cargo.toml
@@ -21,10 +21,10 @@ targets = []
 workspace = true
 
 [dependencies]
-futures = "0.3.30"
+futures = "0.3.31"
 peniko.workspace = true
-wasm-bindgen = "0.2.92"
-wasm-bindgen-futures = "0.4.42"
+wasm-bindgen = "0.2.97"
+wasm-bindgen-futures = "0.4.47"
 xilem_core = { workspace = true, features = ["kurbo"] }
 
 [dependencies.web-sys]
@@ -44,6 +44,7 @@ features = [
   "ResizeObserver",
   "ResizeObserverEntry",
   "DomRectReadOnly",
+  "MathMlElement",
   "SvgElement",
   "SvgaElement",
   "SvgAnimateElement",

diff --git a/xilem_web/src/modifiers/style.rs b/xilem_web/src/modifiers/style.rs
@@ -154,6 +154,8 @@ fn set_style(element: &web_sys::Element, name: &str, value: &str) {
         el.style().set_property(name, value).unwrap_throw();
     } else if let Some(el) = element.dyn_ref::<web_sys::SvgElement>() {
         el.style().set_property(name, value).unwrap_throw();
+    } else if let Some(el) = element.dyn_ref::<web_sys::MathMlElement>() {
+        el.style().set_property(name, value).unwrap_throw();
     }
 }
 
@@ -162,6 +164,8 @@ fn remove_style(element: &web_sys::Element, name: &str) {
         el.style().remove_property(name).unwrap_throw();
     } else if let Some(el) = element.dyn_ref::<web_sys::SvgElement>() {
         el.style().remove_property(name).unwrap_throw();
+    } else if let Some(el) = element.dyn_ref::<web_sys::MathMlElement>() {
+        el.style().remove_property(name).unwrap_throw();
     }
 }
 

diff --git a/xilem_web/web_examples/counter/Cargo.toml b/xilem_web/web_examples/counter/Cargo.toml
@@ -11,6 +11,6 @@ workspace = true
 
 [dependencies]
 console_error_panic_hook = "0.1"
-wasm-bindgen = "0.2.92"
-web-sys = "0.3.72"
+wasm-bindgen = "0.2.97"
+web-sys = "0.3.74"
 xilem_web = { path = "../.." }
diff --git a/xilem_web/web_examples/counter_custom_element/Cargo.toml b/xilem_web/web_examples/counter_custom_element/Cargo.toml
@@ -11,6 +11,6 @@ workspace = true
 
 [dependencies]
 console_error_panic_hook = "0.1"
-wasm-bindgen = "0.2.92"
-web-sys = "0.3.69"
+wasm-bindgen = "0.2.97"
+web-sys = "0.3.74"
 xilem_web = { path = "../.." }
diff --git a/xilem_web/web_examples/fetch/Cargo.toml b/xilem_web/web_examples/fetch/Cargo.toml
@@ -15,6 +15,6 @@ console_log = "1"
 gloo-net = { version = "0.6.0", default-features = false, features = ["http", "json", "serde"] }
 log = "0.4"
 serde = { version = "1", features = ["derive"] }
-web-sys = { version = "0.3.69", features = ["Event", "HtmlInputElement"] }
-wasm-bindgen = "0.2.92"
+web-sys = { version = "0.3.74", features = ["Event", "HtmlInputElement"] }
+wasm-bindgen = "0.2.97"
 xilem_web = { path = "../.." }
diff --git a/xilem_web/web_examples/mathml_svg/Cargo.toml b/xilem_web/web_examples/mathml_svg/Cargo.toml
@@ -11,6 +11,6 @@ workspace = true
 
 [dependencies]
 console_error_panic_hook = "0.1"
-wasm-bindgen = "0.2.92"
-web-sys = "0.3.69"
+wasm-bindgen = "0.2.97"
+web-sys = "0.3.74"
 xilem_web = { path = "../.." }
diff --git a/xilem_web/web_examples/raw_dom_access/Cargo.toml b/xilem_web/web_examples/raw_dom_access/Cargo.toml
@@ -10,5 +10,5 @@ rust-version.workspace = true
 console_error_panic_hook = "0.1"
 console_log = "1.0.0"
 log = "0.4.22"
-web-sys = "0.3.69"
+web-sys = "0.3.74"
 xilem_web = { path = "../.." }
diff --git a/xilem_web/web_examples/svgdraw/Cargo.toml b/xilem_web/web_examples/svgdraw/Cargo.toml
@@ -11,6 +11,6 @@ workspace = true
 
 [dependencies]
 console_error_panic_hook = "0.1"
-wasm-bindgen = "0.2.92"
-web-sys = "0.3.69"
+wasm-bindgen = "0.2.97"
+web-sys = "0.3.74"
 xilem_web = { path = "../.." }
diff --git a/xilem_web/web_examples/svgtoy/Cargo.toml b/xilem_web/web_examples/svgtoy/Cargo.toml
@@ -11,6 +11,6 @@ workspace = true
 
 [dependencies]
 console_error_panic_hook = "0.1"
-wasm-bindgen = "0.2.92"
-web-sys = "0.3.69"
+wasm-bindgen = "0.2.97"
+web-sys = "0.3.74"
 xilem_web = { path = "../.." }
diff --git a/xilem_web/web_examples/todomvc/Cargo.toml b/xilem_web/web_examples/todomvc/Cargo.toml
@@ -15,6 +15,6 @@ serde = { version = "1.0.204", features = ["derive"] }
 serde_json = "1.0.120"
 tracing = "0.1.40"
 tracing-wasm = "0.2.1"
-wasm-bindgen = "0.2.92"
-web-sys = { version = "0.3.69", features = ["Storage", "Window"] }
+wasm-bindgen = "0.2.97"
+web-sys = { version = "0.3.74", features = ["Storage", "Window"] }
 xilem_web = { path = "../.." }