@perspective-dev/viewer 4.0.1 → 4.1.1

package/src/rust/components/form/mod.rs

@@ -20,10 +20,11 @@ pub mod code_editor;
 pub mod color_range_selector;
 pub mod color_selector;
 pub mod debug;
-mod highlight;
 pub mod number_field;
 pub mod number_input;
 pub mod number_range_field;
 pub mod optional_field;
+pub mod select_enum_field;
+pub mod select_value_field;
 
-pub mod select_field;
+mod highlight;

package/src/rust/components/form/optional_field.rs

@@ -14,10 +14,10 @@ use yew::{Callback, Children, Html, MouseEvent, Properties, classes, function_co
 
 #[derive(Properties, PartialEq)]
 pub struct OptionalFieldProps {
-    pub label: String,
-    pub on_check: Callback<MouseEvent>,
     pub checked: bool,
     pub children: Children,
+    pub label: String,
+    pub on_check: Callback<MouseEvent>,
 
     #[prop_or(String::from("section"))]
     pub class: String,

package/src/rust/components/form/{select_field.rs → select_enum_field.rs}

@@ -11,7 +11,6 @@
 // ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
 
 use std::fmt::{Debug, Display};
-use std::rc::Rc;
 
 use itertools::Itertools;
 use strum::IntoEnumIterator;
@@ -25,8 +24,8 @@ pub struct SelectEnumFieldProps<T>
 where
     T: IntoEnumIterator + Display + Default + PartialEq + Clone + 'static,
 {
-    pub label: String,
     pub current_value: Option<T>,
+    pub label: String,
     pub on_change: Callback<Option<T>>,
 
     #[prop_or_default]
@@ -58,47 +57,3 @@ where
         </div>
     }
 }
-
-#[derive(Properties, Debug, PartialEq, Clone)]
-pub struct SelectValueFieldProps<T>
-where
-    T: Display + PartialEq + Clone + 'static,
-{
-    pub label: String,
-    pub current_value: Option<T>,
-    pub default_value: T,
-    pub values: Rc<Vec<T>>,
-    pub on_change: Callback<Option<T>>,
-
-    #[prop_or_default]
-    pub disabled: bool,
-}
-
-#[function_component(SelectValueField)]
-pub fn select_value_field<T>(props: &SelectValueFieldProps<T>) -> yew::Html
-where
-    T: Display + PartialEq + Clone + 'static,
-{
-    let values = yew::use_memo(props.values.clone(), |values| {
-        values.iter().cloned().map(SelectItem::Option).collect_vec()
-    });
-
-    let selected = props
-        .current_value
-        .clone()
-        .unwrap_or_else(|| props.default_value.clone());
-
-    let checked = selected != props.default_value;
-    html! {
-        <div class="row">
-            <OptionalField
-                label={props.label.clone()}
-                on_check={props.on_change.reform(|_| None)}
-                {checked}
-                disabled={props.disabled}
-            >
-                <Select<T> {values} {selected} on_select={props.on_change.reform(Option::Some)} />
-            </OptionalField>
-        </div>
-    }
-}

package/src/rust/components/form/select_value_field.rs

@@ -0,0 +1,64 @@
+// ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
+// ┃ ██████ ██████ ██████       █      █      █      █      █ █▄  ▀███ █       ┃
+// ┃ ▄▄▄▄▄█ █▄▄▄▄▄ ▄▄▄▄▄█  ▀▀▀▀▀█▀▀▀▀▀ █ ▀▀▀▀▀█ ████████▌▐███ ███▄  ▀█ █ ▀▀▀▀▀ ┃
+// ┃ █▀▀▀▀▀ █▀▀▀▀▀ █▀██▀▀ ▄▄▄▄▄ █ ▄▄▄▄▄█ ▄▄▄▄▄█ ████████▌▐███ █████▄   █ ▄▄▄▄▄ ┃
+// ┃ █      ██████ █  ▀█▄       █ ██████      █      ███▌▐███ ███████▄ █       ┃
+// ┣━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┫
+// ┃ Copyright (c) 2017, the Perspective Authors.                              ┃
+// ┃ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ ┃
+// ┃ This file is part of the Perspective library, distributed under the terms ┃
+// ┃ of the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0). ┃
+// ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
+
+use std::fmt::{Debug, Display};
+use std::rc::Rc;
+
+use itertools::Itertools;
+use yew::{Callback, Properties, function_component, html};
+
+use crate::components::containers::select::{Select, SelectItem};
+use crate::components::form::optional_field::OptionalField;
+
+#[derive(Properties, Debug, PartialEq, Clone)]
+pub struct SelectValueFieldProps<T>
+where
+    T: Display + PartialEq + Clone + 'static,
+{
+    pub current_value: Option<T>,
+    pub default_value: T,
+    pub label: String,
+    pub on_change: Callback<Option<T>>,
+    pub values: Rc<Vec<T>>,
+
+    #[prop_or_default]
+    pub disabled: bool,
+}
+
+#[function_component(SelectValueField)]
+pub fn select_value_field<T>(props: &SelectValueFieldProps<T>) -> yew::Html
+where
+    T: Display + PartialEq + Clone + 'static,
+{
+    let values = yew::use_memo(props.values.clone(), |values| {
+        values.iter().cloned().map(SelectItem::Option).collect_vec()
+    });
+
+    let selected = props
+        .current_value
+        .clone()
+        .unwrap_or_else(|| props.default_value.clone());
+
+    let checked = selected != props.default_value;
+    html! {
+        <div class="row">
+            <OptionalField
+                label={props.label.clone()}
+                on_check={props.on_change.reform(|_| None)}
+                {checked}
+                disabled={props.disabled}
+            >
+                <Select<T> {values} {selected} on_select={props.on_change.reform(Option::Some)} />
+            </OptionalField>
+        </div>
+    }
+}

package/src/rust/components/function_dropdown.rs

@@ -19,6 +19,18 @@ use crate::utils::WeakScope;
 
 static CSS: &str = include_str!(concat!(env!("OUT_DIR"), "/css/function-dropdown.css"));
 
+#[derive(Properties, PartialEq)]
+pub struct FunctionDropDownProps {
+    #[prop_or_default]
+    pub weak_link: WeakScope<FunctionDropDown>,
+}
+
+impl ModalLink<FunctionDropDown> for FunctionDropDownProps {
+    fn weak_link(&self) -> &'_ WeakScope<FunctionDropDown> {
+        &self.weak_link
+    }
+}
+
 pub enum FunctionDropDownMsg {
     SetValues(Vec<CompletionItemSuggestion>),
     SetCallback(Callback<CompletionItemSuggestion>),
@@ -33,18 +45,6 @@ pub struct FunctionDropDown {
     on_select: Option<Callback<CompletionItemSuggestion>>,
 }
 
-#[derive(Properties, PartialEq)]
-pub struct FunctionDropDownProps {
-    #[prop_or_default]
-    pub weak_link: WeakScope<FunctionDropDown>,
-}
-
-impl ModalLink<FunctionDropDown> for FunctionDropDownProps {
-    fn weak_link(&self) -> &'_ WeakScope<FunctionDropDown> {
-        &self.weak_link
-    }
-}
-
 impl Component for FunctionDropDown {
     type Message = FunctionDropDownMsg;
     type Properties = FunctionDropDownProps;
@@ -88,19 +88,19 @@ impl Component for FunctionDropDown {
             },
             FunctionDropDownMsg::ItemDown => {
                 self.selected += 1;
-                if let Some(ref values) = self.values
-                    && self.selected >= values.len()
-                {
-                    self.selected = 0;
+                if let Some(ref values) = self.values {
+                    if self.selected >= values.len() {
+                        self.selected = 0;
+                    }
                 };
 
                 true
             },
             FunctionDropDownMsg::ItemUp => {
-                if let Some(ref values) = self.values
-                    && self.selected < 1
-                {
-                    self.selected = values.len();
+                if let Some(ref values) = self.values {
+                    if self.selected < 1 {
+                        self.selected = values.len();
+                    }
                 }
 
                 self.selected -= 1;
@@ -146,6 +146,6 @@ impl Component for FunctionDropDown {
             }
         };
 
-        html! { <><style>{ &CSS }</style>{ body }</> }
+        html! { <><style>{ CSS }</style>{ body }</> }
     }
 }

package/src/rust/components/main_panel.rs

@@ -0,0 +1,219 @@
+// ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
+// ┃ ██████ ██████ ██████       █      █      █      █      █ █▄  ▀███ █       ┃
+// ┃ ▄▄▄▄▄█ █▄▄▄▄▄ ▄▄▄▄▄█  ▀▀▀▀▀█▀▀▀▀▀ █ ▀▀▀▀▀█ ████████▌▐███ ███▄  ▀█ █ ▀▀▀▀▀ ┃
+// ┃ █▀▀▀▀▀ █▀▀▀▀▀ █▀██▀▀ ▄▄▄▄▄ █ ▄▄▄▄▄█ ▄▄▄▄▄█ ████████▌▐███ █████▄   █ ▄▄▄▄▄ ┃
+// ┃ █      ██████ █  ▀█▄       █ ██████      █      ███▌▐███ ███████▄ █       ┃
+// ┣━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┫
+// ┃ Copyright (c) 2017, the Perspective Authors.                              ┃
+// ┃ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ ┃
+// ┃ This file is part of the Perspective library, distributed under the terms ┃
+// ┃ of the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0). ┃
+// ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
+
+use futures::channel::oneshot::*;
+use perspective_js::utils::*;
+use wasm_bindgen::prelude::*;
+use yew::prelude::*;
+
+use super::render_warning::RenderWarning;
+use super::status_bar::StatusBar;
+use crate::PerspectiveProperties;
+use crate::custom_events::CustomEvents;
+use crate::presentation::Presentation;
+use crate::renderer::*;
+use crate::session::*;
+use crate::utils::*;
+
+#[derive(Clone, Properties, PerspectiveProperties!)]
+pub struct MainPanelProps {
+    pub on_settings: Callback<()>,
+
+    /// State
+    pub custom_events: CustomEvents,
+    pub session: Session,
+    pub renderer: Renderer,
+    pub presentation: Presentation,
+}
+
+impl PartialEq for MainPanelProps {
+    fn eq(&self, _rhs: &Self) -> bool {
+        false
+    }
+}
+
+impl MainPanelProps {
+    fn is_title(&self) -> bool {
+        self.session.get_title().is_some()
+    }
+}
+
+#[derive(Debug)]
+pub enum MainPanelMsg {
+    Reset(bool, Option<Sender<()>>),
+    RenderLimits(Option<(usize, usize, Option<usize>, Option<usize>)>),
+    PointerEvent(web_sys::PointerEvent),
+    Error,
+}
+
+pub struct MainPanel {
+    _subscriptions: [Subscription; 2],
+    dimensions: Option<(usize, usize, Option<usize>, Option<usize>)>,
+    main_panel_ref: NodeRef,
+}
+
+impl Component for MainPanel {
+    type Message = MainPanelMsg;
+    type Properties = MainPanelProps;
+
+    fn create(ctx: &Context<Self>) -> Self {
+        let session_sub = {
+            let callback = ctx.link().callback(move |(_, render_limits)| {
+                MainPanelMsg::RenderLimits(Some(render_limits))
+            });
+
+            ctx.props()
+                .renderer
+                .render_limits_changed
+                .add_listener(callback)
+        };
+
+        let error_sub = ctx
+            .props()
+            .session
+            .table_errored
+            .add_listener(ctx.link().callback(|_| MainPanelMsg::Error));
+
+        Self {
+            _subscriptions: [session_sub, error_sub],
+            dimensions: None,
+            main_panel_ref: NodeRef::default(),
+        }
+    }
+
+    fn update(&mut self, ctx: &Context<Self>, msg: Self::Message) -> bool {
+        match msg {
+            MainPanelMsg::Error => true,
+            MainPanelMsg::Reset(all, sender) => {
+                ctx.props().presentation.set_open_column_settings(None);
+
+                clone!(
+                    ctx.props().renderer,
+                    ctx.props().session,
+                    ctx.props().presentation
+                );
+
+                ApiFuture::spawn(async move {
+                    session
+                        .reset(ResetOptions {
+                            config: true,
+                            expressions: all,
+                            ..ResetOptions::default()
+                        })
+                        .await?;
+                    let columns_config = if all {
+                        presentation.reset_columns_configs();
+                        None
+                    } else {
+                        Some(presentation.all_columns_configs())
+                    };
+
+                    renderer.reset(columns_config.as_ref()).await?;
+                    presentation.reset_available_themes(None).await;
+                    if all {
+                        presentation.reset_theme().await?;
+                    }
+
+                    let result = renderer.draw(session.validate().await?.create_view()).await;
+                    if let Some(sender) = sender {
+                        sender.send(()).unwrap();
+                    }
+
+                    renderer.reset_changed.emit(());
+                    result
+                });
+
+                false
+            },
+
+            MainPanelMsg::RenderLimits(dimensions) => {
+                if self.dimensions != dimensions {
+                    self.dimensions = dimensions;
+                    true
+                } else {
+                    false
+                }
+            },
+
+            MainPanelMsg::PointerEvent(event) => {
+                if event.target().map(JsValue::from)
+                    == self
+                        .main_panel_ref
+                        .cast::<web_sys::HtmlElement>()
+                        .map(JsValue::from)
+                {
+                    ctx.props()
+                        .custom_events
+                        .dispatch_event(format!("statusbar-{}", event.type_()).as_str(), &event)
+                        .unwrap();
+                }
+
+                false
+            },
+        }
+    }
+
+    fn changed(&mut self, _ctx: &Context<Self>, _old: &Self::Properties) -> bool {
+        true
+    }
+
+    fn view(&self, ctx: &Context<Self>) -> Html {
+        let Self::Properties {
+            custom_events,
+            presentation,
+            renderer,
+            session,
+            ..
+        } = ctx.props();
+
+        let is_settings_open =
+            ctx.props().presentation.is_settings_open() && ctx.props().session.has_table();
+
+        let on_settings = (!is_settings_open).then(|| ctx.props().on_settings.clone());
+
+        let mut class = classes!();
+        if !is_settings_open {
+            class.push("settings-closed");
+        }
+
+        if ctx.props().is_title() {
+            class.push("titled");
+        }
+
+        let on_reset = ctx.link().callback(|all| MainPanelMsg::Reset(all, None));
+        let pointerdown = ctx.link().callback(MainPanelMsg::PointerEvent);
+        html! {
+            <div id="main_column">
+                <StatusBar
+                    id="status_bar"
+                    {on_settings}
+                    on_reset={on_reset.clone()}
+                    {custom_events}
+                    {presentation}
+                    {renderer}
+                    {session}
+                />
+                <div
+                    id="main_panel_container"
+                    ref={self.main_panel_ref.clone()}
+                    {class}
+                    onpointerdown={pointerdown}
+                >
+                    <RenderWarning {renderer} {session} dimensions={self.dimensions} />
+                    <slot />
+                </div>
+            </div>
+        }
+    }
+
+    fn destroy(&mut self, _ctx: &Context<Self>) {}
+}

package/src/rust/components/mod.rs

@@ -16,9 +16,12 @@
 
 pub mod column_dropdown;
 pub mod column_selector;
+pub mod column_settings_sidebar;
 pub mod containers;
 pub mod copy_dropdown;
 pub mod datetime_column_style;
+pub mod editable_header;
+pub mod empty_row;
 pub mod error_message;
 pub mod export_dropdown;
 pub mod expression_editor;
@@ -26,20 +29,17 @@ pub mod filter_dropdown;
 pub mod font_loader;
 pub mod form;
 pub mod function_dropdown;
+pub mod main_panel;
 pub mod modal;
 pub mod number_column_style;
 pub mod plugin_selector;
 pub mod render_warning;
+pub mod settings_panel;
 pub mod status_bar;
 pub mod status_bar_counter;
 pub mod status_indicator;
 pub mod string_column_style;
 pub mod style;
+pub mod style_controls;
 pub mod type_icon;
 pub mod viewer;
-
-pub mod column_settings_sidebar;
-pub mod style_controls;
-// pub mod empty_row;
-pub mod editable_header;
-pub mod empty_row;

package/src/rust/components/modal.rs

@@ -21,36 +21,14 @@ use yew::virtual_dom::VChild;
 
 use crate::utils::WeakScope;
 
-#[derive(Clone, Default, Eq, PartialEq)]
-pub struct ModalOrientation(Rc<Cell<bool>>);
-
-impl ImplicitClone for ModalOrientation {}
-
-impl From<ModalOrientation> for bool {
-    fn from(x: ModalOrientation) -> Self {
-        x.0.get()
-    }
-}
-
-pub trait ModalLink<T>
-where
-    T: Component,
-{
-    fn weak_link(&self) -> &'_ WeakScope<T>;
-}
-
-pub trait SetModalLink {
-    fn set_modal_link(&self);
-}
-
-impl<T> SetModalLink for &Context<T>
+#[derive(Properties, Derivative)]
+#[derivative(PartialEq(bound = ""))]
+pub struct ModalProps<T>
 where
     T: Component,
     T::Properties: ModalLink<T>,
 {
-    fn set_modal_link(&self) {
-        *self.props().weak_link().borrow_mut() = Some(self.link().clone());
-    }
+    pub child: Option<VChild<T>>,
 }
 
 #[derive(Debug)]
@@ -67,16 +45,6 @@ where
     SubMsg(T::Message),
 }
 
