@perspective-dev/viewer 4.0.1 → 4.1.1

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

@@ -12,20 +12,14 @@
 
 use yew::prelude::*;
 
-use crate::components::form::select_field::SelectEnumField;
+use crate::components::form::select_enum_field::SelectEnumField;
 use crate::components::modal::{ModalLink, SetModalLink};
 use crate::config::*;
 use crate::utils::WeakScope;
 
-pub enum DatetimeStyleSimpleMsg {
-    DateStyleChanged(Option<SimpleDatetimeFormat>),
-    TimeStyleChanged(Option<SimpleDatetimeFormat>),
-}
-
 #[derive(Properties)]
 pub struct DatetimeStyleSimpleProps {
     pub enable_time_config: bool,
-
     pub config: SimpleDatetimeStyleConfig,
 
     #[prop_or_default]
@@ -47,6 +41,11 @@ impl PartialEq for DatetimeStyleSimpleProps {
     }
 }
 
+pub enum DatetimeStyleSimpleMsg {
+    DateStyleChanged(Option<SimpleDatetimeFormat>),
+    TimeStyleChanged(Option<SimpleDatetimeFormat>),
+}
+
 /// `DatetimeStyleSimple` represents the variation of the options parameter to
 /// `Intl.DatetimeFormat()` which supports `timeStyle` and `dateStyle`. These
 /// options are mutually exclusive with those of `DatetimeStyleCustom`, hence
@@ -55,13 +54,6 @@ pub struct DatetimeStyleSimple {
     config: SimpleDatetimeStyleConfig,
 }
 
-impl DatetimeStyleSimple {
-    /// When this config has changed, we must signal the wrapper element.
-    fn dispatch_config(&self, ctx: &Context<Self>) {
-        ctx.props().on_change.emit(self.config.clone());
-    }
-}
-
 impl Component for DatetimeStyleSimple {
     type Message = DatetimeStyleSimpleMsg;
     type Properties = DatetimeStyleSimpleProps;
@@ -120,3 +112,10 @@ impl Component for DatetimeStyleSimple {
         }
     }
 }
+
+impl DatetimeStyleSimple {
+    /// When this config has changed, we must signal the wrapper element.
+    fn dispatch_config(&self, ctx: &Context<Self>) {
+        ctx.props().on_change.emit(self.config.clone());
+    }
+}

package/src/rust/components/datetime_column_style.rs

@@ -28,54 +28,17 @@ use super::modal::{ModalLink, SetModalLink};
 use super::style::LocalStyle;
 use crate::components::datetime_column_style::custom::DatetimeStyleCustom;
 use crate::components::datetime_column_style::simple::DatetimeStyleSimple;
-use crate::components::form::select_field::{SelectEnumField, SelectValueField};
+use crate::components::form::select_enum_field::SelectEnumField;
+use crate::components::form::select_value_field::SelectValueField;
 use crate::config::*;
+use crate::css;
 use crate::utils::WeakScope;
-use crate::*;
-
-#[wasm_bindgen]
-extern "C" {
-    #[wasm_bindgen(js_name = supportedValuesOf, js_namespace = Intl)]
-    pub fn supported_values_of(s: &JsValue) -> js_sys::Array;
-}
-
-thread_local! {
-    static ALL_TIMEZONES: LazyLock<Rc<Vec<String>>> = LazyLock::new(|| {
-        Rc::new(
-            supported_values_of(&JsValue::from("timeZone"))
-                .iter()
-                .map(|x| x.as_string().unwrap())
-                .collect(),
-        )
-    });
-}
-
-static USER_TIMEZONE: LazyLock<String> = LazyLock::new(|| {
-    js_sys::Reflect::get(
-        &js_sys::Intl::DateTimeFormat::new(&navigator().languages(), &json!({})).resolved_options(),
-        &JsValue::from("timeZone"),
-    )
-    .unwrap()
-    .as_string()
-    .unwrap()
-});
-
-pub enum DatetimeColumnStyleMsg {
-    SimpleDatetimeStyleConfigChanged(SimpleDatetimeStyleConfig),
-    CustomDatetimeStyleConfigChanged(CustomDatetimeStyleConfig),
-    TimezoneChanged(Option<String>),
-    ColorModeChanged(Option<DatetimeColorMode>),
-    ColorChanged(String),
-    ColorReset,
-}
 
 #[derive(Properties, Derivative)]
 #[derivative(Debug)]
 pub struct DatetimeColumnStyleProps {
     pub enable_time_config: bool,
-
     pub config: Option<DatetimeColumnStyleConfig>,
-
     pub default_config: DatetimeColumnStyleDefaultConfig,
 
     #[prop_or_default]
@@ -98,6 +61,15 @@ impl PartialEq for DatetimeColumnStyleProps {
     }
 }
 
