@perspective-dev/viewer 4.1.1 → 4.3.0

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

@@ -514,18 +514,18 @@ impl FilterColumnProps {
             }
         };
 
-        if let Some(input) = filter_input {
-            if &input != filter_column.term() {
-                *filter_column.term_mut() = input;
-                let update = ViewConfigUpdate {
-                    filter: Some(filters),
-                    ..ViewConfigUpdate::default()
-                };
-
-                self.update_and_render(update)
-                    .map(ApiFuture::spawn)
-                    .unwrap_or_log();
-            }
+        if let Some(input) = filter_input
+            && &input != filter_column.term()
+        {
+            *filter_column.term_mut() = input;
+            let update = ViewConfigUpdate {
+                filter: Some(filters),
+                ..ViewConfigUpdate::default()
+            };
+
+            self.update_and_render(update)
+                .map(ApiFuture::spawn)
+                .unwrap_or_log();
         }
     }
 }

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

@@ -26,11 +26,15 @@ pub struct PivotColumnProps {
     /// Column name.
     pub column: String,
 
+    #[prop_or_default]
+    pub column_type: Option<ColumnType>,
+
     /// The drag starte of this column, if applicable.
     pub action: DragTarget,
 
     // State
-    pub session: Session,
+    #[prop_or_default]
+    pub opt_session: Option<Session>,
     pub dragdrop: DragDrop,
 }
 
@@ -74,12 +78,13 @@ impl Component for PivotColumn {
             move |_event| dragdrop.notify_drag_end()
         });
 
