@perspective-dev/viewer 4.1.1 → 4.2.0

package/dist/wasm/perspective-viewer.wasm.d.ts

@@ -3,157 +3,169 @@
 export const memory: WebAssembly.Memory;
 export const __wbg_columndropdownelement_free: (a: number, b: number) => void;
 export const __wbg_copydropdownmenuelement_free: (a: number, b: number) => void;
-export const copydropdownmenuelement_new: (a: number) => number;
-export const copydropdownmenuelement_open: (a: number, b: number) => void;
-export const copydropdownmenuelement_hide: (a: number, b: number) => void;
+export const __wbg_filterdropdownelement_free: (a: number, b: number) => void;
+export const __wbg_functiondropdownelement_free: (a: number, b: number) => void;
+export const __wbg_perspectivedebugpluginelement_free: (a: number, b: number) => void;
+export const __wbg_perspectiveviewerelement_free: (a: number, b: number) => void;
 export const copydropdownmenuelement___set_model: (a: number, b: number) => void;
 export const copydropdownmenuelement_connected_callback: (a: number) => void;
-export const __wbg_perspectivedebugpluginelement_free: (a: number, b: number) => void;
-export const perspectivedebugpluginelement_new: (a: number) => number;
-export const perspectivedebugpluginelement_name: (a: number, b: number) => void;
-export const perspectivedebugpluginelement_select_mode: (a: number, b: number) => void;
-export const perspectivedebugpluginelement_config_column_names: (a: number) => number;
-export const perspectivedebugpluginelement_draw: (a: number, b: number) => number;
+export const copydropdownmenuelement_hide: (a: number, b: number) => void;
+export const copydropdownmenuelement_new: (a: number) => number;
+export const copydropdownmenuelement_open: (a: number, b: number) => void;
+export const exportdropdownmenuelement___set_model: (a: number, b: number) => void;
+export const exportdropdownmenuelement_hide: (a: number, b: number) => void;
+export const exportdropdownmenuelement_open: (a: number, b: number) => void;
+export const init: () => void;
 export const perspectivedebugpluginelement_clear: (a: number) => number;
+export const perspectivedebugpluginelement_config_column_names: (a: number) => number;
 export const perspectivedebugpluginelement_connectedCallback: (a: number) => void;
-export const exportdropdownmenuelement_open: (a: number, b: number) => void;
-export const exportdropdownmenuelement_hide: (a: number, b: number) => void;
-export const exportdropdownmenuelement___set_model: (a: number, b: number) => void;
-export const __wbg_filterdropdownelement_free: (a: number, b: number) => void;
-export const __wbg_functiondropdownelement_free: (a: number, b: number) => void;
-export const __wbg_perspectiveviewerelement_free: (a: number, b: number) => void;
-export const perspectiveviewerelement_new: (a: number) => number;
+export const perspectivedebugpluginelement_draw: (a: number, b: number) => number;
+export const perspectivedebugpluginelement_name: (a: number, b: number) => void;
+export const perspectivedebugpluginelement_new: (a: number) => number;
+export const perspectivedebugpluginelement_select_mode: (a: number, b: number) => void;
+export const perspectiveviewerelement___get_model: (a: number) => number;
 export const perspectiveviewerelement_connectedCallback: (a: number, b: number) => void;
-export const perspectiveviewerelement_load: (a: number, b: number, c: number) => void;
+export const perspectiveviewerelement_copy: (a: number, b: number) => number;
 export const perspectiveviewerelement_delete: (a: number) => number;
+export const perspectiveviewerelement_download: (a: number, b: number) => number;
 export const perspectiveviewerelement_eject: (a: number) => number;
-export const perspectiveviewerelement_getView: (a: number) => number;
-export const perspectiveviewerelement_getViewConfig: (a: number) => number;
-export const perspectiveviewerelement_getTable: (a: number, b: number) => number;
+export const perspectiveviewerelement_export: (a: number, b: number) => number;
+export const perspectiveviewerelement_flush: (a: number) => number;
+export const perspectiveviewerelement_getAllPlugins: (a: number) => number;
 export const perspectiveviewerelement_getClient: (a: number, b: number) => number;
+export const perspectiveviewerelement_getEditPort: (a: number, b: number) => void;
+export const perspectiveviewerelement_getPlugin: (a: number, b: number, c: number, d: number) => void;
 export const perspectiveviewerelement_getRenderStats: (a: number, b: number) => void;
