feat: allow using Formatter::Function from WASM, add value_formatter …

…in Tooltip
yuankunzhang · Jul 26, 2024 · 2926354 · 2926354
1 parent 7bb6774
commit 2926354
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/charming/src/element/formatter.rs b/charming/src/element/formatter.rs
@@ -1,11 +1,15 @@
-use serde::Serialize;
-
 use super::RawString;
+use serde::Serialize;
 
 #[derive(Serialize)]
 #[serde(untagged)]
 pub enum Formatter {
     String(String),
+
+    #[cfg(target_arch = "wasm32")]
+    Function(#[serde(with = "serde_wasm_bindgen::preserve")] web_sys::js_sys::Function),
+
+    #[cfg(not(target_arch = "wasm32"))]
     Function(RawString),
 }
 
@@ -15,6 +19,7 @@ impl From<&str> for Formatter {
     }
 }
 
+#[cfg(not(target_arch = "wasm32"))]
 impl From<RawString> for Formatter {
     fn from(s: RawString) -> Self {
         Formatter::Function(s)

diff --git a/charming/src/element/tooltip.rs b/charming/src/element/tooltip.rs
@@ -36,6 +36,9 @@ pub struct Tooltip {
     #[serde(skip_serializing_if = "Option::is_none")]
     formatter: Option<Formatter>,
 
+    #[serde(skip_serializing_if = "Option::is_none")]
+    value_formatter: Option<Formatter>,
+
     #[serde(skip_serializing_if = "Option::is_none")]
     position: Option<String>,
 
@@ -59,6 +62,7 @@ impl Tooltip {
             trigger_on: None,
             axis_pointer: None,
             formatter: None,
+            value_formatter: None,
             position: None,
             padding: None,
             background_color: None,
@@ -87,6 +91,11 @@ impl Tooltip {
         self
     }
 
+    pub fn value_formatter<F: Into<Formatter>>(mut self, value_formatter: F) -> Self {
+        self.value_formatter = Some(value_formatter.into());
+        self
+    }
+
     pub fn position<S: Into<String>>(mut self, position: S) -> Self {
         self.position = Some(position.into());
         self