+pub enum DatetimeColumnStyleMsg {
+    SimpleDatetimeStyleConfigChanged(SimpleDatetimeStyleConfig),
+    CustomDatetimeStyleConfigChanged(CustomDatetimeStyleConfig),
+    TimezoneChanged(Option<String>),
+    ColorModeChanged(Option<DatetimeColorMode>),
+    ColorChanged(String),
+    ColorReset,
+}
+
 /// Column style controls for the `datetime` type.
 #[derive(Debug)]
 pub struct DatetimeColumnStyle {
@@ -105,42 +77,6 @@ pub struct DatetimeColumnStyle {
     default_config: DatetimeColumnStyleDefaultConfig,
 }
 
-impl DatetimeColumnStyle {
-    /// When this config has changed, we must signal the wrapper element.
-    fn dispatch_config(&self, ctx: &Context<Self>) {
-        let update =
-            Some(self.config.clone()).filter(|x| x != &DatetimeColumnStyleConfig::default());
-        ctx.props()
-            .on_change
-            .emit(ColumnConfigValueUpdate::DatagridDatetimeStyle(update));
-    }
-
-    /// Generate a color selector component for a specific `StringColorMode`
-    /// variant.
-    fn color_select_row(&self, ctx: &Context<Self>, mode: &DatetimeColorMode, title: &str) -> Html {
-        let on_color = ctx.link().callback(DatetimeColumnStyleMsg::ColorChanged);
-        let color = self
-            .config
-            .color
-            .clone()
-            .unwrap_or_else(|| self.default_config.color.to_owned());
-
-        let color_props = props!(ColorProps {
-            title: title.to_owned(),
-            on_color,
-            is_modified: color != self.default_config.color,
-            color,
-            on_reset: ctx.link().callback(|_| DatetimeColumnStyleMsg::ColorReset)
-        });
-
-        if &self.config.datetime_color_mode == mode {
-            html! { <div class="row"><ColorSelector ..color_props /></div> }
-        } else {
-            html! {}
-        }
-    }
-}
-
 impl Component for DatetimeColumnStyle {
     type Message = DatetimeColumnStyleMsg;
     type Properties = DatetimeColumnStyleProps;
@@ -282,3 +218,66 @@ impl Component for DatetimeColumnStyle {
         }
     }
 }
+
+#[wasm_bindgen]
+extern "C" {
+    #[wasm_bindgen(js_name = supportedValuesOf, js_namespace = Intl)]
+    pub fn supported_values_of(s: &JsValue) -> js_sys::Array;
+}
+
+thread_local! {
+    static ALL_TIMEZONES: LazyLock<Rc<Vec<String>>> = LazyLock::new(|| {
+        Rc::new(
+            supported_values_of(&JsValue::from("timeZone"))
+                .iter()
+                .map(|x| x.as_string().unwrap())
+                .collect(),
+        )
+    });
+}
+
+static USER_TIMEZONE: LazyLock<String> = LazyLock::new(|| {
+    js_sys::Reflect::get(
+        &js_sys::Intl::DateTimeFormat::new(&navigator().languages(), &json!({})).resolved_options(),
+        &JsValue::from("timeZone"),
+    )
+    .unwrap()
+    .as_string()
+    .unwrap()
+});
+
+impl DatetimeColumnStyle {
+    /// When this config has changed, we must signal the wrapper element.
+    fn dispatch_config(&self, ctx: &Context<Self>) {
+        let update =
+            Some(self.config.clone()).filter(|x| x != &DatetimeColumnStyleConfig::default());
+        ctx.props()
+            .on_change
+            .emit(ColumnConfigValueUpdate::DatagridDatetimeStyle(update));
+    }
+
+    /// Generate a color selector component for a specific `StringColorMode`
+    /// variant.
+    fn color_select_row(&self, ctx: &Context<Self>, mode: &DatetimeColorMode, title: &str) -> Html {
+        let on_color = ctx.link().callback(DatetimeColumnStyleMsg::ColorChanged);
+        let color = self
+            .config
+            .color
+            .clone()
+            .unwrap_or_else(|| self.default_config.color.to_owned());
+
+        let color_props = props!(ColorProps {
+            title: title.to_owned(),
+            on_color,
+            is_modified: color != self.default_config.color,
+            color,
+            on_reset: ctx.link().callback(|_| DatetimeColumnStyleMsg::ColorReset)
+        });
+
+        if &self.config.datetime_color_mode == mode {
+            html! { <div class="row"><ColorSelector ..color_props /></div> }
+        } else {
+            html! {}
+        }
+    }
+}