-export const perspectiveviewerelement_flush: (a: number) => number;
-export const perspectiveviewerelement_restore: (a: number, b: number) => number;
-export const perspectiveviewerelement_resetError: (a: number) => number;
-export const perspectiveviewerelement_save: (a: number) => number;
-export const perspectiveviewerelement_download: (a: number, b: number) => number;
-export const perspectiveviewerelement_export: (a: number, b: number) => number;
-export const perspectiveviewerelement_copy: (a: number, b: number) => number;
+export const perspectiveviewerelement_getSelection: (a: number) => number;
+export const perspectiveviewerelement_getTable: (a: number, b: number) => number;
+export const perspectiveviewerelement_getView: (a: number) => number;
+export const perspectiveviewerelement_getViewConfig: (a: number) => number;
+export const perspectiveviewerelement_load: (a: number, b: number, c: number) => void;
+export const perspectiveviewerelement_new: (a: number) => number;
+export const perspectiveviewerelement_openColumnSettings: (a: number, b: number, c: number, d: number) => number;
 export const perspectiveviewerelement_reset: (a: number, b: number) => number;
+export const perspectiveviewerelement_resetError: (a: number) => number;
+export const perspectiveviewerelement_resetThemes: (a: number, b: number, c: number) => number;
 export const perspectiveviewerelement_resize: (a: number, b: number) => number;
-export const perspectiveviewerelement_setAutoSize: (a: number, b: number) => void;
+export const perspectiveviewerelement_restore: (a: number, b: number) => number;
+export const perspectiveviewerelement_restyleElement: (a: number) => number;
+export const perspectiveviewerelement_save: (a: number) => number;
 export const perspectiveviewerelement_setAutoPause: (a: number, b: number) => void;
-export const perspectiveviewerelement_getSelection: (a: number) => number;
+export const perspectiveviewerelement_setAutoSize: (a: number, b: number) => void;
 export const perspectiveviewerelement_setSelection: (a: number, b: number, c: number) => void;
-export const perspectiveviewerelement_getEditPort: (a: number, b: number) => void;
-export const perspectiveviewerelement_restyleElement: (a: number) => number;
-export const perspectiveviewerelement_resetThemes: (a: number, b: number, c: number) => number;
 export const perspectiveviewerelement_setThrottle: (a: number, b: number, c: number) => void;
-export const perspectiveviewerelement_toggleConfig: (a: number, b: number) => number;
-export const perspectiveviewerelement_getAllPlugins: (a: number) => number;
-export const perspectiveviewerelement_getPlugin: (a: number, b: number, c: number, d: number) => void;
-export const perspectiveviewerelement___get_model: (a: number) => number;
 export const perspectiveviewerelement_toggleColumnSettings: (a: number, b: number, c: number) => number;
-export const perspectiveviewerelement_openColumnSettings: (a: number, b: number, c: number, d: number) => number;
+export const perspectiveviewerelement_toggleConfig: (a: number, b: number) => number;
 export const registerPlugin: (a: number, b: number) => void;
-export const init: () => void;
-export const perspectivedebugpluginelement_min_config_columns: (a: number) => number;
 export const perspectivedebugpluginelement_update: (a: number, b: number) => number;
-export const perspectivedebugpluginelement_resize: (a: number) => number;
-export const perspectivedebugpluginelement_restyle: (a: number) => number;
+export const perspectivedebugpluginelement_min_config_columns: (a: number) => number;
 export const perspectivedebugpluginelement_save: (a: number) => number;
-export const perspectivedebugpluginelement_restore: (a: number) => number;
 export const perspectivedebugpluginelement_delete: (a: number) => number;
+export const perspectivedebugpluginelement_resize: (a: number) => number;
+export const perspectivedebugpluginelement_restore: (a: number) => number;
+export const perspectivedebugpluginelement_restyle: (a: number) => number;
 export const exportdropdownmenuelement_new: (a: number) => number;
 export const __wbg_exportdropdownmenuelement_free: (a: number, b: number) => void;
 export const exportdropdownmenuelement_connected_callback: (a: number) => void;
-export const __wbg_proxysession_free: (a: number, b: number) => void;
-export const proxysession_handle_request: (a: number, b: number) => number;
-export const proxysession_close: (a: number) => number;
 export const __wbg_client_free: (a: number, b: number) => void;