-        let col_type = ctx
-            .props()
-            .session
-            .metadata()
-            .get_column_table_type(&ctx.props().column)
-            .unwrap_or(ColumnType::Integer);
+        let col_type = ctx.props().column_type.unwrap_or_else(|| {
+            ctx.props()
+                .opt_session
+                .as_ref()
+                .and_then(|x| x.metadata().get_column_table_type(&ctx.props().column))
+                .unwrap_or(ColumnType::Integer)
+        });
 
         html! {
             <div

package/src/rust/components/column_selector.rs

@@ -28,6 +28,7 @@ use std::rc::Rc;
 pub use empty_column::*;
 pub use invalid_column::*;
 use perspective_js::utils::ApiFuture;
+pub use pivot_column::*;
 use web_sys::*;
 use yew::prelude::*;
 
@@ -77,6 +78,7 @@ pub enum ColumnSelectorMsg {
     TableLoaded,
     ViewCreated,
     HoverActiveIndex(Option<usize>),
+    SetWidth(f64),
     Drag(DragEffect),
     DragEnd,
     Drop((String, DragTarget, DragEffect, usize)),
@@ -91,6 +93,7 @@ pub struct ColumnSelector {
     named_row_count: usize,
     drag_container: DragDropContainer,
     column_dropdown: ColumnDropDownElement,
+    viewport_width: f64,
     on_reset: Rc<PubSub<()>>,
 }
 
@@ -147,6 +150,7 @@ impl Component for ColumnSelector {
         Self {
             _subscriptions: [table_sub, view_sub, drop_sub, drag_sub, dragend_sub],
             named_row_count,
+            viewport_width: 0f64,
             drag_container,
             column_dropdown,
             on_reset: Default::default(),
@@ -157,6 +161,10 @@ impl Component for ColumnSelector {
         match msg {
             Drag(DragEffect::Move(DragTarget::Active)) => false,
             Drag(_) | DragEnd | TableLoaded => true,
+            SetWidth(w) => {
+                self.viewport_width = w;
+                false
+            },
             ViewCreated => {
                 let named = maybe! {
                     let plugin =
@@ -355,11 +363,7 @@ impl Component for ColumnSelector {
             })
             .collect();
 
-        let size = if !inactive_children.is_empty() {
-            56.0
-        } else {
-            28.0
-        };
+        let size = 28.0;
 
         let add_column = if ctx
             .props()
@@ -389,8 +393,8 @@ impl Component for ColumnSelector {
             inactive_children.insert(0, add_column);
         }
 
-        let selected_columns = html! {
-            <div id="selected-columns">
+        let mut selected_columns = vec![html! {
+            <div id="selected-columns" key="__active_columns__">
                 <ScrollPanel
                     id="active-columns"
                     class={active_classes}
@@ -398,13 +402,27 @@ impl Component for ColumnSelector {
                     dragenter={&self.drag_container.dragenter}
                     dragleave={&self.drag_container.dragleave}
                     viewport_ref={&self.drag_container.noderef}
+                    initial_width={self.viewport_width}
+                    on_auto_width={ctx.link().callback(ColumnSelectorMsg::SetWidth)}
                     drop={ondrop}
                     on_resize={&ctx.props().on_resize}
                     on_dimensions_reset={&self.on_reset}
                     children={std::iter::once(config_selector).chain(active_columns).collect::<Vec<_>>()}
                 />
             </div>
-        };
+        }];
+
+        if !inactive_children.is_empty() {
+            selected_columns.push(html! {
+                <ScrollPanel
+                    id="sub-columns"
+                    key="__sub_columns__"
+                    on_resize={&ctx.props().on_resize}
+                    on_dimensions_reset={&self.on_reset}
+                    children={inactive_children}
+                />
+            })
+        }
 
         html! {
             <>
@@ -415,15 +433,7 @@ impl Component for ColumnSelector {
                     skip_empty=true
                     orientation={Orientation::Vertical}
                 >
-                    { selected_columns }
-                    if !inactive_children.is_empty() {
-                        <ScrollPanel
-                            id="sub-columns"
-                            on_resize={&ctx.props().on_resize}
-                            on_dimensions_reset={&self.on_reset}
-                            children={inactive_children}
-                        />
-                    }
+                    { for selected_columns }
                 </SplitPanel>
             </>
         }

package/src/rust/components/column_settings_sidebar/style_tab/symbol/row_selector.rs

@@ -55,15 +55,15 @@ pub fn row_selector(props: &RowSelectorProps) -> Html {
 
     let inner = if props.selected_row.is_none() || props.focused {
         let mut pairs = props.pairs.clone();
-        if let Some(ref rowval) = props.selected_row {
-            if let Some((i, _)) = pairs.iter().find_position(|pair| {
+        if let Some(ref rowval) = props.selected_row
+            && let Some((i, _)) = pairs.iter().find_position(|pair| {
                 pair.key
                     .as_ref()
                     .map(|keyval| keyval == rowval)
                     .unwrap_or_default()
-            }) {
-                pairs.remove(i);
-            }
+            })
+        {
+            pairs.remove(i);
         }
 
         let exclude: HashSet<_> = pairs

package/src/rust/components/column_settings_sidebar.rs

@@ -156,7 +156,7 @@ impl Component for ColumnSettingsPanel {
     }
 
     fn update(&mut self, ctx: &yew::prelude::Context<Self>, msg: Self::Message) -> bool {
-        let result = match msg {
+        match msg {
             ColumnSettingsPanelMsg::SetExprValue(val) => {
                 if self.expr_value != val {
                     self.expr_value = val;
@@ -241,9 +241,7 @@ impl Component for ColumnSettingsPanel {
                     false
                 }
             },
-        };
-
-        result
+        }
     }
 
     fn view(&self, ctx: &yew::prelude::Context<Self>) -> Html {

package/src/rust/components/containers/dragdrop_list.rs

@@ -14,11 +14,13 @@ use std::collections::HashSet;
 use std::marker::PhantomData;
 
 use derivative::Derivative;
+use perspective_client::proto::ColumnType;
 use web_sys::*;
 use yew::html::Scope;
 use yew::prelude::*;
 
 use crate::components::column_selector::{EmptyColumn, InPlaceColumn, InvalidColumn};
+use crate::components::type_icon::TypeIcon;
 use crate::custom_elements::ColumnDropDownElement;
 use crate::dragdrop::*;
 use crate::utils::DragTarget;
@@ -32,12 +34,16 @@ where
     <U as Component>::Properties: DragDropListItemProps,
 {
     pub parent: Scope<T>,
+
     pub dragdrop: DragDrop,
     pub name: &'static str,
     pub column_dropdown: ColumnDropDownElement,
     pub exclude: HashSet<String>,
     pub children: ChildrenWithProps<U>,
 
+    #[prop_or_default]
+    pub disabled: bool,
+
     #[prop_or_default]
     pub is_dragover: Option<(
         usize,
@@ -59,6 +65,7 @@ where
             && self.children == other.children
             && self.allow_duplicates == other.allow_duplicates
             && self.is_dragover == other.is_dragover
+            && self.disabled == other.disabled
     }
 }
 
@@ -213,10 +220,11 @@ where
                     .position(|x| x.1.1.as_ref().unwrap().props.get_item() == *column);
 
                 valid_duplicate_drag = is_duplicate.is_some() && !ctx.props().allow_duplicates;
-                if let Some(duplicate) = is_duplicate {
-                    if !is_append && (!ctx.props().allow_duplicates || is_self_move) {
-                        columns.remove(duplicate);
-                    }
+                if let Some(duplicate) = is_duplicate
+                    && !is_append
+                    && (!ctx.props().allow_duplicates || is_self_move)
+                {
+                    columns.remove(duplicate);
                 }
 
                 // If inserting into the middle of the list, use
@@ -282,20 +290,34 @@ where
         let column_dropdown = ctx.props().column_dropdown.clone();
         let exclude = ctx.props().exclude.clone();
         let on_select = ctx.props().parent.callback(V::create);
+        let class = classes!("rrow");
+        let is_enabled = true;
+
         html! {
-            <div ref={&self.elem} class="rrow">
+            <div ref={&self.elem} {class}>
                 <div
                     id={ctx.props().name}
-                    ondragover={dragover}
-                    ondragenter={drag_container.dragenter}
-                    ondragleave={drag_container.dragleave}
+                    ondragover={is_enabled.then_some(dragover)}
+                    ondragenter={is_enabled.then_some(drag_container.dragenter)}
+                    ondragleave={is_enabled.then_some(drag_container.dragleave)}
                     ref={drag_container.noderef}
-                    ondrop={drop}
+                    ondrop={is_enabled.then_some(drop)}
                 >
                     <div class="psp-text-field">
                         <ul class="psp-text-field__input" for={ctx.props().name}>
                             { columns_html }
-                            if ctx.props().is_dragover.is_none() | (!invalid_drag && valid_duplicate_drag) {
+                            if ctx.props().disabled && ctx.props().is_dragover.is_none() {
+                                <div class="pivot-column">
+                                    <div class="pivot-column-border pivot-column-total">
+                                        <TypeIcon ty={ColumnType::Integer} />
+                                        <span class="column_name">{ "TOTAL" }</span>
+                                    </div>
+                                    <span
+                                        class="toggle-mode is_column_active"
+                                        onmousedown={ctx.props().parent.callback(move |_| V::close(0))}
+                                    />
+                                </div>
+                            } else if ctx.props().is_dragover.is_none() | (!invalid_drag && valid_duplicate_drag) {
                                 <EmptyColumn {column_dropdown} {exclude} {on_select} />
                             } else if invalid_drag {
                                 <InvalidColumn />

package/src/rust/components/containers/scroll_panel.rs

@@ -34,6 +34,9 @@ pub struct ScrollPanelProps {
     #[prop_or_default]
     pub viewport_ref: Option<NodeRef>,
 
+    #[prop_or_default]
+    pub initial_width: Option<f64>,
+
     #[prop_or_default]
     pub class: Classes,
 
@@ -52,6 +55,9 @@ pub struct ScrollPanelProps {
     #[prop_or_default]
     pub on_resize: Option<Rc<PubSub<()>>>,
 
+    #[prop_or_default]
+    pub on_auto_width: Callback<f64>,
+
     #[prop_or_default]
     pub on_dimensions_reset: Option<Rc<PubSub<()>>>,
 
@@ -125,7 +131,7 @@ impl Component for ScrollPanel {
         Self {
             viewport_ref: Default::default(),
             viewport_height: 0f64,
-            viewport_width: 0f64,
+            viewport_width: ctx.props().initial_width.unwrap_or_default(),
             content_window: None,
             needs_rerender: true,
             total_height,
@@ -150,6 +156,7 @@ impl Component for ScrollPanel {
 
                 self.viewport_height = rect.height() - 8.0;
                 self.viewport_width = self.viewport_width.max(rect.width() - 6.0);
+                ctx.props().on_auto_width.emit(self.viewport_width);
                 re_render
             },
             ScrollPanelMsg::CalculateWindowContent => self.calculate_window_content(ctx),

package/src/rust/components/containers/select.rs

@@ -100,12 +100,12 @@ where
                             ctx.props().on_select.emit(self.selected.clone());
                             return true;
                         }
-                    } else if code.as_str() == "ArrowDown" {
-                        if let Some(x) = find_nth(idx + 1, &ctx.props().values) {
-                            self.selected = x.clone();
-                            ctx.props().on_select.emit(self.selected.clone());
-                            return true;
-                        }
+                    } else if code.as_str() == "ArrowDown"
+                        && let Some(x) = find_nth(idx + 1, &ctx.props().values)
+                    {
+                        self.selected = x.clone();
+                        ctx.props().on_select.emit(self.selected.clone());
+                        return true;
                     }
                 }
 
@@ -220,9 +220,9 @@ where
         };
 
         let value = if ctx.props().is_autosize {
-            self.selected.to_string()
+            Some(self.selected.to_string())
         } else {
-            "".to_owned()
+            None
         };
 
         html! {
@@ -230,7 +230,7 @@ where
                 <label>
                     { ctx.props().label.as_ref().map(|x| x.to_string()).unwrap_or_default() }
                 </label>
-                <div class={wrapper_class} data-value={value.clone()}>{ select }</div>
+                <div class={wrapper_class} data-value={value}>{ select }</div>
             } else {
                 <div class={wrapper_class} data-value={value}>{ select }</div>
             }

package/src/rust/components/containers/split_panel.rs

@@ -201,11 +201,11 @@ impl Component for SplitPanel {
         let count = iter.len();
         let contents = html! {
             <>
-                <LocalStyle key=0 href={css!("containers/split-panel")} />
+                <LocalStyle href={css!("containers/split-panel")} />
                 for (i, x) in iter {
                     if i == 0 {
                         if count == 1 {
-                            <key={i}>
+                            <key=0>
                                 {x}
                             </>
                         } else {

package/src/rust/components/filter_dropdown.rs

@@ -87,19 +87,19 @@ impl Component for FilterDropDown {
             },
             FilterDropDownMsg::ItemDown => {
                 self.selected += 1;
-                if let Some(ref values) = self.values {
-                    if self.selected >= values.len() {
-                        self.selected = 0;
-                    }
+                if let Some(ref values) = self.values
+                    && self.selected >= values.len()
+                {
+                    self.selected = 0;
                 };
 
                 true
             },
             FilterDropDownMsg::ItemUp => {
-                if let Some(ref values) = self.values {
-                    if self.selected < 1 {
-                        self.selected = values.len();
-                    }
+                if let Some(ref values) = self.values
+                    && self.selected < 1
+                {
+                    self.selected = values.len();
                 };
 
                 self.selected -= 1;

package/src/rust/components/function_dropdown.rs

@@ -88,19 +88,19 @@ impl Component for FunctionDropDown {
             },
             FunctionDropDownMsg::ItemDown => {
                 self.selected += 1;
-                if let Some(ref values) = self.values {
-                    if self.selected >= values.len() {
-                        self.selected = 0;
-                    }
+                if let Some(ref values) = self.values
+                    && self.selected >= values.len()
+                {
+                    self.selected = 0;
                 };
 
                 true
             },
             FunctionDropDownMsg::ItemUp => {
-                if let Some(ref values) = self.values {
-                    if self.selected < 1 {
-                        self.selected = values.len();
-                    }
+                if let Some(ref values) = self.values
+                    && self.selected < 1
+                {
+                    self.selected = values.len();
                 }
 
                 self.selected -= 1;

package/src/rust/components/modal.rs

@@ -82,10 +82,10 @@ where
                 true
             },
             ModalMsg::SubMsg(msg) => {
-                if let Some(child) = &ctx.props().child {
-                    if let Some(link) = child.props.weak_link().borrow().as_ref() {
-                        link.send_message(msg);
-                    }
+                if let Some(child) = &ctx.props().child
+                    && let Some(link) = child.props.weak_link().borrow().as_ref()
+                {
+                    link.send_message(msg);
                 }
 
                 false

package/src/rust/components/plugin_selector.rs

@@ -83,11 +83,21 @@ impl Component for PluginSelector {
                     let metadata =
                         renderer.get_next_plugin_metadata(&PluginUpdate::Update(plugin_name));
 
-                    let mut update = ViewConfigUpdate::default();
-                    session.set_update_column_defaults(
-                        &mut update,
-                        metadata.as_ref().unwrap_or(&*renderer.metadata()),
-                    );
+                    let prev_metadata = renderer.metadata();
+                    let requirements = metadata.as_ref().unwrap_or(&*prev_metadata);
+                    let rollup_features = session
+                        .metadata()
+                        .get_features()
+                        .map(|x| x.get_group_rollup_modes())
+                        .unwrap();
+
+                    let group_rollups = requirements.get_group_rollups(&rollup_features);
+                    let mut update = ViewConfigUpdate {
+                        group_rollup_mode: group_rollups.first().cloned(),
+                        ..ViewConfigUpdate::default()
+                    };
+
+                    session.set_update_column_defaults(&mut update, requirements);
 
                     if let Ok(task) = ctx.props().update_and_render(update) {
                         ApiFuture::spawn(task);

package/src/rust/components/status_indicator.rs

@@ -164,6 +164,9 @@ impl Reducible for StatusIconState {
                 StatusIconStateAction::Increment | StatusIconStateAction::Decrement,
             ) => StatusIconState::Loading,
             (_, StatusIconStateAction::Increment) => Self::Updating(1),
+            (StatusIconState::Errored(x, y, z), _) => {
+                StatusIconState::Errored(x.clone(), y.clone(), z)
+            },
             (_, StatusIconStateAction::Decrement) => StatusIconState::Normal,
         };
 

package/src/rust/custom_elements/filter_dropdown.rs

@@ -93,10 +93,10 @@ impl FilterDropDownElement {
                         FilterDropDownMsg::SetValues(values),
                     ]);
 
-                    if let Some(x) = self.target.borrow().clone() {
-                        if !self.modal.is_open() {
-                            ApiFuture::spawn(self.modal.clone().open(x, None))
-                        }
+                    if let Some(x) = self.target.borrow().clone()
+                        && !self.modal.is_open()
+                    {
+                        ApiFuture::spawn(self.modal.clone().open(x, None))
                     }
                 }
             },

package/src/rust/custom_elements/viewer.rs

@@ -77,9 +77,6 @@ pub struct PerspectiveViewerElement {
     _subscriptions: Rc<[Subscription; 2]>,
 }
 
-// derive_model!( Renderer, Root, Session, Presentation for
-// PerspectiveViewerElement);
-
 impl CustomElementMetadata for PerspectiveViewerElement {
     const CUSTOM_ELEMENT_NAME: &'static str = "perspective-viewer";
     const STATICS: &'static [&'static str] = ["registerPlugin", "getExprTKCommands"].as_slice();
@@ -939,10 +936,8 @@ impl PerspectiveViewerElement {
                 .cloned();
 
             changed = presentation.set_theme_name(reset_theme.as_deref()).await? || changed;
-            if changed {
-                if let Some(view) = session.get_view() {
-                    return renderer.restyle_all(&view).await;
-                }
+            if changed && let Some(view) = session.get_view() {
+                return renderer.restyle_all(&view).await;
             }
 
             Ok(JsValue::UNDEFINED)

package/src/rust/js/plugin.rs

@@ -10,6 +10,7 @@
 // ┃ of the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0). ┃
 // ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
 
+use perspective_client::config::GroupRollupMode;
 use perspective_js::utils::*;
 use serde::*;
 use wasm_bindgen::prelude::*;
@@ -61,6 +62,9 @@ extern "C" {
     #[wasm_bindgen(method, getter)]
     pub fn priority(this: &JsPerspectiveViewerPlugin) -> Option<i32>;
 
+    #[wasm_bindgen(method, getter)]
+    pub fn group_rollups(this: &JsPerspectiveViewerPlugin) -> Option<js_sys::Array>;
+
     /// Don't call this method directly. Instead, call the corresponding method on the PluginColumnStyles model.
     #[wasm_bindgen(method, catch)]
     pub fn can_render_column_styles(this: &JsPerspectiveViewerPlugin, view_type: &str, group: Option<&str>) -> ApiResult<bool>;
@@ -146,6 +150,7 @@ pub struct ViewConfigRequirements {
     pub max_cells: Option<usize>,
     pub name: String,
     pub render_warning: bool,
+    group_rollups: Option<Vec<GroupRollupMode>>,
 }
 
 impl ViewConfigRequirements {
@@ -155,6 +160,17 @@ impl ViewConfigRequirements {
             .map(|x| index < x.len() - 1)
             .unwrap_or(false)
     }
+
+    pub fn get_group_rollups(&self, rollup_features: &[GroupRollupMode]) -> Vec<GroupRollupMode> {
+        self.group_rollups
+            .clone()
+            .map(|x| {
+                x.into_iter()
+                    .filter(|y| rollup_features.is_empty() || rollup_features.contains(y))
+                    .collect()
+            })
+            .unwrap_or_default()
+    }
 }
 
 impl JsPerspectiveViewerPlugin {
@@ -169,6 +185,9 @@ impl JsPerspectiveViewerPlugin {
             max_cells: self.max_cells(),
             name: self.name(),
             render_warning: self.render_warning().unwrap_or(true),
+            group_rollups: self
+                .group_rollups()
+                .map(|x| x.into_serde_ext::<Vec<GroupRollupMode>>().unwrap()),
         })
     }
 }

package/src/rust/model/copy_export.rs

@@ -12,6 +12,7 @@
 
 use std::collections::HashSet;
 
+use base64::prelude::*;
 use futures::join;
 use itertools::Itertools;
 use perspective_client::ViewWindow;
@@ -59,7 +60,7 @@ pub trait CopyExportModel:
         let mut config = config?;
         config.settings = false;
         let js_config = serde_json::to_string(&config)?;
-        let html = export_app::render(&base64::encode(arrow), &js_config, &plugins);
+        let html = export_app::render(&BASE64_STANDARD.encode(arrow), &js_config, &plugins);
         Ok(js_sys::JsString::from(html.trim()).into())
     }
 

package/src/rust/model/intersection_observer.rs

@@ -38,8 +38,9 @@ impl IntersectionObserverHandle {
     ) -> Self {
         clone!(session, renderer, presentation);
         let _callback = Closure::new(move |xs: js_sys::Array| {
+            // https://stackoverflow.com/questions/53862160/intersectionobserver-multiple-entries
             let intersect = xs
-                .get(0)
+                .pop()
                 .unchecked_into::<IntersectionObserverEntry>()
                 .is_intersecting();
 
@@ -49,6 +50,7 @@ impl IntersectionObserverHandle {
                 session,
                 renderer,
             };
+
             ApiFuture::spawn(state.set_pause(intersect));
         });
 

package/src/rust/presentation/sheets.rs

@@ -46,7 +46,10 @@ fn fill_rule_theme_names(
                 if property == "--theme-name" {
                     let name = style.get_property_value("--theme-name")?;
                     let trimmed = name.trim();
-                    themes.push(trimmed[1..trimmed.len() - 1].to_owned());
+                    let theme = &trimmed[1..trimmed.len() - 1];
+                    if themes.iter().find(|x| x == &theme).is_none() {
+                        themes.push(theme.to_owned());
+                    }
                 }
             }
         }