Merge pull request #79 from estie-inc/chart_solid_fill

feat: add chart_solid_fill

Author: rajyan

rust/src/wrapper/chart/chart_format.rs

@@ -2,6 +2,7 @@ use rust_xlsxwriter::{self as xlsx};
 use wasm_bindgen::prelude::*;
 
 use crate::wrapper::color::Color;
+use crate::wrapper::chart::chart_solid_fill::ChartSolidFill;
 
 /// The `ChartFormat` struct represents formatting for various chart objects.
 ///
@@ -79,7 +80,12 @@ impl ChartFormat {
         self
     }
 
-    // TODO: set_gradient_fill, set_pattern_fill, set_solid_fill
+    // TODO: set_gradient_fill, set_pattern_fill
+    #[wasm_bindgen(js_name = "setSolidFill")]
+    pub fn set_solid_fill(mut self, fill: &ChartSolidFill) -> ChartFormat {
+        self.inner.set_solid_fill(&fill.inner);
+        self
+    }
 }
 
 /// The `ChartLine` struct represents a chart line/border.

rust/src/wrapper/chart/chart_point.rs

@@ -38,6 +38,7 @@ impl ChartPoint {
         }
     }
 
+    #[wasm_bindgen(js_name = "setFormat")]
     pub fn set_format(&self, format: &mut ChartFormat) -> ChartPoint {
         ChartPoint {
             inner: self.clone().inner.set_format(&mut format.inner),

rust/src/wrapper/chart/chart_series.rs

@@ -3,7 +3,7 @@ use std::sync::{Arc, Mutex};
 use rust_xlsxwriter as xlsx;
 use wasm_bindgen::prelude::*;
 
-use super::{chart_data_label::ChartDataLabel, chart_marker::ChartMarker, chart_point::ChartPoint, chart_range::ChartRange};
+use super::{chart_data_label::ChartDataLabel, chart_format::ChartFormat, chart_marker::ChartMarker, chart_point::ChartPoint, chart_range::ChartRange};
 
 #[wasm_bindgen]
 pub struct ChartSeries {
@@ -151,4 +151,13 @@ impl ChartSeries {
             inner: Arc::clone(&self.inner),
         }
     }
+
+    #[wasm_bindgen(js_name = "setFormat", skip_jsdoc)]
+    pub fn set_format(&self, format: &mut ChartFormat) -> ChartSeries {
+        let mut series = self.inner.lock().unwrap();
+        series.set_format(&mut format.inner);
+        ChartSeries {
+            inner: Arc::clone(&self.inner),
+        }
+    }
 }

rust/src/wrapper/chart/chart_solid_fill.rs

@@ -0,0 +1,50 @@
+use rust_xlsxwriter as xlsx;
+use wasm_bindgen::prelude::*;
+
+use crate::wrapper::color::Color;
+
+/// The `ChartSolidFill` struct represents a solid fill for chart elements.
+///
+/// The `ChartSolidFill` struct is used to define the solid fill properties
+/// for chart elements such as plot areas, chart areas, data series, and other
+/// fillable elements in a chart.
+///
+/// It is used in conjunction with the {@link Chart} struct.
+#[wasm_bindgen]
+pub struct ChartSolidFill {
+    pub(crate) inner: xlsx::ChartSolidFill,
+}
+
+#[wasm_bindgen]
+impl ChartSolidFill {
+    /// Create a new `ChartSolidFill` object.
+    #[wasm_bindgen(constructor)]
+    pub fn new() -> ChartSolidFill {
+        ChartSolidFill {
+            inner: xlsx::ChartSolidFill::new(),
+        }
+    }
+
+    /// Set the color of a solid fill.
+    ///
+    /// @param {Color} color - The color property.
+    /// @return {ChartSolidFill} - The ChartSolidFill instance.
+    #[wasm_bindgen(js_name = "setColor")]
+    pub fn set_color(mut self, color: &Color) -> ChartSolidFill {
+        self.inner.set_color(color.inner);
+        self
+    }
+
+    /// Set the transparency of a solid fill.
+    ///
+    /// Set the transparency of a solid fill color for a Chart element.
+    /// You must also specify a fill color in order for the transparency to be applied.
+    ///
+    /// @param {number} transparency - The color transparency in the range 0-100.
+    /// @return {ChartSolidFill} - The ChartSolidFill instance.
+    #[wasm_bindgen(js_name = "setTransparency")]
+    pub fn set_transparency(mut self, transparency: u8) -> ChartSolidFill {
+        self.inner.set_transparency(transparency);
+        self
+    }
+}

rust/src/wrapper/chart/mod.rs

@@ -10,6 +10,7 @@ mod chart_marker_type;
 mod chart_point;
 mod chart_range;
 mod chart_series;
+mod chart_solid_fill;
 mod chart_title;
 mod chart_type;
 

test/chart.test.ts

@@ -10,6 +10,10 @@ import {
   ChartDataLabelPosition,
   ChartMarker,
   ChartMarkerType,
+  ChartSolidFill,
+  ChartFormat,
+  Color,
+  ChartLine,
 } from "../web/wasm_xlsxwriter";
 import { describe, test, beforeAll, expect } from "vitest";
 import { initWasModule, readXlsx, readXlsxFile } from "./common";
@@ -46,23 +50,31 @@ describe("xlsx-wasm test", () => {
     const chartDataLabel = new ChartDataLabel().setFont(chartFont).showValue().setPosition(ChartDataLabelPosition.Left);
 
     const chartSeries1 = new ChartSeries();
-    const chartMarker1 = new ChartMarker().setType(ChartMarkerType.Circle).setSize(10);
+    const chartLine1 = new ChartLine().setColor(Color.green());
+    const chartSolidFill1 = new ChartSolidFill().setColor(Color.green());
+    const chartFormat1 = new ChartFormat().setLine(chartLine1).setSolidFill(chartSolidFill1);
+    const chartMarker1 = new ChartMarker().setType(ChartMarkerType.Circle).setSize(10).setFormat(chartFormat1);
     const categoriesRange1 = new ChartRange("Sheet1", 1, 0, 6, 0);
     const valuesRange1 = new ChartRange("Sheet1", 1, 1, 6, 1);
     chartSeries1
       .setName("Score 1")
       .setCategories(categoriesRange1)
       .setValues(valuesRange1)
+      .setFormat(chartFormat1)
       .setDataLabel(chartDataLabel)
       .setMarker(chartMarker1);
     const chartSeries2 = new ChartSeries();
-    const chartMarker2 = new ChartMarker().setType(ChartMarkerType.Diamond).setSize(10);
+    const chartLine2 = new ChartLine().setColor(Color.purple());
+    const chartSolidFill2 = new ChartSolidFill().setColor(Color.purple());  
+    const chartFormat2 = new ChartFormat().setLine(chartLine2).setSolidFill(chartSolidFill2);
+    const chartMarker2 = new ChartMarker().setType(ChartMarkerType.Diamond).setSize(10).setFormat(chartFormat2);
     const categoriesRange2 = new ChartRange("Sheet1", 1, 0, 6, 0);
     const valuesRange2 = new ChartRange("Sheet1", 1, 2, 6, 2);
     chartSeries2
       .setName("Score 2")
       .setCategories(categoriesRange2)
       .setValues(valuesRange2)
+      .setFormat(chartFormat2)
       .setDataLabel(chartDataLabel)
       .setMarker(chartMarker2);
     chart