From 167077a95b911066c65be4f9c949864bcb72a0f2 Mon Sep 17 00:00:00 2001
From: Kuba Groblewski <kkgroblewski@gmail.com>
Date: Wed, 11 Dec 2024 19:48:04 +0100
Subject: [PATCH 1/4] feat: line z, silent, charming disabled options

---
 charming/src/element/emphasis.rs |  9 +++++++++
 charming/src/series/line.rs      | 18 ++++++++++++++++++
 charming/tests/line.rs           | 24 ++++++++++++++++++++----
 3 files changed, 47 insertions(+), 4 deletions(-)

diff --git a/charming/src/element/emphasis.rs b/charming/src/element/emphasis.rs
index 67f0927..f4f9a33 100644
--- a/charming/src/element/emphasis.rs
+++ b/charming/src/element/emphasis.rs
@@ -29,6 +29,9 @@ pub struct Emphasis {
 
     #[serde(skip_serializing_if = "Option::is_none")]
     label: Option<Label>,
+
+    #[serde(skip_serializing_if = "Option::is_none")]
+    disabled: Option<bool>,
 }
 
 impl Default for Emphasis {
@@ -44,6 +47,7 @@ impl Emphasis {
             item_style: None,
             area_style: None,
             label: None,
+            disabled: None,
         }
     }
 
@@ -66,4 +70,9 @@ impl Emphasis {
         self.label = Some(label.into());
         self
     }
+
+    pub fn disabled(mut self, disabled: bool) -> Self {
+        self.disabled = Some(disabled);
+        self
+    }
 }
diff --git a/charming/src/series/line.rs b/charming/src/series/line.rs
index 97131ec..517179e 100644
--- a/charming/src/series/line.rs
+++ b/charming/src/series/line.rs
@@ -80,6 +80,12 @@ pub struct Line {
     #[serde(skip_serializing_if = "Option::is_none")]
     tooltip: Option<Tooltip>,
 
+    #[serde(skip_serializing_if = "Option::is_none")]
+    silent: Option<bool>,
+
+    #[serde(skip_serializing_if = "Option::is_none")]
+    z: Option<i32>,
+
     #[serde(skip_serializing_if = "Vec::is_empty")]
     data: DataFrame,
 }
@@ -116,6 +122,8 @@ impl Line {
             x_axis_index: None,
             y_axis_index: None,
             tooltip: None,
+            silent: None,
+            z: None,
             data: vec![],
         }
     }
@@ -232,6 +240,16 @@ impl Line {
         self
     }
 
+    pub fn silent(mut self, silent: bool) -> Self {
+        self.silent = Some(silent);
+        self
+    }
+
+    pub fn z(mut self, z: i32) -> Self {
+        self.z = Some(z);
+        self
+    }
+
     pub fn data<D: Into<DataPoint>>(mut self, data: Vec<D>) -> Self {
         self.data = data.into_iter().map(|d| d.into()).collect();
         self
diff --git a/charming/tests/line.rs b/charming/tests/line.rs
index ded5c22..6a97c30 100644
--- a/charming/tests/line.rs
+++ b/charming/tests/line.rs
@@ -1,5 +1,10 @@
 use assert_json_diff::assert_json_eq;
-use charming::{component::Axis, element::AxisType, series::Line, Chart};
+use charming::{
+    component::Axis,
+    element::{AxisType, Emphasis},
+    series::Line,
+    Chart,
+};
 use serde_json::json;
 
 #[test]
@@ -17,9 +22,14 @@ fn basic_line_chart() {
         "series": [
           {
             "data": [150, 230, 224, 218, 135, 147, 260],
-            "type": "line"
+            "type": "line",
+            "silent": false,
+            "z": 3,
+            "emphasis": {
+              "disabled": false
+            }
           }
-        ]
+        ],
       }
     );
 
@@ -30,7 +40,13 @@ fn basic_line_chart() {
                 .data(vec!["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"]),
         )
         .y_axis(Axis::new().type_(AxisType::Value))
