@adaptabletools/adaptable 16.2.1 → 16.2.2

package/package.json

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

package/publishTimestamp.d.ts

@@ -1,2 +1,2 @@
-declare const _default: 1700847739740;
+declare const _default: 1701089574640;
 export default _default;

package/publishTimestamp.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = 1700847739740;
+exports.default = 1701089574640;

package/src/Api/Implementation/ColumnApiImpl.js

@@ -4,7 +4,6 @@ exports.ColumnApiImpl = void 0;
 const tslib_1 = require("tslib");
 const ApiBase_1 = require("./ApiBase");
 const GeneralConstants = tslib_1.__importStar(require("../../Utilities/Constants/GeneralConstants"));
-const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/ArrayExtensions"));
 const ColumnInternalApi_1 = require("../Internal/ColumnInternalApi");
 class ColumnApiImpl extends ApiBase_1.ApiBase {
@@ -58,7 +57,7 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         // put this here as there might be other indicators we are not aware of
         // perhaps with non auto groups ?
         //https://www.ag-grid.com/javascript-grid-grouping/
-        return columnId === null || columnId === void 0 ? void 0 : columnId.startsWith(GeneralConstants_1.AG_GRID_GROUPED_COLUMN);
+        return columnId === null || columnId === void 0 ? void 0 : columnId.startsWith(GeneralConstants.AG_GRID_GROUPED_COLUMN);
     }
     isAutoPivotColumn(columnId) {
         // put this here as there might be other indicators we are not aware of?

package/src/Api/Implementation/DashboardApiImpl.js

@@ -60,9 +60,11 @@ class DashboardApiImpl extends ApiBase_1.ApiBase {
             return document.getElementById(this.internalApi.getCustomToolbarRenderContainerId(customToolbarName));
         }
         if (customToolbar.toolbarButtons) {
+            this.logWarn(`(get/set)CustomToolbarHTMLElement(${customToolbarName}) should only be used in Vanilla AdapTable for toolbars created via a 'render' function! For React/Adaptable components let the framework renderer handle it!`);
             return document.getElementById(this.internalApi.getCustomToolbarButtonsContainerId(customToolbarName));
         }
         if (customToolbar.frameworkComponent) {
+            this.logWarn(`(get/set)CustomToolbarHTMLElement(${customToolbarName}) should only be used in Vanilla AdapTable for toolbars created via a 'render' function! For React/Adaptable components let the framework renderer handle it!`);
             return document.getElementById(this.internalApi.getCustomToolbarComponentContainerId(customToolbarName));
         }
     }

package/src/Api/Internal/DashboardInternalApi.js

