@adaptabletools/adaptable-cjs 22.0.6 → 22.0.8

package/src/agGrid/AdaptableAgGrid.js

@@ -2158,38 +2158,16 @@ class AdaptableAgGrid {
         }
         const colDef = this.agGridAdapter.getAgGridApi().getColumnDef(columnId);
         if (colDef) {
-            if (typeof colDef.valueFormatter == 'function') {
-                const column = this.agGridAdapter.getAgGridApi().getColumn(columnId);
-                const params = {
-                    value: rawValue,
-                    node: rowNode,
-                    data: rowNode.data,
-                    colDef,
-                    column,
-                    api: this.agGridAdapter.getAgGridApi(),
-                    context: this.agGridAdapter.getGridOption('context'),
-                };
-                const formattedValue = colDef.valueFormatter(params);
-                return formattedValue || '';
-            }
+            const formattedValue = this.agGridAdapter._agGridApi_getFormattedValue(columnId, rowNode);
+            return formattedValue || '';
         }
-        else if (this.api.columnApi.isPivotResultColumn(columnId)) {
+        if (this.api.columnApi.isPivotResultColumn(columnId)) {
             const pivotResultColumn = this.agGridAdapter
                 .getAgGridApi()
                 .getPivotResultColumns()
                 .find((col) => col.getColId() === columnId);
-            const pivotResultColDef = pivotResultColumn?.getColDef();
-            if (pivotResultColDef && typeof pivotResultColDef.valueFormatter === 'function') {
-                const params = {
-                    value: rawValue,
-                    node: rowNode,
-                    data: rowNode.data,
-                    colDef: pivotResultColDef,
-                    column: pivotResultColumn,
-                    api: this.agGridAdapter.getAgGridApi(),
-                    context: this.agGridAdapter.getGridOption('context'),
-                };
-                const formattedValue = pivotResultColDef.valueFormatter(params);
+            if (pivotResultColumn) {
+                const formattedValue = this.agGridAdapter._agGridApi_getFormattedValue(pivotResultColumn, rowNode);
                 return formattedValue || '';
             }
         }
@@ -2735,9 +2713,11 @@ class AdaptableAgGrid {
         };
         // No distinct values so lets return unique grid cells
         const mapFn = (gridCell, level) => {
+            const itemId = `${gridCell.rowNode?.id}-${gridCell.column?.columnId}`;
             if (level || Array.isArray(gridCell.children)) {
                 const cell = gridCell;
                 const inFilterValue = {
+                    id: itemId,
                     value: gridCell.rawValue,
                     label: gridCell.displayValue,
                     level: level ?? 0,
@@ -2758,6 +2738,7 @@ class AdaptableAgGrid {
                 return inFilterValue;
             }
             return {
+                id: itemId,
                 value: gridCell.rawValue,
                 label: gridCell.displayValue,
             };
@@ -2777,7 +2758,9 @@ class AdaptableAgGrid {
                     const result = gridApiInternal
                         .sortDistinctValues(getCurrentGridCells(), column)
                         .map((gridCell) => {
+                        const itemId = `${gridCell.rowNode?.id}-${gridCell.column?.columnId}`;
                         return {
+                            id: itemId,
                             label: gridCell.displayValue,
                             value: gridCell.rawValue,
                             isSelected: gridCell.rowNode.displayed,
@@ -2803,7 +2786,9 @@ class AdaptableAgGrid {
                 },
                 get defaultValues() {
                     const result = getCurrentGridCells().map((gridCell) => {
+                        const itemId = `${gridCell.rowNode?.id}-${gridCell.column?.columnId}`;
                         return {
+                            id: itemId,
                             label: gridCell.displayValue,
                             value: gridCell.rawValue,
                             isSelected: gridCell.rowNode.displayed,
@@ -2831,7 +2816,9 @@ class AdaptableAgGrid {
                     const rowNodes = gridApiInternal.getSortedRowNodesWithCurrentLayoutSortOrder();
                     const currentGridCells = self.getDistinctGridCellsForColumn(column, rowNodes);
                     const result = currentGridCells.map((gridCell) => {
+                        const itemId = `${gridCell.rowNode?.id}-${gridCell.column?.columnId}`;
                         return {
+                            id: itemId,
                             label: gridCell.displayValue,
                             value: gridCell.rawValue,
                             isSelected: gridCell.rowNode.displayed,
@@ -3734,7 +3721,11 @@ class AdaptableAgGrid {
         }
         const distinctRawValues = this.api.gridApi.internalApi
             .getUnsortedDistinctRawValuesForColumn(columnId)
-            .map((item) => item.rawValue);
+            .map((item) => item.rawValue)
+            .filter((v) => typeof v === 'number' && !isNaN(v));
+        if (distinctRawValues.length === 0) {
+            return undefined;
+        }
         value = minMax === 'min' ? Math.min(...distinctRawValues) : Math.max(...distinctRawValues);
         this.columnMinMaxValuesCache[columnId] = {
             ...this.columnMinMaxValuesCache[columnId],

package/src/agGrid/AgGridAdapter.d.ts

@@ -81,4 +81,5 @@ export declare class AgGridAdapter {
     traverseColDefs(colDefs: (ColDef | ColGroupDef)[], modifyFn: (colDef: ColDef) => ColDef | null): (ColDef | ColGroupDef)[];
     getDefaultColumnDefinition(): GridOptions['defaultColDef'];
     _agGridApi_getValue(colKey: string | Column, rowNode: IRowNode, gridApi?: GridApi): any;
+    _agGridApi_getFormattedValue(colKey: string | Column, rowNode: IRowNode, gridApi?: GridApi): any;
 }

package/src/agGrid/AgGridAdapter.js

@@ -839,5 +839,9 @@ class AgGridAdapter {
         gridApi = gridApi || this.getAgGridApi();
         return gridApi.getCellValue({ colKey, rowNode });
     }
+    _agGridApi_getFormattedValue(colKey, rowNode, gridApi) {
+        gridApi = gridApi || this.getAgGridApi();
+        return gridApi.getCellValue({ colKey, rowNode, useFormatter: true });
+    }
 }
 exports.AgGridAdapter = AgGridAdapter;

package/src/agGrid/AgGridColumnAdapter.js

@@ -1199,8 +1199,8 @@ class AgGridColumnAdapter {
     getStyledColumnStyle(styledColumn, abColumn, params) {
         let style = {};
         const gradientStyle = styledColumn?.GradientStyle;
-        if (params.value === undefined) {
-            return;
+        if (params.value == undefined || params.value === '') {
+            return style;
         }
         let colValue = params.value;
         if (this.adaptableApi.gridApi.isGroupRowNode(params.node)) {
@@ -1316,7 +1316,7 @@ class AgGridColumnAdapter {
         const columnHighlight = this.adaptableApi.internalApi
             .getInternalState()
             .ColumnHighlightInfo.find((columnHighlightInfo) => {
-            return (gridCell.column.columnId === columnHighlightInfo.columnId);
+            return gridCell.column.columnId === columnHighlightInfo.columnId;
         });
         if (columnHighlight) {
             return (0, StyleHelper_1.convertAdaptableStyleToCSS)(columnHighlight.highlightStyle);

package/src/agGrid/AgGridExportAdapter.js

@@ -434,9 +434,7 @@ class AgGridExportAdapter {
         }
         const getColIdAndRawValue = () => {
             if (this.adaptableApi.columnApi.isAutoRowGroupColumn(agColumn?.getColId())) {
-                const columnId = rowNode.rowGroupColumn?.getColId() ??
-                    rowNode.rowGroupColumn?.getColDef()?.field ??
-                    rowNode.field;
+                const columnId = agColumn.getColId();
                 let rawValue = rowNode.key;
                 return { columnId, rawValue };
             }

package/src/components/Tree/TreeDropdown/index.d.ts

@@ -24,4 +24,13 @@ export type TreeDropdownProps<T extends TreeListItem<any>> = {
     clearable?: boolean;
 };
 export declare function toDisplayValueDefault(value: any[][] | string[]): string;
+/**
+ * Formats the closed TreeDropdown input using each option's `label` for the stored `value` path
+ * segments (same shape as {@link toDisplayValueDefault}, but resolves raw values to labels).
+ */
+export declare function toDisplayValueFromOptionTree<T extends {
+    value: any;
+    label: string;
+    children?: T[];
+}>(paths: any[][] | string[], options: T[]): string;
 export declare function TreeDropdown<T extends TreeListItem<any>>(props: TreeDropdownProps<T>): React.JSX.Element;

package/src/components/Tree/TreeDropdown/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toDisplayValueDefault = toDisplayValueDefault;
+exports.toDisplayValueFromOptionTree = toDisplayValueFromOptionTree;
 exports.TreeDropdown = TreeDropdown;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
@@ -28,6 +29,25 @@ function toDisplayValueDefault(value) {
     }
     return value.map((v) => (Array.isArray(v) ? v.join('-') : v)).join(', ');
 }
+/**
+ * Formats the closed TreeDropdown input using each option's `label` for the stored `value` path
+ * segments (same shape as {@link toDisplayValueDefault}, but resolves raw values to labels).
+ */
+function toDisplayValueFromOptionTree(paths, options) {
+    const valueToLabel = new Map();
+    const walk = (node) => {
+        valueToLabel.set(node.value, node.label);
+        if (Array.isArray(node.children)) {
+            node.children.forEach(walk);
+        }
+    };
+    options.forEach(walk);
+    return paths
+        .map((path) => Array.isArray(path)
+        ? path.map((segment) => valueToLabel.get(segment) ?? String(segment)).join('-')
+        : valueToLabel.get(path) ?? String(path))
+        .join(', ');
+}
 const getLabelColumn = (field, { includeExpandCollapseButton }) => {
     return {
         field,
@@ -254,7 +274,7 @@ function TreeDropdown(props) {
                     } }, children));
             } },
             React.createElement(FieldWrap_1.default, { style: props.fieldStyle, className: "twa:w-full" },
-                React.createElement(Input_1.default, { type: "text", readOnly: true, "data-name": "Select Values", "aria-expanded": visible, placeholder: props.placeholder ?? 'Select a value', className: `twa:w-full ${props.clearable ? 'twa:pr-0' : ''}`, value: props.toDisplayValue ? props.toDisplayValue(value) : toDisplayValueDefault(value), onFocus: () => {
+                React.createElement(Input_1.default, { type: "text", readOnly: true, "data-name": "Select Values", "aria-expanded": visible, placeholder: props.placeholder ?? 'Select...', className: `twa:w-full ${props.clearable ? 'twa:pr-0' : ''}`, value: props.toDisplayValue ? props.toDisplayValue(value) : toDisplayValueDefault(value), onFocus: () => {
                         if (!visible) {
                             setVisible(true);
                         }

package/src/env.js

@@ -2,6 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = {
     NEXT_PUBLIC_INFINITE_TABLE_LICENSE_KEY: "StartDate=2021-06-29|EndDate=2030-01-01|Owner=Adaptable|Type=distribution|TS=1624971462479|C=137829811,1004007071,2756196225,1839832928,3994409405,636616862" || '',
-    PUBLISH_TIMESTAMP: 1774360471339 || Date.now(),
-    VERSION: "22.0.6" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1775221059632 || Date.now(),
+    VERSION: "22.0.8" || '--current-version--',
 };

package/src/layout-manager/src/index.js

@@ -1033,6 +1033,12 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
         const shouldSkipTriggerChange = options?.skipTriggerChange === true;
         const shouldSkipEqualityCheck = options?.force === true;
         if (!shouldSkipEqualityCheck && (0, isLayoutEqual_1.isLayoutEqual)(this.currentLayout, layout)) {
+            // isLayoutEqual strips Ignore_* properties (ColumnHeaders, Filters, etc.)
+            // so even when grid-derived properties match, we must sync currentLayout
+            // to preserve any Ignore_* changes — otherwise getLayoutModelFromGrid
+            // will copy stale values from this.currentLayout
+            // this.currentLayout = layout;
+            this.silentSetCurrentLayout(layout);
             return false;
         }
         const prevCurrent = this.currentLayout;