@adaptabletools/adaptable-cjs 21.0.0-canary.3 → 21.0.0-canary.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable-cjs",
-  "version": "21.0.0-canary.3",
+  "version": "21.0.0-canary.5",
   "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/FilterOptions.d.ts

@@ -26,7 +26,7 @@ export interface FilterOptions<TData = any> {
      */
     clearFiltersOnStartUp?: boolean;
     /**
-     * Provide custom values (or sorting / count info) when using the `In` Filter
+     * Provide custom values (or sorting / count info) when using `In` Predicate in Column or Grid Filter
      * @param context
      * @returns
      */
@@ -208,17 +208,16 @@ export interface InFilterValue<ValueType = any> {
 /**
  * Result when providing custom values for the IN Column Filter
  */
-export type InFilterValueResult = {
+export interface InFilterValueResult {
     /**
      * List of Items to display in the IN Column Filter
      */
     values: InFilterValue[];
     /**
-     * When TRUE, displays the provided values without any filtering.
-     * When FALSE, the values are filtered based on the current search text.
+     * If true, AdapTable will not filter the list using the current search value
      */
     skipDefaultSearch?: boolean;
-};
+}
 /**
  * Information about items in the IN Column Filter
  */
@@ -249,11 +248,11 @@ export interface CustomInFilterValuesContext<TData = any> extends AdaptableColum
      */
     defaultValues: Required<InFilterValueInfo>[];
     /**
-     * Default values but Sorted based on Column's sort
+     * Default values but sorted (if Column is sorted)
      */
     sortedValues: Required<InFilterValueInfo>[];
     /**
-     * Default values but in the order in which they are currently listed in the grid - (after all the sorting has been applied, or, if no sorting, in their natural order)
+     * Default values in order which currently listed in the grid
      */
     orderedValues: Required<InFilterValueInfo>[];
     /**
@@ -261,8 +260,7 @@ export interface CustomInFilterValuesContext<TData = any> extends AdaptableColum
      */
     currentSearchValue: string;
     /**
-     * Memoized result from previous invocation. Helps avoid expensive recomputations,
-     * especially for async operations (e.g. server-side filtering).
+     * Previous filter result; avoids expensive recomputations (e.g for async op or server-side filtering)
      */
     previousFilterResult?: InFilterValueResult;
 }

package/src/Api/Internal/AlertInternalApi.js

@@ -529,7 +529,7 @@ class AlertInternalApi extends ApiBase_1.ApiBase {
                             isValidExpression &&
                                 this.getAdaptableApi()
                                     .internalApi.getQueryLanguageService()
-                                    .evaluateBooleanExpression(expression, 'Alert', rowNode, dataChangedEvent);
+                                    .evaluateBooleanExpression(expression, 'Alert', rowNode, { dataChangedEvent });
                     }
                     catch (error) {
                         isSatisfiedExpression = false;

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

@@ -1,4 +1,4 @@
-import { HeaderValueGetterParams, IRowNode } from 'ag-grid-enterprise';
+import { Column, HeaderValueGetterParams, IRowNode } from 'ag-grid-enterprise';
 import { AdaptableColumn, AdaptableFormat, AdaptablePredicateDef, ColumnScope, FormatColumn, FormatColumnConfig, FormatColumnTarget, StringFormatterOptions } from '../../types';
 import { ApiBase } from '../Implementation/ApiBase';
 export declare class FormatColumnInternalApi extends ApiBase {
@@ -85,7 +85,7 @@ export declare class FormatColumnInternalApi extends ApiBase {
      * @param column
      * @param params
      */
-    formatColumnShouldRenderInCell(formatColumn: FormatColumn, column: AdaptableColumn, rowNode: IRowNode, cellValue: any): boolean;
+    formatColumnShouldRenderInCell(formatColumn: FormatColumn, column: AdaptableColumn, rowNode: IRowNode, cellValue: any, pivotResultColumn?: Column): boolean;
     /**
      * Checks if format column is relevant for a given Column Header
      *
@@ -95,17 +95,6 @@ export declare class FormatColumnInternalApi extends ApiBase {
     formatColumnShouldRenderInHeader(formatColumn: FormatColumn, column: AdaptableColumn): boolean;
     private evaluatePredicate;
     private evaluateExpression;
-    /**
-     * Extract from the given FormatColumns only the ones which are relevant for a given cell (intersection of given AdaptableColumn and RowNode)
-     *
-     * @param formatColumns
-     * @param column
-     * @param params
-     */
-    getFormatColumnsRelevantForColumn(formatColumns: FormatColumn[], column: AdaptableColumn, params: {
-        node: IRowNode;
-        value: any;
-    }): FormatColumn[];
     /**
      * Extract from the given FormatColumns the one which is the most relevant  for a given cell (intersection of given AdaptableColumn and RowNode)
      *

package/src/Api/Internal/FormatColumnInternalApi.js

@@ -226,7 +226,7 @@ class FormatColumnInternalApi extends ApiBase_1.ApiBase {
      * @param column
      * @param params
      */
-    formatColumnShouldRenderInCell(formatColumn, column, rowNode, cellValue) {
+    formatColumnShouldRenderInCell(formatColumn, column, rowNode, cellValue, pivotResultColumn) {
         // suspended is important to be first
         if (formatColumn.IsSuspended) {
             return false;
@@ -274,7 +274,7 @@ class FormatColumnInternalApi extends ApiBase_1.ApiBase {
             return this.evaluatePredicate(formatColumn, predicateDefHandlerContext);
         } // then run the Expression
         else if (formatColumn.Rule.BooleanExpression) {
-            return this.evaluateExpression(formatColumn, rowNode);
+            return this.evaluateExpression(formatColumn, rowNode, pivotResultColumn);
         }
         // nothing has passed then return false
         return false;
@@ -298,29 +298,19 @@ class FormatColumnInternalApi extends ApiBase_1.ApiBase {
     evaluatePredicate(formatColumn, predicateDefHandlerContext) {
         return this.getPredicateApi().handleColumnPredicates(formatColumn.Rule?.Predicates, predicateDefHandlerContext, false);
     }
-    evaluateExpression(formatColumn, node) {
+    evaluateExpression(formatColumn, node, pivotResultColumn) {
         const isValidExpression = this.getExpressionApi().isValidBooleanExpression(formatColumn.Rule.BooleanExpression, ModuleConstants.FormatColumnModuleId, `Invalid format column rule '${formatColumn.Rule.BooleanExpression}'`);
         try {
             return (isValidExpression &&
                 this.getAdaptableApi()
                     .internalApi.getQueryLanguageService()
-                    .evaluateBooleanExpression(formatColumn.Rule.BooleanExpression, ModuleConstants.FormatColumnModuleId, node));
+                    .evaluateBooleanExpression(formatColumn.Rule.BooleanExpression, ModuleConstants.FormatColumnModuleId, node, { pivotResultColumn }));
         }
         catch (error) {
             (0, AdaptableLogger_1.errorOnce)(error.message);
             return false;
         }
     }
-    /**
-     * Extract from the given FormatColumns only the ones which are relevant for a given cell (intersection of given AdaptableColumn and RowNode)
-     *
-     * @param formatColumns
-     * @param column
-     * @param params
-     */
-    getFormatColumnsRelevantForColumn(formatColumns, column, params) {
-        return formatColumns.filter((formatColumn) => this.formatColumnShouldRenderInCell(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)
      *

package/src/Strategy/FlashingCellModule.js

@@ -89,7 +89,9 @@ class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                             isValidExpression &&
                                 this.api.internalApi
                                     .getQueryLanguageService()
-                                    .evaluateBooleanExpression(expression, this.moduleInfo.ModuleName, rowNode, cellDataChangedInfo);
+                                    .evaluateBooleanExpression(expression, this.moduleInfo.ModuleName, rowNode, {
+                                    dataChangedEvent: cellDataChangedInfo,
+                                });
                     }
                     catch (error) {
                         isSatisfiedExpression = false;

package/src/Utilities/ExpressionFunctions/scalarExpressionFunctions.js

@@ -64,6 +64,14 @@ exports.scalarExpressionFunctions = {
             if (!column.queryable) {
                 throw new ExpressionEvaluationError_1.ExpressionEvaluationError('COL', `Column name "${columnId}" is not queryable`);
             }
+            // see #derived_pivot_cell_style
+            if (context.pivotResultColumn) {
+                const baseColumnId = context.pivotResultColumn.getColDef()?.pivotValueColumn?.getColId();
+                if (baseColumnId === columnId) {
+                    // we evaluate the pivot result column instead of the base column
+                    return context.adaptableApi?.gridApi.getNormalisedValueFromRowNode(context.node, context.pivotResultColumn.getColId());
+                }
+            }
             return context.adaptableApi?.gridApi.getNormalisedValueFromRowNode(context.node, columnId);
         },
         description: 'Returns the value of a Column',

package/src/Utilities/Services/Interface/IQueryLanguageService.d.ts

@@ -1,6 +1,6 @@
 import { Observable } from 'rxjs';
 import { IAdaptableService } from './IAdaptableService';
-import { IRowNode } from 'ag-grid-enterprise';
+import { Column, IRowNode } from 'ag-grid-enterprise';
 import { CellDataChangedInfo } from '../../../AdaptableState/Common/CellDataChangedInfo';
 import { RowDataChangedInfo } from '../../../AdaptableState/Common/RowDataChangedInfo';
 import { AdaptableModule } from '../../../AdaptableState/Common/Types';
@@ -11,7 +11,10 @@ import { ScalarFunctionName } from '../../ExpressionFunctions/scalarExpressionFu
 import { ObservableFunctionName } from '../../ExpressionFunctions/observableExpressionFunctions';
 import { ExpressionFunctionMap } from '../../../parser/src/types';
 export interface IQueryLanguageService extends IAdaptableService {
-    evaluateBooleanExpression(expression: string, module: AdaptableModule, rowNode: IRowNode, dataChangedEvent?: CellDataChangedInfo): boolean;
+    evaluateBooleanExpression(expression: string, module: AdaptableModule, rowNode: IRowNode, evalContext?: {
+        dataChangedEvent?: CellDataChangedInfo;
+        pivotResultColumn?: Column;
+    }): boolean;
     evaluateScalarExpression(expression: string, module: AdaptableModule, rowNode: IRowNode): any;
     evaluateObservableExpression(expression: string, module: AdaptableModule): Observable<CellDataChangedInfo | RowDataChangedInfo>;
     evaluateAggregatedBooleanExpression(expression: string, module: AdaptableModule): BooleanAggregationParameter;

package/src/Utilities/Services/QueryLanguageService.d.ts

@@ -1,4 +1,4 @@
-import { IRowNode } from 'ag-grid-enterprise';
+import { Column, IRowNode } from 'ag-grid-enterprise';
 import { Observable } from 'rxjs';
 import { AdaptableApi, RowDataChangedInfo } from '../../../types';
 import { GlobalExpressionFunctionsContext } from '../../AdaptableOptions/ExpressionOptions';
@@ -16,7 +16,10 @@ export declare class QueryLanguageService implements IQueryLanguageService {
     private cacheAggregatedScalarValidation;
     private cacheModuleSpecificExpressionFunctions;
     constructor(adaptableApi: AdaptableApi);
-    evaluateBooleanExpression(expression: string, module: AdaptableModule, rowNode: any, dataChangedEvent?: CellDataChangedInfo): any;
+    evaluateBooleanExpression(expression: string, module: AdaptableModule, rowNode: any, evalContext?: {
+        dataChangedEvent?: CellDataChangedInfo;
+        pivotResultColumn?: Column;
+    }): any;
     evaluateScalarExpression(expression: string, module: AdaptableModule, rowNode: IRowNode): any;
     evaluateAggregatedScalarExpression(expression: string, module: AdaptableModule, getRowNodes?: () => IRowNode[]): ScalarAggregationParameter;
     evaluateObservableExpression(reactiveExpression: string, module: AdaptableModule): Observable<CellDataChangedInfo | RowDataChangedInfo>;

package/src/Utilities/Services/QueryLanguageService.js

@@ -21,7 +21,7 @@ class QueryLanguageService {
         this.cacheAggregatedScalarValidation = new Map();
         this.cacheModuleSpecificExpressionFunctions = new Map();
     }
-    evaluateBooleanExpression(expression, module, rowNode, dataChangedEvent) {
+    evaluateBooleanExpression(expression, module, rowNode, evalContext) {
         if (expression == undefined) {
             // should never happen, but just in case
             this.adaptableApi.logError('QueryLanguageService.evaluateBooleanExpression was called with an undefined expression');
@@ -33,7 +33,8 @@ class QueryLanguageService {
             node: rowNode,
             functions: booleanAndScalarFunctions,
             evaluateCustomQueryVariable: this.evaluateCustomQueryVariable,
-            dataChangedEvent,
+            dataChangedEvent: evalContext?.dataChangedEvent,
+            pivotResultColumn: evalContext?.pivotResultColumn,
             ...this.adaptableApi.internalApi.buildBaseContext(),
         });
     }
@@ -125,7 +126,7 @@ class QueryLanguageService {
                 newValue: 100,
                 oldValue: 150,
             };
-            this.evaluateBooleanExpression(expression, module, firstRowNode, dataChangedEvent);
+            this.evaluateBooleanExpression(expression, module, firstRowNode, { dataChangedEvent });
             const result = {
                 isValid: true,
                 errorMessage: '',

package/src/agGrid/AgGridColumnAdapter.js

@@ -319,7 +319,13 @@ class AgGridColumnAdapter {
                     const baseColumn = params.column.getColDef()?.pivotValueColumn;
                     if (baseColumn) {
                         const baseColDefCellStyle = baseColumn?.getColDef()?.cellStyle;
-                        const baseColParams = { ...params, column: baseColumn };
+                        const baseColParams = {
+                            ...params,
+                            column: baseColumn,
+                            // @ts-ignore
+                            // #derived_pivot_cell_style
+                            __pivotResultColumn: params.column,
+                        };
                         baseStyles =
                             typeof baseColDefCellStyle === 'function'
                                 ? baseColDefCellStyle(baseColParams)
@@ -1144,7 +1150,9 @@ class AgGridColumnAdapter {
             return {};
         }
         const relevantFormatColumnsWithStyle = activeFormatColumnsWithStyle.filter((formatColumn) => {
-            return this.adaptableApi.formatColumnApi.internalApi.formatColumnShouldRenderInCell(formatColumn, abColumn, params.node, params.value);
+            return this.adaptableApi.formatColumnApi.internalApi.formatColumnShouldRenderInCell(formatColumn, abColumn, params.node, params.value, 
+            // @ts-ignore see #derived_pivot_cell_style
+            params.__pivotResultColumn);
         });
         return this.getFormatColumnAdaptableStyle(relevantFormatColumnsWithStyle);
     }

package/src/components/Modal/index.d.ts

@@ -5,7 +5,6 @@ export declare const ensureLoadingScreenPortalElement: () => HTMLElement;
 export interface ModalProps extends FlexProps {
     isOpen?: boolean;
     baseZIndex?: number;
-    backdropZIndexOffset?: number;
     onBringToFront?: () => void;
 }
 export declare const Modal: React.FunctionComponent<React.PropsWithChildren<ModalProps>>;

package/src/components/Modal/index.js

@@ -11,6 +11,7 @@ const rebass_1 = require("rebass");
 const Backdrop_1 = tslib_1.__importStar(require("./Backdrop"));
 const uuid_1 = require("../utils/uuid");
 const UIHelper_1 = require("../../View/UIHelper");
+const useStacking_1 = require("../WindowModal/useStacking");
 let portalElement;
 let loadingScreenPortalElement;
 const ensurePortalElement = () => {
@@ -44,8 +45,9 @@ const Modal = (props) => {
     const uuid = (0, react_1.useMemo)(() => (0, uuid_1.createUuid)(), []);
     const counter = (0, react_1.useMemo)(() => globalCounter++, [isOpen]);
     const openTimestamp = counter;
-    const backdropZIndexOffset = props.backdropZIndexOffset || 1;
-    const zIndex = (props.baseZIndex || 2000) + counter;
+    const backdropZIndexOffset = 1;
+    const stacking = (0, useStacking_1.useStacking)();
+    const zIndex = stacking.zIndex;
     return (0, react_dom_1.createPortal)(isOpen ? (React.createElement(React.Fragment, null,
         React.createElement(Backdrop_1.default, { timestamp: openTimestamp, uuid: uuid, zIndex: zIndex - backdropZIndexOffset, onBringToFront: onBringToFront }),
         React.createElement(react_remove_scroll_1.RemoveScroll, null,

package/src/components/OverlayTrigger/index.js

@@ -17,6 +17,7 @@ const contains_1 = tslib_1.__importDefault(require("../utils/contains"));
 const UIHelper_1 = require("../../View/UIHelper");
 const InfiniteTable_1 = require("../InfiniteTable");
 const AdaptableContext_1 = require("../../View/AdaptableContext");
+const overlayBaseZIndex_1 = require("../overlayBaseZIndex");
 const getConstrainElement = (target, constrainTo) => {
     let el = null;
     if (typeof constrainTo === 'string') {
@@ -37,6 +38,7 @@ const getConstrainRect = (target, constrainTo) => {
 };
 exports.getConstrainRect = getConstrainRect;
 let portalElement;
+const OVERLAY_TRIGGER_Z_INDEX = overlayBaseZIndex_1.OVERLAY_BASE_Z_INDEX;
 const ensurePortalElement = () => {
     if (!(0, UIHelper_1.isBrowserDocumentAvailable)()) {
         return;
@@ -46,7 +48,7 @@ const ensurePortalElement = () => {
     }
     portalElement = document.createElement('div');
     portalElement.style.position = 'absolute';
-    portalElement.style.zIndex = '9999999';
+    portalElement.style.zIndex = OVERLAY_TRIGGER_Z_INDEX.toString();
     portalElement.style.top = '0px';
     portalElement.style.left = '0px';
     document.body.appendChild(portalElement);

package/src/components/Select/Select.js

@@ -13,6 +13,7 @@ const react_1 = require("react");
 const join_1 = tslib_1.__importDefault(require("../utils/join"));
 const re_resizable_1 = require("re-resizable");
 const Tooltip_1 = tslib_1.__importDefault(require("../Tooltip"));
+const overlayBaseZIndex_1 = require("../overlayBaseZIndex");
 const resizableDirections = {
     right: true,
     bottom: true,
@@ -537,7 +538,7 @@ const Select = function (props) {
             menuPortal: (baseStyle) => {
                 return {
                     ...baseStyle,
-                    zIndex: 999999,
+                    zIndex: overlayBaseZIndex_1.OVERLAY_BASE_Z_INDEX,
                     textAlign: 'left',
                 };
             },
@@ -545,7 +546,7 @@ const Select = function (props) {
             menu: (baseStyle, state) => {
                 return {
                     ...baseStyle,
-                    zIndex: 999999,
+                    zIndex: overlayBaseZIndex_1.OVERLAY_BASE_Z_INDEX,
                     boxShadow: 'var(--ab-cmp-select-menu__box-shadow)',
                     minWidth: `var(--ab-cmp-select-menu__min-width)`,
                     width: resizable ? '100%' : `${Math.max(maxLabelLength, 10)}ch`,

package/src/components/WindowModal/useStacking.js

@@ -8,6 +8,15 @@ const setZIndexMap = {};
 const zIndexMap = [];
 // starts with 3000, to be above the default zIndex of the Modal component
 const BASE_Z_INDEX = 3000;
+const Z_INDEX_GAP = 5;
+let GLOBAL_COUNTER = 0;
+const getNewOffset = () => {
+    const counter = GLOBAL_COUNTER++;
+    return counter * Z_INDEX_GAP;
+};
+const getNewZIndex = () => {
+    return BASE_Z_INDEX + getNewOffset();
+};
 /**
  * Used to facilitate the stacking between multiple opened windows.
  * When calling 'bringToFront' brings caller to top.
@@ -15,7 +24,7 @@ const BASE_Z_INDEX = 3000;
  */
 const useStacking = () => {
     const modalZIndexId = React.useMemo(() => (0, uuid_1.createUuid)(), []);
-    const [zIndex, setZIndex] = React.useState(BASE_Z_INDEX);
+    const [zIndex, setZIndex] = React.useState(getNewZIndex);
     React.useEffect(() => {
         setZIndexMap[modalZIndexId] = setZIndex;
         return () => {
@@ -34,8 +43,8 @@ const useStacking = () => {
         else {
             zIndexMap.push(modalZIndexId);
         }
-        zIndexMap.forEach((id, index) => {
-            setZIndexMap?.[id]?.(BASE_Z_INDEX + index * 10);
+        zIndexMap.forEach((id) => {
+            setZIndexMap?.[id]?.(getNewZIndex());
         });
     }, []);
     return {

package/src/components/overlayBaseZIndex.d.ts

@@ -0,0 +1 @@
+export declare const OVERLAY_BASE_Z_INDEX = 9999999;

package/src/components/overlayBaseZIndex.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OVERLAY_BASE_Z_INDEX = void 0;
+exports.OVERLAY_BASE_Z_INDEX = 9999999;

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: 1757076059447 || Date.now(),
-    VERSION: "21.0.0-canary.3" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1757191030366 || Date.now(),
+    VERSION: "21.0.0-canary.5" || '--current-version--',
 };

package/src/metamodel/adaptable.metamodel.d.ts

@@ -2464,11 +2464,19 @@ export declare const ADAPTABLE_METAMODEL: {
         name: string;
         kind: string;
         desc: string;
-        props: {
+        props: ({
             name: string;
             kind: string;
             desc: string;
-        }[];
+            isOpt?: undefined;
+            ref?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt: boolean;
+            ref: string;
+        })[];
     };
     CustomQueryVariableContext: {
         name: string;
@@ -4086,6 +4094,22 @@ export declare const ADAPTABLE_METAMODEL: {
             isOpt: boolean;
         }[];
     };
+    InFilterValueResult: {
+        name: string;
+        kind: string;
+        desc: string;
+        props: ({
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt: boolean;
+        } | {
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt?: undefined;
+        })[];
+    };
     InitialState: {
         name: string;
         kind: string;