Merge pull request #135 from cooljingle/wasm-hashmap-conversion

Fix Wasm HashMap conversion
yuankunzhang · Dec 23, 2024 · 6a02036 · 6a02036
2 parents c893566 + 6e4e32e
commit 6a02036
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/charming/Cargo.toml b/charming/Cargo.toml
@@ -22,6 +22,7 @@ serde_json = "1.0"
 serde_v8 = { version = "0.220", optional = true }
 serde_with = "3.11.0"
 wasm-bindgen = { version = "0.2", optional = true }
+js-sys = { version = "0.3", optional = true }
 
 [dev-dependencies]
 assert-json-diff = "2.0.2"
@@ -39,7 +40,7 @@ features = [
 default = ["html"]
 html = ["handlebars"]
 ssr = ["html", "deno_core", "image", "resvg", "serde_v8"]
-wasm = ["serde-wasm-bindgen", "wasm-bindgen", "web-sys"]
+wasm = ["serde-wasm-bindgen", "wasm-bindgen", "web-sys", "js-sys"]
 
 [package.metadata.docs.rs]
 all-features = true

diff --git a/charming/src/renderer/wasm_renderer.rs b/charming/src/renderer/wasm_renderer.rs
@@ -54,7 +54,7 @@ impl WasmRenderer {
             })
             .unwrap(),
         );
-        echarts.set_option(to_value(chart).unwrap());
+        Self::update(&echarts, chart);
 
         Ok(echarts)
     }
@@ -66,7 +66,9 @@ impl WasmRenderer {
     }
 
     pub fn update(echarts: &Echarts, chart: &Chart) {
-        echarts.set_option(to_value(chart).unwrap());
+        let json_str = serde_json::to_string(chart).unwrap();
+        let option = js_sys::JSON::parse(&json_str).unwrap();
+        echarts.set_option(option);
     }
 }