@perspective-dev/viewer 4.2.0 → 4.4.0

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

@@ -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/sidebar_close_button.rs

@@ -24,7 +24,7 @@ pub fn SidebarCloseButton(p: &SidebarCloseButtonProps) -> Html {
     let id = &p.id;
     html! {
         <div {onclick} {id} class="sidebar_close_button">
-            <div class="sidebar_close_button_inner" />
+            <div class="sidebar_close_button_inner"><span class="icon" /></div>
         </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 {
@@ -412,6 +412,7 @@ impl ResizingState {
                     Orientation::Vertical => event.client_y(),
                 })
             });
+
             move |x| cb.emit(x)
         });
 

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

@@ -95,7 +95,7 @@ impl<T: ColumnTab> Component for TabList<T> {
                         <div class="tab-border" />
                     </span>
                 </div>
-                <div id="format-tab" class="tab-content">
+                <div id="format-tab" class="tab-content scrollable">
                     { ctx.props().children.iter().nth(self.selected_idx) }
                 </div>
             </>

package/src/rust/components/copy_dropdown.rs

@@ -15,47 +15,25 @@ use std::rc::Rc;
 use yew::prelude::*;
 
 use super::containers::dropdown_menu::*;
-use super::modal::*;
-use super::style::StyleProvider;
-use crate::model::*;
 use crate::renderer::*;
-use crate::utils::*;
+use crate::tasks::*;
 
 type CopyDropDownMenuItem = DropDownMenuItem<ExportFile>;
 
 #[derive(Properties, PartialEq)]
 pub struct CopyDropDownMenuProps {
     pub callback: Callback<ExportFile>,
-    pub root: web_sys::HtmlElement,
     pub renderer: Renderer,
-
-    #[prop_or_default]
-    weak_link: WeakScope<CopyDropDownMenu>,
-}
-
-impl ModalLink<CopyDropDownMenu> for CopyDropDownMenuProps {
-    fn weak_link(&self) -> &'_ WeakScope<CopyDropDownMenu> {
-        &self.weak_link
-    }
 }
 
