Merge pull request #33 from dgsantana/dynamic_update

Expose update to allow dynamic updates on wasm

charming/Cargo.toml

@@ -12,14 +12,14 @@ license = "MIT/Apache-2.0"
 readme = "../README.md"
 
 [dependencies]
-deno_core = { version = "0.209", optional = true }
-handlebars = "4.3"
+deno_core = { version = "0.232", optional = true }
+handlebars = { version = "4.3", optional = true }
 image = { version = "0.24", optional = true }
-resvg = { version = "0.35", optional = true }
+resvg = { version = "0.36", optional = true }
 serde = { version = "1.0", features = ["derive"] }
-serde-wasm-bindgen = {version = "0.5", optional = true }
+serde-wasm-bindgen = {version = "0.6", optional = true }
 serde_json = "1.0"
-serde_v8 = { version = "0.120", optional = true }
+serde_v8 = { version = "0.141", optional = true }
 wasm-bindgen = { version = "0.2", optional = true }
 
 [dependencies.web-sys]
@@ -32,7 +32,9 @@ features = [
 ]
 
 [features]
-ssr = ["deno_core", "image", "resvg", "serde_v8"]
+default = ["html"]
+html = ["handlebars"]
+ssr = ["html", "deno_core", "image", "resvg", "serde_v8"]
 wasm = ["serde-wasm-bindgen", "wasm-bindgen", "web-sys"]
 
 [package.metadata.docs.rs]

charming/src/datatype/datapoint.rs

@@ -124,8 +124,8 @@ mod test {
         let q = DataPoint::Value(42.into());
         assert_eq!(p, q);
 
-        let p: DataPoint = (-3.14).into();
-        let q = DataPoint::Value((-3.14).into());
+        let p: DataPoint = (-std::f32::consts::PI).into();
+        let q = DataPoint::Value((-std::f32::consts::PI).into());
         assert_eq!(p, q);
 
         let p: DataPoint = "foo".into();
@@ -134,14 +134,14 @@ mod test {
 
         let p: DataPoint = vec![
             CompositeValue::from(42),
-            CompositeValue::from(-3.14),
+            CompositeValue::from(-std::f32::consts::PI),
             CompositeValue::from("foo"),
         ]
         .into();
         let q = DataPoint::Value(
             vec![
                 CompositeValue::from(42),
-                CompositeValue::from(-3.14),
+                CompositeValue::from(-std::f32::consts::PI),
                 CompositeValue::from("foo"),
             ]
             .into(),

charming/src/element/text_style.rs

@@ -25,6 +25,9 @@ pub struct TextStyle {
 
     #[serde(skip_serializing_if = "Option::is_none")]
     align: Option<String>,
+
+    #[serde(skip_serializing_if = "Option::is_none")]
+    padding: Option<[f64; 4]>,
 }
 
 impl TextStyle {
@@ -37,6 +40,7 @@ impl TextStyle {
             font_size: None,
             line_height: None,
             align: None,
+            padding: None,
         }
     }
 
@@ -74,4 +78,34 @@ impl TextStyle {
         self.align = Some(align.into());
         self
     }
+
+    pub fn padding<F: Into<f64> + Copy>(mut self, padding: [F; 4]) -> Self {
+        self.padding = Some([
+            padding[0].into(),
+            padding[1].into(),
+            padding[2].into(),
+            padding[3].into(),
+        ]);
+        self
+    }
+
+    pub fn padding_all<F: Into<f64> + Copy>(mut self, padding: F) -> Self {
+        self.padding = Some([
+            padding.into(),
+            padding.into(),
+            padding.into(),
+            padding.into(),
+        ]);
+        self
+    }
+
+    pub fn padding_pair<F: Into<f64> + Copy>(mut self, padding: [F; 2]) -> Self {
+        self.padding = Some([
+            padding[0].into(),
+            padding[1].into(),
+            padding[0].into(),
+            padding[1].into(),
+        ]);
+        self
+    }
 }

charming/src/renderer/mod.rs

@@ -1,3 +1,5 @@
+#[cfg(feature = "html")]
+#[cfg_attr(docsrs, doc(cfg(feature = "html")))]
 pub mod html_renderer;
 #[cfg(feature = "ssr")]
 #[cfg_attr(docsrs, doc(cfg(feature = "ssr")))]
@@ -6,6 +8,8 @@ pub mod image_renderer;
 #[cfg_attr(docsrs, doc(cfg(feature = "wasm")))]
 pub mod wasm_renderer;
 
+#[cfg(feature = "html")]
+#[cfg_attr(docsrs, doc(cfg(feature = "html")))]
 pub use html_renderer::*;
 #[cfg(feature = "ssr")]
 #[cfg_attr(docsrs, doc(cfg(feature = "ssr")))]

charming/src/renderer/wasm_renderer.rs

@@ -56,6 +56,10 @@ impl WasmRenderer {
         echarts
             .resize(to_value(&chart_size).expect("could not convert resize options to `JsValue`"));
     }
+
+    pub fn update(echarts: &Echarts, chart: &Chart) {
+        echarts.set_option(to_value(chart).unwrap());
+    }
 }
 
 #[derive(Serialize)]

gallery/src/line/line_gradient.rs

@@ -98,10 +98,10 @@ pub fn chart() -> Chart {
                 .max(10)
                 .max((data_list.len() - 1) as f64),
         )
-        .x_axis(Axis::new().data(data_list.iter().map(|v| *v).collect()))
+        .x_axis(Axis::new().data(data_list.to_vec()))
         .x_axis(
             Axis::new()
-                .data(data_list.iter().map(|v| *v).collect())
+                .data(data_list.to_vec())
                 .grid_index(1),
         )
         .y_axis(Axis::new())

gallery/src/line/rainfall.rs

@@ -13,8 +13,8 @@ use charming::{
 
 pub fn chart() -> Chart {
     let time_data = TIME.iter().map(|&x| x.to_string()).collect::<Vec<_>>();
-    let flow_data = FLOW_DATA.iter().map(|&x| x).collect::<Vec<_>>();
-    let rainfall_data = RAINFALL_DATA.iter().map(|&x| x).collect::<Vec<_>>();
+    let flow_data = FLOW_DATA.to_vec();
+    let rainfall_data = RAINFALL_DATA.to_vec();
 
     Chart::new()
         .title(

gallery/src/line/rainfall_vs_evaporation.rs

@@ -16,8 +16,8 @@ pub fn chart() -> Chart {
         .map(|x| x.replace("2009/", ""))
         .collect::<Vec<_>>();
 
-    let evaporation_data = EVAPORATION_DATA.iter().map(|x| *x).collect::<Vec<_>>();
-    let rainfall_data = RAINFALL_DATA.iter().map(|x| *x).collect::<Vec<_>>();
+    let evaporation_data = EVAPORATION_DATA.to_vec();
+    let rainfall_data = RAINFALL_DATA.to_vec();
 
     Chart::new()
         .title(Title::new().text("Rainfall vs Evaporation").left("center"))