+export const __wbg_genericsqlvirtualservermodel_free: (a: number, b: number) => void;
+export const __wbg_proxysession_free: (a: number, b: number) => void;
+export const __wbg_table_free: (a: number, b: number) => void;
+export const __wbg_view_free: (a: number, b: number) => void;
+export const __wbg_virtualdataslice_free: (a: number, b: number) => void;
+export const __wbg_virtualserver_free: (a: number, b: number) => void;
 export const client___getClassname: (a: number, b: number) => void;
+export const client_get_hosted_table_names: (a: number) => number;
+export const client_handle_error: (a: number, b: number, c: number, d: number) => number;
+export const client_handle_response: (a: number, b: number) => number;
 export const client_new: (a: number, b: number, c: number) => void;
 export const client_new_proxy_session: (a: number, b: number) => number;
-export const client_handle_response: (a: number, b: number) => number;
-export const client_handle_error: (a: number, b: number, c: number, d: number) => number;
 export const client_on_error: (a: number, b: number) => number;
-export const client_table: (a: number, b: number, c: number) => number;
-export const client_terminate: (a: number, b: number) => void;
-export const client_open_table: (a: number, b: number, c: number) => number;
-export const client_get_hosted_table_names: (a: number) => number;
 export const client_on_hosted_tables_update: (a: number, b: number) => number;
+export const client_open_table: (a: number, b: number, c: number) => number;
 export const client_remove_hosted_tables_update: (a: number, b: number) => number;
 export const client_system_info: (a: number) => number;
+export const client_table: (a: number, b: number, c: number) => number;
+export const client_terminate: (a: number, b: number) => void;
+export const genericsqlvirtualservermodel_getHostedTables: (a: number, b: number) => void;
+export const genericsqlvirtualservermodel_new: (a: number, b: number) => void;
+export const genericsqlvirtualservermodel_tableMakeView: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => void;
+export const genericsqlvirtualservermodel_tableSchema: (a: number, b: number, c: number, d: number) => void;
+export const genericsqlvirtualservermodel_tableSize: (a: number, b: number, c: number, d: number) => void;
+export const genericsqlvirtualservermodel_tableValidateExpression: (a: number, b: number, c: number, d: number, e: number, f: number) => void;
+export const genericsqlvirtualservermodel_viewColumnSize: (a: number, b: number, c: number, d: number) => void;
+export const genericsqlvirtualservermodel_viewDelete: (a: number, b: number, c: number, d: number) => void;
+export const genericsqlvirtualservermodel_viewGetData: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => void;
+export const genericsqlvirtualservermodel_viewSchema: (a: number, b: number, c: number, d: number) => void;
+export const genericsqlvirtualservermodel_viewSize: (a: number, b: number, c: number, d: number) => void;
+export const proxysession_close: (a: number) => number;
+export const proxysession_handle_request: (a: number, b: number) => number;
+export const proxysession_new: (a: number, b: number) => number;
 export const table___getClassname: (a: number, b: number) => void;
-export const __wbg_table_free: (a: number, b: number) => void;
-export const table_get_index: (a: number) => number;
-export const table_get_client: (a: number) => number;
-export const table_get_name: (a: number) => number;
-export const table_get_limit: (a: number) => number;
 export const table_clear: (a: number) => number;
-export const table_delete: (a: number, b: number) => number;
-export const table_size: (a: number) => number;
-export const table_schema: (a: number) => number;
 export const table_columns: (a: number) => number;
+export const table_delete: (a: number, b: number) => number;
+export const table_get_client: (a: number) => number;
+export const table_get_index: (a: number) => number;
+export const table_get_limit: (a: number) => number;
+export const table_get_name: (a: number) => number;
 export const table_make_port: (a: number) => number;
 export const table_on_delete: (a: number, b: number) => number;
-export const table_remove_delete: (a: number, b: number) => number;
 export const table_remove: (a: number, b: number, c: number) => number;
+export const table_remove_delete: (a: number, b: number) => number;
 export const table_replace: (a: number, b: number, c: number) => number;
+export const table_schema: (a: number) => number;
+export const table_size: (a: number) => number;
 export const table_update: (a: number, b: number, c: number) => number;
