other charts (#15)

Billy-Sheppard · Jan 30, 2024 · b16ed95 · b16ed95
1 parent 5dd69d8
commit b16ed95
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 42 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "chart-js-rs"
-version = "0.0.14"
+version = "0.0.15"
 edition = "2021"
 authors = ["Billy Sheppard", "Luis Moreno"]
 license = "Apache-2.0"

diff --git a/examples/src/lib.rs b/examples/src/lib.rs
@@ -253,7 +253,7 @@ impl Model {
             .prop("id", id)
             .style("height", "calc(100vh - 270px)")
             .after_inserted(move |_| {
-                chart.to_chart().render() // use .to_chart().render_mutate(id) if you wish to run some javascript on this chart, for more detail see bar and index.html
+                chart.into_chart().render() // use .to_chart().render_mutate(id) if you wish to run some javascript on this chart, for more detail see bar and index.html
             })
         })
     }
@@ -333,7 +333,7 @@ impl Model {
                         .prop("id", three_id)
                         .style("height", "calc(100vh - 270px)")
                         .after_inserted(move |_| {
-                            three_a_chart.to_chart().render()
+                            three_a_chart.into_chart().render()
                         })
                     }))
                 }),
@@ -344,7 +344,7 @@ impl Model {
                         .prop("id", four_id)
                         .style("height", "calc(100vh - 270px)")
                         .after_inserted(move |_| {
-                            three_b_chart.to_chart().render()
+                            three_b_chart.into_chart().render()
                         })
                     }))
                 })

diff --git a/src/bar.rs b/src/bar.rs
@@ -1,9 +1,8 @@
-use gloo_utils::format::JsValueSerdeExt;
-use serde::Serialize;
+use serde::{de::DeserializeOwned, Deserialize, Serialize};
 
-use crate::{types::*, utils::*, ChartOptions};
+use crate::{types::*, ChartExt, ChartOptions};
 
-#[derive(Debug, Clone, Serialize, Default)]
+#[derive(Debug, Clone, Deserialize, Serialize, Default)]
 pub struct Bar<A: Annotation> {
     #[serde(rename = "type")]
     pub r#type: BarString,
@@ -12,16 +11,13 @@ pub struct Bar<A: Annotation> {
     pub id: String,
 }
 
-impl<A: Annotation> Bar<A> {
-    pub fn to_chart(self) -> Chart {
-        Chart(
-            <::wasm_bindgen::JsValue as JsValueSerdeExt>::from_serde(&self)
-                .expect("Unable to serialize chart."),
-            self.id,
-        )
+impl<A: Annotation + DeserializeOwned> ChartExt for Bar<A> {
+    fn get_id(self) -> String {
+        self.id
     }
 }
-#[derive(Debug, Clone)]
+
+#[derive(Debug, Clone, Deserialize)]
 pub struct BarString(String);
 impl Serialize for BarString {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>

diff --git a/src/doughnut.rs b/src/doughnut.rs
@@ -1,28 +1,22 @@
-use gloo_utils::format::JsValueSerdeExt;
-use serde::Serialize;
+use serde::{de::DeserializeOwned, Deserialize, Serialize};
 
-use crate::{types::*, utils::*, ChartOptions};
+use crate::{types::*, ChartExt, ChartOptions};
 
-#[derive(Debug, Clone, Serialize, Default)]
+#[derive(Debug, Clone, Deserialize, Serialize, Default)]
 pub struct Doughnut<A: Annotation> {
     #[serde(rename = "type")]
     pub r#type: DoughnutString,
     pub data: Dataset<Vec<SinglePointDataset>>,
     pub options: ChartOptions<A>,
     pub id: String,
 }
-
-impl<A: Annotation> Doughnut<A> {
-    pub fn to_chart(self) -> Chart {
-        Chart(
-            <::wasm_bindgen::JsValue as JsValueSerdeExt>::from_serde(&self)
-                .expect("Unable to serialize chart."),
-            self.id,
-        )
+impl<A: Annotation + DeserializeOwned> ChartExt for Doughnut<A> {
+    fn get_id(self) -> String {
+        self.id
     }
 }
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Deserialize)]
 pub struct DoughnutString(String);
 impl Serialize for DoughnutString {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>

diff --git a/src/pie.rs b/src/pie.rs
@@ -1,9 +1,8 @@
-use gloo_utils::format::JsValueSerdeExt;
-use serde::Serialize;
+use serde::{de::DeserializeOwned, Deserialize, Serialize};
 
-use crate::{types::*, utils::*, ChartOptions};
+use crate::{types::*, ChartExt, ChartOptions};
 
-#[derive(Debug, Clone, Serialize, Default)]
+#[derive(Debug, Clone, Deserialize, Serialize, Default)]
 pub struct Pie<A: Annotation> {
     #[serde(rename = "type")]
     pub r#type: PieString,
@@ -12,17 +11,13 @@ pub struct Pie<A: Annotation> {
     pub id: String,
 }
 
-impl<A: Annotation> Pie<A> {
-    pub fn to_chart(self) -> Chart {
-        Chart(
-            <::wasm_bindgen::JsValue as JsValueSerdeExt>::from_serde(&self)
-                .expect("Unable to serialize chart."),
-            self.id,
-        )
+impl<A: Annotation + DeserializeOwned> ChartExt for Pie<A> {
+    fn get_id(self) -> String {
+        self.id
     }
 }
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Deserialize)]
 pub struct PieString(String);
 impl Serialize for PieString {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>