@adaptabletools/adaptable-cjs 21.1.0-canary.2 → 21.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable-cjs",
-  "version": "21.1.0-canary.2",
+  "version": "21.1.0",
   "description": "Powerful data-agnostic HTML5 AG Grid extension which provides advanced, cutting-edge functionality to meet all DataGrid requirements",
   "keywords": [
     "web-components",

package/src/AdaptableOptions/DefaultAdaptableOptions.js

@@ -220,7 +220,7 @@ const DefaultAdaptableOptions = {
         systemFlashingCellPredicates: AdaptablePredicate_1.SystemFlashingCellPredicateIds,
         systemBadgeStylePredicates: AdaptablePredicate_1.SystemBadgeStylePredicateIds,
         caseSensitivePredicates: false,
-        evaluateInPredicateUsingTime: true,
+        evaluateInPredicateUsingTime: false,
     },
     quickSearchOptions: {
         clearQuickSearchOnStartUp: false,

package/src/AdaptableOptions/PredicateOptions.d.ts

@@ -38,8 +38,8 @@ export interface PredicateOptions {
     caseSensitivePredicates?: boolean | ((context: AdaptableColumnContext) => boolean);
     /**
      *
-     * Should Values (IN) Predicate evaluate using datetime (rather than date)
-     * @defaultValue  true
+     * Should In Predicate evaluate using datetime, rather than date (the default)
+     * @defaultValue  false
      * @noCodeItem
      */
     evaluateInPredicateUsingTime?: boolean | ((context: AdaptableColumnContext) => boolean);

package/src/Api/Events/LayoutChanged.d.ts

@@ -20,4 +20,4 @@ export interface LayoutChangedInfo extends BaseContext {
 /**
  * Trigger for Layout Changed Event
  */
-export type LayoutChangedAction = 'ADAPTABLE_READY' | 'LAYOUT_ADD' | 'LAYOUT_EDIT' | 'LAYOUT_SAVE' | 'LAYOUT_DELETE' | 'LAYOUT_SELECT' | 'LAYOUT_COLUMN_FILTER_ADD' | 'LAYOUT_COLUMN_FILTER_EDIT' | 'LAYOUT_COLUMN_FILTER_SET' | 'LAYOUT_COLUMN_FILTER_CLEAR' | 'LAYOUT_COLUMN_FILTER_CLEAR_ALL' | 'LAYOUT_COLUMN_FILTER_SUSPEND' | 'LAYOUT_COLUMN_FILTER_SUSPEND_ALL' | 'LAYOUT_COLUMN_FILTER_UNSUSPEND' | 'LAYOUT_COLUMN_FILTER_UNSUSPEND_ALL' | 'LAYOUT_GRID_FILTER_SET' | 'LAYOUT_GRID_FILTER_CLEAR' | 'LAYOUT_GRID_FILTER_SUSPEND' | 'LAYOUT_GRID_FILTER_UNSUSPEND';
+export type LayoutChangedAction = 'LAYOUT_READY' | 'LAYOUT_ADD' | 'LAYOUT_EDIT' | 'LAYOUT_SAVE' | 'LAYOUT_DELETE' | 'LAYOUT_SELECT' | 'LAYOUT_COLUMN_FILTER_ADD' | 'LAYOUT_COLUMN_FILTER_EDIT' | 'LAYOUT_COLUMN_FILTER_SET' | 'LAYOUT_COLUMN_FILTER_CLEAR' | 'LAYOUT_COLUMN_FILTER_CLEAR_ALL' | 'LAYOUT_COLUMN_FILTER_SUSPEND' | 'LAYOUT_COLUMN_FILTER_SUSPEND_ALL' | 'LAYOUT_COLUMN_FILTER_UNSUSPEND' | 'LAYOUT_COLUMN_FILTER_UNSUSPEND_ALL' | 'LAYOUT_GRID_FILTER_SET' | 'LAYOUT_GRID_FILTER_CLEAR' | 'LAYOUT_GRID_FILTER_SUSPEND' | 'LAYOUT_GRID_FILTER_UNSUSPEND';

package/src/Api/LayoutApi.d.ts

@@ -64,9 +64,9 @@ export interface LayoutApi {
     getExtendedLayoutByName(layoutName: string): ExtendedLayout | undefined;
     /**
      * Creates (or Updates) an Extended Layout
-     * @param extendedLayoutInfo extendedLayout to Create
+     * @param extendedLayout extendedLayout to Create
      */
-    createOrUpdateExtendedLayout(extendedLayoutInfo: ExtendedLayout): void;
+    createOrUpdateExtendedLayout(extendedLayout: ExtendedLayout): void;
     /**
      * Retrieves all Layouts in Adaptable State
      * @returns layouts

package/src/Strategy/LayoutModule.js

@@ -38,7 +38,7 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             if (this.api.isDestroyed()) {
                 return;
             }
-            this.api.eventApi.internalApi.fireLayoutChangedEvent('ADAPTABLE_READY', null, this.api.layoutApi.getLayoutState());
+            this.api.eventApi.internalApi.fireLayoutChangedEvent('LAYOUT_READY', null, this.api.layoutApi.getLayoutState());
         });
     }
     getModuleAdaptableObjects() {

package/src/agGrid/AdaptableAgGrid.js

@@ -3958,13 +3958,19 @@ You need to define at least one Layout!`);
         const prevLayoutForRefresh = this.__prevLayoutForRefresh || this.api.layoutApi.getCurrentLayout();
         // see #on-regroup-expect-group-column-to-be-recomputed-and-setup-properly
         const rowGroupsChanged = this.isRowGroupDifferentInLayout(prevLayoutForRefresh, layout);
-        // when grouping changes, if we have a filter on the grouped column, we need to remove it
-        // as it is no longer valid
-        if (rowGroupsChanged && layout.ColumnFilters) {
-            const newFilters = layout.ColumnFilters.filter((filter) => filter.ColumnId !== GeneralConstants_1.AG_GRID_GROUPED_COLUMN);
-            if (newFilters.length != layout.ColumnFilters.length) {
-                layout = { ...layout };
-                layout.ColumnFilters = newFilters;
+        if (rowGroupsChanged) {
+            // when grouping changes, if we have a filter on the grouped column, we need to remove it
+            // as it is no longer valid
+            if (layout.ColumnFilters) {
+                const newFilters = layout.ColumnFilters.filter((filter) => filter.ColumnId !== GeneralConstants_1.AG_GRID_GROUPED_COLUMN);
+                if (newFilters.length != layout.ColumnFilters.length) {
+                    layout = { ...layout };
+                    layout.ColumnFilters = newFilters;
+                }
+            }
+            // also we need to reset the cache for the group column, when we have rowGripDisplayType single
+            if (layout.RowGroupDisplayType === 'single') {
+                this.api.filterApi.columnFilterApi.resetFilterValues(GeneralConstants_1.AG_GRID_GROUPED_COLUMN);
             }
         }
         const hasPivotTotalsInLayout = this.hasPivotTotalsInLayout(prevLayoutForRefresh, layout);

package/src/agGrid/AgGridAdapter.js

@@ -99,6 +99,22 @@ class AgGridAdapter {
                         colDef.hide = !allDisplayedColIds.includes(colDef.colId);
                     }
                 });
+                // for pre-existing ColDefs, keep the filter property from the previous one
+                if (self.adaptableApi.optionsApi.getFilterOptions().useAdaptableFiltering) {
+                    const hasActiveFilters = self.adaptableApi.filterApi.columnFilterApi.getActiveColumnFilters().length;
+                    // theoretically we should always update the filter property
+                    // practically, only do it if there are active filters to avoid unnecessary processing
+                    if (hasActiveFilters) {
+                        self.patchColDefs(colDefsWithSpecialColumns, (colDef) => {
+                            if (colDef.filter !== false) {
+                                const originalColDef = self.getAgGridApi().getColumnDef(colDef.colId);
+                                if (originalColDef) {
+                                    colDef.filter = originalColDef.filter;
+                                }
+                            }
+                        });
+                    }
+                }
                 options['columnDefs'] = colDefsWithSpecialColumns;
                 self.logger.info(`Added SpecialColumns on GridOptions.columnDefs update (source=${source})`);
             }

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

@@ -28,7 +28,7 @@ function toDisplayValueDefault(value) {
     return value.map((v) => (Array.isArray(v) ? v.join('-') : v)).join(', ');
 }
 exports.toDisplayValueDefault = toDisplayValueDefault;
-const getLabelColumn = (field) => {
+const getLabelColumn = (field, { includeExpandCollapseButton }) => {
     return {
         field,
         defaultFlex: 1,
@@ -63,14 +63,14 @@ const getLabelColumn = (field) => {
                         api.focus();
                     } }),
                 React.createElement(rebass_1.Flex, { flex: 1 }),
-                React.createElement(SimpleButton_1.default, { label: "toggle-expand-collapse", icon: allFirstLevelCollapsed ? 'expand-all' : 'collapse-all', onMouseDown: () => {
+                includeExpandCollapseButton ? (React.createElement(SimpleButton_1.default, { label: "toggle-expand-collapse", icon: allFirstLevelCollapsed ? 'expand-all' : 'collapse-all', onMouseDown: () => {
                         if (allFirstLevelCollapsed) {
                             dataSourceApi.treeApi.expandAll();
                         }
                         else {
                             dataSourceApi.treeApi.collapseAll();
                         }
-                    }, iconPosition: "end" }, allFirstLevelCollapsed ? 'Expand All' : 'Collapse All')));
+                    }, iconPosition: "end" }, allFirstLevelCollapsed ? 'Expand All' : 'Collapse All')) : null));
         },
     };
 };
@@ -94,11 +94,6 @@ function TreeDropdown(props) {
     const [treeExpandState, setTreeExpandState] = (0, react_1.useState)(undefined);
     const [searchValue, setSearchValue] = (0, react_1.useState)('');
     const labelField = props.labelField ?? 'label';
-    const columns = (0, react_1.useMemo)(() => {
-        return {
-            label: getLabelColumn(labelField),
-        };
-    }, [labelField]);
     const [stateValue, setStateValue] = (0, react_1.useState)(props.value !== undefined ? props.value : props.defaultValue || []);
     const onChange = (0, react_1.useCallback)((value) => {
         const paths = value instanceof InfiniteTable_1.TreeSelectionState
@@ -120,6 +115,14 @@ function TreeDropdown(props) {
     const rowCount = (0, react_1.useMemo)(() => {
         return getRowCount(props.options);
     }, [props.options]);
+    const hasChildren = rowCount > props.options.length;
+    const columns = (0, react_1.useMemo)(() => {
+        return {
+            label: getLabelColumn(labelField, {
+                includeExpandCollapseButton: hasChildren,
+            }),
+        };
+    }, [labelField, hasChildren]);
     const [size, setSize] = (0, react_1.useState)({
         width: 0,
         height: rowCount * 35,
@@ -196,7 +199,13 @@ function TreeDropdown(props) {
         React.createElement(NotifyResize_1.default, { onResize: (newSize) => {
                 setWidth(newSize.width);
             } }),
-        React.createElement(OverlayTrigger_1.default, { visible: visible, targetOffset: 20, render: () => {
+        React.createElement(OverlayTrigger_1.default, { visible: visible, targetOffset: 20, alignPosition: [
+                // overlay - target
+                ['TopLeft', 'BottomLeft'],
+                ['TopRight', 'BottomRight'],
+                ['BottomLeft', 'TopLeft'],
+                ['BottomRight', 'TopRight'],
+            ], render: () => {
                 const minWidth = listSizeConstraints?.minWidth ||
                     computedCSSVars['--ab-cmp-select-menu__min-width'] ||
                     240;
@@ -208,19 +217,24 @@ function TreeDropdown(props) {
                     computedCSSVars['--ab-cmp-select-menu__max-height'] ||
                     '50vh';
                 const resizable = getProps().resizable;
-                const treeList = (React.createElement(TreeList_1.TreeList, { primaryKey: props.primaryKey ?? 'id', treeFilterFunction: filterFunction, columnHeaderHeight: 40, onReady: ({ api }) => {
+                const treeListStyle = resizable
+                    ? { ...sizeFull }
+                    : {
+                        width: size.width,
+                        height: size.height,
+                        maxWidth,
+                        minHeight,
+                        maxHeight,
+                        minWidth,
+                    };
+                if (!hasChildren) {
+                    // @ts-ignore - don't leave any space for the > expand icon, as there are no children
+                    treeListStyle['--infinite-group-row-column-nesting'] = 'var(--ab-space-2)';
+                }
+                const treeList = (React.createElement(TreeList_1.TreeList, { primaryKey: props.primaryKey ?? 'id', treeFilterFunction: filterFunction, columnHeaderHeight: 32, onReady: ({ api }) => {
                         setTreeListApi(api);
                         api.focus();
-                    }, defaultTreeExpandState: treeExpandState, onTreeExpandStateChange: setTreeExpandState, columns: columns, options: props.options, treeSelection: treeSelection, onTreeSelectionChange: (0, InfiniteTable_1.withSelectedLeafNodesOnly)(onChange), style: resizable
-                        ? sizeFull
-                        : {
-                            width: size.width,
-                            height: size.height,
-                            maxWidth,
-                            minHeight,
-                            maxHeight,
-                            minWidth,
-                        } }));
+                    }, defaultTreeExpandState: treeExpandState, onTreeExpandStateChange: setTreeExpandState, columns: columns, options: props.options, treeSelection: treeSelection, onTreeSelectionChange: (0, InfiniteTable_1.withSelectedLeafNodesOnly)(onChange), style: treeListStyle }));
                 let children = (React.createElement(rebass_1.Flex, { flexDirection: 'column', height: '100%' },
                     React.createElement(rebass_1.Flex, { backgroundColor: 'defaultbackground', p: 1, alignItems: 'center', justifyContent: 'stretch', justifyItems: 'stretch' },
                         React.createElement(Input_1.default, { "data-name": "menulist-search-input", placeholder: "Search...", style: { width: '100%' }, value: searchValue, onChange: (e) => setSearchValue(e.target.value) })),
@@ -238,7 +252,9 @@ function TreeDropdown(props) {
                             e.preventDefault();
                         } }, children));
                 }
-                return (React.createElement(rebass_1.Box, { ref: overlayDOMRef, className: "ab-TreeDropdownOverlay", "data-name": "menu-container" }, children));
+                return (React.createElement(rebass_1.Box, { ref: overlayDOMRef, className: "ab-TreeDropdownOverlay", "data-name": "menu-container", style: {
+                        fontSize: 'var(--ab-cmp-select__font-size)',
+                    } }, children));
             } },
             React.createElement(FieldWrap_1.default, { style: { width: '100%', ...props.fieldStyle } },
                 React.createElement(Input_1.default, { type: "text", readOnly: true, "data-name": "Select Values", placeholder: props.placeholder ?? 'Select a value', style: {

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: 1763392658235 || Date.now(),
-    VERSION: "21.1.0-canary.2" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1763997644941 || Date.now(),
+    VERSION: "21.1.0" || '--current-version--',
 };