@adaptabletools/adaptable-cjs 20.1.2 → 20.1.4

package/src/components/Select/Select.d.ts

@@ -43,8 +43,10 @@ export type SelectProps<SelectValue extends unknown, IsMulti extends boolean = f
     };
     onInputChange?: (value: string) => void;
     onMenuOpen?: VoidFunction;
+    'aria-label'?: string;
     size?: 'small' | 'normal';
     isCreatable?: boolean;
     menuPortalTarget?: HTMLElement;
+    onKeyDown?: React.KeyboardEventHandler<HTMLDivElement>;
 };
 export declare const Select: <SelectValue extends unknown, IsMulti extends boolean = false>(props: SelectProps<SelectValue, IsMulti>) => React.JSX.Element;

package/src/components/Select/Select.js

@@ -369,7 +369,7 @@ const Select = function (props) {
         setInputValue(value);
         props.onInputChange?.(value);
     }, [props.onInputChange, isMulti]);
-    return (React.createElement(SelectComponent, { ref: ref, inputValue: inputValue, onInputChange: onInputChange, onFocus: onFocus, onBlur: onBlur, onMenuOpen: props.onMenuOpen, isLoading: props.isLoading, options: props.options, className: (0, join_1.default)(props.className, 'ab-Select'), isDisabled: disabled, menuPlacement: props.menuPlacement ?? 'auto', isSearchable: props.searchable, hideSelectedOptions: false, isMulti: isMulti, value: selectedOption, blurInputOnSelect: false, menuPosition: props.menuPosition ?? 'absolute', 
+    return (React.createElement(SelectComponent, { ref: ref, "aria-label": props['aria-label'], onKeyDown: props.onKeyDown, inputValue: inputValue, onInputChange: onInputChange, onFocus: onFocus, onBlur: onBlur, onMenuOpen: props.onMenuOpen, isLoading: props.isLoading, options: props.options, className: (0, join_1.default)(props.className, 'ab-Select'), isDisabled: disabled, menuPlacement: props.menuPlacement ?? 'auto', isSearchable: props.searchable, hideSelectedOptions: false, isMulti: isMulti, value: selectedOption, blurInputOnSelect: false, menuPosition: props.menuPosition ?? 'absolute', 
         // This needed so the menu is not clipped by overflow: hidden
         menuPortalTarget: props.menuPortalTarget === undefined ? document.body : null, isClearable: props.isClearable, closeMenuOnSelect: props.closeMenuOnSelect, onChange: (option) => {
             if (isMulti) {

package/src/components/SimpleButton/index.js

@@ -85,7 +85,11 @@ const SimpleButton = React.forwardRef((givenProps, theRef) => {
     const fontWeight = buttonProps.fontWeight
         ? theme_1.default[buttonProps.fontWeight] ?? buttonProps.fontWeight ?? 'normal'
         : 'normal';
-    const btn = (React.createElement(rebass_1.Button, { ...buttonProps, disabled: disabled, className: (0, join_1.default)(className, exports.baseClassName, disabled ? `${exports.baseClassName}--disabled` : '', fontWeight ? `${exports.baseClassName}--font-weight=${fontWeight}` : '', `${exports.baseClassName}--variant-${variant}`, `${exports.baseClassName}--tone-${tone}`), ref: theRef }, children));
+    const btn = (React.createElement(rebass_1.Button, { ...buttonProps, "aria-label": buttonProps['aria-label'] ||
+            buttonProps.label ||
+            tooltip ||
+            buttonProps.title ||
+            `${buttonProps.key}`, disabled: disabled, className: (0, join_1.default)(className, exports.baseClassName, disabled ? `${exports.baseClassName}--disabled` : '', fontWeight ? `${exports.baseClassName}--font-weight=${fontWeight}` : '', `${exports.baseClassName}--variant-${variant}`, `${exports.baseClassName}--tone-${tone}`), ref: theRef }, children));
     return tooltip ? React.createElement(Tooltip_1.default, { label: tooltip }, btn) : btn;
 });
 exports.default = SimpleButton;

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: 1746687680781 || Date.now(),
-    VERSION: "20.1.2" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1747747722676 || Date.now(),
+    VERSION: "20.1.4" || '--current-version--',
 };

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

@@ -245,19 +245,28 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
             : this.getTableLayoutModelFromGrid();
     }
     getPivotLayoutModelFromGrid() {
-        const pivotResultColumnsSet = new Set((this.gridApi.getPivotResultColumns() || []).map((col) => col.getColId()));
+        const pivotResultColumns = this.gridApi.getPivotResultColumns() || [];
+        const pivotResultColumnsSet = new Set(pivotResultColumns.map((col) => col.getColId()));
         const prevLayout = this.currentLayout;
         const columnState = this.gridApi
             .getColumnState()
             .filter((col) => !pivotResultColumnsSet.has(col.colId));
         let PivotColumns = this.gridApi.getPivotColumns().map((col) => col.getColId());
         const layout = this.getUndecidedLayoutModelFromGrid(columnState);
+        let ColumnWidths = layout.ColumnWidths || {};
+        //let's also include the column widths of the pivotResult columns
+        pivotResultColumns.forEach((col) => {
+            ColumnWidths[col.getColId()] = col.getActualWidth();
+        });
+        if (!Object.keys(ColumnWidths).length) {
+            ColumnWidths = undefined;
+        }
         delete layout.TableColumns;
         const pivotLayout = {
             PivotColumns,
             ColumnPinning: layout.ColumnPinning,
             ColumnSorts: layout.ColumnSorts,
-            ColumnWidths: layout.ColumnWidths,
+            ColumnWidths,
             ColumnVisibility: layout.ColumnVisibility,
             RowGroupValues: layout.RowGroupValues,
             PivotGroupedColumns: layout.RowGroupedColumns,
@@ -824,7 +833,10 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
             return acc;
         }, {});
         columnState.applyOrder = true;
-        const columnIds = getColumnOrderIdsForAllColDefs([...layout.PivotColumns, ...layout.PivotAggregationColumns.map((col) => col.ColumnId)], this.gridApi.getColumnDefs());
+        const columnIds = getColumnOrderIdsForAllColDefs([
+            ...layout.PivotColumns,
+            ...(layout.PivotAggregationColumns || []).map((col) => col.ColumnId),
+        ], this.gridApi.getColumnDefs());
         const pivotAggsToIndexes = layout.PivotAggregationColumns.reduce((acc, { ColumnId }, index) => {
             acc[ColumnId] = index;
             return acc;
@@ -1039,6 +1051,23 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
         // now recompute and apply the last one
         this.computePivotAggregations(layout, columnState);
         this.gridApi.applyColumnState(columnState);
+        // let's also include the column widths of the pivotResult columns
+        // we can't simply include those in the columnState because the columnState will also apply order
+        // but we don't want to affect the order of the pivotResult columns
+        // so we'll do it manually, and apply the widths after the columnState
+        // by using the gridApi.setColumnWidths method
+        if (layout.ColumnWidths) {
+            const colWidthForPivotResultColumns = [];
+            (this.gridApi.getPivotResultColumns() || []).forEach((col) => {
+                const colId = col.getColId();
+                if (layout.ColumnWidths[colId]) {
+                    colWidthForPivotResultColumns.push({ key: colId, newWidth: layout.ColumnWidths[colId] });
+                }
+            });
+            if (colWidthForPivotResultColumns.length) {
+                this.gridApi.setColumnWidths(colWidthForPivotResultColumns);
+            }
+        }
         this.applyPivotExpandLevel(layout);
         const hasGroupedColumns = layout.PivotGroupedColumns && layout.PivotGroupedColumns.length;
         // but also let's not forget to apply the row group values

package/src/metamodel/adaptable.metamodel.d.ts

@@ -443,6 +443,16 @@ export declare const ADAPTABLE_METAMODEL: {
         kind: string;
         desc: string;
     };
+    AdaptableFilterState: {
+        name: string;
+        kind: string;
+        desc: string;
+        props: {
+            name: string;
+            kind: string;
+            desc: string;
+        }[];
+    };
     AdaptableFlashingCell: {
         name: string;
         kind: string;
@@ -879,16 +889,6 @@ export declare const ADAPTABLE_METAMODEL: {
             desc: string;
         }[];
     };
-    AdaptableSearchState: {
-        name: string;
-        kind: string;
-        desc: string;
-        props: {
-            name: string;
-            kind: string;
-            desc: string;
-        }[];
-    };
     AdaptableSettingsPanel: {
         name: string;
         kind: string;