@perspective-dev/viewer 4.0.1 → 4.1.0

package/src/rust/components/number_column_style.rs

@@ -18,10 +18,10 @@ use super::form::number_field::NumberFieldProps;
 use super::modal::*;
 use super::style::LocalStyle;
 use crate::components::form::number_field::NumberField;
-use crate::components::form::select_field::SelectEnumField;
+use crate::components::form::select_enum_field::SelectEnumField;
 use crate::config::*;
 use crate::session::Session;
-use crate::utils::WeakScope;
+use crate::utils::*;
 use crate::*;
 
 #[derive(PartialEq, Eq, Copy, Clone, Debug)]
@@ -32,16 +32,6 @@ pub enum Side {
 
 use Side::*;
 
-#[derive(Debug)]
-pub enum NumberColumnStyleMsg {
-    PosColorChanged(Side, String),
-    NegColorChanged(Side, String),
-    NumberForeModeChanged(NumberForegroundMode),
-    NumberBackModeChanged(NumberBackgroundMode),
-    GradientChanged(Side, Option<f64>),
-    DefaultGradientChanged(f64),
-}
-
 /// A `ColumnStyle` component is mounted to the window anchored at the screen
 /// position of `elem`.
 ///
@@ -61,11 +51,11 @@ pub struct NumberColumnStyleProps {
     #[prop_or_default]
     pub weak_link: WeakScope<NumberColumnStyle>,
 
-    #[prop_or_default]
-    pub session: Option<Session>,
-
     #[prop_or_default]
     pub column_name: Option<String>,
+
+    // State
+    pub session: Session,
 }
 
 impl ModalLink<NumberColumnStyle> for NumberColumnStyleProps {
@@ -80,25 +70,35 @@ impl PartialEq for NumberColumnStyleProps {
     }
 }
 
-impl NumberColumnStyleProps {
-    fn set_default_gradient(&self, ctx: &Context<NumberColumnStyle>) {
-        if let Some(session) = self.session.clone()
-            && let Some(column_name) = self.column_name.clone()
-        {
-            ctx.link().send_future(async move {
-                let view = session.get_view().unwrap();
-                let min_max = view.get_min_max(column_name).await.unwrap();
-                let abs_max = max!(
-                    min_max.0.parse::<f64>().unwrap_or_default().abs(),
-                    min_max.1.parse::<f64>().unwrap_or_default().abs()
-                );
-                let gradient = (abs_max * 100.).round() / 100.;
-                NumberColumnStyleMsg::DefaultGradientChanged(gradient)
-            });
-        }
+fn set_default_gradient(session: &Session, ctx: &Context<NumberColumnStyle>) {
+    if let Some(column_name) = ctx.props().column_name.clone() {
+        let session = session.clone();
+        ctx.link().send_future(async move {
+            let view = session.get_view().unwrap();
+            let min_max = view.get_min_max(column_name).await.unwrap();
+            let abs_max = min_max
+                .0
+                .parse::<f64>()
+                .unwrap_or_default()
+                .abs()
+                .max(min_max.1.parse::<f64>().unwrap_or_default().abs());
+
+            let gradient = (abs_max * 100.).round() / 100.;
+            NumberColumnStyleMsg::DefaultGradientChanged(gradient)
+        });
     }
 }
 
+#[derive(Debug)]
+pub enum NumberColumnStyleMsg {
+    PosColorChanged(Side, String),
+    NegColorChanged(Side, String),
+    NumberForeModeChanged(NumberForegroundMode),
+    NumberBackModeChanged(NumberBackgroundMode),
+    GradientChanged(Side, Option<f64>),
+    DefaultGradientChanged(f64),
+}
+
 /// A column style form control for `number` columns.
 pub struct NumberColumnStyle {
     config: NumberColumnStyleConfig,
@@ -119,7 +119,7 @@ impl Component for NumberColumnStyle {
 
     fn create(ctx: &Context<Self>) -> Self {
         ctx.set_modal_link();
-        ctx.props().set_default_gradient(ctx);
+        set_default_gradient(&ctx.props().session, ctx);
         Self::reset(
             &ctx.props().config.clone().unwrap_or_default(),
             &ctx.props().default_config.clone(),
@@ -131,68 +131,14 @@ impl Component for NumberColumnStyle {
             &ctx.props().config.clone().unwrap_or_default(),
             &ctx.props().default_config.clone(),
         );
-        ctx.props().set_default_gradient(ctx);
+
+        set_default_gradient(&ctx.props().session, ctx);
         std::mem::swap(self, &mut new);
         true
     }
 
     fn update(&mut self, ctx: &Context<Self>, msg: Self::Message) -> bool {
         match msg {
-            // NumberColumnStyleMsg::Reset(config, default_config) => {
-            //     let mut new = Self::reset(&config, &default_config);
-            //     std::mem::swap(self, &mut new);
-            //     true
-            // },
-            // NumberColumnStyleMsg::ForeEnabledChanged(val) => {
-            //     if val {
-            //         let color_mode = match self.fg_mode {
-            //             NumberForegroundMode::Disabled => NumberForegroundMode::default(),
-            //             x => x,
-            //         };
-
-            //         self.config.number_fg_mode = color_mode;
-            //         self.config.pos_fg_color = Some(self.pos_fg_color.to_owned());
-            //         self.config.neg_fg_color = Some(self.neg_fg_color.to_owned());
-            //         if self.fg_mode.needs_gradient() {
-            //             self.config.fg_gradient = Some(self.fg_gradient.unwrap());
-            //         } else {
-            //             self.config.fg_gradient = None;
-            //         }
-            //     } else {
-            //         self.config.number_fg_mode = NumberForegroundMode::Disabled;
-            //         self.config.pos_fg_color = None;
-            //         self.config.neg_fg_color = None;
-            //         self.config.fg_gradient = None;
-            //     }
-
-            //     self.dispatch_config(ctx);
-            //     true
-            // },
-            // NumberColumnStyleMsg::BackEnabledChanged(val) => {
-            //     if val {
-            //         let color_mode = match self.bg_mode {
-            //             NumberBackgroundMode::Disabled => NumberBackgroundMode::Color,
-            //             x => x,
-            //         };
-
-            //         self.config.number_bg_mode = color_mode;
-            //         self.config.pos_bg_color = Some(self.pos_bg_color.to_owned());
-            //         self.config.neg_bg_color = Some(self.neg_bg_color.to_owned());
-            //         if self.bg_mode.needs_gradient() {
-            //             self.config.bg_gradient = Some(self.bg_gradient.unwrap());
-            //         } else {
-            //             self.config.bg_gradient = None;
-            //         }
-            //     } else {
-            //         self.config.number_bg_mode = NumberBackgroundMode::Disabled;
-            //         self.config.pos_bg_color = None;
-            //         self.config.neg_bg_color = None;
-            //         self.config.bg_gradient = None;
-            //     }
-
-            //     self.dispatch_config(ctx);
-            //     true
-            // },
             NumberColumnStyleMsg::PosColorChanged(side, val) => {
                 if side == Fg {
                     self.pos_fg_color = val;

package/src/rust/components/plugin_selector.rs

@@ -11,6 +11,7 @@
 // ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
 
 use perspective_client::config::ViewConfigUpdate;
+use perspective_js::utils::ApiFuture;
 use yew::prelude::*;
 
 use super::containers::select::*;
@@ -22,21 +23,15 @@ use crate::presentation::Presentation;
 use crate::renderer::*;
 use crate::session::*;
 use crate::utils::*;
-use crate::*;
+use crate::{css, *};
 
-#[derive(Properties, PartialEq)]
+#[derive(Properties, PartialEq, PerspectiveProperties!)]
 pub struct PluginSelectorProps {
+    pub presentation: Presentation,
     pub renderer: Renderer,
     pub session: Session,
-    pub presentation: Presentation,
-
-    #[cfg(test)]
-    #[prop_or_default]
-    pub weak_link: WeakScope<PluginSelector>,
 }
 
-derive_model!(Renderer, Session, Presentation for PluginSelectorProps);
-
 #[derive(Debug)]
 pub enum PluginSelectorMsg {
     ComponentSelectPlugin(String),
@@ -57,8 +52,9 @@ impl Component for PluginSelector {
     type Properties = PluginSelectorProps;
 
     fn create(ctx: &Context<Self>) -> Self {
-        let options = generate_plugin_optgroups(&ctx.props().renderer);
-        let _plugin_sub = ctx.props().renderer.plugin_changed.add_listener({
+        let PluginSelectorProps { renderer, .. } = ctx.props();
+        let options = generate_plugin_optgroups(renderer);
+        let _plugin_sub = renderer.plugin_changed.add_listener({
             let link = ctx.link().clone();
             move |plugin: JsPerspectiveViewerPlugin| {
                 let name = plugin.name();
@@ -74,28 +70,30 @@ impl Component for PluginSelector {
     }
 
     fn update(&mut self, ctx: &Context<Self>, msg: Self::Message) -> bool {
+        let PluginSelectorProps {
+            presentation,
+            renderer,
+            session,
+            ..
+        } = ctx.props();
         match msg {
             RendererSelectPlugin(_plugin_name) => true,
             ComponentSelectPlugin(plugin_name) => {
-                if !ctx.props().session.is_errored() {
-                    let metadata = ctx
-                        .props()
-                        .renderer
-                        .get_next_plugin_metadata(&PluginUpdate::Update(plugin_name));
+                if !session.is_errored() {
+                    let metadata =
+                        renderer.get_next_plugin_metadata(&PluginUpdate::Update(plugin_name));
 
                     let mut update = ViewConfigUpdate::default();
-                    ctx.props().session.set_update_column_defaults(
+                    session.set_update_column_defaults(
                         &mut update,
-                        metadata
-                            .as_ref()
-                            .unwrap_or(&*ctx.props().renderer.metadata()),
+                        metadata.as_ref().unwrap_or(&*renderer.metadata()),
                     );
 
                     if let Ok(task) = ctx.props().update_and_render(update) {
                         ApiFuture::spawn(task);
                     }
 
-                    ctx.props().presentation.set_open_column_settings(None);
+                    presentation.set_open_column_settings(None);
                     self.is_open = false;
                     false
                 } else {
@@ -116,7 +114,6 @@ impl Component for PluginSelector {
 
     fn view(&self, ctx: &Context<Self>) -> Html {
         let callback = ctx.link().callback(|_| OpenMenu);
-
         let plugin_name = ctx.props().renderer.get_active_plugin().unwrap().name();
         let plugin_name2 = plugin_name.clone();
         let class = if self.is_open { "open" } else { "" };
@@ -170,7 +167,7 @@ struct PluginSelectProps {
 
 #[function_component]
 fn PluginSelect(props: &PluginSelectProps) -> Html {
-    let name = props.name.clone().tee::<2>();
+    let name = props.name.clone();
     let path: String = props
         .name
         .chars()
@@ -186,9 +183,9 @@ fn PluginSelect(props: &PluginSelectProps) -> Html {
     html! {
         <div
             class="plugin-select-item"
-            data-plugin={name.0}
+            data-plugin={name.clone()}
             style={format!("--default-column-title:var(--plugin-name-{}--content, \"{}\")", path, props.name)}
-            onclick={props.on_click.reform(move |_| name.1.clone())}
+            onclick={props.on_click.reform(move |_| name.clone())}
         >
             <span class="plugin-select-item-name" />
         </div>

package/src/rust/components/render_warning.rs

@@ -13,14 +13,17 @@
 use yew::prelude::*;
 
 use super::style::LocalStyle;
+use crate::model::*;
 use crate::renderer::*;
 use crate::session::*;
-use crate::utils::*;
 use crate::*;
 
-#[derive(Properties)]
+#[derive(Properties, PerspectiveProperties!)]
 pub struct RenderWarningProps {
+    // Current dimensions
     pub dimensions: Option<(usize, usize, Option<usize>, Option<usize>)>,
+
+    // State
     pub renderer: Renderer,
     pub session: Session,
 }
@@ -67,7 +70,6 @@ impl Component for RenderWarning {
     type Properties = RenderWarningProps;
 
     fn create(ctx: &Context<Self>) -> Self {
-        // enable_weak_link_test!(props, link);
         let mut elem = Self {
             col_warn: None,
             row_warn: None,
@@ -80,10 +82,11 @@ impl Component for RenderWarning {
     fn update(&mut self, ctx: &Context<Self>, msg: Self::Message) -> bool {
         match msg {
             RenderWarningMsg::DismissWarning => {
-                clone!(ctx.props().renderer, ctx.props().session);
+                let state = ctx.props().clone_state();
                 ApiFuture::spawn(async move {
-                    renderer.disable_active_plugin_render_warning();
-                    renderer.update(&session).await
+                    state.renderer().disable_active_plugin_render_warning();
+                    let view_task = state.session().get_view();
+                    state.renderer().update(view_task).await
                 });
             },
         };

package/src/rust/components/settings_panel.rs

@@ -0,0 +1,82 @@
+// ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
+// ┃ ██████ ██████ ██████       █      █      █      █      █ █▄  ▀███ █       ┃
+// ┃ ▄▄▄▄▄█ █▄▄▄▄▄ ▄▄▄▄▄█  ▀▀▀▀▀█▀▀▀▀▀ █ ▀▀▀▀▀█ ████████▌▐███ ███▄  ▀█ █ ▀▀▀▀▀ ┃
+// ┃ █▀▀▀▀▀ █▀▀▀▀▀ █▀██▀▀ ▄▄▄▄▄ █ ▄▄▄▄▄█ ▄▄▄▄▄█ ████████▌▐███ █████▄   █ ▄▄▄▄▄ ┃
+// ┃ █      ██████ █  ▀█▄       █ ██████      █      ███▌▐███ ███████▄ █       ┃
+// ┣━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┫
+// ┃ 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::rc::Rc;
+
+use yew::prelude::*;
+
+use super::column_selector::ColumnSelector;
+use super::plugin_selector::PluginSelector;
+use crate::PerspectiveProperties;
+use crate::components::containers::sidebar_close_button::SidebarCloseButton;
+use crate::dragdrop::*;
+use crate::model::*;
+use crate::presentation::{ColumnLocator, Presentation};
+use crate::renderer::*;
+use crate::session::*;
+use crate::utils::*;
+
+#[derive(Clone, Properties, PerspectiveProperties!)]
+pub struct SettingsPanelProps {
+    pub on_close: Callback<()>,
+    pub on_resize: Rc<PubSub<()>>,
+    pub on_select_column: Callback<ColumnLocator>,
+    pub on_debug: Callback<()>,
+    pub is_debug: bool,
+
+    /// State
+    pub dragdrop: DragDrop,
+    pub session: Session,
+    pub renderer: Renderer,
+    pub presentation: Presentation,
+}
+
+impl PartialEq for SettingsPanelProps {
+    fn eq(&self, _rhs: &Self) -> bool {
+        false
+    }
+}
+
+#[function_component]
+pub fn SettingsPanel(props: &SettingsPanelProps) -> Html {
+    let SettingsPanelProps {
+        dragdrop,
+        presentation,
+        renderer,
+        session,
+        ..
+    } = &props;
+    let selected_column = props.get_current_column_locator();
+    html! {
+        <div id="settings_panel" class="sidebar_column noselect split-panel orient-vertical">
+            if selected_column.is_none() {
+                <SidebarCloseButton
+                    id="settings_close_button"
+                    on_close_sidebar={&props.on_close.clone()}
+                />
+            }
+            <SidebarCloseButton
+                id={if props.is_debug {"debug_close_button"} else {"debug_open_button"}}
+                on_close_sidebar={&props.on_debug}
+            />
+            <PluginSelector {presentation} {renderer} {session} />
+            <ColumnSelector
+                on_resize={&props.on_resize}
+                on_open_expr_panel={&props.on_select_column}
+                selected_column={selected_column.clone()}
+                {dragdrop}
+                {renderer}
+                {session}
+            />
+        </div>
+    }
+}