@perspective-dev/viewer 5.5.1 → 5.6.0

package/src/rust/queries/plugin_column_styles.rs

@@ -13,22 +13,12 @@
 use itertools::Itertools;
 use perspective_client::config::ViewConfig;
 use perspective_js::utils::{ApiResult, JsValueSerdeExt};
-use serde::Serialize;
 
+use super::column_locator::is_pivot_only_column;
 use crate::config::ColumnConfigSchema;
-use crate::renderer::Renderer;
+use crate::renderer::{ColumnRole, Renderer};
 use crate::session::SessionMetadata;
 
-/// Stats payload passed to `plugin.column_config_schema` as the
-/// `column_stats` arg. The caller (e.g. the StyleTab) owns the value —
-/// typically populated by `fetch_column_abs_max` resolving into a
-/// component-local `use_state`. Missing when no fetch has resolved yet.
-#[derive(Default, Serialize)]
-struct ColumnStats {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    abs_max: Option<f64>,
-}
-
 /// Queries the active plugin for its plugin-scoped [`ColumnConfigSchema`] as
 /// it applies to `current_value`.
 pub fn get_plugin_config_schema(
@@ -51,10 +41,6 @@ pub fn get_plugin_config_schema(
 ///
 /// `current_value` is the column's existing flat JSON config (if any);
 /// plugins use it to dynamically gate fields based on prior state.
-/// `abs_max` is the caller-owned numeric stat (typically a Yew
-/// `use_state` populated by an in-flight `fetch_column_abs_max` task);
-/// `None` means the fetch has not yet resolved and gradient defaults
-/// fall back to 0.
 pub fn get_column_config_schema(
     renderer: &Renderer,
     view_config: &ViewConfig,
@@ -73,9 +59,22 @@ pub fn get_column_config_schema(
         .and_then(|(idx, _)| names.get(idx))
         .map(|s| s.as_str());
 
-    let view_type = if let Some(x) = metadata.get_column_view_type(column_name) {
-        x
+    let role = if !is_pivot_only_column(column_name, view_config) {
+        ColumnRole::Column
+    } else if view_config.split_by.iter().any(|x| x == column_name) {
+        ColumnRole::SplitBy
     } else {
+        ColumnRole::GroupBy
+    };
+
+    let view_type = match role {
+        ColumnRole::Column => metadata.get_column_view_type(column_name),
+        _ => metadata
+            .get_column_table_type(column_name)
+            .or_else(|| metadata.get_column_view_type(column_name)),
+    };
+
+    let Some(view_type) = view_type else {
         return Ok(ColumnConfigSchema { fields: vec![] });
     };
 
@@ -87,9 +86,8 @@ pub fn get_column_config_schema(
     let view_config_js =
         wasm_bindgen::JsValue::from_serde_ext(view_config).unwrap_or(wasm_bindgen::JsValue::NULL);
 
-    let stats = ColumnStats { abs_max };
-    let stats_js =
-        wasm_bindgen::JsValue::from_serde_ext(&stats).unwrap_or(wasm_bindgen::JsValue::NULL);
+    let plugin_config_js = wasm_bindgen::JsValue::from_serde_ext(&renderer.get_plugin_config())
+        .unwrap_or(wasm_bindgen::JsValue::NULL);
 
     let raw = plugin._column_config_schema(
         &view_type.to_string(),
@@ -97,10 +95,11 @@ pub fn get_column_config_schema(
         column_name,
         &current_js,
         &view_config_js,
-        &stats_js,
+        &plugin_config_js,
+        role.as_str(),
     )?;
 
     serde_wasm_bindgen::from_value::<ColumnConfigSchema>(raw)
-        .map(|schema| schema.canonicalize())
+        .map(|schema| schema.canonicalize().resolve_stat_defaults(abs_max))
         .map_err(|e| e.into())
 }

package/src/rust/renderer/dispatch.rs

@@ -43,6 +43,8 @@ impl Renderer {
         let is_solo = self.0.is_solo_panel.get();
         let _ = el.class_list().toggle_with_force("single", is_solo);
         let _ = el.class_list().toggle_with_force("multi", !is_solo);
+        let viewer = self.plugin_data.borrow().viewer_elem.clone();
+        stamp_plugin_host_state(&viewer, el);
     }
 
     pub fn stamp_theme(&self, plugin: Option<&JsPerspectiveViewerPlugin>) {