@perspective-dev/viewer 4.4.1 → 4.5.1

package/src/rust/components/string_column_style.rs

@@ -11,9 +11,7 @@
 // ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
 
 use yew::prelude::*;
-use yew::*;
 
-use super::form::color_selector::*;
 use super::modal::{ModalLink, SetModalLink};
 use super::style::LocalStyle;
 use crate::components::form::select_enum_field::SelectEnumField;
@@ -21,13 +19,18 @@ use crate::config::*;
 use crate::css;
 use crate::utils::WeakScope;
 
+/// Format-only widget for [`String`] columns. Renders the `format` enum
+/// only; color/color-mode UI is provided externally as primitive `Enum`
+/// + `Color` schema fields.
 #[derive(Properties)]
 pub struct StringColumnStyleProps {
     pub config: Option<StringColumnStyleConfig>,
-    pub default_config: StringColumnStyleDefaultConfig,
 
     #[prop_or_default]
-    pub on_change: Callback<ColumnConfigValueUpdate>,
+    pub on_change: Callback<ColumnConfigFieldUpdate>,
+
+    #[prop_or_default]
+    pub keys: Vec<String>,
 
     #[prop_or_default]
     weak_link: WeakScope<StringColumnStyle>,
@@ -41,22 +44,16 @@ impl ModalLink<StringColumnStyle> for StringColumnStyleProps {
 
 impl PartialEq for StringColumnStyleProps {
     fn eq(&self, other: &Self) -> bool {
-        self.config == other.config && self.default_config == other.default_config
+        self.config == other.config
     }
 }
 
 pub enum StringColumnStyleMsg {
-    Reset(StringColumnStyleConfig),
     FormatChanged(Option<FormatMode>),
-    ColorModeChanged(Option<StringColorMode>),
-    ColorChanged(String),
-    ColorReset,
 }
 
-/// A component for the style form control for [`String`] columns.
 pub struct StringColumnStyle {
     config: StringColumnStyleConfig,
-    default_config: StringColumnStyleDefaultConfig,
 }
 
 impl Component for StringColumnStyle {
@@ -67,11 +64,9 @@ impl Component for StringColumnStyle {
         ctx.set_modal_link();
         Self {
             config: ctx.props().config.clone().unwrap_or_default(),
-            default_config: ctx.props().default_config.clone(),
         }
     }
 
-    // Always re-render when config changes.
     fn changed(&mut self, ctx: &Context<Self>, _old: &Self::Properties) -> bool {
         let mut new_config = ctx.props().config.clone().unwrap_or_default();
         if self.config != new_config {
@@ -84,51 +79,16 @@ impl Component for StringColumnStyle {
 
     fn update(&mut self, ctx: &Context<Self>, msg: Self::Message) -> bool {
         match msg {
-            StringColumnStyleMsg::Reset(config) => {
-                self.config = config;
-                true
-            },
             StringColumnStyleMsg::FormatChanged(val) => {
                 self.config.format = val.unwrap_or_default();
                 self.dispatch_config(ctx);
                 true
             },
-            StringColumnStyleMsg::ColorModeChanged(mode) => {
-                self.config.string_color_mode = mode.unwrap_or_default();
-                self.dispatch_config(ctx);
-                true
-            },
-            StringColumnStyleMsg::ColorChanged(color) => {
-                self.config.color = Some(color);
-                self.dispatch_config(ctx);
-                true
-            },
-            StringColumnStyleMsg::ColorReset => {
-                self.config.color = Some(self.default_config.color.clone());
-                self.dispatch_config(ctx);
-                true
-            },
         }
     }
 
     fn view(&self, ctx: &Context<Self>) -> Html {
-        let format_mode_selected = self.config.format;
         let format_mode_changed = ctx.link().callback(StringColumnStyleMsg::FormatChanged);
-        let selected_color_mode = self.config.string_color_mode;
-        let color_mode_changed = ctx.link().callback(StringColumnStyleMsg::ColorModeChanged);
-        let color_controls = match selected_color_mode {
-            StringColorMode::Foreground => {
-                self.color_select_row(ctx, &StringColorMode::Foreground, "foreground-label")
-            },
-            StringColorMode::Background => {
-                self.color_select_row(ctx, &StringColorMode::Background, "background-label")
-            },
-            StringColorMode::Series => {
-                self.color_select_row(ctx, &StringColorMode::Series, "series-label")
-            },
-            StringColorMode::None => html! {},
-        };
-
         html! {
             <>
                 <LocalStyle href={css!("column-style")} />
@@ -136,14 +96,8 @@ impl Component for StringColumnStyle {
                     <SelectEnumField<FormatMode>
                         label="format"
                         on_change={format_mode_changed}
-                        current_value={format_mode_selected}
-                    />
-                    <SelectEnumField<StringColorMode>
-                        label="color"
-                        on_change={color_mode_changed}
-                        current_value={selected_color_mode}
+                        current_value={self.config.format}
                     />
-                    { color_controls }
                 </div>
             </>
         }
@@ -153,34 +107,18 @@ impl Component for StringColumnStyle {
 impl StringColumnStyle {
     /// When this config has changed, we must signal the wrapper element.
     fn dispatch_config(&self, ctx: &Context<Self>) {
-        let update = Some(self.config.clone()).filter(|x| x != &StringColumnStyleConfig::default());
-        ctx.props()
-            .on_change
-            .emit(ColumnConfigValueUpdate::DatagridStringStyle(update));
-    }
+        let value = if self.config == StringColumnStyleConfig::default() {
+            serde_json::Map::new()
+        } else {
+            match serde_json::to_value(&self.config) {
+                Ok(serde_json::Value::Object(m)) => m,
+                _ => serde_json::Map::new(),
+            }
+        };
 
-    /// Generate a color selector component for a specific `StringColorMode`
-    /// variant.
-    fn color_select_row(&self, ctx: &Context<Self>, mode: &StringColorMode, title: &str) -> Html {
-        let on_color = ctx.link().callback(StringColumnStyleMsg::ColorChanged);
-        let color = self
-            .config
-            .color
-            .clone()
-            .unwrap_or_else(|| self.default_config.color.to_owned());
-
-        let color_props = props!(ColorProps {
-            title: title.to_owned(),
-            on_color,
-            is_modified: color != self.default_config.color,
-            color,
-            on_reset: ctx.link().callback(|_| StringColumnStyleMsg::ColorReset)
+        ctx.props().on_change.emit(ColumnConfigFieldUpdate {
+            keys: ctx.props().keys.clone(),
+            value,
         });
-
-        if &self.config.string_color_mode == mode {
-            html! { <div class="row"><ColorSelector ..color_props /></div> }
-        } else {
-            html! {}
-        }
     }
 }

package/src/rust/components/style_controls/number_string_format.rs

@@ -26,9 +26,11 @@ use crate::css;
 #[derive(Properties, PartialEq, Clone)]
 pub struct CustomNumberFormatProps {
     pub restored_config: CustomNumberFormatConfig,
-    pub on_change: Callback<ColumnConfigValueUpdate>,
+    pub on_change: Callback<ColumnConfigFieldUpdate>,
     pub view_type: ColumnType,
     pub column_name: String,
+    #[prop_or_default]
+    pub keys: Vec<String>,
 }
 
 pub enum CustomNumberFormatMsg {
@@ -56,10 +58,6 @@ pub struct CustomNumberFormat {
     config: CustomNumberFormatConfig,
     style: NumberStyle,
     notation: Option<NotationName>,
-    // show_frac: bool,
-    // show_sig: bool,
-    // disable_rounding_increment: bool,
-    // disable_rounding_priority: bool,
 }
 
 impl Component for CustomNumberFormat {
@@ -197,11 +195,17 @@ impl Component for CustomNumberFormat {
 
         let is_float = ctx.props().view_type == ColumnType::Float;
         let filtered_config = self.config.clone().filter_default(is_float);
-        let value =
-            (filtered_config != CustomNumberFormatConfig::default()).then_some(filtered_config);
-
-        let update = ColumnConfigValueUpdate::CustomNumberStringFormat(value);
-        ctx.props().on_change.emit(update);
+        let mut value = serde_json::Map::new();
+        if filtered_config != CustomNumberFormatConfig::default() {
+            value.insert(
+                "number_format".to_owned(),
+                serde_json::to_value(&filtered_config).unwrap_or(serde_json::Value::Null),
+            );
+        }
+        ctx.props().on_change.emit(ColumnConfigFieldUpdate {
+            keys: ctx.props().keys.clone(),
+            value,
+        });
         true
     }
 
@@ -220,22 +224,6 @@ impl Component for CustomNumberFormat {
 impl CustomNumberFormat {
     fn initialize(ctx: &yew::prelude::Context<Self>) -> Self {
         let config = ctx.props().restored_config.clone();
-        // let show_frac = config
-        //     .minimum_fraction_digits
-        //     .or(config.maximum_fraction_digits)
-        //     .or(config.rounding_increment)
-        //     .is_some();
-        // let show_sig = config
-        //     .minimum_significant_digits
-        //     .or(config.maximum_significant_digits)
-        //     .is_some();
-        // let disable_rounding_increment = show_sig
-        //     || show_frac
-        //     || !matches!(
-        //         config.rounding_priority,
-        //         Some(RoundingPriority::Auto) | None
-        //     );
-        // let disable_rounding_priority = !(show_frac && show_sig);
         Self {
             style: config
                 ._style
@@ -248,10 +236,6 @@ impl CustomNumberFormat {
                 })
                 .unwrap_or_default(),
             config,
-            // show_frac,
-            // show_sig,
-            // disable_rounding_increment,
-            // disable_rounding_priority,
             notation: None,
         }
     }