@perspective-dev/viewer 5.3.0 → 5.4.0

package/src/rust/components/status_bar.rs

@@ -10,25 +10,27 @@
 // ┃ of the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0). ┃
 // ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
 
+use std::rc::Rc;
+
 use perspective_client::config::Filter;
 use wasm_bindgen_futures::spawn_local;
 use web_sys::*;
 use yew::prelude::*;
 
 use super::status_indicator::StatusIndicator;
-use crate::components::containers::select::*;
 use crate::components::copy_dropdown::CopyDropDownMenu;
 use crate::components::export_dropdown::ExportDropDownMenu;
 use crate::components::global_filter_bar::GlobalFilterBar;
-use crate::components::portal::PortalModal;
-use crate::components::status_bar_counter::StatusBarRowsCounter;
+use crate::components::new_panel_menu::{HostedTables, NewPanelMenu, NewPanelPick, PanelLabels};
 use crate::components::style::StyleSurface;
 use crate::config::*;
 use crate::js::*;
 use crate::presentation::{Presentation, PresentationProps};
+use crate::queries::fetch_hosted_tables;
 use crate::renderer::*;
 use crate::session::*;
 use crate::tasks::*;
+use crate::ui::{PortalModal, Select, SelectItem};
 use crate::utils::*;
 use crate::workspace::Workspace;
 use crate::*;
