@perspective-dev/viewer 4.1.0 → 4.2.0

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();
@@ -124,7 +121,13 @@ impl PerspectiveViewerElement {
             clone!(renderer, session);
             move |_| {
                 clone!(renderer, session);
-                ApiFuture::spawn(async move { renderer.update(session.get_view()).await })
+                ApiFuture::spawn(async move {
+                    renderer
+                        .update(session.get_view())
+                        .await
+                        .ignore_view_delete()
+                        .map(|_| ())
+                })
             }
         });
 
@@ -256,7 +259,7 @@ impl PerspectiveViewerElement {
         self.session.update_view_config(config)?;
 
         clone!(self.renderer, self.session);
-        Ok(ApiFuture::new(async move {
+        Ok(ApiFuture::new_throttled(async move {
             let task = async {
                 // Ignore this error, which is blown away by the table anyway.
                 let _ = task.await;
@@ -340,9 +343,9 @@ impl PerspectiveViewerElement {
             );
 
             std::mem::swap(self, &mut state);
-            ApiFuture::new(state.delete())
+            ApiFuture::new_throttled(state.delete())
         } else {
-            ApiFuture::new(async move { Ok(()) })
+            ApiFuture::new_throttled(async move { Ok(()) })
         }
     }
 
@@ -481,7 +484,7 @@ impl PerspectiveViewerElement {
     /// ```
     pub fn flush(&self) -> ApiFuture<()> {
         clone!(self.renderer);
-        ApiFuture::new(async move {
+        ApiFuture::new_throttled(async move {
             // We must let two AFs pass to guarantee listeners to the DOM state
             // have themselves triggered, or else `request_animation_frame`
             // may finish before a `ResizeObserver` triggered before is
@@ -527,7 +530,7 @@ impl PerspectiveViewerElement {
     /// ```
     pub fn restore(&self, update: JsValue) -> ApiFuture<()> {
         let this = self.clone();
-        ApiFuture::new(async move {
+        ApiFuture::new_throttled(async move {
             let decoded_update = ViewerConfigUpdate::decode(&update)?;
             tracing::info!("Restoring {}", decoded_update);
             let root = this.root.clone();
@@ -568,7 +571,7 @@ impl PerspectiveViewerElement {
     pub fn resetError(&self) -> ApiFuture<()> {
         ApiFuture::spawn(self.session.reset(ResetOptions::default()));
         let this = self.clone();
-        ApiFuture::new(async move {
+        ApiFuture::new_throttled(async move {
             this.update_and_render(ViewConfigUpdate::default())?.await?;
             Ok(())
         })
@@ -622,7 +625,7 @@ impl PerspectiveViewerElement {
     /// ```
     pub fn download(&self, method: Option<JsString>) -> ApiFuture<()> {
         let this = self.clone();
-        ApiFuture::new(async move {
+        ApiFuture::new_throttled(async move {
             let method = if let Some(method) = method
                 .map(|x| x.unchecked_into())
                 .map(serde_wasm_bindgen::from_value)
@@ -692,7 +695,7 @@ impl PerspectiveViewerElement {
     /// ```
     pub fn copy(&self, method: Option<JsString>) -> ApiFuture<()> {
         let this = self.clone();
-        ApiFuture::new(async move {
+        ApiFuture::new_throttled(async move {
             let method = if let Some(method) = method
                 .map(|x| x.unchecked_into())
                 .map(serde_wasm_bindgen::from_value)
@@ -723,7 +726,7 @@ impl PerspectiveViewerElement {
         tracing::debug!("Resetting config");
         let root = self.root.clone();
         let all = reset_all.unwrap_or_default();
-        ApiFuture::new(async move {
+        ApiFuture::new_throttled(async move {
             let (sender, receiver) = channel::<()>();
             root.borrow()
                 .as_ref()
@@ -763,7 +766,7 @@ impl PerspectiveViewerElement {
         }
 
         let state = self.clone_state();
-        ApiFuture::new(async move {
+        ApiFuture::new_throttled(async move {
             if !state.renderer().is_plugin_activated()? {
                 state
                     .update_and_render(ViewConfigUpdate::default())?
@@ -933,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)
@@ -1031,7 +1032,7 @@ impl PerspectiveViewerElement {
     #[wasm_bindgen]
     pub fn toggleColumnSettings(&self, column_name: String) -> ApiFuture<()> {
         clone!(self.session, self.root);
-        ApiFuture::new(async move {
+        ApiFuture::new_throttled(async move {
             let locator = session.get_column_locator(Some(column_name));
             let (sender, receiver) = channel::<()>();
             root.borrow().as_ref().into_apierror()?.send_message(
@@ -1056,7 +1057,7 @@ impl PerspectiveViewerElement {
     ) -> ApiFuture<()> {
         let locator = self.get_column_locator(column_name);
         clone!(self.root);
-        ApiFuture::new(async move {
+        ApiFuture::new_throttled(async move {
             let (sender, receiver) = channel::<()>();
             root.borrow().as_ref().into_apierror()?.send_message(
                 PerspectiveViewerMsg::OpenColumnSettings {

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 {