-pub struct CopyDropDownMenu {
-    _sub: Subscription,
-}
+pub struct CopyDropDownMenu {}
 
 impl Component for CopyDropDownMenu {
     type Message = ();
     type Properties = CopyDropDownMenuProps;
 
-    fn create(ctx: &Context<Self>) -> Self {
-        ctx.set_modal_link();
-        let _sub = ctx
-            .props()
-            .renderer
-            .plugin_changed
-            .add_listener(ctx.link().callback(|_| ()));
-
-        Self { _sub }
+    fn create(_ctx: &Context<Self>) -> Self {
+        Self {}
     }
 
     fn update(&mut self, _ctx: &Context<Self>, _msg: Self::Message) -> bool {
@@ -67,12 +45,13 @@ impl Component for CopyDropDownMenu {
         let is_chart = plugin.name().as_str() != "Datagrid";
         let has_selection = ctx.props().renderer.get_selection().is_some();
         html! {
-            <StyleProvider root={ctx.props().root.clone()}>
+            <>
+                <div id="test" />
                 <DropDownMenu<ExportFile>
                     values={Rc::new(get_menu_items(is_chart, has_selection))}
                     callback={&ctx.props().callback}
                 />
-            </StyleProvider>
+            </>
         }
     }
 }

package/src/rust/components/datetime_column_style/custom.rs

@@ -40,8 +40,8 @@ impl ModalLink<DatetimeStyleCustom> for DatetimeStyleCustomProps {
 }
 
 impl PartialEq for DatetimeStyleCustomProps {
-    fn eq(&self, _other: &Self) -> bool {
-        false
+    fn eq(&self, other: &Self) -> bool {
+        self.enable_time_config == other.enable_time_config && self.config == other.config
     }
 }
 

package/src/rust/components/datetime_column_style/simple.rs

@@ -36,8 +36,8 @@ impl ModalLink<DatetimeStyleSimple> for DatetimeStyleSimpleProps {
 }
 
 impl PartialEq for DatetimeStyleSimpleProps {
-    fn eq(&self, _other: &Self) -> bool {
-        false
+    fn eq(&self, other: &Self) -> bool {
+        self.enable_time_config == other.enable_time_config && self.config == other.config
     }
 }
 

package/src/rust/components/datetime_column_style.rs

@@ -56,8 +56,10 @@ impl ModalLink<DatetimeColumnStyle> for DatetimeColumnStyleProps {
 }
 
 impl PartialEq for DatetimeColumnStyleProps {
-    fn eq(&self, _other: &Self) -> bool {
-        false
+    fn eq(&self, other: &Self) -> bool {
+        self.enable_time_config == other.enable_time_config
+            && self.config == other.config
+            && self.default_config == other.default_config
     }
 }
 

package/src/rust/components/editable_header.rs

@@ -18,10 +18,10 @@ use yew::{Callback, Component, Html, NodeRef, Properties, TargetCast, classes, h
 
 use super::type_icon::TypeIconType;
 use crate::components::type_icon::TypeIcon;
-use crate::session::Session;
-use crate::*;
+use crate::maybe;
+use crate::session::{Session, SessionMetadataRc};
 
-#[derive(Clone, PartialEq, Properties, PerspectiveProperties!)]
+#[derive(Clone, PartialEq, Properties)]
 pub struct EditableHeaderProps {
     pub icon_type: Option<TypeIconType>,
     pub on_change: Callback<(Option<String>, bool)>,
@@ -32,6 +32,9 @@ pub struct EditableHeaderProps {
     #[prop_or_default]
     pub reset_count: u8,
 
+    /// Session metadata snapshot — threaded from `SessionProps`.
+    pub metadata: SessionMetadataRc,
+
     // State
     pub session: Session,
 }
@@ -111,7 +114,7 @@ impl Component for EditableHeader {
                     if !self.edited {
                         return Some(true);
                     }
-                    let metadata = ctx.props().session.metadata();
+                    let metadata = &ctx.props().metadata;
                     let expressions = metadata.get_expression_columns();
                     let found = metadata
                         .get_table_columns()?

package/src/rust/components/empty_row.rs

@@ -19,9 +19,9 @@ use wasm_bindgen::JsCast;
 use web_sys::*;
 use yew::prelude::*;
 
+use crate::components::filter_dropdown::FilterDropDownElement;
 use crate::components::style::LocalStyle;
 use crate::css;
-use crate::custom_elements::FilterDropDownElement;
 
 #[derive(Properties, Derivative)]
 #[derivative(Debug)]

package/src/rust/components/export_dropdown.rs

@@ -12,16 +12,12 @@
 
 use std::rc::Rc;
 
-use session::Session;
 use yew::prelude::*;
 
 use super::containers::dropdown_menu::*;
-use super::modal::{ModalLink, SetModalLink};
-use super::style::StyleProvider;
-use crate::model::*;
 use crate::renderer::*;
-use crate::utils::*;
-use crate::*;
+use crate::session::Session;
+use crate::tasks::*;
 
 pub type ExportDropDownMenuItem = DropDownMenuItem<ExportFile>;
 
@@ -30,16 +26,6 @@ pub struct ExportDropDownMenuProps {
     pub renderer: Renderer,
     pub session: Session,
     pub callback: Callback<ExportFile>,
-    pub root: web_sys::HtmlElement,
-
-    #[prop_or_default]
-    weak_link: WeakScope<ExportDropDownMenu>,
-}
-
-impl ModalLink<ExportDropDownMenu> for ExportDropDownMenuProps {
-    fn weak_link(&self) -> &'_ utils::WeakScope<ExportDropDownMenu> {
-        &self.weak_link
-    }
 }
 
 pub enum ExportDropDownMenuMsg {
@@ -49,7 +35,6 @@ pub enum ExportDropDownMenuMsg {
 #[derive(Default)]
 pub struct ExportDropDownMenu {
     title: String,
-    _sub: Option<Subscription>,
     input_ref: NodeRef,
     invalid: bool,
 }
@@ -61,11 +46,9 @@ impl Component for ExportDropDownMenu {
     fn view(&self, ctx: &Context<Self>) -> yew::virtual_dom::VNode {
         let callback = ctx.link().callback(|_| ExportDropDownMenuMsg::TitleChange);
         let plugin = ctx.props().renderer.get_active_plugin().unwrap();
-        // let has_render = js_sys::Reflect::has(&plugin,
-        // js_intern::js_intern!("render")).unwrap();
         let is_chart = plugin.name().as_str() != "Datagrid";
         html! {
-            <StyleProvider root={ctx.props().root.clone()}>
+            <>
                 <span class="dropdown-group-label">{ "Save as" }</span>
                 <input
                     class={if self.invalid { "invalid" } else { "" }}
@@ -77,7 +60,7 @@ impl Component for ExportDropDownMenu {
                     values={Rc::new(get_menu_items(&self.title, is_chart))}
                     callback={&ctx.props().callback}
                 />
-            </StyleProvider>
+            </>
         }
     }
 
@@ -97,21 +80,12 @@ impl Component for ExportDropDownMenu {
     }
 
     fn create(ctx: &Context<Self>) -> Self {
-        ctx.set_modal_link();
-        let _sub = Some(
-            ctx.props()
-                .renderer
-                .plugin_changed
-                .add_listener(ctx.link().callback(|_| ExportDropDownMenuMsg::TitleChange)),
-        );
-
         Self {
             title: ctx
                 .props()
                 .session
                 .get_title()
                 .unwrap_or_else(|| "untitled".to_owned()),
-            _sub,
             ..Default::default()
         }
     }

package/src/rust/components/expression_editor.rs

@@ -17,11 +17,10 @@ use yew::prelude::*;
 
 use super::form::code_editor::*;
 use super::style::LocalStyle;
-use crate::model::*;
-use crate::session::Session;
+use crate::session::{Session, SessionMetadata, SessionMetadataRc};
 use crate::*;
 
-#[derive(Properties, PartialEq, PerspectiveProperties!, Clone)]
+#[derive(Properties, PartialEq, Clone)]
 pub struct ExpressionEditorProps {
     pub on_save: Callback<()>,
     pub on_validate: Callback<bool>,
@@ -32,6 +31,13 @@ pub struct ExpressionEditorProps {
     #[prop_or_default]
     pub reset_count: u8,
 
+    /// Session metadata snapshot — threaded from `SessionProps`.
+    pub metadata: SessionMetadataRc,
+
+    /// Selected theme name, threaded for PortalModal consumers.
+    #[prop_or_default]
+    pub selected_theme: Option<String>,
+
     // State
     pub session: Session,
 }
@@ -55,7 +61,7 @@ impl Component for ExpressionEditor {
 
     fn create(ctx: &Context<Self>) -> Self {
         let oninput = ctx.link().callback(ExpressionEditorMsg::SetExpr);
-        let expr = initial_expr(&ctx.props().session, &ctx.props().alias);
+        let expr = initial_expr(&ctx.props().metadata, &ctx.props().alias);
         ctx.link()
             .send_message(Self::Message::SetExpr(expr.clone()));
 
@@ -89,8 +95,8 @@ impl Component for ExpressionEditor {
                 if self.error.is_none() {
                     maybe!({
                         let alias = ctx.props().alias.as_ref()?;
-                        let session = ctx.props().session();
-                        let old = session.metadata().get_expression_by_alias(alias)?;
+                        let session = &ctx.props().session;
+                        let old = ctx.props().metadata.get_expression_by_alias(alias)?;
                         let is_edited = *self.expr != old;
                         session
                             .metadata_mut()
@@ -124,6 +130,7 @@ impl Component for ExpressionEditor {
                         {disabled}
                         oninput={self.oninput.clone()}
                         onsave={ctx.props().on_save.clone()}
+                        theme={ctx.props().selected_theme.clone().unwrap_or_default()}
                     />
                     <div id="psp-expression-editor-meta">
                         <div class="error">
@@ -136,11 +143,13 @@ impl Component for ExpressionEditor {
     }
 
     fn changed(&mut self, ctx: &Context<Self>, old_props: &Self::Properties) -> bool {
-        if ctx.props().alias != old_props.alias || ctx.props().reset_count != old_props.reset_count
+        if ctx.props().alias != old_props.alias
+            || ctx.props().reset_count != old_props.reset_count
+            || (ctx.props().alias.is_some() && ctx.props().metadata != old_props.metadata)
         {
             ctx.link()
                 .send_message(ExpressionEditorMsg::SetExpr(initial_expr(
-                    &ctx.props().session,
+                    &ctx.props().metadata,
                     &ctx.props().alias,
                 )));
             false
@@ -150,10 +159,10 @@ impl Component for ExpressionEditor {
     }
 }
 
-fn initial_expr(session: &Session, alias: &Option<String>) -> Rc<String> {
+fn initial_expr(metadata: &SessionMetadata, alias: &Option<String>) -> Rc<String> {
     alias
         .as_ref()
-        .and_then(|alias| session.metadata().get_expression_by_alias(alias))
+        .and_then(|alias| metadata.get_expression_by_alias(alias))
         .unwrap_or_default()
         .into()
 }