@deephaven/js-plugin-pivot 0.0.3-alpha-pivots.988 → 0.0.3-dev.984

package/dist/index.js

@@ -9920,10 +9920,10 @@ _defineProperty(GridRenderer, "getCachedColorWithAlpha", memoizeClear$1(GridColo
 _defineProperty(GridRenderer, "getCachedColorIsDark", memoizeClear$1(ColorUtils$1.isDark, {
   max: 1e3
 }));
-function isPivotColumnHeaderGroup(group) {
-  return group instanceof PivotColumnHeaderGroup;
+function isExpandableColumnHeaderGroup(group) {
+  return group instanceof ExpandableColumnHeaderGroup;
 }
-class PivotColumnHeaderGroup extends irisGrid.ColumnHeaderGroup {
+class ExpandableColumnHeaderGroup extends irisGrid.ColumnHeaderGroup {
   constructor({
     name,
     displayName,
@@ -10022,10 +10022,10 @@ function makeGrandTotalColumnName(valueSource) {
   return `__GRAND_TOTAL/${valueSource.name}`;
 }
 function makeColumnName(keys2, depth) {
-  return keys2.slice(0, depth + 1).filter((k) => k != null).map((k) => encodeURIComponent(String(k))).join("/");
+  return keys2.slice(0, depth + 1).filter((k) => k != null).join("/");
 }
 function makeColumnGroupName(keys2, columnSources, depth) {
-  return keys2.slice(0, depth + 1).map((k, i) => k == null ? columnSources[i].name : k).map((k) => encodeURIComponent(String(k))).join("/");
+  return keys2.slice(0, depth + 1).map((k, i) => k == null ? columnSources[i].name : k).join("/");
 }
 function makeValueSourceColumnName(columnName, valueSource) {
   return `${columnName}/${valueSource.name}`;
@@ -10072,11 +10072,11 @@ function checkColumnsChanged(prevColumns, newColumns) {
 }
 function getKeyColumnGroups(columnSources, rowSources) {
   const groups = columnSources.length === 0 ? [
-    new PivotColumnHeaderGroup({
-      name: "/",
+    new ExpandableColumnHeaderGroup({
+      // TODO:
+      name: "__All",
       displayName: "",
-      // For empty row sources we will render a "dead column"
-      // or a Groups column, depending on the table settings
+      // TODO: what if rowSources is empty?
       children: rowSources.map((c) => c.name),
       childIndexes: [],
       isKeyColumnGroup: true,
@@ -10084,7 +10084,7 @@ function getKeyColumnGroups(columnSources, rowSources) {
       isExpandable: false
     })
   ] : columnSources.map(
-    (source, i) => new PivotColumnHeaderGroup({
+    (source, i) => new ExpandableColumnHeaderGroup({
       name: source.name,
       displayName: source.name,
       children: i === columnSources.length - 1 ? rowSources.map((c) => c.name) : [columnSources[i + 1].name],
@@ -10102,15 +10102,20 @@ function getKeyColumnGroups(columnSources, rowSources) {
 function getTotalsColumnGroups(columnSources, valueSources, isRootColumnExpanded) {
   const groupName = pluralize(valueSources.length, GRAND_TOTALS_GROUP_NAME);
   return columnSources.length === 0 ? [
-    new PivotColumnHeaderGroup({
-      name: "/GrandTotals",
+    new ExpandableColumnHeaderGroup({
+      // TODO:
+      name: "TMP__GrandTotals",
       displayName: groupName,
       children: valueSources.map((v) => makeGrandTotalColumnName(v)),
       childIndexes: [],
       depth: 1
+      // Only the top level is expandable
+      // TODO:
+      // isExpandable: i === 0,
+      // isExpanded: isRootColumnExpanded,
     })
   ] : columnSources.map(
-    (source, i) => new PivotColumnHeaderGroup({
+    (source, i) => new ExpandableColumnHeaderGroup({
       name: makeGrandTotalColumnName(source),
       displayName: i === 0 ? groupName : "",
       children: i === columnSources.length - 1 ? valueSources.map((v) => makeGrandTotalColumnName(v)) : [makeGrandTotalColumnName(columnSources[i + 1])],
@@ -10136,7 +10141,7 @@ function getSnapshotColumnGroups(snapshotColumns, columnSources, valueSources, f
       const isTotalGroup = keys2[i] == null;
       const parentKey = i > 0 ? keys2[i - 1] : null;
       const totalsGroupDisplayName = parentKey == null ? "" : groupName;
-      const group = groupMap.get(name) ?? new PivotColumnHeaderGroup({
+      const group = groupMap.get(name) ?? new ExpandableColumnHeaderGroup({
         name,
         displayName: isTotalGroup ? totalsGroupDisplayName : keys2[i],
         isTotalGroup,
@@ -10184,9 +10189,6 @@ const SET_VIEWPORT_THROTTLE = 150;
 const APPLY_VIEWPORT_THROTTLE = 0;
 const ROW_BUFFER_PAGES = 1;
 const COLUMN_BUFFER_PAGES = 1;
-function isIrisGridPivotModel(model) {
-  return typeof model === "object" && model !== null && "pivotTable" in model && "keyColumns" in model && "expandAll" in model && "collapseAll" in model && "hasExpandableRows" in model && "hasExpandableColumns" in model;
-}
 class IrisGridPivotModel extends irisGrid.IrisGridModel {
   constructor(dh, pivotTable, formatter = new jsapiUtils.Formatter(dh), config = {}) {
     if (!isCorePlusDh(dh)) {
@@ -10552,7 +10554,7 @@ class IrisGridPivotModel extends irisGrid.IrisGridModel {
     } = irisGrid.IrisGridUtils.parseColumnHeaderGroups(
       this,
       groups,
-      (args) => new PivotColumnHeaderGroup(args)
+      (args) => new ExpandableColumnHeaderGroup(args)
     );
     this._columnHeaderGroups = newGroups;
     this.columnHeaderMaxDepth = maxDepth;
@@ -10567,14 +10569,14 @@ class IrisGridPivotModel extends irisGrid.IrisGridModel {
   }
   textForColumnHeader(x, depth = 0) {
     const header = this.columnAtDepth(x, depth);
-    if (isPivotColumnHeaderGroup(header)) {
+    if (isExpandableColumnHeaderGroup(header)) {
       return header.isNew ? "" : header.displayName ?? header.name;
     }
     return (header == null ? void 0 : header.displayName) ?? (header == null ? void 0 : header.name);
   }
   colorForColumnHeader(x, depth = 0, theme = {}) {
     const column = this.columnAtDepth(x, depth);
-    if (isPivotColumnHeaderGroup(column)) {
+    if (isExpandableColumnHeaderGroup(column)) {
       if (column.isTotalGroup != null && column.isTotalGroup) {
         return theme.totalsHeaderBackground ?? null;
       }
@@ -10586,7 +10588,7 @@ class IrisGridPivotModel extends irisGrid.IrisGridModel {
   }
   getColumnHeaderGroup(modelIndex, depth) {
     const group = this.columnAtDepth(modelIndex, depth);
-    if (isPivotColumnHeaderGroup(group)) {
+    if (isExpandableColumnHeaderGroup(group)) {
       return group;
     }
     return void 0;
@@ -11231,26 +11233,6 @@ class PivotColumnGroupMouseHandler extends GridMouseHandler {
     }
     return null;
   }
-  setCursor(gridPoint, grid) {
-    const { column, columnHeaderDepth } = gridPoint;
-    if (this.isExpandableColumnGroup(column, columnHeaderDepth)) {
-      this.cursor = "pointer";
-      return { stopPropagation: false, preventDefault: false };
-    }
-    this.cursor = null;
-    return false;
-  }
-  isExpandableColumnGroup(column, columnHeaderDepth = 0) {
-    const { model } = this.irisGrid.props;
-    if (column == null || model == null) {
-      return false;
-    }
-    const group = model.getColumnHeaderGroup(column, columnHeaderDepth);
-    return group != null && isPivotColumnHeaderGroup(group) && group.isExpandable;
-  }
-  onMove(gridPoint, grid) {
-    return this.setCursor(gridPoint, grid);
-  }
   // We need to remember where the down started, because the canvas element will trigger a click wherever mouseUp is
   onDown(gridPoint) {
     this.column = this.getColumnGroupFromGridPoint(gridPoint);
@@ -11258,7 +11240,7 @@ class PivotColumnGroupMouseHandler extends GridMouseHandler {
   }
   onClick(gridPoint, grid, event) {
     const column = this.getColumnGroupFromGridPoint(gridPoint);
-    if (column != null && column === this.column && this.isExpandableColumnGroup(column, gridPoint.columnHeaderDepth)) {
+    if (column != null && column === this.column) {
       this.irisGrid.toggleExpandColumn(column);
       return true;
     }
@@ -11417,9 +11399,6 @@ class IrisGridPivotRenderer extends irisGrid.IrisGridRenderer {
   }
   drawColumnHeadersAtDepth(context, state, range, bounds, depth) {
     const { metrics, model, theme } = state;
-    if (!isIrisGridPivotModel(model)) {
-      throw new Error("Unsupported model type");
-    }
     const {
       modelColumns,
       allColumnXs,
@@ -11453,14 +11432,10 @@ class IrisGridPivotRenderer extends irisGrid.IrisGridRenderer {
       while (columnIndex <= endIndex) {
         const { columnCount } = metrics;
         const modelColumn = getOrThrow(modelColumns, columnIndex);
-        const columnGroupColor = model.colorForColumnHeader(
-          modelColumn,
-          depth,
-          theme
-        );
+        const columnGroupColor = isExpandableColumnGridModel(model) ? model.colorForColumnHeader(modelColumn, depth, theme) : model.colorForColumnHeader(modelColumn, depth);
         const headerGroup = model.getColumnHeaderGroup(modelColumn, depth ?? 0);
-        const isExpandable = isPivotColumnHeaderGroup(headerGroup) && headerGroup.isExpandable;
-        const isExpanded = isPivotColumnHeaderGroup(headerGroup) && headerGroup.isExpanded;
+        const isExpandable = isExpandableColumnHeaderGroup(headerGroup) && headerGroup.isExpandable;
+        const isExpanded = isExpandableColumnHeaderGroup(headerGroup) && headerGroup.isExpanded;
         const columnGroupName = getColumnGroupName(model, modelColumn, depth);
         let columnGroupLeft = getOrThrow(allColumnXs, columnIndex) + gridX;
         let columnGroupRight = columnGroupLeft + getOrThrow(allColumnWidths, columnIndex);
@@ -11711,7 +11686,7 @@ function useHydratePivotGrid(fetch, id, metadata) {
   const loadPlugin = dashboardCorePlugins.useLoadTablePlugin();
   const fetchTable = React.useCallback(
     () => fetch().then((result) => {
-      log$1.debug("Pivot fetch result:", result);
+      log$1.debug("pivotWidget fetch result:", result);
       if (!isCorePlusDh(api)) {
         throw new Error("CorePlus is not available");
       }

package/package.json

@@ -1,20 +1,14 @@
 {
   "name": "@deephaven/js-plugin-pivot",
-  "version": "0.0.3-alpha-pivots.988+5b061b1",
+  "version": "0.0.3-dev.984+0d63a3d6",
   "description": "Pivot plugin for Deephaven",
   "keywords": [
     "Deephaven",
-    "plugin",
-    "deephaven-js-plugin",
-    "pivot"
+    "plugin"
   ],
-  "author": "Deephaven Data Labs LLC",
+  "author": "Deephaven Data Labs",
   "license": "Apache-2.0",
   "main": "dist/index.js",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/deephaven/deephaven-plugins"
-  },
   "scripts": {
     "start": "vite build --watch",
     "build": "vite build"
@@ -54,10 +48,11 @@
     "nanoid": "^5.1.5"
   },
   "publishConfig": {
-    "access": "public"
+    "access": "public",
+    "provenance": false
   },
   "files": [
     "dist/index.js"
   ],
-  "gitHead": "5b061b1eec07f0532fa8c4bb47b38587cae7109d"
+  "gitHead": "0d63a3d64a19349448965fc689a3b0e4511fb7b2"
 }