-export const table_view: (a: number, b: number) => number;
 export const table_validate_expressions: (a: number, b: number) => number;
-export const __wbg_view_free: (a: number, b: number) => void;
+export const table_view: (a: number, b: number) => number;
 export const view___get_model: (a: number) => number;
+export const view_collapse: (a: number, b: number) => number;
 export const view_column_paths: (a: number, b: number) => number;
 export const view_delete: (a: number) => number;
 export const view_dimensions: (a: number) => number;
+export const view_expand: (a: number, b: number) => number;
 export const view_expression_schema: (a: number) => number;
 export const view_get_config: (a: number) => number;
 export const view_get_min_max: (a: number, b: number, c: number) => number;
+export const view_num_columns: (a: number) => number;
 export const view_num_rows: (a: number) => number;
+export const view_on_delete: (a: number, b: number) => number;
+export const view_on_update: (a: number, b: number, c: number) => number;
+export const view_remove_delete: (a: number, b: number) => number;
+export const view_remove_update: (a: number, b: number) => number;
 export const view_schema: (a: number) => number;
+export const view_set_depth: (a: number, b: number) => number;
 export const view_to_arrow: (a: number, b: number) => number;
-export const view_to_columns_string: (a: number, b: number) => number;
 export const view_to_columns: (a: number, b: number) => number;
-export const view_to_json_string: (a: number, b: number) => number;
+export const view_to_columns_string: (a: number, b: number) => number;
+export const view_to_csv: (a: number, b: number) => number;
 export const view_to_json: (a: number, b: number) => number;
+export const view_to_json_string: (a: number, b: number) => number;
 export const view_to_ndjson: (a: number, b: number) => number;
-export const view_to_csv: (a: number, b: number) => number;
-export const view_on_update: (a: number, b: number, c: number) => number;
-export const view_remove_update: (a: number, b: number) => number;
-export const view_on_delete: (a: number, b: number) => number;
-export const view_num_columns: (a: number) => number;
-export const view_remove_delete: (a: number, b: number) => number;
-export const view_collapse: (a: number, b: number) => number;
-export const view_expand: (a: number, b: number) => number;
-export const view_set_depth: (a: number, b: number) => number;
-export const __wbg_jsvirtualdataslice_free: (a: number, b: number) => void;
-export const jsvirtualdataslice_new: () => number;
-export const jsvirtualdataslice_setCol: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number) => void;
-export const jsvirtualdataslice_setStringCol: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => void;
-export const jsvirtualdataslice_setIntegerCol: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => void;
-export const jsvirtualdataslice_setFloatCol: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => void;
-export const jsvirtualdataslice_setBooleanCol: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => void;
-export const jsvirtualdataslice_setDatetimeCol: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => void;
-export const __wbg_jsvirtualserver_free: (a: number, b: number) => void;
-export const jsvirtualserver_new: (a: number, b: number) => void;
-export const jsvirtualserver_handleRequest: (a: number, b: number, c: number) => number;
-export const proxysession_new: (a: number, b: number) => number;
-export const __wasm_bindgen_func_elem_5618: (a: number, b: number, c: number) => void;
-export const __wasm_bindgen_func_elem_455: (a: number, b: number) => void;
-export const __wasm_bindgen_func_elem_18148: (a: number, b: number) => void;
-export const __wasm_bindgen_func_elem_18140: (a: number, b: number) => void;
-export const __wasm_bindgen_func_elem_5616: (a: number, b: number, c: number) => void;
-export const __wasm_bindgen_func_elem_5617: (a: number, b: number, c: number) => void;
-export const __wasm_bindgen_func_elem_13059: (a: number, b: number) => number;
-export const __wasm_bindgen_func_elem_12591: (a: number, b: number) => void;
-export const __wasm_bindgen_func_elem_18169: (a: number, b: number, c: number) => void;
-export const __wasm_bindgen_func_elem_18154: (a: number, b: number) => void;
-export const __wasm_bindgen_func_elem_452: (a: number, b: number) => void;
-export const __wasm_bindgen_func_elem_17223: (a: number, b: number, c: number) => void;
-export const __wasm_bindgen_func_elem_17151: (a: number, b: number) => void;
-export const __wasm_bindgen_func_elem_19856: (a: number, b: number, c: number, d: number) => void;
+export const virtualdataslice_new: (a: number) => number;
+export const virtualdataslice_setBooleanCol: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => void;
+export const virtualdataslice_setCol: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number) => void;
+export const virtualdataslice_setDatetimeCol: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => void;
+export const virtualdataslice_setFloatCol: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => void;
+export const virtualdataslice_setIntegerCol: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => void;
+export const virtualdataslice_setStringCol: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => void;
+export const virtualserver_handleRequest: (a: number, b: number, c: number) => number;
+export const virtualserver_new: (a: number, b: number) => void;
+export const __wasm_bindgen_func_elem_13825: (a: number, b: number) => void;
+export const __wasm_bindgen_func_elem_4731: (a: number, b: number) => void;
+export const __wasm_bindgen_func_elem_4732: (a: number, b: number) => void;
+export const __wasm_bindgen_func_elem_17730: (a: number, b: number) => void;
+export const __wasm_bindgen_func_elem_18379: (a: number, b: number) => void;
+export const __wasm_bindgen_func_elem_18417: (a: number, b: number) => void;
+export const __wasm_bindgen_func_elem_20097: (a: number, b: number, c: number, d: number) => void;
+export const __wasm_bindgen_func_elem_5112: (a: number, b: number, c: number) => void;
+export const __wasm_bindgen_func_elem_5113: (a: number, b: number, c: number) => void;
+export const __wasm_bindgen_func_elem_5110: (a: number, b: number, c: number) => void;
+export const __wasm_bindgen_func_elem_17748: (a: number, b: number, c: number) => void;
+export const __wasm_bindgen_func_elem_18419: (a: number, b: number, c: number) => void;
+export const __wasm_bindgen_func_elem_14088: (a: number, b: number) => number;
+export const __wasm_bindgen_func_elem_18381: (a: number, b: number) => void;
 export const __wbindgen_export: (a: number, b: number) => number;
 export const __wbindgen_export2: (a: number, b: number, c: number, d: number) => number;
 export const __wbindgen_export3: (a: number) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@perspective-dev/viewer",
