@perspective-dev/viewer 4.4.1 → 4.5.1

package/src/rust/config/columns_config.rs

@@ -10,105 +10,12 @@
 // ┃ of the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0). ┃
 // ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
 
-use std::collections::HashMap;
+//! Auxiliary types used by `ColumnConfigSchema`'s composite control
+//! variants. Per-column persisted state itself is opaque
+//! `serde_json::Map<String, serde_json::Value>`; see
+//! [`crate::presentation::ColumnConfigMap`].
 
 use serde::{Deserialize, Serialize};
-use ts_rs::TS;
-
-use super::{
-    CustomNumberFormatConfig, DatetimeColumnStyleConfig, DatetimeColumnStyleDefaultConfig,
-    NumberColumnStyleConfig, NumberColumnStyleDefaultConfig, StringColumnStyleConfig,
-    StringColumnStyleDefaultConfig,
-};
-
-fn is_zero(x: &u32) -> bool {
-    x == &0
-}
-
-/// The value de/serialized and stored in the viewer config.
-/// Also passed to the plugin via `plugin.save()`.
-#[derive(Clone, Debug, Default, Deserialize, PartialEq, Serialize, TS)]
-pub struct ColumnConfigValues {
-    #[serde(default)]
-    #[serde(skip_serializing_if = "HashMap::is_empty")]
-    pub symbols: HashMap<String, String>,
-
-    #[serde(flatten)]
-    pub datagrid_number_style: NumberColumnStyleConfig,
-
-    #[serde(flatten)]
-    pub datagrid_string_style: StringColumnStyleConfig,
-
-    #[serde(flatten)]
-    pub datagrid_datetime_style: DatetimeColumnStyleConfig,
-
-    #[serde(default)]
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub number_format: Option<CustomNumberFormatConfig>,
-
-    #[serde(default)]
-    #[serde(skip_serializing_if = "is_zero")]
-    pub aggregate_depth: u32,
-}
-
-#[derive(Debug)]
-pub enum ColumnConfigValueUpdate {
-    DatagridNumberStyle(Option<NumberColumnStyleConfig>),
-    DatagridStringStyle(Option<StringColumnStyleConfig>),
-    DatagridDatetimeStyle(Option<DatetimeColumnStyleConfig>),
-    Symbols(Option<HashMap<String, String>>),
-    CustomNumberStringFormat(Option<CustomNumberFormatConfig>),
-    AggregateDepth(u32),
-}
-
-impl ColumnConfigValues {
-    pub fn update(self, update: ColumnConfigValueUpdate) -> Self {
-        match update {
-            ColumnConfigValueUpdate::DatagridNumberStyle(update) => Self {
-                datagrid_number_style: update.unwrap_or_default(),
-                ..self
-            },
-            ColumnConfigValueUpdate::DatagridStringStyle(update) => Self {
-                datagrid_string_style: update.unwrap_or_default(),
-                ..self
-            },
-            ColumnConfigValueUpdate::DatagridDatetimeStyle(update) => Self {
-                datagrid_datetime_style: update.unwrap_or_default(),
-                ..self
-            },
-            ColumnConfigValueUpdate::Symbols(update) => Self {
-                symbols: update.unwrap_or_default(),
-                ..self
-            },
-            ColumnConfigValueUpdate::CustomNumberStringFormat(update) => Self {
-                number_format: update.filter(|x| x != &CustomNumberFormatConfig::default()),
-                ..self
-            },
-            ColumnConfigValueUpdate::AggregateDepth(aggregate_depth) => Self {
-                aggregate_depth,
-                ..self
-            },
-        }
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self == &Self::default()
-    }
-}
-
-/// The controls returned by plugin.column_style_controls.
-///
-/// This is a way to fill out default values for the given controls.
-/// If a control is not given, it will not be rendered. I would like to
-/// eventually show these as inactive values.
-#[derive(Serialize, Deserialize, PartialEq, Debug, Default)]
-pub struct ColumnStyleOpts {
-    pub datagrid_number_style: Option<NumberColumnStyleDefaultConfig>,
-    pub datagrid_string_style: Option<StringColumnStyleDefaultConfig>,
-    pub datagrid_datetime_style: Option<DatetimeColumnStyleDefaultConfig>,
-    pub symbols: Option<KeyValueOpts>,
-    pub number_string_format: Option<bool>,
-}
 
 #[derive(Serialize, Deserialize, Debug, PartialEq, Clone, Copy)]
 #[serde(rename_all = "snake_case")]

