@perspective-dev/viewer 5.2.0 → 5.3.1

package/src/css/viewer.css

@@ -125,11 +125,6 @@
         0 12.5px 0 -11.5px var(--psp-inactive--border-color);
 }
 
-:host input[type="number"]::-webkit-inner-spin-button {
-    transform: scale(1.5) translateX(-5px);
-    filter: var(--psp-input--filter);
-}
-
 :host .sidebar_close_button {
     position: absolute;
     top: 0;

package/src/rust/agent/tools.rs

@@ -630,25 +630,56 @@ fn control_schema_entries(spec: &ControlSpec) -> Vec<(String, Value)> {
         },
         ControlSpec::Color { key, default } => vec![(
             key.clone(),
-            json!({ "type": "string", "format": "color", "default": default }),
+            json!({
+                "type": "string",
+                "description": "A CSS color (`#rrggbb`, `rgb()`), or a host-defined named color `var(--psp-user--color-<name>)`",
+                "default": default,
+            }),
         )],
-        ControlSpec::ColorRange {
-            key_pos,
-            key_neg,
-            default_pos,
-            default_neg,
-            ..
-        } => vec![
-            (
-                key_pos.clone(),
-                json!({ "type": "string", "format": "color", "default": default_pos }),
-            ),
-            (
-                key_neg.clone(),
-                json!({ "type": "string", "format": "color", "default": default_neg }),
-            ),
-        ],
-        ControlSpec::DatetimeFormat => vec![(
+        ControlSpec::Palette { key, default, max } => {
+            let mut description = "Ordered discrete color palette, cycled over the column's \
+                                   categories/series: a CSS `linear-gradient(to right, #rrggbb, \
+                                   #rrggbb, …)` of N colors WITHOUT positions, or a host-defined \
+                                   named palette `var(--psp-user--palette-<name>)`"
+                .to_owned();
+            if let Some(max) = max {
+                description.push_str(&format!(" (at most {max} colors)"));
+            }
+
+            vec![(
+                key.clone(),
+                json!({
+                    "type": "string",
+                    "description": description,
+                    "default": default,
+                }),
+            )]
+        },
+        ControlSpec::GradientStops {
+            key,
+            default,
+            discrete,
+        } => {
+            let mut description = "Multi-stop color gradient: a CSS `linear-gradient(to right, \
+                                   #rrggbb P%, …)` with positioned stops (direction normalized to \
+                                   `to right`; stops[0] maps to the most negative value), or a \
+                                   host-defined named gradient `var(--psp-user--gradient-<name>)`"
+                .to_owned();
+
+            if *discrete {
+                description.push_str(" — exactly 2 stops (the negative and positive colors)");
+            }
+
+            vec![(
+                key.clone(),
+                json!({
+                    "type": "string",
+                    "description": description,
+                    "default": default,
+                }),
+            )]
+        },
+        ControlSpec::DatetimeFormat { .. } => vec![(
             "date_format".to_owned(),
             json!({ "description": "Datetime display format: a style preset or custom format fields" }),
         )],
@@ -670,7 +701,7 @@ fn control_schema_entries(spec: &ControlSpec) -> Vec<(String, Value)> {
             "symbols".to_owned(),
             json!({ "type": "object", "description": "Map of column values to symbol names" }),
         )],
-        ControlSpec::NumberFormat => vec![(
+        ControlSpec::NumberFormat { .. } => vec![(
             "number_format".to_owned(),
             json!({ "type": "object", "description": "Intl.NumberFormat-style options" }),
         )],
@@ -678,6 +709,9 @@ fn control_schema_entries(spec: &ControlSpec) -> Vec<(String, Value)> {
             "aggregate_depth".to_owned(),
             json!({ "type": "integer", "description": "Group-by rollup depth override" }),
         )],
+        ControlSpec::Group { fields, .. } => {
+            fields.iter().flat_map(control_schema_entries).collect()
+        },
     }
 }
 

package/src/rust/components/column_selector/active_column.rs

@@ -23,7 +23,7 @@ use super::expr_edit_button::*;
 use crate::components::column_dropdown::ColumnDropDownElement;
 use crate::components::column_selector::{EmptyColumn, InvalidColumn};
 use crate::config::ColumnSelectMode;
-use crate::presentation::{ColumnLocator, Presentation};
+use crate::presentation::{ColumnSettingsTarget, Presentation};
 use crate::queries::*;
 use crate::renderer::*;
 use crate::session::*;
@@ -51,7 +51,7 @@ pub struct ActiveColumnProps {
     pub onselect: Callback<()>,
 
     /// Fires when this component's expression/config button is clicked.
-    pub on_open_expr_panel: Callback<ColumnLocator>,
+    pub on_open_expr_panel: Callback<ColumnSettingsTarget>,
 
     /// Is this column in a grouped context (does the aggregate selector
     /// need to be visible)?

package/src/rust/components/column_selector/add_expression_button.rs

@@ -12,12 +12,12 @@
 
 use yew::prelude::*;
 
-use super::ColumnLocator;
+use super::{ColumnLocator, ColumnSettingsTarget};
 
 #[derive(Clone, PartialEq, Properties)]
 pub struct AddExpressionButtonProps {
     // Fires when this button is clicked.
-    pub on_open_expr_panel: Callback<ColumnLocator>,
+    pub on_open_expr_panel: Callback<ColumnSettingsTarget>,
 
     /// The column this butotn will open configuration for.
     pub selected_column: Option<ColumnLocator>,
@@ -47,7 +47,7 @@ pub fn AddExpressionButton(p: &AddExpressionButtonProps) -> Html {
 
     let onmousedown = p
         .on_open_expr_panel
-        .reform(|_| ColumnLocator::NewExpression);
+        .reform(|_| ColumnSettingsTarget::NewExpression);
 
     let class = if *is_mouseover || matches!(p.selected_column, Some(ColumnLocator::NewExpression))
     {

package/src/rust/components/column_selector/aggregate_selector.rs

@@ -10,9 +10,9 @@
 // ┃ of the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0). ┃
 // ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
 
-use std::collections::HashSet;
 use std::rc::Rc;
 
+use itertools::Itertools;
 use perspective_client::config::*;
 use yew::prelude::*;
 
@@ -163,8 +163,7 @@ impl AggregateSelector {
                 Aggregate::MultiAggregate(x, _) => Some(x),
                 _ => None,
             })
-            .collect::<HashSet<_>>()
-            .into_iter()
+            .unique()
             .map(|x| {
                 SelectItem::OptGroup(
                     x.clone().into(),

package/src/rust/components/column_selector/config_selector.rs

@@ -279,6 +279,14 @@ impl Component for ConfigSelector {
                     ctx.props().metadata.get_features().unwrap(),
                 );
 
+                super::close_column_settings_if_displaced(
+                    &ctx.props().presentation,
+                    &ctx.props().renderer,
+                    &ctx.props().metadata,
+                    &ctx.props().view_config,
+                    &update,
+                );
+
                 {
                     let session = ctx.props().session.clone();
                     let renderer = ctx.props().renderer.clone();

package/src/rust/components/column_selector/expr_edit_button.rs

@@ -12,7 +12,7 @@
 
 use yew::prelude::*;
 
-use super::ColumnLocator;
+use super::ColumnSettingsTarget;
 
 #[derive(PartialEq, Clone, Properties)]
 pub struct ExprEditButtonProps {
@@ -27,7 +27,7 @@ pub struct ExprEditButtonProps {
     pub is_window: bool,
 
     /// Fires when the config/expresison button is clicked.
-    pub on_open_expr_panel: Callback<ColumnLocator>,
+    pub on_open_expr_panel: Callback<ColumnSettingsTarget>,
 
     /// Is the expression/config panel open?
     pub is_editing: bool,
@@ -42,14 +42,8 @@ pub struct ExprEditButtonProps {
 #[function_component]
 pub fn ExprEditButton(p: &ExprEditButtonProps) -> Html {
     let onmousedown = yew::use_callback(p.clone(), |_, p| {
-        let name = if p.is_window {
-            ColumnLocator::Window(p.name.clone())
-        } else if p.is_expression {
-            ColumnLocator::Expression(p.name.clone())
-        } else {
-            ColumnLocator::Table(p.name.clone())
-        };
-        p.on_open_expr_panel.emit(name)
+        p.on_open_expr_panel
+            .emit(ColumnSettingsTarget::Column(p.name.clone()))
     });
 
     let class = if p.is_disabled {

package/src/rust/components/column_selector/inactive_column.rs

@@ -18,7 +18,7 @@ use yew::prelude::*;
 use super::expr_edit_button::*;
 use crate::components::type_icon::TypeIcon;
 use crate::config::ColumnSelectMode;
-use crate::presentation::{ColumnLocator, Presentation};
+use crate::presentation::{ColumnSettingsTarget, Presentation};
 use crate::renderer::*;
 use crate::session::*;
 use crate::tasks::apply_and_render;
@@ -61,7 +61,7 @@ pub struct InactiveColumnProps {
     pub onselect: Callback<()>,
 
     /// Fires when this column's expression/config button is clicked.
-    pub on_open_expr_panel: Callback<ColumnLocator>,
+    pub on_open_expr_panel: Callback<ColumnSettingsTarget>,
 
     // State
     pub presentation: Presentation,

package/src/rust/components/column_selector.rs

@@ -29,7 +29,7 @@ use std::rc::Rc;
 pub use column_selector_column_row::*;
 pub use empty_column::*;
 pub use invalid_column::*;
-use perspective_client::config::ViewConfig;
+use perspective_client::config::{ViewConfig, ViewConfigUpdate};
 pub use pivot_column::*;
 use web_sys::*;
 use yew::prelude::*;
@@ -43,8 +43,10 @@ use super::containers::split_panel::{Orientation, SplitPanel};
 use crate::components::column_dropdown::{ColumnDropDownElement, ColumnDropDownPortal};
 use crate::components::containers::scroll_panel_item::ScrollPanelItem;
 use crate::config::PluginStaticConfig;
-use crate::presentation::{ColumnLocator, DragDropContainer, Presentation};
-use crate::queries::{ActiveColumnState, ActiveColumnStateData, ColumnsIteratorSet};
+use crate::presentation::{ColumnLocator, ColumnSettingsTarget, DragDropContainer, Presentation};
+use crate::queries::{
+    ActiveColumnState, ActiveColumnStateData, ColumnsIteratorSet, get_current_column_locator,
+};
 use crate::renderer::*;
 use crate::session::drag_drop_update::*;
 use crate::session::*;
@@ -54,7 +56,7 @@ use crate::utils::*;
 #[derive(Properties)]
 pub struct ColumnSelectorProps {
     /// Fires when the expression/config column is open.
-    pub on_open_expr_panel: Callback<ColumnLocator>,
+    pub on_open_expr_panel: Callback<ColumnSettingsTarget>,
 
     /// This is passed to the add_expression_button for styling.
     pub selected_column: Option<ColumnLocator>,
@@ -137,6 +139,32 @@ pub struct ColumnSelector {
     on_reset: Rc<PubSub<()>>,
 }
 
+fn close_column_settings_if_displaced(
+    presentation: &Presentation,
+    renderer: &Renderer,
+    metadata: &SessionMetadata,
+    view_config: &ViewConfig,
+    update: &ViewConfigUpdate,
+) {
+    let Some(columns) = &update.columns else {
+        return;
+    };
+
+    let ocs = presentation.get_open_column_settings();
+    if get_current_column_locator(&ocs, renderer, view_config, metadata).is_none() {
+        return;
+    }
+
+    let next_config = ViewConfig {
+        columns: columns.clone(),
+        ..view_config.clone()
+    };
+
+    if get_current_column_locator(&ocs, renderer, &next_config, metadata).is_none() {
+        presentation.set_open_column_settings(None);
+    }
+}
+
 impl Component for ColumnSelector {
     type Message = ColumnSelectorMsg;
     type Properties = ColumnSelectorProps;
@@ -224,6 +252,14 @@ impl Component for ColumnSelector {
                         ctx.props().metadata.get_features().unwrap(),
                     );
 
+                    close_column_settings_if_displaced(
+                        &ctx.props().presentation,
+                        &ctx.props().renderer,
+                        &ctx.props().metadata,
+                        &ctx.props().view_config,
+                        &update,
+                    );
+
                     let session = ctx.props().session.clone();
                     let renderer = ctx.props().renderer.clone();
                     if let Ok(task) = apply_and_render(&session, &renderer, update) {
@@ -249,6 +285,14 @@ impl Component for ColumnSelector {
                     ctx.props().metadata.get_features().unwrap(),
                 );
 
+                close_column_settings_if_displaced(
+                    &ctx.props().presentation,
+                    &ctx.props().renderer,
+                    &ctx.props().metadata,
+                    &ctx.props().view_config,
+                    &update,
+                );
+
                 let session = ctx.props().session.clone();
                 let renderer = ctx.props().renderer.clone();
                 if let Ok(task) = apply_and_render(&session, &renderer, update) {