-        .series(Line::new().data(vec![150, 230, 224, 218, 135, 147, 260]));
+        .series(
+            Line::new()
+                .silent(false)
+                .z(3)
+                .emphasis(Emphasis::new().disabled(false))
+                .data(vec![150, 230, 224, 218, 135, 147, 260]),
+        );
 
     let charming_json = serde_json::from_str::<serde_json::Value>(&chart.to_string()).unwrap();
     println!("{}", serde_json::to_string_pretty(&echarts_json).unwrap());

From 31eecc71795b60d96d62e16642f21f8fb01fa438 Mon Sep 17 00:00:00 2001
From: Kuba Groblewski <kkgroblewski@gmail.com>
Date: Wed, 11 Dec 2024 22:19:05 +0100
Subject: [PATCH 2/4] update line z param type

---
 charming/src/series/line.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/charming/src/series/line.rs b/charming/src/series/line.rs
index 517179e..9098008 100644
--- a/charming/src/series/line.rs
+++ b/charming/src/series/line.rs
@@ -245,8 +245,8 @@ impl Line {
         self
     }
 
-    pub fn z(mut self, z: i32) -> Self {
-        self.z = Some(z);
+    pub fn z<I: Into<i32>>(mut self, z: I) -> Self {
+        self.z = Some(z.into());
         self
     }
 

From de84e8c3aab8799e9440f4774638bb3038f025fa Mon Sep 17 00:00:00 2001
From: Kuba Groblewski <kkgroblewski@gmail.com>
Date: Fri, 13 Dec 2024 17:13:41 +0100
Subject: [PATCH 3/4] revert line test changes

---
 charming/tests/line.rs | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/charming/tests/line.rs b/charming/tests/line.rs
index 6a97c30..7db4b2b 100644
--- a/charming/tests/line.rs
+++ b/charming/tests/line.rs
@@ -1,10 +1,5 @@
 use assert_json_diff::assert_json_eq;
-use charming::{
-    component::Axis,
-    element::{AxisType, Emphasis},
-    series::Line,
-    Chart,
-};
+use charming::{component::Axis, element::AxisType, series::Line, Chart};
 use serde_json::json;
 
 #[test]
@@ -23,11 +18,6 @@ fn basic_line_chart() {
           {
             "data": [150, 230, 224, 218, 135, 147, 260],
             "type": "line",
-            "silent": false,
-            "z": 3,
-            "emphasis": {
-              "disabled": false
-            }
           }
         ],
       }
@@ -40,13 +30,7 @@ fn basic_line_chart() {
                 .data(vec!["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"]),
         )
         .y_axis(Axis::new().type_(AxisType::Value))
-        .series(
-            Line::new()
-                .silent(false)
-                .z(3)
-                .emphasis(Emphasis::new().disabled(false))
-                .data(vec![150, 230, 224, 218, 135, 147, 260]),
-        );
+        .series(Line::new().data(vec![150, 230, 224, 218, 135, 147, 260]));
 
     let charming_json = serde_json::from_str::<serde_json::Value>(&chart.to_string()).unwrap();
     println!("{}", serde_json::to_string_pretty(&echarts_json).unwrap());

From aed12f42c8a104028b1eb8047fa4735ad733c1d4 Mon Sep 17 00:00:00 2001
From: Kuba Groblewski <kkgroblewski@gmail.com>
Date: Fri, 13 Dec 2024 17:17:29 +0100
Subject: [PATCH 4/4] format

---
 charming/tests/line.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/charming/tests/line.rs b/charming/tests/line.rs
index 7db4b2b..ded5c22 100644
--- a/charming/tests/line.rs
+++ b/charming/tests/line.rs
@@ -17,9 +17,9 @@ fn basic_line_chart() {
         "series": [
           {
             "data": [150, 230, 224, 218, 135, 147, 260],
-            "type": "line",
+            "type": "line"
           }
-        ],
+        ]
       }
     );