package/src/rust/config/datetime_column_style.rs

@@ -92,8 +92,3 @@ impl Default for DatetimeColumnStyleConfig {
         }
     }
 }
-
-#[derive(Clone, Default, Deserialize, Eq, PartialEq, Serialize, Debug)]
-pub struct DatetimeColumnStyleDefaultConfig {
-    pub color: String,
-}

package/src/rust/config/mod.rs

@@ -13,19 +13,25 @@
 //! A collection of (de-)serializable structs which capture the application
 //! state, suitable for persistence, history, etc. features.
 
+mod column_config_schema;
 mod columns_config;
 mod datetime_column_style;
+mod export_method;
 mod kvpair;
-mod number_column_style;
+mod number_series_style;
 mod number_string_format;
+mod plugin_static_config;
 mod string_column_style;
 pub mod view_config;
 mod viewer_config;
 
+pub use column_config_schema::*;
 pub use columns_config::*;
 pub use datetime_column_style::*;
-pub use number_column_style::*;
+pub use export_method::*;
+pub use number_series_style::*;
 pub use number_string_format::*;
+pub use plugin_static_config::*;
 pub use string_column_style::*;
 pub use view_config::*;
 pub use viewer_config::*;

package/src/rust/config/number_series_style.rs

@@ -0,0 +1,79 @@
+// ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
+// ┃ ██████ ██████ ██████       █      █      █      █      █ █▄  ▀███ █       ┃
+// ┃ ▄▄▄▄▄█ █▄▄▄▄▄ ▄▄▄▄▄█  ▀▀▀▀▀█▀▀▀▀▀ █ ▀▀▀▀▀█ ████████▌▐███ ███▄  ▀█ █ ▀▀▀▀▀ ┃
+// ┃ █▀▀▀▀▀ █▀▀▀▀▀ █▀██▀▀ ▄▄▄▄▄ █ ▄▄▄▄▄█ ▄▄▄▄▄█ ████████▌▐███ █████▄   █ ▄▄▄▄▄ ┃
+// ┃ █      ██████ █  ▀█▄       █ ██████      █      ███▌▐███ ███████▄ █       ┃
+// ┣━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┫
+// ┃ Copyright (c) 2017, the Perspective Authors.                              ┃
+// ┃ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ ┃
+// ┃ This file is part of the Perspective library, distributed under the terms ┃
+// ┃ of the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0). ┃
+// ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
+
+use serde::{Deserialize, Serialize};
+use strum::{Display, EnumIter};
+use ts_rs::TS;
+
+/// Render glyph for a numeric aggregate in the Y Bar plugin. Serialized as
+/// a lowercase string to match the plugin's runtime lookup (which does a
+/// case-insensitive `chart_type` match against the same literal set).
+#[derive(
+    Clone, Copy, Debug, Default, Deserialize, Display, EnumIter, Eq, PartialEq, Serialize, TS,
+)]
+pub enum ChartType {
+    #[default]
+    #[serde(rename = "bar")]
+    Bar,
+
+    #[serde(rename = "line")]
+    Line,
+
+    #[serde(rename = "scatter")]
+    Scatter,
+
+    #[serde(rename = "area")]
+    Area,
+}
+
+impl ChartType {
+    pub fn is_default(&self) -> bool {
+        *self == Self::Bar
+    }
+
+    /// Glyphs for which `stack` is a meaningful option. Line/Scatter never
+    /// stack; Bar/Area stack by default but can be opted out per column.
+    pub fn supports_stack(&self) -> bool {
+        matches!(self, Self::Bar | Self::Area)
+    }
+}
+
+/// Per-column render-style config for numeric aggregates in series charts
+/// (currently Y Bar). Stored flat in the column's
+/// `serde_json::Map<String, serde_json::Value>`, so the JSON shape at the
+/// viewer boundary is `{ "chart_type": "line", "stack": false }`.
+///
+/// Default `Bar` + `None` stack serializes as an empty object so plugins
+/// that never touch these fields don't pay any JSON overhead.
+#[derive(Serialize, Deserialize, Clone, Default, Debug, PartialEq, TS)]
+pub struct NumberSeriesStyleConfig {
+    #[serde(default)]
+    #[serde(skip_serializing_if = "ChartType::is_default")]
+    pub chart_type: ChartType,
+
+    /// Stack override. `None` means "use the glyph default"
+    /// (Bar/Area stack, Line/Scatter don't). `Some(false)` on a Bar/Area
+    /// forces non-stacking.
+    #[serde(default)]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub stack: Option<bool>,
+}
+
+/// Defaults-only shape carried by `ControlSpec::NumberSeriesStyle`. The
+/// presence of this control in a plugin's `column_config_schema` is the
+/// signal for the sidebar to render the chart-type picker.
+#[derive(Serialize, Deserialize, Clone, Default, Debug, PartialEq)]
+pub struct NumberSeriesStyleDefaultConfig {
+    pub chart_type: ChartType,
+    #[serde(default)]
+    pub stack: Option<bool>,
+}

