@adaptabletools/adaptable 11.0.2 → 11.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "11.0.2",
+  "version": "11.0.3",
   "description": "Powerful data-agnostic HTML5 datagrid add-on that sits on top of an underlying grid component and provides all the rich functionality that advanced users expect from their DataGrids and Data Tables",
   "keywords": [
     "web-components",

package/publishTimestamp.d.ts

@@ -1,2 +1,2 @@
-declare const _default: 1646406406997;
+declare const _default: 1646417924493;
 export default _default;

package/publishTimestamp.js

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

package/src/Strategy/FormatColumnModule.js

@@ -19,7 +19,7 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
          * Use Case: Data (cell/row) has changed
          * Action: Any CheckboxFormatColumns need to be updated, as their disabled state may have changed
          */
-        this.api.internalApi.getDataService().on('DataChanged', () => {
+        this.api.internalApi.getDataService().on('DataChanged', (dataChangedInfo) => {
             const activeCheckboxColumnIds = this.api.columnApi
                 .getColumns()
                 .filter((aColumn) => {
@@ -27,8 +27,8 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 return checkboxFormatColumn && !checkboxFormatColumn.IsSuspended;
             })
                 .map((aColumn) => aColumn.columnId);
-            if (activeCheckboxColumnIds.length) {
-                console.log('update ', activeCheckboxColumnIds);
+            // no need to refresh the CheckboxColumns if the change was triggered by one of them
+            if (!activeCheckboxColumnIds.includes(dataChangedInfo.column.columnId)) {
                 this.api.internalApi
                     .getAdaptableInstance()
                     .refreshCells(null, activeCheckboxColumnIds, true, true);

package/src/agGrid/CheckboxRenderer.d.ts

@@ -3,6 +3,8 @@ import { AdaptableApi } from '../Api/AdaptableApi';
 import { ICellEditorComp, ICellEditorParams } from '@ag-grid-community/core/dist/cjs/es5/interfaces/iCellEditor';
 export declare const getCheckboxRendererForColumn: (columnId: string, isColumnReadOnly: boolean, api: AdaptableApi) => ICellRendererFunc;
 export declare class CheckboxEditor implements ICellEditorComp {
+    private eGui;
+    private value;
     isCancelBeforeStart(): boolean;
     init(params: ICellEditorParams): void;
     getGui(): HTMLElement;

package/src/agGrid/CheckboxRenderer.js

@@ -21,12 +21,23 @@ exports.getCheckboxRendererForColumn = (columnId, isColumnReadOnly, api) => {
                                align-items: center;
                                justify-content: center;`;
         this.eGui.appendChild(inputElement);
+        if (!inputElement.disabled) {
+            this.suppressEditEvent = this.suppressEditEvent.bind(this);
+            this.eGui.addEventListener('click', this.suppressEditEvent);
+            this.eGui.addEventListener('dblclick', this.suppressEditEvent);
+        }
     };
     CheckboxRenderer.prototype.checkedHandler = function (e) {
         let checked = e.target.checked;
         this.params.node.setDataValue(columnId, checked);
         api.formatColumnApi.fireCheckboxColumnClickedEvent(columnId, this.params.node.data, api.gridApi.getPrimaryKeyValueForRowNode(this.params.node), checked);
     };
+    CheckboxRenderer.prototype.suppressEditEvent = function (event) {
+        if (event.target === this.eGui) {
+            event.preventDefault();
+            event.stopPropagation();
+        }
+    };
     CheckboxRenderer.prototype.getGui = function () {
         return this.eGui;
     };
@@ -36,8 +47,10 @@ exports.getCheckboxRendererForColumn = (columnId, isColumnReadOnly, api) => {
         return false;
     };
     CheckboxRenderer.prototype.destroy = function () {
-        var _a, _b;
+        var _a, _b, _c, _d;
         (_b = (_a = this.eGui) === null || _a === void 0 ? void 0 : _a.firstChild) === null || _b === void 0 ? void 0 : _b.removeEventListener('click', this.checkedHandler);
+        (_c = this.eGui) === null || _c === void 0 ? void 0 : _c.removeEventListener('click', this.suppressEditEvent);
+        (_d = this.eGui) === null || _d === void 0 ? void 0 : _d.removeEventListener('dblclick', this.suppressEditEvent);
     };
     return CheckboxRenderer;
 };
@@ -47,10 +60,30 @@ class CheckboxEditor {
         // never show the editor, we edit it via the checkbox input element
         return true;
     }
-    init(params) { }
+    // the initialisation below is not required in 99% of cases,  as the editor is never shown
+    // however, using ReactUI makes some race conditions possible, in which cases the editor will be displayed for a few milliseconds
+    // we provide this logic for those few cases (to avoid a flicker effect)
+    init(params) {
+        const adaptable = params.api.__adaptable;
+        const inputElement = document.createElement('input');
+        inputElement.type = 'checkbox';
+        inputElement.checked = params.value;
+        inputElement.disabled = adaptable.api.internalApi
+            .getAdaptableInstance()
+            .isCellEditable(params.node, params.column);
+        this.eGui = document.createElement('div');
+        this.eGui.style.cssText = `display: flex;
+                               height: 100%;
+                               align-items: center;
+                               justify-content: center;`;
+        this.eGui.appendChild(inputElement);
+        this.value = params.value;
+    }
     getGui() {
-        return undefined;
+        return this.eGui;
+    }
+    getValue() {
+        return this.value;
     }
-    getValue() { }
 }
 exports.CheckboxEditor = CheckboxEditor;

package/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "11.0.2";
+declare const _default: "11.0.3";
 export default _default;

package/version.js

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