@adaptabletools/adaptable 18.0.0-canary.29 → 18.0.0-canary.30

package/package.json

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

package/src/AdaptableInterfaces/IAdaptable.d.ts

@@ -238,7 +238,8 @@ export interface IAdaptable {
     getRowCount(): number;
     getColumnCount(): number;
     getVisibleColumnCount(): number;
-    isGridSelectable(): boolean;
+    isGridRangeSelectable(): boolean;
+    isGridRowSelectable(): boolean;
     isGridGroupingActive(): boolean;
     getAgGridCurrentThemeName(): string;
     applyAdaptableTheme(theme: AdaptableTheme | string): void;

package/src/Api/GridApi.d.ts

@@ -359,9 +359,19 @@ export interface GridApi {
      */
     isGridGroupable(): boolean;
     /**
-     * Whether AdapTable instance offers cell selection
+     * Whether AdapTable instance offers row selection
+     *
+     * @deprecated use `isGridRowSelectable()` instead
      */
     isGridSelectable(): boolean;
+    /**
+     * Whether AdapTable instance offers row selection
+     */
+    isGridRowSelectable(): boolean;
+    /**
+     * Whether AdapTable instance offers cell range selection
+     */
+    isGridRangeSelectable(): boolean;
     /**
      * Whether Grid is currently showing Row Groups
      */

package/src/Api/Implementation/GridApiImpl.d.ts

@@ -94,6 +94,8 @@ export declare class GridApiImpl extends ApiBase implements GridApi {
     isGridPivotable(): boolean;
     isGridGroupable(): boolean;
     isGridSelectable(): boolean;
+    isGridRowSelectable(): boolean;
+    isGridRangeSelectable(): boolean;
     isGridRowGrouped(): boolean;
     isGridInPivotMode(): boolean;
     isGroupRowNode(rowNode: IRowNode): boolean;

package/src/Api/Implementation/GridApiImpl.js

@@ -356,7 +356,14 @@ export class GridApiImpl extends ApiBase {
         return !this.getAdaptableApi().internalApi.isGridInTreeMode();
     }
     isGridSelectable() {
-        return this.adaptable.isGridSelectable();
+        logDeprecation(this.adaptable.logger, 'GridApi', 'isGridSelectable', 'isGridRowSelectable');
+        return this.isGridRowSelectable();
+    }
+    isGridRowSelectable() {
+        return this.adaptable.isGridRowSelectable();
+    }
+    isGridRangeSelectable() {
+        return this.adaptable.isGridRangeSelectable();
     }
     isGridRowGrouped() {
         return this.adaptable.isGridGroupingActive();

package/src/Api/Internal/FormatColumnInternalApi.d.ts

@@ -84,10 +84,7 @@ export declare class FormatColumnInternalApi extends ApiBase {
      * @param column
      * @param params
      */
-    isFormatColumnRelevantForColumn(formatColumn: FormatColumn, column: AdaptableColumn, params: {
-        node: IRowNode;
-        value: any;
-    }): boolean;
+    formatColumnShouldRender(formatColumn: FormatColumn, column: AdaptableColumn, rowNode: IRowNode, cellValue: any): boolean;
     private evaluatePredicate;
     private evaluateExpression;
     /**

package/src/Api/Internal/FormatColumnInternalApi.js

@@ -154,29 +154,29 @@ export class FormatColumnInternalApi extends ApiBase {
      * @param column
      * @param params
      */
-    isFormatColumnRelevantForColumn(formatColumn, column, params) {
-        var _a, _b, _c, _d;
+    formatColumnShouldRender(formatColumn, column, rowNode, cellValue) {
+        var _a, _b, _c;
         // suspended is important to be first
         if (formatColumn.IsSuspended) {
             return false;
         }
         if (!formatColumn.IncludeGroupedRows &&
-            this.getAdaptableApi().gridApi.isGroupRowNode(params.node)) {
+            this.getAdaptableApi().gridApi.isGroupRowNode(rowNode)) {
             return false;
         }
-        if (!formatColumn.IncludeRowSummaries && ((_b = (_a = params.node) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b[ROW_SUMMARY_ROW_ID])) {
+        if (!formatColumn.IncludeRowSummaries && ((_a = rowNode === null || rowNode === void 0 ? void 0 : rowNode.data) === null || _a === void 0 ? void 0 : _a[ROW_SUMMARY_ROW_ID])) {
             return false;
         }
         if (!formatColumn.Rule) {
             return true;
         }
         // first run the predicate
-        if (formatColumn.Rule.Predicates && ((_d = (_c = formatColumn.Rule) === null || _c === void 0 ? void 0 : _c.Predicates) === null || _d === void 0 ? void 0 : _d.length)) {
-            const predicateDefHandlerContext = Object.assign({ value: params.value, oldValue: null, displayValue: params.value, node: params.node, column: column }, this.getAdaptableApi().internalApi.buildBaseContext());
+        if (formatColumn.Rule.Predicates && ((_c = (_b = formatColumn.Rule) === null || _b === void 0 ? void 0 : _b.Predicates) === null || _c === void 0 ? void 0 : _c.length)) {
+            const predicateDefHandlerContext = Object.assign({ value: cellValue, oldValue: null, displayValue: cellValue, node: rowNode, column: column }, this.getAdaptableApi().internalApi.buildBaseContext());
             return this.evaluatePredicate(formatColumn, predicateDefHandlerContext);
-        }
+        } // then run the Expression
         else if (formatColumn.Rule.BooleanExpression) {
-            return this.evaluateExpression(formatColumn, params.node);
+            return this.evaluateExpression(formatColumn, rowNode);
         }
         // nothing has passed then return false
         return false;
@@ -200,7 +200,7 @@ export class FormatColumnInternalApi extends ApiBase {
      * @param params
      */
     getFormatColumnsRelevantForColumn(formatColumns, column, params) {
-        return formatColumns.filter((formatColumn) => this.isFormatColumnRelevantForColumn(formatColumn, column, params));
+        return formatColumns.filter((formatColumn) => this.formatColumnShouldRender(formatColumn, column, params.node, params.value));
     }
     /**
      * Extract from the given FormatColumns the one which is the most relevant  for a given cell (intersection of given AdaptableColumn and RowNode)
@@ -210,7 +210,7 @@ export class FormatColumnInternalApi extends ApiBase {
      * @param params
      */
     getMostRelevantFormatColumnForColumn(formatColumns, column, params) {
-        return formatColumns.find((formatColumn) => this.isFormatColumnRelevantForColumn(formatColumn, column, params));
+        return formatColumns.find((formatColumn) => this.formatColumnShouldRender(formatColumn, column, params.node, params.value));
     }
     /**
      * Retrieves all Format Columns which have an Expression

package/src/PredefinedConfig/FormatColumnState.d.ts

@@ -41,12 +41,13 @@ export interface FormatColumn extends SuspendableObject {
      */
     CellAlignment?: 'Left' | 'Right' | 'Center';
     /**
-     * Whether to Format the Column in Grouped Rows
+     * Interop.io to Format the Column in Grouped Rows
      * @defaultValue false
      */
     IncludeGroupedRows?: boolean;
     /**
-     * Wehther to include Row Summary Rows
+     * Interop.io to include Row Summary Rows
+     * @defaultValue false
      */
     IncludeRowSummaries?: boolean;
 }

package/src/Utilities/Services/ReportService.js

@@ -84,8 +84,11 @@ export class ReportService {
             reportName == VISUAL_DATA_REPORT);
     }
     IsSystemReportActive(reportName) {
-        if (reportName == SELECTED_CELLS_REPORT || reportName == SELECTED_ROWS_REPORT) {
-            return this.adaptableApi.gridApi.isGridSelectable();
+        if (reportName == SELECTED_CELLS_REPORT) {
+            return this.adaptableApi.gridApi.isGridRangeSelectable();
+        }
+        if (reportName == SELECTED_ROWS_REPORT) {
+            return this.adaptableApi.gridApi.isGridRowSelectable();
         }
         if (reportName === VISUAL_DATA_REPORT) {
             return this.adaptableApi.exportApi

package/src/agGrid/AdaptableAgGrid.d.ts

@@ -159,7 +159,8 @@ export declare class AdaptableAgGrid implements IAdaptable {
     getAdaptableContainerElement(): HTMLElement | null;
     refreshSelectedCellsState(): SelectedCellInfo | undefined;
     refreshSelectedRowsState(): SelectedRowInfo | undefined;
-    isGridSelectable(): boolean;
+    isGridRowSelectable(): boolean;
+    isGridRangeSelectable(): boolean;
     private initAdaptableStore;
     private mapAdaptableStateToAgGridState;
     private addGridEventListeners;

package/src/agGrid/AdaptableAgGrid.js

@@ -1127,10 +1127,7 @@ export class AdaptableAgGrid {
     // This method returns selected cells ONLY (if selection mode is cells or multiple cells).
     // If the selection mode is row it will returns nothing - use the setSelectedRows() method
     refreshSelectedCellsState() {
-        var _a;
-        const isRangeSelectionModuleRegistered = this.agGridAdapter.isModulePresent(ModuleNames.RangeSelectionModule);
-        if (!isRangeSelectionModuleRegistered ||
-            !((_a = this.agGridAdapter.getLiveGridOptions()) === null || _a === void 0 ? void 0 : _a.enableRangeSelection) === true) {
+        if (!this.isGridRangeSelectable()) {
             return;
         }
         const selectedCellInfo = this.agGridAdapter.deriveSelectedCellInfoFromAgGrid();
@@ -1141,8 +1138,8 @@ export class AdaptableAgGrid {
         return selectedCellInfo;
     }
     refreshSelectedRowsState() {
-        if (!this.isGridSelectable()) {
-            return undefined;
+        if (!this.isGridRowSelectable()) {
+            return;
         }
         const selectedRowInfo = this.agGridAdapter.deriveSelectedRowInfoFromAgGrid();
         this.api.gridApi.internalApi.setSelectedRows(selectedRowInfo);
@@ -1150,10 +1147,14 @@ export class AdaptableAgGrid {
         this.api.eventApi.emit('RowSelectionChanged', rowSelectionChangedInfo);
         return selectedRowInfo;
     }
-    isGridSelectable() {
+    isGridRowSelectable() {
         const rowSelection = this.agGridAdapter.getAgGridApi().getGridOption('rowSelection');
         return rowSelection === 'single' || rowSelection === 'multiple';
     }
+    isGridRangeSelectable() {
+        return (this.agGridAdapter.isModulePresent(ModuleNames.RangeSelectionModule) &&
+            this.agGridAdapter.getGridOption('enableRangeSelection'));
+    }
     initAdaptableStore() {
         const perfNewAdaptableStore = this.logger.beginPerf(`initAdaptableStore()`);
         const adaptableStore = new AdaptableStore(this);

package/src/agGrid/AgGridColumnAdapter.js

@@ -604,7 +604,7 @@ export class AgGridColumnAdapter {
             .map((formatColumn) => {
             var _a, _b;
             if (((_a = formatColumn.Style) === null || _a === void 0 ? void 0 : _a.ClassName) &&
-                this.adaptableApi.formatColumnApi.internalApi.isFormatColumnRelevantForColumn(formatColumn, abColumn, params)) {
+                this.adaptableApi.formatColumnApi.internalApi.formatColumnShouldRender(formatColumn, abColumn, params.node, params.value)) {
                 return (_b = formatColumn.Style) === null || _b === void 0 ? void 0 : _b.ClassName;
             }
         })
@@ -729,7 +729,7 @@ export class AgGridColumnAdapter {
             return {};
         }
         const relevantFormatColumnsWithStyle = activeFormatColumnsWithStyle.filter((formatColumn) => {
-            return this.adaptableApi.formatColumnApi.internalApi.isFormatColumnRelevantForColumn(formatColumn, abColumn, params);
+            return this.adaptableApi.formatColumnApi.internalApi.formatColumnShouldRender(formatColumn, abColumn, params.node, params.value);
         });
         return this.getFormatColumnAdaptableStyle(relevantFormatColumnsWithStyle);
     }

package/src/env.js

@@ -1,5 +1,5 @@
 export 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: 1712751917039 || Date.now(),
-    VERSION: "18.0.0-canary.29" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1712760567298 || Date.now(),
+    VERSION: "18.0.0-canary.30" || '--current-version--',
 };