always send update on column change

Author: ada mandala

rust/perspective-viewer/src/rust/components/column_selector/active_column.rs

@@ -103,8 +103,8 @@ impl ActiveColumnProps {
         let open_name = self
             .presentation
             .get_open_column_settings()
-            .and_then(|s| s.locator)
-            .and_then(|s| s.name().map(|s| s.to_owned()));
+            .locator
+            .and_then(|l| l.name().map(|n| n.to_owned()));
         if let Some(s) = open_name && s == name {
             self.presentation.set_open_column_settings(None);
         }

rust/perspective-viewer/src/rust/components/viewer.rs

@@ -144,9 +144,7 @@ impl Component for PerspectiveViewer {
                 if update {
                     vec![PerspectiveViewerMsg::RenderLimits(Some(x))]
                 } else {
-                    let locator = presentation
-                        .get_open_column_settings()
-                        .and_then(|s| s.locator);
+                    let locator = presentation.get_open_column_settings().locator;
                     let is_active = locator
                         .as_ref()
                         .map(|l| l.is_active(&session))
@@ -282,22 +280,19 @@ impl Component for PerspectiveViewer {
                     self.selected_column = locator.clone();
 
                     locator
+                        .clone()
                         .map(|c| match c {
                             ColumnLocator::Plain(s) => (true, Some(s)),
                             ColumnLocator::Expr(maybe_s) => (true, maybe_s),
                         })
                         .unwrap_or_default()
                 };
 
-                ctx.props().presentation.set_open_column_settings(
-                    ctx.props()
-                        .presentation
-                        .get_open_column_settings()
-                        .map(|mut s| {
-                            s.locator = self.selected_column.clone();
-                            s
-                        }),
-                );
+                let mut open_column_settings = ctx.props().presentation.get_open_column_settings();
+                open_column_settings.locator = self.selected_column.clone();
+                ctx.props()
+                    .presentation
+                    .set_open_column_settings(Some(open_column_settings));
 
                 if let Some(sender) = sender {
                     sender.send(()).unwrap();

rust/perspective-viewer/src/rust/presentation.rs

@@ -47,7 +47,7 @@ impl Deref for Presentation {
 
 impl ImplicitClone for Presentation {}
 
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Default, Debug, PartialEq)]
 pub struct OpenColumnSettings {
     pub locator: Option<ColumnLocator>,
     pub tab: Option<ColumnSettingsTab>,
@@ -66,7 +66,7 @@ pub struct PresentationHandle {
     theme_data: Mutex<ThemeData>,
     name: RefCell<Option<String>>,
     is_settings_open: RefCell<bool>,
-    open_column_settings: RefCell<Option<OpenColumnSettings>>,
+    open_column_settings: RefCell<OpenColumnSettings>,
     is_workspace: RefCell<Option<bool>>,
     pub settings_open_changed: PubSub<bool>,
     pub column_settings_open_changed: PubSub<(bool, Option<String>)>,
@@ -145,17 +145,19 @@ impl Presentation {
     }
 
     /// Sets the currently opened column settings. Emits an internal event on
-    /// change.
+    /// change. Passing None is a shorthand for setting all fields to
+    /// None.
     pub fn set_open_column_settings(&self, settings: Option<OpenColumnSettings>) {
+        let settings = settings.unwrap_or_default();
         if *(self.open_column_settings.borrow()) != settings {
             *(self.open_column_settings.borrow_mut()) = settings.to_owned();
             self.column_settings_open_changed
-                .emit_all((true, settings.and_then(|s| s.name())));
+                .emit_all((true, settings.name()));
         }
     }
 
     /// Gets a clone of the current OpenColumnSettings.
-    pub fn get_open_column_settings(&self) -> Option<OpenColumnSettings> {
+    pub fn get_open_column_settings(&self) -> OpenColumnSettings {
         self.open_column_settings.borrow().deref().clone()
     }