package/src/rust/components/editable_header.rs

@@ -12,29 +12,30 @@
 
 use std::rc::Rc;
 
-use derivative::Derivative;
 use itertools::Itertools;
 use web_sys::{FocusEvent, HtmlInputElement, KeyboardEvent};
 use yew::{Callback, Component, Html, NodeRef, Properties, TargetCast, classes, html};
 
 use super::type_icon::TypeIconType;
 use crate::components::type_icon::TypeIcon;
-use crate::maybe;
 use crate::session::Session;
+use crate::*;
 
-#[derive(PartialEq, Properties, Derivative, Clone)]
-#[derivative(Debug)]
+#[derive(Clone, PartialEq, Properties, PerspectiveProperties!)]
 pub struct EditableHeaderProps {
     pub icon_type: Option<TypeIconType>,
     pub on_change: Callback<(Option<String>, bool)>,
     pub editable: bool,
     pub initial_value: Option<String>,
     pub placeholder: Rc<String>,
+
     #[prop_or_default]
     pub reset_count: u8,
-    #[derivative(Debug = "ignore")]
+
+    // State
     pub session: Session,
 }
+
 impl EditableHeaderProps {
     fn split_placeholder(&self) -> String {
         let split = self
@@ -42,6 +43,7 @@ impl EditableHeaderProps {
             .split_once('\n')
             .map(|(a, _)| a)
             .unwrap_or(&*self.placeholder);
+
         match split.char_indices().nth(25) {
             None => split.to_string(),
             Some((idx, _)) => split[..idx].to_owned(),
@@ -49,19 +51,12 @@ impl EditableHeaderProps {
     }
 }
 
-#[derive(Default, Debug, PartialEq, Copy, Clone)]
-pub enum ValueState {
-    #[default]
-    Unedited,
-    Edited,
-}
-
 pub enum EditableHeaderMsg {
     SetNewValue(String),
     OnClick(()),
 }
 
-#[derive(Default, Debug)]
+#[derive(Debug)]
 pub struct EditableHeader {
     noderef: NodeRef,
     edited: bool,
@@ -69,6 +64,7 @@ pub struct EditableHeader {
     value: Option<String>,
     placeholder: String,
 }
+
 impl Component for EditableHeader {
     type Message = EditableHeaderMsg;
     type Properties = EditableHeaderProps;
@@ -78,7 +74,8 @@ impl Component for EditableHeader {
             value: ctx.props().initial_value.clone(),
             placeholder: ctx.props().split_placeholder(),
             valid: true,
-            ..Self::default()
+            noderef: NodeRef::default(),
+            edited: false,
         }
     }
 
@@ -181,3 +178,10 @@ impl Component for EditableHeader {
         }
     }
 }
+
+#[derive(Default, Debug, PartialEq, Copy, Clone)]
+pub enum ValueState {
+    #[default]
+    Unedited,
+    Edited,
+}

package/src/rust/components/empty_row.rs

@@ -23,11 +23,6 @@ use crate::components::style::LocalStyle;
 use crate::css;
 use crate::custom_elements::FilterDropDownElement;
 
-#[derive(Default)]
-pub struct EmptyRow {
-    input_ref: NodeRef,
-}
-
 #[derive(Properties, Derivative)]
 #[derivative(Debug)]
 pub struct EmptyRowProps {
@@ -57,6 +52,11 @@ pub enum EmptyRowMsg {
 
 use EmptyRowMsg::*;
 
+#[derive(Default)]
+pub struct EmptyRow {
+    input_ref: NodeRef,
+}
+
 impl Component for EmptyRow {
     type Message = EmptyRowMsg;
     type Properties = EmptyRowProps;

package/src/rust/components/export_dropdown.rs

@@ -12,7 +12,7 @@
 
 use std::rc::Rc;
 
-use presentation::Presentation;
+use session::Session;
 use yew::prelude::*;
 
 use super::containers::dropdown_menu::*;
@@ -28,7 +28,7 @@ pub type ExportDropDownMenuItem = DropDownMenuItem<ExportFile>;
 #[derive(Properties, PartialEq)]
 pub struct ExportDropDownMenuProps {
     pub renderer: Renderer,
-    pub presentation: Presentation,
+    pub session: Session,
     pub callback: Callback<ExportFile>,
     pub root: web_sys::HtmlElement,
 
@@ -42,6 +42,10 @@ impl ModalLink<ExportDropDownMenu> for ExportDropDownMenuProps {
     }
 }
 
+pub enum ExportDropDownMenuMsg {
+    TitleChange,
+}
+
 #[derive(Default)]
 pub struct ExportDropDownMenu {
     title: String,
@@ -50,45 +54,6 @@ pub struct ExportDropDownMenu {
     invalid: bool,
 }
 
-pub enum ExportDropDownMenuMsg {
-    TitleChange,
-}
-
-fn get_menu_items(name: &str, is_chart: bool) -> Vec<ExportDropDownMenuItem> {
-    vec![
-        ExportDropDownMenuItem::OptGroup(
-            "Current View".into(),
-            if is_chart {
-                vec![
-                    ExportMethod::Csv.new_file(name, is_chart),
-                    ExportMethod::Json.new_file(name, is_chart),
-                    ExportMethod::Ndjson.new_file(name, is_chart),
-                    ExportMethod::Arrow.new_file(name, is_chart),
-                    ExportMethod::Html.new_file(name, is_chart),
-                    ExportMethod::Plugin.new_file(name, is_chart),
-                ]
-            } else {
-                vec![
-                    ExportMethod::Csv.new_file(name, is_chart),
-                    ExportMethod::Json.new_file(name, is_chart),
-                    ExportMethod::Ndjson.new_file(name, is_chart),
-                    ExportMethod::Arrow.new_file(name, is_chart),
-                    ExportMethod::Html.new_file(name, is_chart),
-                ]
-            },
-        ),
-        ExportDropDownMenuItem::OptGroup("All".into(), vec![
-            ExportMethod::CsvAll.new_file(name, is_chart),
-            ExportMethod::JsonAll.new_file(name, is_chart),
-            ExportMethod::NdjsonAll.new_file(name, is_chart),
-            ExportMethod::ArrowAll.new_file(name, is_chart),
-        ]),
-        ExportDropDownMenuItem::OptGroup("Config".into(), vec![
-            ExportMethod::JsonConfig.new_file(name, is_chart),
-        ]),
-    ]
-}
-
 impl Component for ExportDropDownMenu {
     type Message = ExportDropDownMenuMsg;
     type Properties = ExportDropDownMenuProps;
@@ -143,7 +108,7 @@ impl Component for ExportDropDownMenu {
         Self {
             title: ctx
                 .props()
-                .presentation
+                .session
                 .get_title()
                 .unwrap_or_else(|| "untitled".to_owned()),
             _sub,
@@ -151,3 +116,38 @@ impl Component for ExportDropDownMenu {
         }
     }
 }
+
+fn get_menu_items(name: &str, is_chart: bool) -> Vec<ExportDropDownMenuItem> {
+    vec![
+        ExportDropDownMenuItem::OptGroup(
+            "Current View".into(),
+            if is_chart {
+                vec![
+                    ExportMethod::Csv.new_file(name, is_chart),
+                    ExportMethod::Json.new_file(name, is_chart),
+                    ExportMethod::Ndjson.new_file(name, is_chart),
+                    ExportMethod::Arrow.new_file(name, is_chart),
+                    ExportMethod::Html.new_file(name, is_chart),
+                    ExportMethod::Plugin.new_file(name, is_chart),
+                ]
+            } else {
+                vec![
+                    ExportMethod::Csv.new_file(name, is_chart),
+                    ExportMethod::Json.new_file(name, is_chart),
+                    ExportMethod::Ndjson.new_file(name, is_chart),
+                    ExportMethod::Arrow.new_file(name, is_chart),
+                    ExportMethod::Html.new_file(name, is_chart),
+                ]
+            },
+        ),
+        ExportDropDownMenuItem::OptGroup("All".into(), vec![
+            ExportMethod::CsvAll.new_file(name, is_chart),
+            ExportMethod::JsonAll.new_file(name, is_chart),
+            ExportMethod::NdjsonAll.new_file(name, is_chart),
+            ExportMethod::ArrowAll.new_file(name, is_chart),
+        ]),
+        ExportDropDownMenuItem::OptGroup("Config".into(), vec![
+            ExportMethod::JsonConfig.new_file(name, is_chart),
+        ]),
+    ]
+}

package/src/rust/components/expression_editor.rs

@@ -17,35 +17,29 @@ use yew::prelude::*;
 
 use super::form::code_editor::*;
 use super::style::LocalStyle;
+use crate::model::*;
 use crate::session::Session;
 use crate::*;
 
-#[derive(Debug)]
-pub enum ExpressionEditorMsg {
-    SetExpr(Rc<String>),
-    ValidateComplete(Option<ExprValidationError>),
-}
-
-#[derive(Properties, PartialEq, Clone)]
+#[derive(Properties, PartialEq, PerspectiveProperties!, Clone)]
 pub struct ExpressionEditorProps {
-    pub session: Session,
     pub on_save: Callback<()>,
     pub on_validate: Callback<bool>,
     pub on_input: Callback<Rc<String>>,
     pub alias: Option<String>,
     pub disabled: bool,
+
     #[prop_or_default]
     pub reset_count: u8,
+
+    // State
+    pub session: Session,
 }
 
-impl ExpressionEditorProps {
-    fn initial_expr(&self) -> Rc<String> {
-        self.alias
-            .as_ref()
-            .and_then(|alias| self.session.metadata().get_expression_by_alias(alias))
-            .unwrap_or_default()
-            .into()
-    }
+#[derive(Debug)]
+pub enum ExpressionEditorMsg {
+    SetExpr(Rc<String>),
+    ValidateComplete(Option<ExprValidationError>),
 }
 
 /// Expression editor component `CodeEditor` and a button toolbar.
@@ -61,7 +55,7 @@ impl Component for ExpressionEditor {
 
     fn create(ctx: &Context<Self>) -> Self {
         let oninput = ctx.link().callback(ExpressionEditorMsg::SetExpr);
-        let expr = ctx.props().initial_expr();
+        let expr = initial_expr(&ctx.props().session, &ctx.props().alias);
         ctx.link()
             .send_message(Self::Message::SetExpr(expr.clone()));
 
@@ -95,12 +89,13 @@ impl Component for ExpressionEditor {
                 if self.error.is_none() {
                     maybe!({
                         let alias = ctx.props().alias.as_ref()?;
-                        let session = &ctx.props().session;
+                        let session = ctx.props().session();
                         let old = session.metadata().get_expression_by_alias(alias)?;
                         let is_edited = *self.expr != old;
                         session
                             .metadata_mut()
                             .set_edit_by_alias(alias, self.expr.to_string());
+
                         Some(is_edited)
                     });
 
@@ -144,10 +139,21 @@ impl Component for ExpressionEditor {
         if ctx.props().alias != old_props.alias || ctx.props().reset_count != old_props.reset_count
         {
             ctx.link()
-                .send_message(ExpressionEditorMsg::SetExpr(ctx.props().initial_expr()));
+                .send_message(ExpressionEditorMsg::SetExpr(initial_expr(
+                    &ctx.props().session,
+                    &ctx.props().alias,
+                )));
             false
         } else {
             true
         }
     }
 }
+
+fn initial_expr(session: &Session, alias: &Option<String>) -> Rc<String> {
+    alias
+        .as_ref()
+        .and_then(|alias| session.metadata().get_expression_by_alias(alias))
+        .unwrap_or_default()
+        .into()
+}

package/src/rust/components/filter_dropdown.rs

@@ -18,6 +18,18 @@ use crate::utils::WeakScope;
 
 static CSS: &str = include_str!(concat!(env!("OUT_DIR"), "/css/filter-dropdown.css"));
 
+#[derive(Properties, PartialEq)]
+pub struct FilterDropDownProps {
+    #[prop_or_default]
+    pub weak_link: WeakScope<FilterDropDown>,
+}
+
+impl ModalLink<FilterDropDown> for FilterDropDownProps {
+    fn weak_link(&self) -> &'_ WeakScope<FilterDropDown> {
+        &self.weak_link
+    }
+}
+
 pub enum FilterDropDownMsg {
     SetValues(Vec<String>),
     SetCallback(Callback<String>),
@@ -32,18 +44,6 @@ pub struct FilterDropDown {
     on_select: Option<Callback<String>>,
 }
 
-#[derive(Properties, PartialEq)]
-pub struct FilterDropDownProps {
-    #[prop_or_default]
-    pub weak_link: WeakScope<FilterDropDown>,
-}
-
-impl ModalLink<FilterDropDown> for FilterDropDownProps {
-    fn weak_link(&self) -> &'_ WeakScope<FilterDropDown> {
-        &self.weak_link
-    }
-}
-
 impl Component for FilterDropDown {
     type Message = FilterDropDownMsg;
     type Properties = FilterDropDownProps;
@@ -87,20 +87,20 @@ impl Component for FilterDropDown {
             },
             FilterDropDownMsg::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
             },
             FilterDropDownMsg::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;
                 true
@@ -139,6 +139,6 @@ impl Component for FilterDropDown {
             }
         };
 
-        html! { <><style>{ &CSS }</style>{ body }</> }
+        html! { <><style>{ CSS }</style>{ body }</> }
     }
 }