package/src/rust/config/plugin_static_config.rs

@@ -0,0 +1,144 @@
+// ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
+// ┃ ██████ ██████ ██████       █      █      █      █      █ █▄  ▀███ █       ┃
+// ┃ ▄▄▄▄▄█ █▄▄▄▄▄ ▄▄▄▄▄█  ▀▀▀▀▀█▀▀▀▀▀ █ ▀▀▀▀▀█ ████████▌▐███ ███▄  ▀█ █ ▀▀▀▀▀ ┃
+// ┃ █▀▀▀▀▀ █▀▀▀▀▀ █▀██▀▀ ▄▄▄▄▄ █ ▄▄▄▄▄█ ▄▄▄▄▄█ ████████▌▐███ █████▄   █ ▄▄▄▄▄ ┃
+// ┃ █      ██████ █  ▀█▄       █ ██████      █      ███▌▐███ ███████▄ █       ┃
+// ┣━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┫
+// ┃ Copyright (c) 2017, the Perspective Authors.                              ┃
+// ┃ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ ┃
+// ┃ This file is part of the Perspective library, distributed under the terms ┃
+// ┃ of the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0). ┃
+// ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
+
+use perspective_client::config::GroupRollupMode;
+use serde::Deserialize;
+use ts_rs::TS;
+
+#[derive(Clone, Copy, Debug, Default, Deserialize, Eq, PartialEq, TS)]
+#[serde(rename_all = "camelCase")]
+pub enum ColumnSelectMode {
+    #[default]
+    Toggle,
+    Select,
+}
+
+impl ColumnSelectMode {
+    pub fn css(&self) -> yew::Classes {
+        match self {
+            Self::Toggle => yew::classes!("toggle-mode", "is_column_active"),
+            Self::Select => yew::classes!("select-mode", "is_column_active"),
+        }
+    }
+}
+
+/// Static, immutable configuration for a plugin.
+///
+/// Returned once per plugin from `get_static_config()` at registration
+/// time and cached in [`crate::renderer::PluginRecord`]. Consumers
+/// (renderer, session, queries, components) read these fields off the
+/// renderer's active-plugin metadata rather than calling back into JS.
+///
+/// `<perspective-viewer>` reads this exactly once per plugin (at
+/// `registerPlugin` time) and caches it for the lifetime of the
+/// application. The result must be stable; do not mutate any field
+/// after registration.
+#[derive(Clone, Debug, Default, Deserialize, PartialEq, TS)]
+pub struct PluginStaticConfig {
+    /// The unique key for this plugin. Used as the `plugin` field in a
+    /// `ViewerConfig` and as the display name key in the
+    /// `<perspective-viewer>` UI.
+    pub name: String,
+
+    /// Category in the plugin picker menu.
+    #[serde(default)]
+    #[ts(as = "Option<_>")]
+    #[ts(optional)]
+    pub category: Option<String>,
+
+    /// Soft limit on the number of columns the plugin will render.
+    /// Triggers the "Rendering N of M" warning when the view exceeds
+    /// this value (until dismissed).
+    #[serde(default)]
+    #[ts(as = "Option<_>")]
+    #[ts(optional)]
+    pub max_columns: Option<usize>,
+
+    /// Soft limit on the number of cells (rows × columns) the plugin
+    /// will render. Triggers the "Rendering N of M" warning when the view
+    /// exceeds this value (until dismissed).
+    #[serde(default)]
+    #[ts(as = "Option<_>")]
+    #[ts(optional)]
+    pub max_cells: Option<usize>,
+
+    /// Column add/remove behavior. `"select"` exclusively selects the
+    /// added column, removing other columns. `"toggle"` toggles the
+    /// column on or off based on its current state, leaving other
+    /// columns alone.
+    #[serde(default)]
+    #[ts(as = "Option<_>")]
+    #[ts(optional)]
+    pub select_mode: ColumnSelectMode,
+
+    /// Minimum number of columns the plugin requires to render. Mostly
+    /// affects drag/drop and column-remove button behavior. `undefined`
+    /// is treated identically to `1`.
+    #[serde(default)]
+    #[ts(as = "Option<_>")]
+    #[ts(optional)]
+    pub min_config_columns: Option<usize>,
+
+    /// Named column slots. Named columns have replace/swap behavior in
+    /// drag/drop rather than insert. The length must be at least
+    /// `min_config_columns`.
+    #[serde(default)]
+    #[ts(as = "Option<_>")]
+    #[ts(optional)]
+    pub config_column_names: Vec<String>,
+
+    /// Group-rollup modes the plugin accepts, in preference order.
+    /// The first entry that matches a feature flag becomes the default.
+    #[serde(default)]
+    #[ts(as = "Option<_>")]
+    #[ts(optional)]
+    pub group_rollup_modes: Option<Vec<GroupRollupMode>>,
+
+    /// Plugin load priority. Higher numbers win; ties resolve in
+    /// registration order. The highest-priority plugin is loaded by
+    /// default unless `restore({ plugin })` overrides it.
+    #[serde(default)]
+    #[ts(as = "Option<_>")]
+    #[ts(optional)]
+    pub priority: Option<i32>,
+
+    /// Whether this plugin opts into per-column style controls in the
+    /// settings sidebar. When `true`, the StyleTab is shown for active
+    /// columns and the plugin's `column_config_schema` is queried for
+    /// the per-column field set. When `false` or omitted, no StyleTab
+    /// is shown.
+    #[serde(default)]
+    #[ts(as = "Option<_>")]
+    #[ts(optional)]
+    pub can_render_column_styles: bool,
+}
+
+impl PluginStaticConfig {
+    /// `true` if dropping a column at `index` should swap with the
+    /// column already there rather than insert. Only the named slots
+    /// (`config_column_names[..len()-1]`) participate in swap behaviour;
+    /// the trailing unnamed tail inserts.
+    pub fn is_swap(&self, index: usize) -> bool {
+        !self.config_column_names.is_empty() && index < self.config_column_names.len() - 1
+    }
+
+    pub fn get_group_rollups(&self, rollup_features: &[GroupRollupMode]) -> Vec<GroupRollupMode> {
+        self.group_rollup_modes
+            .clone()
+            .map(|x| {
+                x.into_iter()
+                    .filter(|y| rollup_features.is_empty() || rollup_features.contains(y))
+                    .collect()
+            })
+            .unwrap_or_default()
+    }
+}