-#[derive(Properties, Derivative)]
-#[derivative(PartialEq(bound = ""))]
-pub struct ModalProps<T>
-where
-    T: Component,
-    T::Properties: ModalLink<T>,
-{
-    pub child: Option<VChild<T>>,
-}
-
 #[derive(Default)]
 pub struct Modal<T> {
     css: String,
@@ -114,10 +82,10 @@ where
                 true
             },
             ModalMsg::SubMsg(msg) => {
-                if let Some(child) = &ctx.props().child
-                    && let Some(link) = child.props.weak_link().borrow().as_ref()
-                {
-                    link.send_message(msg);
+                if let Some(child) = &ctx.props().child {
+                    if let Some(link) = child.props.weak_link().borrow().as_ref() {
+                        link.send_message(msg);
+                    }
                 }
 
                 false
@@ -144,8 +112,40 @@ where
     }
 }
 
+#[derive(Clone, Default, Eq, PartialEq)]
+pub struct ModalOrientation(Rc<Cell<bool>>);
+
+impl ImplicitClone for ModalOrientation {}
+
+impl From<ModalOrientation> for bool {
+    fn from(x: ModalOrientation) -> Self {
+        x.0.get()
+    }
+}
+
+pub trait ModalLink<T>
+where
+    T: Component,
+{
+    fn weak_link(&self) -> &'_ WeakScope<T>;
+}
+
+pub trait SetModalLink {
+    fn set_modal_link(&self);
+}
+
+impl<T> SetModalLink for &Context<T>
+where
+    T: Component,
+    T::Properties: ModalLink<T>,
+{
+    fn set_modal_link(&self) {
+        *self.props().weak_link().borrow_mut() = Some(self.link().clone());
+    }
+}
+
 #[derive(Properties, Clone)]
-pub struct NoRenderProps {
+struct NoRenderProps {
     pub children: Children,
 }
 
@@ -155,7 +155,7 @@ impl PartialEq for NoRenderProps {
     }
 }
 
-pub struct NoRender {}
+struct NoRender {}
 
 impl Component for NoRender {
     type Message = ();