@adaptabletools/adaptable-cjs 18.0.15 → 18.0.17

package/src/View/Components/FilterForm/QuickFilterValues.js

@@ -127,6 +127,7 @@ const QuickFilterValues = (props) => {
         }
         return null;
     };
+    const [defaultSize, setDefaultSize] = React.useState(undefined);
     return (React.createElement(OverlayTrigger_1.default, { showEvent: showEvent, 
         // cannot hide on blur, because the form input receives the input when this is opened
         hideEvent: "mouseleave", hideDelay: 50, ref: (api) => {
@@ -140,18 +141,24 @@ const QuickFilterValues = (props) => {
             }
         }, render: ({ targetWidth }) => {
             var _a;
-            return (React.createElement(re_resizable_1.Resizable, { style: {
+            return (React.createElement(re_resizable_1.Resizable, { onResizeStop: (_e, _direction, element, _delta) => {
+                    const { width, height } = element.getBoundingClientRect();
+                    setDefaultSize({ width, height });
+                }, defaultSize: defaultSize, style: {
                     fontSize: 'var(--ab-font-size-2)',
                     border: '1px solid var(--ab-color-primarydark)',
                     background: 'var(--ab-color-defaultbackground)',
                     zIndex: 1000,
+                    display: 'flex',
+                    flexFlow: 'column',
+                    flexWrap: 'nowrap',
                 }, enable: {
                     top: false,
                     right: true,
-                    bottom: false,
+                    bottom: true,
                     left: false,
                     topRight: false,
-                    bottomRight: false,
+                    bottomRight: true,
                     bottomLeft: false,
                     topLeft: false,
                 }, minWidth: getPopoverWidth(targetWidth) },
@@ -167,13 +174,7 @@ const QuickFilterValues = (props) => {
                                 (_a = valuesDropdownRef.current) === null || _a === void 0 ? void 0 : _a.show();
                             });
                         }
-                    }, "data-name": "quick-filter-form", flexDirection: "column", style: {
-                    // fontSize: 'var(--ab-font-size-2)',
-                    // border: '1px solid var(--ab-color-primarydark)',
-                    // background: 'var(--ab-color-defaultbackground)',
-                    // zIndex: 1000,
-                    // width: getPopoverWidth(targetWidth),
-                    } },
+                    }, "data-name": "quick-filter-form", flexDirection: "column", flex: 1, display: 'flex' },
                     React.createElement(rebass_1.Flex, { m: 2 },
                         React.createElement(SimpleButton_1.default, { onClick: () => clearColumnFilter() }, "Clear Filter"),
                         ((_a = api.optionsApi.getColumnFilterOptions()) === null || _a === void 0 ? void 0 : _a.autoApplyFilter) == false && (React.createElement(SimpleButton_1.default, { ml: 2, onClick: () => {

package/src/agGrid/AdaptableAgGrid.d.ts

@@ -196,6 +196,7 @@ export declare class AdaptableAgGrid implements IAdaptable {
     getNormalisedValueFromRawValue(rawValue: any, column: AdaptableColumn): string | number | boolean | Date | unknown;
     updateColumnModelAndRefreshGrid(config?: {
         skipColDefsRefresh?: boolean;
+        preemptiveColumnStateRefresh?: boolean;
     }): void;
     redrawBody(): void;
     refreshHeader(): void;

package/src/agGrid/AdaptableAgGrid.js

@@ -1800,6 +1800,12 @@ class AdaptableAgGrid {
         if (result == undefined && rowNode.data) {
             result = rowNode.data[this.adaptableOptions.primaryKey];
         }
+        if (result == undefined && rowNode.id != undefined) {
+            // when getPrimaryKeyValueFromRowNode is called for group rows,
+            // which don't have a rowNode.data object, the result is undefined
+            // but we do have an id property on the rowNode object, so we'll use that
+            result = rowNode.id;
+        }
         return result;
     }
     getRawValueFromRowNode(rowNode, columnId) {
@@ -1877,6 +1883,9 @@ class AdaptableAgGrid {
         return rawValue;
     }
     updateColumnModelAndRefreshGrid(config) {
+        if (config === null || config === void 0 ? void 0 : config.preemptiveColumnStateRefresh) {
+            this.deriveAdaptableColumnStateFromAgGrid();
+        }
         if (!(config === null || config === void 0 ? void 0 : config.skipColDefsRefresh)) {
             this.refreshColDefs();
         }
@@ -3157,13 +3166,8 @@ class AdaptableAgGrid {
         return this.ReportService.getCellExportValueFromRawValue(rowNode, rawValue, columnId);
     }
     processCellForExcelExport(rowNode, columnId) {
-        var _a;
         if (this.api.exportApi.internalApi.isVisualDataExportInProgress()) {
-            const cellKey = this.agGridColumnAdapter.getExcelClassNameForCell(columnId, (_a = this.getPrimaryKeyValueFromRowNode(rowNode)) !== null && _a !== void 0 ? _a : rowNode.id
-            // when getPrimaryKeyValueFromRowNode is called for group rows,
-            // which don't have a rowNode.data object, the result is undefined
-            // but we do have an id property on the rowNode object, so we'll use that
-            );
+            const cellKey = this.agGridColumnAdapter.getExcelClassNameForCell(columnId, this.getPrimaryKeyValueFromRowNode(rowNode));
             const isoFormattedDate = this.ReportService.getExcelStyleWithFormattedDate(cellKey);
             if (isoFormattedDate) {
                 // this is a Date cell which will be formatted by Excel
@@ -3724,6 +3728,7 @@ class AdaptableAgGrid {
      */
     updateLayoutFromGrid() {
         var _a, _b;
+        this.logger.info('updateLayoutFromGrid()');
         const agGridApi = this.agGridAdapter.getAgGridApi();
         const columnState = agGridApi.getColumnState();
         const expandedState = agGridApi.getState().rowGroupExpansion || { expandedRowGroupIds: [] };

package/src/env.js

@@ -2,6 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = {
     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: 1716971701577 || Date.now(),
-    VERSION: "18.0.15" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1717077902341 || Date.now(),
+    VERSION: "18.0.17" || '--current-version--',
 };