-  "version": "4.1.1",
+  "version": "4.2.0",
   "description": "The `<perspective-viewer>` Custom Element, frontend for Perspective.js",
   "repository": {
     "type": "git",
@@ -38,7 +38,7 @@
     "@perspective-dev/esbuild-plugin": "",
     "@perspective-dev/test": "",
     "@perspective-dev/metadata": "",
-    "@prospective.co/procss": "0.1.17",
+    "@prospective.co/procss": "0.1.18",
     "@playwright/test": "=1.52.0",
     "@playwright/experimental-ct-react": "=1.52.0",
     "@types/react": "^18",

package/src/rust/components/column_dropdown.rs

@@ -91,19 +91,19 @@ impl Component for ColumnDropDown {
             },
             ColumnDropDownMsg::ItemDown => {
                 self.selected += 1;
-                if let Some(ref values) = self.values {
-                    if self.selected >= values.len() {
-                        self.selected = 0;
-                    }
+                if let Some(ref values) = self.values
+                    && self.selected >= values.len()
+                {
+                    self.selected = 0;
                 }
 
                 true
             },
             ColumnDropDownMsg::ItemUp => {
-                if let Some(ref values) = self.values {
-                    if self.selected < 1 {
-                        self.selected = values.len();
-                    }
+                if let Some(ref values) = self.values
+                    && self.selected < 1
+                {
+                    self.selected = values.len();
                 }
 
                 self.selected -= 1;

package/src/rust/components/column_selector/filter_column.rs

@@ -514,18 +514,18 @@ impl FilterColumnProps {
             }
         };
 
-        if let Some(input) = filter_input {
-            if &input != filter_column.term() {
-                *filter_column.term_mut() = input;
-                let update = ViewConfigUpdate {
-                    filter: Some(filters),
-                    ..ViewConfigUpdate::default()
-                };
-
-                self.update_and_render(update)
-                    .map(ApiFuture::spawn)
-                    .unwrap_or_log();
-            }
+        if let Some(input) = filter_input
+            && &input != filter_column.term()
+        {
+            *filter_column.term_mut() = input;
+            let update = ViewConfigUpdate {
+                filter: Some(filters),
+                ..ViewConfigUpdate::default()
+            };
+
+            self.update_and_render(update)
+                .map(ApiFuture::spawn)
+                .unwrap_or_log();
         }
     }
 }

package/src/rust/components/column_settings_sidebar/style_tab/symbol/row_selector.rs

@@ -55,15 +55,15 @@ pub fn row_selector(props: &RowSelectorProps) -> Html {
 
     let inner = if props.selected_row.is_none() || props.focused {
         let mut pairs = props.pairs.clone();
-        if let Some(ref rowval) = props.selected_row {
-            if let Some((i, _)) = pairs.iter().find_position(|pair| {
+        if let Some(ref rowval) = props.selected_row
+            && let Some((i, _)) = pairs.iter().find_position(|pair| {
                 pair.key
                     .as_ref()
                     .map(|keyval| keyval == rowval)
                     .unwrap_or_default()
-            }) {
-                pairs.remove(i);
-            }
+            })
+        {
+            pairs.remove(i);
         }
 
         let exclude: HashSet<_> = pairs

package/src/rust/components/column_settings_sidebar.rs

@@ -156,7 +156,7 @@ impl Component for ColumnSettingsPanel {
     }
 
     fn update(&mut self, ctx: &yew::prelude::Context<Self>, msg: Self::Message) -> bool {
-        let result = match msg {
+        match msg {
             ColumnSettingsPanelMsg::SetExprValue(val) => {
                 if self.expr_value != val {
                     self.expr_value = val;
@@ -241,9 +241,7 @@ impl Component for ColumnSettingsPanel {
                     false
                 }
             },
-        };
-
-        result
+        }
     }
 
     fn view(&self, ctx: &yew::prelude::Context<Self>) -> Html {

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

@@ -213,10 +213,11 @@ where
                     .position(|x| x.1.1.as_ref().unwrap().props.get_item() == *column);
 
                 valid_duplicate_drag = is_duplicate.is_some() && !ctx.props().allow_duplicates;
-                if let Some(duplicate) = is_duplicate {
-                    if !is_append && (!ctx.props().allow_duplicates || is_self_move) {
-                        columns.remove(duplicate);
-                    }
+                if let Some(duplicate) = is_duplicate
+                    && !is_append
+                    && (!ctx.props().allow_duplicates || is_self_move)
+                {
+                    columns.remove(duplicate);
                 }
 
                 // If inserting into the middle of the list, use

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

@@ -100,12 +100,12 @@ where
                             ctx.props().on_select.emit(self.selected.clone());
                             return true;
                         }
-                    } else if code.as_str() == "ArrowDown" {
-                        if let Some(x) = find_nth(idx + 1, &ctx.props().values) {
-                            self.selected = x.clone();
-                            ctx.props().on_select.emit(self.selected.clone());
-                            return true;
-                        }
+                    } else if code.as_str() == "ArrowDown"
+                        && let Some(x) = find_nth(idx + 1, &ctx.props().values)
+                    {
+                        self.selected = x.clone();
+                        ctx.props().on_select.emit(self.selected.clone());
+                        return true;
                     }
                 }
 

package/src/rust/components/filter_dropdown.rs

@@ -87,19 +87,19 @@ impl Component for FilterDropDown {
             },
             FilterDropDownMsg::ItemDown => {
                 self.selected += 1;
-                if let Some(ref values) = self.values {
-                    if self.selected >= values.len() {
-                        self.selected = 0;
-                    }
+                if let Some(ref values) = self.values
+                    && self.selected >= values.len()
+                {
+                    self.selected = 0;
                 };
 
                 true
             },
             FilterDropDownMsg::ItemUp => {
-                if let Some(ref values) = self.values {
-                    if self.selected < 1 {
-                        self.selected = values.len();
-                    }
+                if let Some(ref values) = self.values
+                    && self.selected < 1
+                {
+                    self.selected = values.len();
                 };
 
                 self.selected -= 1;

package/src/rust/components/function_dropdown.rs

@@ -88,19 +88,19 @@ impl Component for FunctionDropDown {
             },
             FunctionDropDownMsg::ItemDown => {
                 self.selected += 1;
-                if let Some(ref values) = self.values {
-                    if self.selected >= values.len() {
-                        self.selected = 0;
-                    }
+                if let Some(ref values) = self.values
+                    && self.selected >= values.len()
+                {
+                    self.selected = 0;
                 };
 
                 true
             },
             FunctionDropDownMsg::ItemUp => {
-                if let Some(ref values) = self.values {
-                    if self.selected < 1 {
-                        self.selected = values.len();
-                    }
+                if let Some(ref values) = self.values
+                    && self.selected < 1
+                {
+                    self.selected = values.len();
                 }
 
                 self.selected -= 1;

package/src/rust/components/modal.rs

@@ -82,10 +82,10 @@ where
                 true
             },
             ModalMsg::SubMsg(msg) => {
-                if let Some(child) = &ctx.props().child {
-                    if let Some(link) = child.props.weak_link().borrow().as_ref() {
-                        link.send_message(msg);
-                    }
+                if let Some(child) = &ctx.props().child
+                    && let Some(link) = child.props.weak_link().borrow().as_ref()
+                {
+                    link.send_message(msg);
                 }
 
                 false

package/src/rust/custom_elements/filter_dropdown.rs

@@ -93,10 +93,10 @@ impl FilterDropDownElement {
                         FilterDropDownMsg::SetValues(values),
                     ]);
 
-                    if let Some(x) = self.target.borrow().clone() {
-                        if !self.modal.is_open() {
-                            ApiFuture::spawn(self.modal.clone().open(x, None))
-                        }
+                    if let Some(x) = self.target.borrow().clone()
+                        && !self.modal.is_open()
+                    {
+                        ApiFuture::spawn(self.modal.clone().open(x, None))
                     }
                 }
             },

package/src/rust/custom_elements/viewer.rs

@@ -77,9 +77,6 @@ pub struct PerspectiveViewerElement {
     _subscriptions: Rc<[Subscription; 2]>,
 }
 
-// derive_model!( Renderer, Root, Session, Presentation for
-// PerspectiveViewerElement);
-
 impl CustomElementMetadata for PerspectiveViewerElement {
     const CUSTOM_ELEMENT_NAME: &'static str = "perspective-viewer";
     const STATICS: &'static [&'static str] = ["registerPlugin", "getExprTKCommands"].as_slice();
@@ -939,10 +936,8 @@ impl PerspectiveViewerElement {
                 .cloned();
 
             changed = presentation.set_theme_name(reset_theme.as_deref()).await? || changed;
-            if changed {
-                if let Some(view) = session.get_view() {
-                    return renderer.restyle_all(&view).await;
-                }
+            if changed && let Some(view) = session.get_view() {
+                return renderer.restyle_all(&view).await;
             }
 
             Ok(JsValue::UNDEFINED)

package/src/rust/model/copy_export.rs

@@ -12,6 +12,7 @@
 
 use std::collections::HashSet;
 
+use base64::prelude::*;
 use futures::join;
 use itertools::Itertools;
 use perspective_client::ViewWindow;
@@ -59,7 +60,7 @@ pub trait CopyExportModel:
         let mut config = config?;
         config.settings = false;
         let js_config = serde_json::to_string(&config)?;
-        let html = export_app::render(&base64::encode(arrow), &js_config, &plugins);
+        let html = export_app::render(&BASE64_STANDARD.encode(arrow), &js_config, &plugins);
         Ok(js_sys::JsString::from(html.trim()).into())
     }
 

package/src/rust/presentation/sheets.rs

@@ -46,7 +46,10 @@ fn fill_rule_theme_names(
                 if property == "--theme-name" {
                     let name = style.get_property_value("--theme-name")?;
                     let trimmed = name.trim();
-                    themes.push(trimmed[1..trimmed.len() - 1].to_owned());
+                    let theme = &trimmed[1..trimmed.len() - 1];
+                    if themes.iter().find(|x| x == &theme).is_none() {
+                        themes.push(theme.to_owned());
+                    }
                 }
             }
         }

package/src/rust/presentation.rs

@@ -243,10 +243,10 @@ impl Presentation {
     /// A `bool` indicating whether the internal state changed.
     pub async fn set_theme_name(&self, theme: Option<&str>) -> ApiResult<bool> {
         let (themes, selected) = self.get_selected_theme_config().await?;
-        if let Some(x) = selected {
-            if themes.get(x).map(|x| x.as_str()) == theme {
-                return Ok(false);
-            }
+        if let Some(x) = selected
+            && themes.get(x).map(|x| x.as_str()) == theme
+        {
+            return Ok(false);
         }
 
         let index = if let Some(theme) = theme {