@@ -41,9 +43,12 @@ pub struct StatusBarProps {
     /// Fired when the reset button is clicked.
     pub on_reset: Callback<bool>,
 
-    /// Snapshots threaded from root.  Component reads `has_table`, `stats`,
-    /// `error`, `title` from session_props; `selected_theme`,
-    /// `available_themes`, `is_workspace` from presentation_props.
+    /// The left-anchored "New" action, fired with the [`NewPanelMenu`] pick.
+    pub on_new_panel: Callback<NewPanelPick>,
+
+    /// Snapshots threaded from root.  Component reads `has_table`,
+    /// `has_table_cells`, `error` from session_props; `selected_theme`,
+    /// `available_themes` from presentation_props.
     pub session_props: SessionProps,
     pub presentation_props: PresentationProps,
 
@@ -89,6 +94,18 @@ impl PartialEq for StatusBarProps {
 
 pub enum StatusBarMsg {
     Reset(MouseEvent),
+
+    /// The "New" button: fetch the hosted-table listing, then open the
+    /// dropdown.
+    NewPanel,
+
+    /// The listing resolved: open the dropdown anchored at the button, if
+    /// the generation is still the newest.
+    OpenNewPanel(u32, HostedTables),
+    CloseNewPanel,
+
+    /// A pick in the "New" dropdown.
+    NewPanelPick(NewPanelPick),
     Export,
     Copy,
     CloseExport,
@@ -103,9 +120,17 @@ pub enum StatusBarMsg {
 pub struct StatusBar {
     copy_ref: NodeRef,
     export_ref: NodeRef,
+    new_ref: NodeRef,
     statusbar_ref: NodeRef,
     copy_target: Option<HtmlElement>,
     export_target: Option<HtmlElement>,
+
+    /// The "New" dropdown's anchor and listings while it is open.
+    new_menu: Option<(HtmlElement, HostedTables, PanelLabels)>,
+
+    /// Bumped per "New" click; a resolving fetch opens only if it is still
+    /// the newest one.
+    new_generation: u32,
 }
 
 impl Component for StatusBar {
@@ -116,9 +141,12 @@ impl Component for StatusBar {
         Self {
             copy_ref: NodeRef::default(),
             export_ref: NodeRef::default(),
+            new_ref: NodeRef::default(),
             statusbar_ref: NodeRef::default(),
             copy_target: None,
             export_target: None,
+            new_menu: None,
+            new_generation: 0,
         }
     }
 
@@ -129,6 +157,54 @@ impl Component for StatusBar {
                 ctx.props().on_reset.emit(all);
                 false
             },
+            StatusBarMsg::NewPanel => {
+                self.new_generation = self.new_generation.wrapping_add(1);
+                let generation = self.new_generation;
+                let workspace = ctx.props().workspace.clone();
+                let link = ctx.link().clone();
+                ApiFuture::spawn(async move {
+                    let tables = fetch_hosted_tables(&workspace).await;
+                    link.send_message(StatusBarMsg::OpenNewPanel(generation, Rc::new(tables)));
+                    Ok(())
+                });
+
+                false
+            },
+            StatusBarMsg::OpenNewPanel(generation, tables) => {
+                if generation != self.new_generation {
+                    return false;
+                }
+
+                match self.new_ref.cast::<HtmlElement>() {
+                    Some(target) => {
+                        let workspace = &ctx.props().workspace;
+                        let panels = Rc::new(
+                            workspace
+                                .panel_ids()
+                                .into_iter()
+                                .filter_map(|id| {
+                                    let panel = workspace.panel(&id)?;
+                                    let title = panel.session.get_title().filter(|t| !t.is_empty());
+                                    Some((id.as_str().to_owned(), title))
+                                })
+                                .collect::<Vec<_>>(),
+                        );
+
+                        self.new_menu = Some((target, tables, panels));
+                        true
+                    },
+                    None => false,
+                }
+            },
+            StatusBarMsg::CloseNewPanel => {
+                self.new_menu = None;
+                true
+            },
+            StatusBarMsg::NewPanelPick(pick) => {
+                ctx.props().on_new_panel.emit(pick);
+                self.new_menu = None;
+                true
+            },
             StatusBarMsg::ResetTheme => {
                 update_theme(
                     &ctx.props().renderer,
@@ -187,7 +263,6 @@ impl Component for StatusBar {
         let has_table = ctx.props().session_props.has_table.clone();
         let is_errored = ctx.props().session_props.is_errored();
         let is_settings_open = ctx.props().is_settings_open;
-        let title = &ctx.props().session_props.title;
 
         let mut is_updating_class_name = classes!();
         if !is_settings_open {
@@ -204,6 +279,9 @@ impl Component for StatusBar {
         let onexport = ctx.link().callback(|_: MouseEvent| StatusBarMsg::Export);
         let oncopy = ctx.link().callback(|_: MouseEvent| StatusBarMsg::Copy);
         let onreset = ctx.link().callback(StatusBarMsg::Reset);
+        let onnew = ctx.link().callback(|_: MouseEvent| StatusBarMsg::NewPanel);
+        let on_new_select = ctx.link().callback(StatusBarMsg::NewPanelPick);
+        let on_close_new = ctx.link().callback(|_| StatusBarMsg::CloseNewPanel);
 
         // Project only the *active* panel's plugin toolbar into the shared status
         // bar. Each panel's toolbar slots into `statusbar-extra-{its-panel-id}`
@@ -216,12 +294,7 @@ impl Component for StatusBar {
             .map(|id| format!("statusbar-extra-{id}"))
             .unwrap_or_else(|| "statusbar-extra".to_owned());
         let is_menu = matches!(has_table, Some(TableLoadState::Loaded)) && is_settings_open;
-        // The editable title moved to the per-panel `<PanelTab>` headers; the
-        // status bar no longer hosts an `<input>`, so its `is_active` factor is
-        // gone. `is_title` now only gates the row counter.
-        let is_title =
-            is_menu || ctx.props().presentation_props.is_workspace || title.is_some() || is_errored;
-
+        let is_panel_bar = !ctx.props().workspace.clients().is_empty();
         let is_settings =
             !matches!(has_table, Some(TableLoadState::Loaded)) || is_errored || is_settings_open;
 
@@ -293,11 +366,16 @@ impl Component for StatusBar {
                             update_count={ctx.props().update_count}
                             session_props={ctx.props().session_props.clone()}
                         />
-                        if is_title {
-                            <StatusBarRowsCounter stats={ctx.props().session_props.stats.clone()} />
+                        if is_panel_bar {
+                            <div id="panel-bar" class="section">
+                                <span ref={&self.new_ref} class="hover-target" onmousedown={onnew}>
+                                    <span id="new_panel" class="button">
+                                        <span class="icon" />
+                                        <span class="icon-label" />
+                                    </span>
+                                </span>
+                            </div>
                         }
-                        // Global-filter chips sit between the row stats and the
-                        // menu icons (rendered only when there are filters).
                         if !ctx.props().global_filters.is_empty() {
                             <GlobalFilterBar
                                 filters={ctx.props().global_filters.clone()}
@@ -349,9 +427,25 @@ impl Component for StatusBar {
                             </div>
                         }
                     </div>
+                    <PortalModal
+                        tag_name="perspective-new-panel-menu"
+                        sheet={StyleSurface::DropdownMenu.sheet()}
+                        target={self.new_menu.as_ref().map(|(target, ..)| target.clone())}
+                        own_focus=true
+                        on_close={on_close_new}
+                        theme={ctx.props().presentation_props.selected_theme.clone().unwrap_or_default()}
+                    >
+                        if let Some((_, tables, panels)) = &self.new_menu {
+                            <NewPanelMenu
+                                tables={Some(tables.clone())}
+                                panels={panels.clone()}
+                                callback={on_new_select}
+                            />
+                        }
+                    </PortalModal>
                     <PortalModal
                         tag_name="perspective-copy-menu"
-                        surface={StyleSurface::DropdownMenu}
+                        sheet={StyleSurface::DropdownMenu.sheet()}
                         target={self.copy_target.clone()}
                         own_focus=true
                         on_close={on_close_copy}
@@ -361,7 +455,7 @@ impl Component for StatusBar {
                     </PortalModal>
                     <PortalModal
                         tag_name="perspective-export-menu"
-                        surface={StyleSurface::DropdownMenu}
+                        sheet={StyleSurface::DropdownMenu.sheet()}
                         target={self.export_target.clone()}
                         own_focus=true
                         on_close={on_close_export}
@@ -429,7 +523,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/status_indicator.rs

@@ -22,18 +22,15 @@ use crate::utils::*;
 
 /// Value-prop version: no PubSub subscriptions, no reducer.
 /// The parent (`StatusBar`) re-renders this component whenever
-/// `session_props.error/has_table/stats` or `update_count` change (via
-/// root's `UpdateInFlight` / `UpdateSession` messages).
+/// `session_props.error/has_table/has_table_cells` or `update_count` change
+/// (via root's `UpdateInFlight` / `UpdateSession` messages).
 #[derive(PartialEq, Properties)]
 pub struct StatusIndicatorProps {
     pub renderer: Renderer,
     pub session: Session,
-    /// Number of in-flight CONFIG-DRIVEN runs (>0 → "updating" spinner) —
-    /// a level-triggered snapshot of `Session::in_flight_config_runs`
-    /// (RAII-settled; see `UPDATE_COUNT_REGRESSION_PLAN.md`).
+
+    /// TODO(texodus): remove this
     pub update_count: u32,
-    /// Snapshot of session value props — read for `error`, `has_table`,
-    /// `stats` to derive the icon state.
     pub session_props: SessionProps,
 }
 
@@ -42,13 +39,7 @@ pub struct StatusIndicatorProps {
 /// reconnect callback when in an error state.
 #[function_component]
 pub fn StatusIndicator(props: &StatusIndicatorProps) -> Html {
-    let has_table_cells = props
-        .session_props
-        .stats
-        .as_ref()
-        .and_then(|s| s.num_table_cells)
-        .is_some();
-
+    let has_table_cells = props.session_props.has_table_cells;
     let state = if let Some(err) = &props.session_props.error {
         StatusIconState::Errored(
             err.message(),

package/src/rust/components/string_column_style.rs

@@ -12,9 +12,8 @@
 
 use yew::prelude::*;
 
-use super::modal::{ModalLink, SetModalLink};
-use crate::components::form::select_enum_field::SelectEnumField;
 use crate::config::*;
+use crate::ui::{ModalLink, SelectEnumField, SetModalLink};
 use crate::utils::WeakScope;
 
 /// Format-only widget for [`String`] columns. Renders the `format` enum

package/src/rust/components/{style/mod.rs → style.rs}

@@ -25,15 +25,44 @@
 //!
 //! ```ignore
 //! html! {
-//!     <StyleProvider root={host} surface={StyleSurface::Viewer}>
+//!     <StyleProvider root={host} sheet={StyleSurface::Viewer.sheet()}>
 //!         <h1>{ "I am styled!" }</h1>
 //!     </StyleProvider>
 //! }
 //! ```
 
-mod style_provider;
+/// The CSS bundle a shadow tree adopts; each variant maps to one build-time
+/// `src/css/_*.css` entrypoint.
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Default)]
+pub enum StyleSurface {
+    /// The `<perspective-viewer>` ShadowRoot.
+    #[default]
+    Viewer,
+    /// Column-name completion dropdown (inverted color scheme).
+    ColumnDropdown,
+    /// Filter-value completion dropdown.
+    FilterDropdown,
+    /// Expression function-completion dropdown.
+    FunctionDropdown,
+    /// Copy / Export menu (non-inverted color scheme).
+    DropdownMenu,
+    /// Panel context menu (right-click a panel).
+    ContextMenu,
+}
 
-pub use style_provider::{StyleProvider, StyleSurface};
+impl StyleSurface {
+    /// The shared, lazily constructed `CSSStyleSheet` for this surface.
+    pub fn sheet(self) -> web_sys::CssStyleSheet {
+        match self {
+            StyleSurface::Viewer => VIEWER_SHEET.with(|x| x.clone()),
+            StyleSurface::ColumnDropdown => COLUMN_DROPDOWN_SHEET.with(|x| x.clone()),
+            StyleSurface::FilterDropdown => FILTER_DROPDOWN_SHEET.with(|x| x.clone()),
+            StyleSurface::FunctionDropdown => FUNCTION_DROPDOWN_SHEET.with(|x| x.clone()),
+            StyleSurface::DropdownMenu => DROPDOWN_MENU_SHEET.with(|x| x.clone()),
+            StyleSurface::ContextMenu => CONTEXT_MENU_SHEET.with(|x| x.clone()),
+        }
+    }
+}
 
 /// The viewer-surface bundle: every `src/css` file except the floating-popup
 /// sheets. Adopted into the `<perspective-viewer>` ShadowRoot.
@@ -76,15 +105,3 @@ fn make_sheet(css: &str) -> web_sys::CssStyleSheet {
     sheet.replace_sync(css).unwrap();
     sheet
 }
-
-/// The memoized, shared `CSSStyleSheet` for a given [`StyleSurface`].
-pub(crate) fn surface_sheet(surface: StyleSurface) -> web_sys::CssStyleSheet {
-    match surface {
-        StyleSurface::Viewer => VIEWER_SHEET.with(|x| x.clone()),
-        StyleSurface::ColumnDropdown => COLUMN_DROPDOWN_SHEET.with(|x| x.clone()),
-        StyleSurface::FilterDropdown => FILTER_DROPDOWN_SHEET.with(|x| x.clone()),
-        StyleSurface::FunctionDropdown => FUNCTION_DROPDOWN_SHEET.with(|x| x.clone()),
-        StyleSurface::DropdownMenu => DROPDOWN_MENU_SHEET.with(|x| x.clone()),
-        StyleSurface::ContextMenu => CONTEXT_MENU_SHEET.with(|x| x.clone()),
-    }
-}

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

@@ -17,15 +17,13 @@ use perspective_client::config::ColumnType;
 use yew::html;
 
 use super::CustomNumberFormat;
-use crate::components::containers::select::{Select, SelectItem};
-use crate::components::form::number_field::NumberField;
-use crate::components::form::number_range_field::NumberRangeField;
-use crate::components::form::optional_field::OptionalField;
-use crate::components::form::select_enum_field::SelectEnumField;
 use crate::components::style_controls::CustomNumberFormatMsg;
 use crate::config::{
     ROUNDING_INCREMENTS, RoundingIncrement, RoundingMode, RoundingPriority, TrailingZeroDisplay,
 };
+use crate::ui::{
+    NumberField, NumberRangeField, OptionalField, Select, SelectEnumField, SelectItem,
+};
 
 impl CustomNumberFormat {
     pub fn digits_section(&self, ctx: &yew::prelude::Context<Self>) -> yew::prelude::Html {
@@ -37,7 +35,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 +82,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 +109,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 +120,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 +128,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

@@ -13,9 +13,9 @@
 use yew::html;
 
 use super::CustomNumberFormat;
-use crate::components::form::select_enum_field::SelectEnumField;
 use crate::components::style_controls::{CustomNumberFormatMsg, NotationName};
 use crate::config::*;
+use crate::ui::SelectEnumField;
 
 impl CustomNumberFormat {
     pub fn misc_section(&self, ctx: &yew::prelude::Context<Self>) -> yew::prelude::Html {
@@ -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

@@ -13,9 +13,9 @@
 use yew::html;
 
 use super::CustomNumberFormat;
-use crate::components::form::select_enum_field::SelectEnumField;
 use crate::components::style_controls::{CustomNumberFormatMsg, NumberStyle};
 use crate::config::*;
+use crate::ui::SelectEnumField;
 
 impl CustomNumberFormat {
     pub fn style_section(&self, ctx: &yew::prelude::Context<Self>) -> yew::prelude::Html {
@@ -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,
+        }
+    }
+}

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

@@ -15,6 +15,8 @@ mod misc_section;
 mod style_section;
 mod types;
 
+use std::rc::Rc;
+
 use perspective_client::config::ColumnType;
 pub use types::*;
 use yew::{Callback, Component, Properties, html};
@@ -27,6 +29,10 @@ pub struct CustomNumberFormatProps {
     pub on_change: Callback<ColumnConfigFieldUpdate>,
     pub view_type: ColumnType,
     pub column_name: String,
+
+    /// Resolved default values for this column under the active plugin.
+    pub defaults: Rc<NumberFormatDefaults>,
+
     #[prop_or_default]
     pub keys: Vec<String>,
 }
@@ -147,25 +153,39 @@ impl Component for CustomNumberFormat {
                 self.config.minimum_integer_digits = val;
             },
             CustomNumberFormatMsg::FracChange(val) => {
+                let defaults = &ctx.props().defaults;
                 self.config.rounding_increment = None;
                 self.config.maximum_fraction_digits = val.map(|(_, val)| {
-                    let min = self.config.minimum_fraction_digits.unwrap_or(2.);
+                    let min = self
+                        .config
+                        .minimum_fraction_digits
+                        .unwrap_or(defaults.fraction.0);
                     val.max(min)
                 });
 
                 self.config.minimum_fraction_digits = val.map(|(val, _)| {
-                    let max = self.config.maximum_fraction_digits.unwrap_or(2.);
+                    let max = self
+                        .config
+                        .maximum_fraction_digits
+                        .unwrap_or(defaults.fraction.1);
                     val.min(max)
                 });
             },
             CustomNumberFormatMsg::SigChange(val) => {
+                let defaults = &ctx.props().defaults;
                 self.config.maximum_significant_digits = val.map(|(_, val)| {
-                    let min = self.config.minimum_significant_digits.unwrap_or(1.);
+                    let min = self
+                        .config
+                        .minimum_significant_digits
+                        .unwrap_or(defaults.significant.0);
                     val.max(min)
                 });
 
                 self.config.minimum_significant_digits = val.map(|(val, _)| {
-                    let max = self.config.maximum_significant_digits.unwrap_or(21.);
+                    let max = self
+                        .config
+                        .maximum_significant_digits
+                        .unwrap_or(defaults.significant.1);
                     val.min(max)
                 });
             },
@@ -191,8 +211,7 @@ impl Component for CustomNumberFormat {
             },
         };
 
-        let is_float = ctx.props().view_type == ColumnType::Float;
-        let filtered_config = self.config.clone().filter_default(is_float);
+        let filtered_config = self.config.clone().filter_default(&ctx.props().defaults);
         let mut value = serde_json::Map::new();
         if filtered_config != CustomNumberFormatConfig::default() {
             value.insert(
@@ -216,20 +235,24 @@ impl Component for CustomNumberFormat {
 
 impl CustomNumberFormat {
     fn initialize(ctx: &yew::prelude::Context<Self>) -> Self {
-        let config = ctx.props().restored_config.clone();
+        let defaults = &ctx.props().defaults;
+        let mut config = ctx.props().restored_config.clone();
+        if config._style.is_none() && defaults.style != NumberFormatStyle::Decimal {
+            config._style = Some(defaults.style.clone());
+        }
+
+        if config._notation.is_none() && defaults.notation != Notation::Standard {
+            config._notation = Some(defaults.notation.clone());
+        }
+
         Self {
             style: config
                 ._style
                 .as_ref()
-                .map(|style| match style {
-                    NumberFormatStyle::Decimal => NumberStyle::Decimal,
-                    NumberFormatStyle::Currency(_) => NumberStyle::Currency,
-                    NumberFormatStyle::Percent => NumberStyle::Percent,
-                    NumberFormatStyle::Unit(_) => NumberStyle::Unit,
-                })
+                .map(NumberStyle::from)
                 .unwrap_or_default(),
+            notation: config._notation.as_ref().map(NotationName::from),
             config,
-            notation: None,
         }
     }
 }