@@ -12,11 +12,21 @@ class DashboardInternalApi extends ApiBase_1.ApiBase {
         const isToolbarStateChangedToVisible = (toolbarName) => {
             const visibleInNewState = this.isToolbarInActiveTab(toolbarName, newDashboardState);
             const visibleInOldState = this.isToolbarInActiveTab(toolbarName, oldDashboardState);
+            if (visibleInNewState && visibleInOldState) {
+                // check for dashboard collapse/expand/hidden changes
+                return ((oldDashboardState.IsCollapsed && !newDashboardState.IsCollapsed) ||
+                    (oldDashboardState.IsHidden && !newDashboardState.IsHidden));
+            }
             return visibleInNewState && !visibleInOldState;
         };
         const isToolbarStateChangedToHidden = (toolbarName) => {
             const visibleInNewState = this.isToolbarInActiveTab(toolbarName, newDashboardState);
             const visibleInOldState = this.isToolbarInActiveTab(toolbarName, oldDashboardState);
+            if (visibleInNewState && visibleInOldState) {
+                // check for dashboard collapse/expand/hidden changes
+                return ((!oldDashboardState.IsCollapsed && newDashboardState.IsCollapsed) ||
+                    (!oldDashboardState.IsHidden && newDashboardState.IsHidden));
+            }
             return visibleInOldState && !visibleInNewState;
         };
         const dashboardChangedInfo = {
@@ -30,7 +40,7 @@ class DashboardInternalApi extends ApiBase_1.ApiBase {
             adaptableId: this.adaptable.api.optionsApi.getAdaptableId(),
         };
         if (!(0, isEqual_1.default)(oldDashboardState, newDashboardState)) {
-            this.adaptable.api.eventApi.emitSync('DashboardChanged', dashboardChangedInfo);
+            setTimeout(() => this.adaptable.api.eventApi.emit('DashboardChanged', dashboardChangedInfo));
         }
     }
     isToolbarInActiveTab(toolbarName, dashboardState) {

package/src/agGrid/Adaptable.js

@@ -1626,7 +1626,7 @@ class Adaptable {
             .columnApi.getColumnState()
             .reduce((acc, col) => {
             var _a;
-            if (col.colId === (GeneralConstants === null || GeneralConstants === void 0 ? void 0 : GeneralConstants.AG_GRID_GROUPED_COLUMN)) {
+            if (this.api.columnApi.isAutoRowGroupColumn(col.colId)) {
                 const widthInLayout = (_a = layout.ColumnWidthMap) === null || _a === void 0 ? void 0 : _a[col.colId];
                 if (widthInLayout && widthInLayout !== col.width) {
                     acc.push(Object.assign(Object.assign({}, col), { width: widthInLayout }));

package/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "16.2.1";
+declare const _default: "16.2.2";
 export default _default;

package/version.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = '16.2.1'; // PLEASE DONT UPDATE THIS!!! - will be updated at build time with the correct version
+exports.default = '16.2.2'; // PLEASE DONT UPDATE THIS!!! - will be updated at build time with the correct version

package/src/agGrid/GroupCellRenderer.d.ts

@@ -1,5 +0,0 @@
-import { GroupCellRenderer } from '@ag-grid-community/core';
-export declare class AdaptableGroupCellRenderer extends GroupCellRenderer {
-    constructor();
-    init(params: any): void;
-}

package/src/agGrid/GroupCellRenderer.js

@@ -1,82 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AdaptableGroupCellRenderer = void 0;
-const tslib_1 = require("tslib");
-const core_1 = require("@ag-grid-community/core");
-const ArrayExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/ArrayExtensions"));
-const GeneralConstants_1 = require("../Utilities/Constants/GeneralConstants");
-const TEMPLATE = 
-/* html */
-`<span class="ag-cell-wrapper">
-        <span class="ag-group-expanded" ref="eExpanded"></span>
-        <span class="ag-group-contracted" ref="eContracted"></span>
-        <span class="ag-group-checkbox ag-invisible" ref="eCheckbox"></span>
-        <span class="ag-group-value" ref="eValue"></span>
-        <span class="ag-group-child-count" ref="eChildCount"></span>
-    </span>`;
-class AdaptableGroupCellRenderer extends core_1.GroupCellRenderer {
-    constructor() {
-        super();
-        this.setTemplate(TEMPLATE);
-    }
-    init(params) {
-        //@ts-ignore
-        this.params = params;
-        //@ts-ignore
-        if (this.gridOptionsWrapper.isGroupIncludeTotalFooter()) {
-            //@ts-ignore
-            this.assignBlankValueToGroupFooterCell(params);
-        }
-        //@ts-ignore
-        const embeddedRowMismatch = this.isEmbeddedRowMismatch();
-        // This allows for empty strings to appear as groups since
-        // it will only return for null or undefined.
-        const nullValue = params.value == null;
-        let skipCell = false;
-        // if the groupCellRenderer is inside of a footer and groupHideOpenParents is true
-        // we should only display the groupCellRenderer if the current column is the rowGroupedColumn
-        if (
-        //@ts-ignore
-        this.gridOptionsWrapper.isGroupIncludeFooter() &&
-            //@ts-ignore
-            this.gridOptionsWrapper.isGroupHideOpenParents()) {
-            const node = params.node;
-            if (node.footer) {
-                const showRowGroup = params.colDef && params.colDef.showRowGroup;
-                const rowGroupColumnId = node.rowGroupColumn && node.rowGroupColumn.getColId();
-                skipCell = showRowGroup !== rowGroupColumnId;
-            }
-        }
-        let skipExpandTool = false;
-        if (params.node.leafGroup == true) {
-            const displayedCols = params.columnApi.getAllDisplayedColumns();
-            if (displayedCols && displayedCols.length > 0) {
-                const nonGroupingCols = displayedCols.map((col) => {
-                    if (!col.getColId().startsWith(GeneralConstants_1.AG_GRID_GROUPED_COLUMN)) {
-                        return col;
-                    }
-                });
-                skipExpandTool = ArrayExtensions_1.default.IsNullOrEmpty(nonGroupingCols.filter((c) => c != undefined));
-            }
-        }
-        //@ts-ignore
-        this.cellIsBlank = embeddedRowMismatch || nullValue || skipCell;
-        //@ts-ignore
-        if (this.cellIsBlank) {
-            return;
-        }
-        //@ts-ignore
-        this.setupDragOpenParents();
-        if (!skipExpandTool) {
-            //@ts-ignore
-            this.addExpandAndContract();
-        }
-        //@ts-ignore
-        this.addCheckboxIfNeeded();
-        //@ts-ignore
-        this.addValueElement();
-        //@ts-ignore
-        this.setupIndent();
-    }
-}
-exports.AdaptableGroupCellRenderer = AdaptableGroupCellRenderer;