@perspective-dev/viewer 5.3.0 → 5.3.1

package/src/rust/components/datetime_column_style/simple.rs

@@ -22,6 +22,13 @@ pub struct DatetimeStyleSimpleProps {
     pub enable_time_config: bool,
     pub config: SimpleDatetimeStyleConfig,
 
+    /// The plugin-declared default preset for each style select.
+    #[prop_or(SimpleDatetimeFormat::Short)]
+    pub date_style_default: SimpleDatetimeFormat,
+
+    #[prop_or(SimpleDatetimeFormat::Medium)]
+    pub time_style_default: SimpleDatetimeFormat,
+
     #[prop_or_default]
     pub on_change: Callback<SimpleDatetimeStyleConfig>,
 
@@ -37,7 +44,10 @@ impl ModalLink<DatetimeStyleSimple> for DatetimeStyleSimpleProps {
 
 impl PartialEq for DatetimeStyleSimpleProps {
     fn eq(&self, other: &Self) -> bool {
-        self.enable_time_config == other.enable_time_config && self.config == other.config
+        self.enable_time_config == other.enable_time_config
+            && self.config == other.config
+            && self.date_style_default == other.date_style_default
+            && self.time_style_default == other.time_style_default
     }
 }
 
@@ -69,12 +79,12 @@ impl Component for DatetimeStyleSimple {
     fn update(&mut self, ctx: &Context<Self>, msg: Self::Message) -> bool {
         match msg {
             DatetimeStyleSimpleMsg::DateStyleChanged(format) => {
-                self.config.date_style = format.unwrap_or_default();
+                self.config.date_style = format.unwrap_or(ctx.props().date_style_default);
                 self.dispatch_config(ctx);
                 true
             },
             DatetimeStyleSimpleMsg::TimeStyleChanged(format) => {
-                self.config.time_style = format.unwrap_or_default();
+                self.config.time_style = format.unwrap_or(ctx.props().time_style_default);
                 self.dispatch_config(ctx);
                 true
             },
@@ -99,13 +109,14 @@ impl Component for DatetimeStyleSimple {
                     label="date-style"
                     on_change={ctx.link().callback(DatetimeStyleSimpleMsg::DateStyleChanged)}
                     current_value={self.config.date_style}
+                    default_value={ctx.props().date_style_default}
                 />
                 if ctx.props().enable_time_config {
                     <SelectEnumField<SimpleDatetimeFormat>
                         label="time-style"
                         on_change={ctx.link().callback(DatetimeStyleSimpleMsg::TimeStyleChanged)}
                         current_value={self.config.time_style}
-                        default_value={SimpleDatetimeFormat::Medium}
+                        default_value={ctx.props().time_style_default}
                     />
                 }
             </>

package/src/rust/components/datetime_column_style.rs

@@ -38,6 +38,9 @@ pub struct DatetimeColumnStyleProps {
     pub enable_time_config: bool,
     pub config: Option<DatetimeColumnStyleConfig>,
 
+    /// The active plugin's declared default `date_format`.
+    pub default_format: Rc<DatetimeFormatType>,
+
     #[prop_or_default]
     pub on_change: Callback<ColumnConfigFieldUpdate>,
 
@@ -57,7 +60,9 @@ impl ModalLink<DatetimeColumnStyle> for DatetimeColumnStyleProps {
 
 impl PartialEq for DatetimeColumnStyleProps {
     fn eq(&self, other: &Self) -> bool {
-        self.enable_time_config == other.enable_time_config && self.config == other.config
+        self.enable_time_config == other.enable_time_config
+            && self.config == other.config
+            && self.default_format == other.default_format
     }
 }
 
@@ -90,7 +95,9 @@ impl Component for DatetimeColumnStyle {
             std::mem::swap(&mut self.config, &mut new_config);
             rerender = true;
         }
-        if old.enable_time_config != ctx.props().enable_time_config {
+        if old.enable_time_config != ctx.props().enable_time_config
+            || old.default_format != ctx.props().default_format
+        {
             rerender = true;
         }
         rerender
@@ -99,22 +106,24 @@ impl Component for DatetimeColumnStyle {
     fn update(&mut self, ctx: &Context<Self>, msg: Self::Message) -> bool {
         match msg {
             DatetimeColumnStyleMsg::TimezoneChanged(val) => {
+                let mut format = self.effective_format(ctx);
                 if Some(&*USER_TIMEZONE) != val.as_ref() {
-                    *self.config.date_format.time_zone_mut() = val;
+                    *format.time_zone_mut() = val;
                 } else {
-                    *self.config.date_format.time_zone_mut() = None;
+                    *format.time_zone_mut() = None;
                 }
 
+                self.set_format(ctx, format);
                 self.dispatch_config(ctx);
                 true
             },
             DatetimeColumnStyleMsg::SimpleDatetimeStyleConfigChanged(simple) => {
-                self.config.date_format = DatetimeFormatType::Simple(simple);
+                self.set_format(ctx, DatetimeFormatType::Simple(simple));
                 self.dispatch_config(ctx);
                 true
             },
             DatetimeColumnStyleMsg::CustomDatetimeStyleConfigChanged(custom) => {
-                self.config.date_format = DatetimeFormatType::Custom(custom);
+                self.set_format(ctx, DatetimeFormatType::Custom(custom));
                 self.dispatch_config(ctx);
                 true
             },
@@ -122,6 +131,24 @@ impl Component for DatetimeColumnStyle {
     }
 
     fn view(&self, ctx: &Context<Self>) -> Html {
+        let format = self.effective_format(ctx);
+        let (date_style_default, time_style_default) = match &*ctx.props().default_format {
+            DatetimeFormatType::Simple(simple) => (simple.date_style, simple.time_style),
+            DatetimeFormatType::Custom(_) => {
+                (SimpleDatetimeFormat::Short, SimpleDatetimeFormat::Medium)
+            },
+        };
+
+        let simple_reset = {
+            let default_format = ctx.props().default_format.clone();
+            ctx.link().callback(move |_| {
+                DatetimeColumnStyleMsg::SimpleDatetimeStyleConfigChanged(match &*default_format {
+                    DatetimeFormatType::Simple(simple) => simple.clone(),
+                    DatetimeFormatType::Custom(_) => SimpleDatetimeStyleConfig::default(),
+                })
+            })
+        };
+
         html! {
             <>
                 <div id="column-style-container" class="datetime-column-style-container">
@@ -131,10 +158,10 @@ impl Component for DatetimeColumnStyle {
                             values={ALL_TIMEZONES.with(|x| (*x).clone())}
                             default_value={(*USER_TIMEZONE).clone()}
                             on_change={ctx.link().callback(DatetimeColumnStyleMsg::TimezoneChanged)}
-                            current_value={self.config.date_format.time_zone().as_ref().unwrap_or(&*USER_TIMEZONE).clone()}
+                            current_value={format.time_zone().as_ref().unwrap_or(&*USER_TIMEZONE).clone()}
                         />
                     }
-                    if let DatetimeFormatType::Simple(config) = &self.config.date_format {
+                    if let DatetimeFormatType::Simple(config) = &format {
                         if ctx.props().enable_time_config {
                             <div class="row">
                                 <button
@@ -149,15 +176,17 @@ impl Component for DatetimeColumnStyle {
                             enable_time_config={ctx.props().enable_time_config}
                             on_change={ctx.link().callback(DatetimeColumnStyleMsg::SimpleDatetimeStyleConfigChanged)}
                             config={config.clone()}
+                            {date_style_default}
+                            {time_style_default}
                         />
-                    } else if let DatetimeFormatType::Custom(config) = &self.config.date_format {
+                    } else if let DatetimeFormatType::Custom(config) = &format {
                         if ctx.props().enable_time_config {
                             <div class="row">
                                 <button
                                     id="datetime_format"
                                     data-title="Custom"
                                     data-title-hover="Switch to Simple"
-                                    onclick={ctx.link().callback(|_| DatetimeColumnStyleMsg::SimpleDatetimeStyleConfigChanged(SimpleDatetimeStyleConfig::default()))}
+                                    onclick={simple_reset}
                                 />
                             </div>
                         }
@@ -201,6 +230,17 @@ static USER_TIMEZONE: LazyLock<String> = LazyLock::new(|| {
 });
 
 impl DatetimeColumnStyle {
+    fn effective_format(&self, ctx: &Context<Self>) -> DatetimeFormatType {
+        self.config
+            .date_format
+            .clone()
+            .unwrap_or_else(|| (*ctx.props().default_format).clone())
+    }
+
+    fn set_format(&mut self, ctx: &Context<Self>, format: DatetimeFormatType) {
+        self.config.date_format = (format != *ctx.props().default_format).then_some(format);
+    }
+
     /// When this config has changed, we must signal the wrapper element.
     fn dispatch_config(&self, ctx: &Context<Self>) {
         let value = if self.config == DatetimeColumnStyleConfig::default() {

package/src/rust/components/plugin_tab.rs

@@ -22,7 +22,9 @@ use yew::prelude::*;
 use crate::components::column_settings_sidebar::style_tab::primitive_field::{
     BoolField, ColorField, EnumField, NumberFieldPrimitive,
 };
+use crate::components::containers::control_group::ControlGroup;
 use crate::config::ControlSpec;
+use crate::presentation::Presentation;
 use crate::queries::get_plugin_config_schema;
 use crate::renderer::Renderer;
 use crate::session::Session;
@@ -47,6 +49,7 @@ pub struct PluginTabProps {
     pub plugin_config: PtrEqRc<serde_json::Map<String, serde_json::Value>>,
 
     // State
+    pub presentation: Presentation,
     pub renderer: Renderer,
     pub session: Session,
 }
@@ -95,98 +98,133 @@ pub fn PluginTab(props: &PluginTabProps) -> Html {
         })
     };
 
-    let raw_config = &*props.plugin_config;
-    let components = schema
-        .iter()
-        .cloned()
-        .filter_map(|spec| {
-            let component = match spec {
-                ControlSpec::Enum {
-                    key,
-                    variants,
-                    default,
-                } => {
-                    let current = raw_config
-                        .get(&key)
-                        .and_then(|v| v.as_str().map(|s| s.to_string()));
-                    html! {
-                        <EnumField
-                            field_key={key}
-                            {variants}
-                            {default}
-                            {current}
-                            on_change={on_change.clone()}
-                        />
-                    }
-                },
-                ControlSpec::Bool { key, default } => {
-                    let current = raw_config.get(&key).and_then(|v| v.as_bool());
-                    html! {
-                        <BoolField
-                            field_key={key}
-                            {default}
-                            {current}
-                            on_change={on_change.clone()}
-                        />
-                    }
-                },
-                ControlSpec::Color { key, default } => {
-                    let current = raw_config
-                        .get(&key)
-                        .and_then(|v| v.as_str().map(|s| s.to_string()));
-                    html! {
-                        <ColorField
-                            field_key={key}
-                            {default}
-                            {current}
-                            on_change={on_change.clone()}
-                        />
-                    }
-                },
-                ControlSpec::Number {
-                    key,
-                    default,
-                    min,
-                    max,
-                    step,
-                    include,
-                } => {
-                    let current = raw_config.get(&key).and_then(|v| v.as_f64());
-                    html! {
-                        <NumberFieldPrimitive
-                            field_key={key}
-                            {default}
-                            {current}
-                            {min}
-                            {max}
-                            {step}
-                            {include}
-                            on_change={on_change.clone()}
-                        />
-                    }
-                },
-                // Column-scoped variants don't apply to
-                // plugin-level config; drop silently.
-                ControlSpec::AggregateDepth
-                | ControlSpec::NumberSeriesStyle { .. }
-                | ControlSpec::DatetimeFormat
-                | ControlSpec::StringFormat
-                | ControlSpec::Symbols { .. }
-                | ControlSpec::NumberFormat
-                | ControlSpec::String { .. }
-                | ControlSpec::Palette { .. }
-                | ControlSpec::GradientStops { .. } => {
-                    return None;
-                },
-            };
-
-            Some(html! { <fieldset class="style-control">{ component }</fieldset> })
+    let on_group_toggle = {
+        let presentation = props.presentation.clone();
+        yew::Callback::from(move |(key, open): (String, bool)| {
+            presentation.set_control_group_collapsed(&key, !open);
         })
-        .collect_vec();
+    };
 
+    let raw_config = &*props.plugin_config;
+    let components = render_specs(
+        &schema,
+        raw_config,
+        &on_change,
+        &props.presentation,
+        &on_group_toggle,
+    );
     html! {
         <div id="plugin-tab" class="sidebar_column scrollable">
             <div id="plugin-config-container" class="tab-section">{ components }</div>
         </div>
     }
 }
+
+fn render_specs(
+    specs: &[ControlSpec],
+    raw_config: &serde_json::Map<String, serde_json::Value>,
+    on_change: &Callback<crate::config::ColumnConfigFieldUpdate>,
+    presentation: &Presentation,
+    on_group_toggle: &Callback<(String, bool)>,
+) -> Vec<Html> {
+    specs
+        .iter()
+        .filter_map(|spec| match spec {
+            ControlSpec::Group { key, fields } => {
+                let children =
+                    render_specs(fields, raw_config, on_change, presentation, on_group_toggle);
+
+                (!children.is_empty()).then(|| {
+                    html! {
+                        <ControlGroup
+                            key={format!("group::{key}")}
+                            group_key={key.clone()}
+                            open={!presentation.is_control_group_collapsed(key)}
+                            on_toggle={on_group_toggle.clone()}
+                        >
+                            { children }
+                        </ControlGroup>
+                    }
+                })
+            },
+            leaf => {
+                let key = leaf.serialized_keys().join("+");
+                let component = render_leaf(leaf, raw_config, on_change)?;
+                Some(html! { <fieldset class="style-control" {key}>{ component }</fieldset> })
+            },
+        })
+        .collect_vec()
+}
+
+fn render_leaf(
+    spec: &ControlSpec,
+    raw_config: &serde_json::Map<String, serde_json::Value>,
+    on_change: &Callback<crate::config::ColumnConfigFieldUpdate>,
+) -> Option<Html> {
+    match spec.clone() {
+        ControlSpec::Enum {
+            key,
+            variants,
+            default,
+        } => {
+            let current = raw_config
+                .get(&key)
+                .and_then(|v| v.as_str().map(|s| s.to_string()));
+            Some(html! {
+                <EnumField
+                    field_key={key}
+                    {variants}
+                    {default}
+                    {current}
+                    on_change={on_change.clone()}
+                />
+            })
+        },
+        ControlSpec::Bool { key, default } => {
+            let current = raw_config.get(&key).and_then(|v| v.as_bool());
+            Some(html! {
+                <BoolField field_key={key} {default} {current} on_change={on_change.clone()} />
+            })
+        },
+        ControlSpec::Color { key, default } => {
+            let current = raw_config
+                .get(&key)
+                .and_then(|v| v.as_str().map(|s| s.to_string()));
+            Some(html! {
+                <ColorField field_key={key} {default} {current} on_change={on_change.clone()} />
+            })
+        },
+        ControlSpec::Number {
+            key,
+            default,
+            min,
+            max,
+            step,
+            include,
+        } => {
+            let current = raw_config.get(&key).and_then(|v| v.as_f64());
+            Some(html! {
+                <NumberFieldPrimitive
+                    field_key={key}
+                    {default}
+                    {current}
+                    {min}
+                    {max}
+                    {step}
+                    {include}
+                    on_change={on_change.clone()}
+                />
+            })
+        },
+        ControlSpec::Group { .. }
+        | ControlSpec::AggregateDepth
+        | ControlSpec::NumberSeriesStyle { .. }
+        | ControlSpec::DatetimeFormat { .. }
+        | ControlSpec::StringFormat
+        | ControlSpec::Symbols { .. }
+        | ControlSpec::NumberFormat { .. }
+        | ControlSpec::String { .. }
+        | ControlSpec::Palette { .. }
+        | ControlSpec::GradientStops { .. } => None,
+    }
+}

package/src/rust/components/settings_panel.rs

@@ -370,6 +370,7 @@ pub fn SettingsPanel(props: &SettingsPanelProps) -> Html {
                 <PluginTab
                     view_config={props.view_config.clone()}
                     plugin_config={props.plugin_config.clone()}
+                    presentation={presentation.clone()}
                     renderer={renderer.clone()}
                     session={session.clone()}
                 // initial_width={width}

package/src/rust/components/status_bar.rs

@@ -429,7 +429,6 @@ fn ThemeSelector(props: &ThemeSelectorProps) -> Html {
                             <span class="icon" />
                             <Select<String>
                                 id="theme_selector"
-                                class="invert"
                                 {values}
                                 selected={selected.to_owned()}
                                 on_select={props.on_change.clone()}

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

@@ -37,7 +37,7 @@ impl CustomNumberFormat {
                     min=1.
                     max=21.
                     step=1.
-                    default=1.
+                    default={ctx.props().defaults.minimum_integer_digits}
                     current_value={self.config.minimum_integer_digits}
                     on_change={ctx.link().callback(CustomNumberFormatMsg::MinimumIntegerDigits)}
                 />
@@ -84,14 +84,23 @@ impl CustomNumberFormat {
     }
 
     fn float_section(&self, ctx: &yew::prelude::Context<Self>) -> yew::prelude::Html {
+        let defaults = &ctx.props().defaults;
         let fractional_value = Some((
-            self.config.minimum_fraction_digits.unwrap_or(2.),
-            self.config.maximum_fraction_digits.unwrap_or(2.),
+            self.config
+                .minimum_fraction_digits
+                .unwrap_or(defaults.fraction.0),
+            self.config
+                .maximum_fraction_digits
+                .unwrap_or(defaults.fraction.1),
         ));
 
         let significant_value = Some((
-            self.config.minimum_significant_digits.unwrap_or(1.),
-            self.config.maximum_significant_digits.unwrap_or(21.),
+            self.config
+                .minimum_significant_digits
+                .unwrap_or(defaults.significant.0),
+            self.config
+                .maximum_significant_digits
+                .unwrap_or(defaults.significant.1),
         ));
 
         html! {
@@ -102,7 +111,7 @@ impl CustomNumberFormat {
                         min=0.
                         max=20.
                         step=1.
-                        default={(2., 2.)}
+                        default={defaults.fraction}
                         current_value={fractional_value}
                         on_change={ctx.link().callback(CustomNumberFormatMsg::FracChange)}
                     />
@@ -113,7 +122,7 @@ impl CustomNumberFormat {
                         min=1.
                         max=21.
                         step=1.
-                        default={(1., 21.)}
+                        default={defaults.significant}
                         current_value={significant_value}
                         on_change={ctx.link().callback(CustomNumberFormatMsg::SigChange)}
                     />
@@ -121,17 +130,20 @@ impl CustomNumberFormat {
                 { self.rounding_increment(ctx) }
                 <SelectEnumField<RoundingPriority>
                     label="rounding-priority"
-                    current_value={self.config.rounding_priority}
+                    current_value={self.config.rounding_priority.unwrap_or(defaults.rounding_priority)}
+                    default_value={defaults.rounding_priority}
                     on_change={ctx.link().callback(CustomNumberFormatMsg::RoundingPriority)}
                 />
                 <SelectEnumField<RoundingMode>
                     label="rounding-mode"
-                    current_value={self.config.rounding_mode}
+                    current_value={self.config.rounding_mode.unwrap_or(defaults.rounding_mode)}
+                    default_value={defaults.rounding_mode}
                     on_change={ctx.link().callback(CustomNumberFormatMsg::RoundingMode)}
                 />
                 <SelectEnumField<TrailingZeroDisplay>
                     label="trailing-zero-display"
-                    current_value={self.config.trailing_zero_display}
+                    current_value={self.config.trailing_zero_display.unwrap_or(defaults.trailing_zero_display)}
+                    default_value={defaults.trailing_zero_display}
                     on_change={ctx.link().callback(CustomNumberFormatMsg::TrailingZero)}
                 />
             </>

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

@@ -32,23 +32,27 @@ impl CustomNumberFormat {
             None
         };
 
+        let defaults = &ctx.props().defaults;
         html! {
             <>
                 <SelectEnumField<NotationName>
                     label="notation"
                     on_change={ctx.link().callback(CustomNumberFormatMsg::NotationChanged)}
                     current_value={self.notation.unwrap_or_default()}
+                    default_value={NotationName::from(&defaults.notation)}
                 />
                 { compact_display_checkbox }
                 <SelectEnumField<UseGrouping>
                     label="use-grouping"
                     on_change={ctx.link().callback(CustomNumberFormatMsg::UseGrouping)}
-                    current_value={self.config.use_grouping.unwrap_or_default()}
+                    current_value={self.config.use_grouping.unwrap_or(defaults.use_grouping)}
+                    default_value={defaults.use_grouping}
                 />
                 <SelectEnumField<SignDisplay>
                     label="sign-display"
                     on_change={ctx.link().callback(CustomNumberFormatMsg::SignDisplay)}
-                    current_value={self.config.sign_display.unwrap_or_default()}
+                    current_value={self.config.sign_display.unwrap_or(defaults.sign_display)}
+                    default_value={defaults.sign_display}
                 />
             </>
         }

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

@@ -60,6 +60,7 @@ impl CustomNumberFormat {
                 <SelectEnumField<NumberStyle>
                     label="style"
                     current_value={self.style}
+                    default_value={NumberStyle::from(&ctx.props().defaults.style)}
                     on_change={ctx.link().callback(CustomNumberFormatMsg::StyleChanged)}
                 />
                 { section }

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

@@ -12,6 +12,8 @@
 
 use strum::{Display, EnumIter};
 
+use crate::config::{Notation, NumberFormatStyle};
+
 #[derive(Clone, PartialEq, Debug, Copy, Default, EnumIter, Display)]
 pub enum NumberStyle {
     #[default]
@@ -21,6 +23,17 @@ pub enum NumberStyle {
     Unit,
 }
 
+impl From<&NumberFormatStyle> for NumberStyle {
+    fn from(style: &NumberFormatStyle) -> Self {
+        match style {
+            NumberFormatStyle::Decimal => Self::Decimal,
+            NumberFormatStyle::Currency(_) => Self::Currency,
+            NumberFormatStyle::Percent => Self::Percent,
+            NumberFormatStyle::Unit(_) => Self::Unit,
+        }
+    }
+}
+
 #[derive(Clone, PartialEq, Debug, Copy, Default, Display, EnumIter)]
 pub enum NotationName {
     #[default]
@@ -29,3 +42,14 @@ pub enum NotationName {
     Engineering,
     Compact,
 }
+
+impl From<&Notation> for NotationName {
+    fn from(notation: &Notation) -> Self {
+        match notation {
+            Notation::Standard => Self::Standard,
+            Notation::Scientific => Self::Scientific,
+            Notation::Engineering => Self::Engineering,
+            Notation::Compact(_) => Self::Compact,
+        }
+    }
+}