package/src/rust/config/string_column_style.rs

@@ -133,8 +133,3 @@ pub struct StringColumnStyleConfig {
     #[serde(default)]
     pub color: Option<String>,
 }
-
-#[derive(Debug, Clone, Default, Deserialize, Eq, PartialEq, Serialize)]
-pub struct StringColumnStyleDefaultConfig {
-    pub color: String,
-}

package/src/rust/config/viewer_config.rs

@@ -10,7 +10,6 @@
 // ┃ of the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0). ┃
 // ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
 
-use std::collections::HashMap;
 use std::ops::Deref;
 use std::sync::LazyLock;
 
@@ -21,8 +20,7 @@ use serde_json::Value;
 use ts_rs::TS;
 use wasm_bindgen::prelude::*;
 
-use super::ColumnConfigValues;
-use crate::presentation::ColumnConfigMap;
+use crate::renderer::ColumnConfigMap;
 
 /// The state of an entire `custom_elements::PerspectiveViewerElement` component
 /// and its `Plugin`.
@@ -32,7 +30,7 @@ pub struct ViewerConfig<V: TS = String> {
     pub version: V,
     pub columns_config: ColumnConfigMap,
     pub plugin: String,
-    pub plugin_config: Value,
+    pub plugin_config: serde_json::Map<String, Value>,
     pub settings: bool,
     pub table: Option<String>,
     pub theme: Option<String>,
@@ -106,7 +104,7 @@ pub struct ViewerConfigUpdate {
     #[serde(default)]
     #[ts(as = "Option<_>")]
     #[ts(optional)]
-    pub plugin_config: Option<PluginConfig>,
+    pub plugin_config: PluginConfigUpdate,
 
     #[serde(default)]
     #[ts(as = "Option<_>")]
@@ -162,7 +160,8 @@ pub type ThemeUpdate = OptionalUpdate<String>;
 pub type TitleUpdate = OptionalUpdate<String>;
 pub type TableUpdate = OptionalUpdate<String>;
 pub type VersionUpdate = OptionalUpdate<String>;
-pub type ColumnConfigUpdate = OptionalUpdate<HashMap<String, ColumnConfigValues>>;
+pub type ColumnConfigUpdate = OptionalUpdate<ColumnConfigMap>;
+pub type PluginConfigUpdate = OptionalUpdate<serde_json::Map<String, Value>>;
 
 /// Handles `{}` when included as a field with `#[serde(default)]`.
 impl<T: Clone> Default for OptionalUpdate<T> {

package/src/rust/custom_elements/copy_dropdown.rs

@@ -23,8 +23,11 @@ use super::viewer::PerspectiveViewerElement;
 use crate::components::copy_dropdown::CopyDropDownMenu;
 use crate::components::portal::PortalModal;
 use crate::components::style::StyleProvider;
+use crate::config::*;
 use crate::js::*;
+use crate::presentation::Presentation;
 use crate::renderer::*;
+use crate::session::Session;
 use crate::tasks::*;
 use crate::utils::*;
 use crate::*;
@@ -130,57 +133,66 @@ impl CopyDropDownMenuElement {
     }
 
     pub fn __set_model(&self, parent: &PerspectiveViewerElement) {
-        self.set_config_model(parent)
+        self.set_config_model(&parent.session, &parent.renderer, &parent.presentation)
     }
 
     pub fn connected_callback(&self) {}
 }
 
 impl CopyDropDownMenuElement {
-    pub fn new_from_model<A>(model: &A) -> Self
-    where
-        A: GetViewerConfigModel + StateProvider,
-        <A as StateProvider>::State: HasPresentation + HasRenderer + HasSession,
-    {
+    pub fn new_from_model(
+        session: &Session,
+        renderer: &Renderer,
+        presentation: &Presentation,
+    ) -> Self {
         let dropdown = global::document()
             .create_element("perspective-copy-menu")
             .unwrap()
             .unchecked_into::<HtmlElement>();
 
         let elem = Self::new(dropdown);
-        elem.set_config_model(model);
+        elem.set_config_model(session, renderer, presentation);
         elem
     }
 
-    pub fn set_config_model<A>(&self, model: &A)
-    where
-        A: GetViewerConfigModel + StateProvider,
-        <A as StateProvider>::State: HasPresentation + HasRenderer + HasSession,
-    {
+    pub fn set_config_model(
+        &self,
+        session: &Session,
+        renderer: &Renderer,
+        presentation: &Presentation,
+    ) {
         let callback = Callback::from({
-            let model = model.clone_state();
+            let session = session.clone();
+            let renderer = renderer.clone();
+            let presentation = presentation.clone();
             let target = self.target.clone();
             let root = self.root.clone();
             move |x: ExportFile| {
-                let model = model.clone();
+                let session = session.clone();
+                let renderer = renderer.clone();
+                let presentation = presentation.clone();
                 let target = target.clone();
                 let root = root.clone();
                 spawn_local(async move {
                     let mime = x.method.mimetype(x.is_chart);
-                    let task = model.export_method_to_blob(x.method);
+                    let task = export_method_to_blob(&session, &renderer, &presentation, x.method);
                     let result = copy_to_clipboard(task, mime).await;
-                    crate::maybe_log!({
+                    let r = (|| -> ApiResult<()> {
                         result?;
                         *target.borrow_mut() = None;
                         if let Some(root) = root.borrow().as_ref() {
                             root.send_message(CopyDropDownWrapperMsg::Close);
                         }
-                    })
+                        Ok(())
+                    })();
+                    if let Err(e) = r {
+                        web_sys::console::warn_1(&e.into());
+                    }
                 })
             }
         });
 
-        let renderer = model.renderer().clone();
+        let renderer = renderer.clone();
         let init = ShadowRootInit::new(ShadowRootMode::Open);
         let shadow_root = self
             .elem

package/src/rust/custom_elements/debug_plugin.rs

@@ -93,9 +93,7 @@ impl PerspectiveDebugPluginElement {
         ApiFuture::default()
     }
 
-    pub fn restyle(&self) -> ApiFuture<()> {
-        ApiFuture::default()
-    }
+    pub fn restyle(&self) {}
 
     pub fn save(&self) -> ApiResult<JsValue> {
         Ok(JsValue::null())

package/src/rust/custom_elements/export_dropdown.rs

@@ -23,6 +23,8 @@ use super::viewer::PerspectiveViewerElement;
 use crate::components::export_dropdown::ExportDropDownMenu;
 use crate::components::portal::PortalModal;
 use crate::components::style::StyleProvider;
+use crate::config::*;
+use crate::presentation::Presentation;
 use crate::renderer::*;
 use crate::session::*;
 use crate::tasks::*;
@@ -132,43 +134,49 @@ impl ExportDropDownMenuElement {
     }
 
     pub fn __set_model(&self, parent: &PerspectiveViewerElement) {
-        self.set_config_model(parent)
+        self.set_config_model(&parent.session, &parent.renderer, &parent.presentation)
     }
 
     pub fn connected_callback(&self) {}
 }
 
 impl ExportDropDownMenuElement {
-    pub fn new_from_model<A>(model: &A) -> Self
-    where
-        A: GetViewerConfigModel + StateProvider,
-        <A as StateProvider>::State: HasPresentation + HasRenderer + HasSession,
-    {
+    pub fn new_from_model(
+        session: &Session,
+        renderer: &Renderer,
+        presentation: &Presentation,
+    ) -> Self {
         let dropdown = global::document()
             .create_element("perspective-export-menu")
             .unwrap()
             .unchecked_into::<HtmlElement>();
 
         let elem = Self::new(dropdown);
-        elem.set_config_model(model);
+        elem.set_config_model(session, renderer, presentation);
         elem
     }
 
-    fn set_config_model<A>(&self, model: &A)
-    where
-        A: GetViewerConfigModel + StateProvider,
-        <A as StateProvider>::State: HasPresentation + HasRenderer + HasSession,
-    {
+    fn set_config_model(
+        &self,
+        session: &Session,
+        renderer: &Renderer,
+        presentation: &Presentation,
+    ) {
         let callback = Callback::from({
-            let model = model.clone_state();
+            let session = session.clone();
+            let renderer = renderer.clone();
+            let presentation = presentation.clone();
             let target = self.target.clone();
             let root = self.root.clone();
             move |x: ExportFile| {
                 if !x.name.is_empty() {
-                    clone!(target, root, model);
+                    clone!(target, root, session, renderer, presentation);
                     spawn_local(async move {
-                        let val = model.export_method_to_blob(x.method).await.unwrap();
-                        let is_chart = model.renderer().is_chart();
+                        let val =
+                            export_method_to_blob(&session, &renderer, &presentation, x.method)
+                                .await
+                                .unwrap();
+                        let is_chart = renderer.is_chart();
                         download(&x.as_filename(is_chart), &val).unwrap();
                         *target.borrow_mut() = None;
                         if let Some(root) = root.borrow().as_ref() {
@@ -179,8 +187,8 @@ impl ExportDropDownMenuElement {
             }
         });
 
-        let renderer = model.renderer().clone();
-        let session = model.session().clone();
+        let renderer = renderer.clone();
+        let session = session.clone();
         let init = ShadowRootInit::new(ShadowRootMode::Open);
         let shadow_root = self
             .elem