@adaptabletools/adaptable 13.0.0-canary.0 → 13.0.0-canary.10

package/index.css

@@ -3733,6 +3733,7 @@ input[type='number'].ab-Input:hover::-webkit-inner-spin-button:active {
       display: table-cell; }
 
 .ab-ToggleButton {
+  user-select: none;
   position: relative;
   display: inline-block;
   min-width: 40px;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "13.0.0-canary.0",
+  "version": "13.0.0-canary.10",
   "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",
@@ -39,10 +39,10 @@
     "normalize.css": "^8.0.1",
     "prop-types": "^15.6.2",
     "re-resizable": "^6.9.1",
-    "react": "^16.8.0 || ^17.0.0",
+    "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
     "react-beautiful-dnd": "13.1.0",
     "react-day-picker": "8.0.6",
-    "react-dom": "^16.8.0 || ^17.0.0",
+    "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0",
     "react-redux": "7.2.4",
     "react-remove-scroll": "2.4.2",
     "react-toastify": "9.0.7",

package/publishTimestamp.d.ts

@@ -1,2 +1,2 @@
-declare const _default: 1663062619888;
+declare const _default: 1663591315752;
 export default _default;

package/publishTimestamp.js

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

package/src/AdaptableInterfaces/IAdaptable.d.ts

@@ -1,4 +1,4 @@
-import { ChartModel, ChartRef, Column, GridOptions, RowNode } from '@ag-grid-community/core';
+import { ChartModel, ChartRef, Column, GridOptions, ModuleNames, RowNode } from '@ag-grid-community/core';
 import { AdaptableApi } from '../Api/AdaptableApi';
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
 import { ColumnSort } from '../PredefinedConfig/Common/ColumnSort';
@@ -27,6 +27,7 @@ import { AdaptableFrameworkComponent } from '../AdaptableOptions/AdaptableFramew
 import { IMetamodelService } from '../Utilities/Services/Interface/IMetamodelService';
 import { ColumnValuesComparer } from '../AdaptableOptions/GeneralOptions';
 import { IRowEditService } from '../Utilities/Services/Interface/IRowEditService';
+import { RenderReactRootFn } from '../renderReactRoot';
 /**
  *  The only interface for Adaptable
  *
@@ -35,6 +36,8 @@ import { IRowEditService } from '../Utilities/Services/Interface/IRowEditService
  * Should only be used internally as all external access is via the Api
  */
 export interface IAdaptable {
+    supressReact18RenderWarning: boolean;
+    renderReactRoot: RenderReactRootFn;
     api: AdaptableApi;
     adaptableOptions: AdaptableOptions;
     adaptableStore: IAdaptableStore;
@@ -213,6 +216,8 @@ export interface IAdaptable {
     exportVisualDataToExcel(): void;
     canGenerateCharts(): boolean;
     canHaveSparklines(): boolean;
+    showCharts(charts: ChartModel[]): ChartRef[];
+    getChartModels(): ChartModel[];
     getCurrentIPPStyle(): IPPStyle;
     getDefaultIPPStyle(): IPPStyle;
     getRowCount(): number;
@@ -252,6 +257,5 @@ export interface IAdaptable {
         skipSetupColumns?: boolean;
     }): void;
     getAgGridColumnForColumnId(columnId: string): Column;
-    showCharts(charts: ChartModel[]): ChartRef[];
-    getChartModels(): ChartModel[];
+    isAgGridModulePresent(moduleName: ModuleNames): boolean;
 }

package/src/AdaptableOptions/AdaptableOptions.d.ts

@@ -50,8 +50,6 @@ export interface AdaptableOptions {
     autogeneratePrimaryKey?: boolean;
     /**
      * The AG Grid object which AdapTable interacts with.  Note: if using AdapTable React or AdapTable Angular, no need to populate this property as AdapTable wires it up differently
-     *
-     * @defaultValue n/a (Mandatory)
      */
     gridOptions?: GridOptions;
     /**

package/src/AdaptableOptions/AdaptableQLOptions.d.ts

@@ -1,8 +1,13 @@
-import { ExpressionFunctionMap } from '../parser/src/types';
+import { ExpressionFunction } from '../parser/src/types';
 import { AdaptablePredicateDef } from '../PredefinedConfig/Common/AdaptablePredicate';
 import { AdaptableModule, AdaptableQLModule, AdaptableQLModules } from '../PredefinedConfig/Common/Types';
 import { BaseContext } from '../PredefinedConfig/Common/BaseContext';
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
+import { BooleanFunctionName } from '../Utilities/ExpressionFunctions/booleanExpressionFunctions';
+import { ScalarFunctionName } from '../Utilities/ExpressionFunctions/scalarExpressionFunctions';
+import { ObservableFunctionName } from '../Utilities/ExpressionFunctions/observableExpressionFunctions';
+import { AggregatedBooleanFunctionName } from '../Utilities/ExpressionFunctions/aggregatedBooleanExpressionFunctions';
+import { AggregatedScalarFunctionName } from '../Utilities/ExpressionFunctions/aggregatedScalarExpressionFunctions';
 /**
  * Options for managing AdaptableQL - the Adaptable Query Language which evaluates Predicates and Expressions
  */
@@ -36,7 +41,7 @@ export interface AdaptableQLOptions {
      */
     customPredicateDefs?: AdaptablePredicateDef[];
     /**
-     * Reference a Column's Header (Friendlyname) in all Expression overviews (instead of ColumnId)
+     * Reference a Column's Header (FriendlyName) in all Expression overviews (instead of ColumnId)
      *
      * @defaultValue true
      */
@@ -47,49 +52,61 @@ export interface AdaptableQLOptions {
  */
 export interface ExpressionOptions {
     /**
-     * Boolean Expression Functions available in AdaptableQL
+     * System (built-in) Boolean Expression Functions available in AdaptableQL
      *
      * @defaultValue null (sets all)
      * @gridInfoItem
      */
-    defaultBooleanFunctions?: ExpressionFunctionMap;
+    systemBooleanFunctions?: BooleanFunctionName[] | ((context: GlobalExpressionFunctionsContext<BooleanFunctionName>) => BooleanFunctionName[]);
     /**
-     * Scalar Expression Functions available in AdaptableQL
+     * Custom (user defined) Boolean Expression Functions available in AdaptableQL
      *
-     * @defaultValue null (sets all)
+     * @defaultValue null (none)
      * @gridInfoItem
      */
-    defaultScalarFunctions?: ExpressionFunctionMap;
+    customBooleanFunctions?: Record<string, ExpressionFunction> | ((context: GlobalExpressionFunctionsContext<BooleanFunctionName>) => Record<string, ExpressionFunction>);
     /**
-     * Observable Expression Functions available in AdaptableQL
+     * System (built-in) Scalar Expression Functions available in AdaptableQL
      *
      * @defaultValue null (sets all)
      * @gridInfoItem
      */
-    defaultObservableFunctions?: ExpressionFunctionMap;
+    systemScalarFunctions?: ScalarFunctionName[] | ((context: GlobalExpressionFunctionsContext<ScalarFunctionName>) => ScalarFunctionName[]);
     /**
-     * Aggregated Boolean Expression Functions available in AdaptableQL
+     * Custom (user defined) Scalar Expression Functions available in AdaptableQL
+     *
+     * @defaultValue null (none)
+     * @gridInfoItem
+     */
+    customScalarFunctions?: Record<string, ExpressionFunction> | ((context: GlobalExpressionFunctionsContext<ScalarFunctionName>) => Record<string, ExpressionFunction>);
+    /**
+     * System (built-in) Observable Expression Functions available in AdaptableQL
      *
      * @defaultValue null (sets all)
      * @gridInfoItem
      */
-    defaultAggregatedBooleanFunctions?: ExpressionFunctionMap;
+    systemObservableFunctions?: ObservableFunctionName[] | ((context: GlobalExpressionFunctionsContext<ObservableFunctionName>) => ObservableFunctionName[]);
     /**
-     * Aggregated Scalar Expression Functions available in AdaptableQL
+     * System (built-in) AggregatedBoolean Expression Functions available in AdaptableQL
      *
      * @defaultValue null (sets all)
      * @gridInfoItem
      */
-    defaultAggregatedScalarFunctions?: ExpressionFunctionMap;
+    systemAggregatedBooleanFunctions?: AggregatedBooleanFunctionName[] | ((context: GlobalExpressionFunctionsContext<AggregatedBooleanFunctionName>) => AggregatedBooleanFunctionName[]);
     /**
-     * Module specific ExpressionFunctions; if not defined, it falls back to the defined default values
+     * System (built-in) AggregatedScalar Expression Functions available in AdaptableQL
      *
-     * @defaultValue undefined (defaults to default values)
+     * @defaultValue undefined (sets all)
      * @gridInfoItem
      */
-    moduleExpressionFunctions?: {
-        [module in AdaptableModule]?: ModuleExpressionFunctions;
-    };
+    systemAggregatedScalarFunctions?: AggregatedScalarFunctionName[] | ((context: GlobalExpressionFunctionsContext<AggregatedScalarFunctionName>) => AggregatedScalarFunctionName[]);
+    /**
+     * Module specific ExpressionFunctions; if not defined, it falls back to the generally defined system and custom values
+     *
+     * @defaultValue undefined (defaults to available system & custom values)
+     * @gridInfoItem
+     */
+    moduleExpressionFunctions?: ModuleExpressionFunctionsMap | ((context: ModuleExpressionFunctionsContext) => ModuleExpressionFunctions | undefined);
     /**
      * Columns that can be included in AdaptableQL Expressions; leave unset to include **ALL**, provide empty array to set **NONE**
      *
@@ -119,12 +136,80 @@ export interface ExpressionOptions {
 /**
  * Module specific Expression Functions
  */
+export declare type ModuleExpressionFunctionsMap = Partial<Record<AdaptableModule, ModuleExpressionFunctions>>;
+/**
+ * Type specific Expression Functions
+ */
 export interface ModuleExpressionFunctions {
-    booleanFunctions?: ExpressionFunctionMap;
-    scalarFunctions?: ExpressionFunctionMap;
-    observableFunctions?: ExpressionFunctionMap;
-    aggregatedBooleanFunctions?: ExpressionFunctionMap;
-    aggregatedScalarFunctions?: ExpressionFunctionMap;
+    /**
+     * System (built-in) Boolean Expression Functions available in AdaptableQL
+     *
+     * @defaultValue null (sets all)
+     * @gridInfoItem
+     */
+    systemBooleanFunctions?: BooleanFunctionName[] | ((context: GlobalExpressionFunctionsContext<BooleanFunctionName>) => BooleanFunctionName[]);
+    /**
+     * Custom (user defined) Boolean Expression Functions available in AdaptableQL
+     *
+     * @defaultValue null (none)
+     * @gridInfoItem
+     */
+    customBooleanFunctions?: Record<string, ExpressionFunction> | ((context: GlobalExpressionFunctionsContext<BooleanFunctionName>) => Record<string, ExpressionFunction>);
+    /**
+     * System (built-in) Scalar Expression Functions available in AdaptableQL
+     *
+     * @defaultValue null (sets all)
+     * @gridInfoItem
+     */
+    systemScalarFunctions?: ScalarFunctionName[] | ((context: GlobalExpressionFunctionsContext<ScalarFunctionName>) => ScalarFunctionName[]);
+    /**
+     * Custom (user defined) Scalar Expression Functions available in AdaptableQL
+     *
+     * @defaultValue null (none)
+     * @gridInfoItem
+     */
+    customScalarFunctions?: Record<string, ExpressionFunction> | ((context: GlobalExpressionFunctionsContext<ScalarFunctionName>) => Record<string, ExpressionFunction>);
+    /**
+     * System (built-in) Observable Expression Functions available in AdaptableQL
+     *
+     * @defaultValue null (sets all)
+     * @gridInfoItem
+     */
+    systemObservableFunctions?: ObservableFunctionName[] | ((context: GlobalExpressionFunctionsContext<ObservableFunctionName>) => ObservableFunctionName[]);
+    /**
+     * System (built-in) AggregatedBoolean Expression Functions available in AdaptableQL
+     *
+     * @defaultValue null (sets all)
+     * @gridInfoItem
+     */
+    systemAggregatedBooleanFunctions?: AggregatedBooleanFunctionName[] | ((context: GlobalExpressionFunctionsContext<AggregatedBooleanFunctionName>) => AggregatedBooleanFunctionName[]);
+    /**
+     * System (built-in) AggregatedScalar Expression Functions available in AdaptableQL
+     *
+     * @defaultValue null (sets all)
+     * @gridInfoItem
+     */
+    systemAggregatedScalarFunctions?: AggregatedScalarFunctionName[] | ((context: GlobalExpressionFunctionsContext<AggregatedScalarFunctionName>) => AggregatedScalarFunctionName[]);
+}
+/**
+ * Context provided to global expression functions properties property callback
+ */
+export interface GlobalExpressionFunctionsContext<T> extends BaseContext {
+    /**
+     * The names of all expression functions available in this context
+     */
+    availableExpressionFunctionNames: T[];
+}
+/**
+ * Context provided to ExpressionOptions.moduleExpressionFunctions property callback
+ */
+export interface ModuleExpressionFunctionsContext extends BaseContext {
+    module: AdaptableModule;
+    availableBooleanFunctionNames: BooleanFunctionName[];
+    availableScalarFunctionNames: ScalarFunctionName[];
+    availableObservableFunctionNames: ObservableFunctionName[];
+    availableAggregatedBooleanFunctionNames: AggregatedBooleanFunctionName[];
+    availableAggregatedScalarFunctionNames: AggregatedScalarFunctionName[];
 }
 /**
  * Context passed when evaluating `ExpressionOptions.customQueryVariables`

package/src/AdaptableOptions/FinsemblePluginOptions.d.ts

@@ -0,0 +1,32 @@
+/**
+ * Options required for when using the Finsemble plugin
+ */
+export interface FinsemblePluginOptions {
+    /**
+     * Application name - used to identify the application in Finsemble console
+     */
+    applicationName?: string;
+    /**
+     * Options for managing Adaptable State with Finsemble State
+     */
+    stateOptions?: FinsemblePluginStateOptions;
+    /**
+     * Should Adaptable's Alerts appear as Finsemble Notifications
+     * @defaultValue true
+     */
+    showAdaptableAlertsAsNotifications?: boolean;
+}
+export interface FinsemblePluginStateOptions {
+    /**
+     * Whether to persist AdapTable State inside Finsemble
+     */
+    persistInFinsemble: boolean;
+    /**
+     * Key used to persist/load AdapTable State in Finsemble
+     */
+    key: string;
+    /**
+     * Topic used to persist/load AdapTable State in Finsemble
+     */
+    topic: string;
+}

package/src/AdaptableOptions/FinsemblePluginOptions.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/src/AdaptableOptions/GeneralOptions.d.ts

@@ -65,6 +65,11 @@ export interface GeneralOptions {
      * Value to use for 'Unbalanced Groups' (string columns)
      */
     unbalancedGroupsKey?: string | ((context: UnbalancedGroupsKeyContext) => string);
+    /**
+     * Specifies whether Conditional Styles (deprecated in v13) will be auto-merged into Format Columns
+     * @defaultValue false
+     */
+    keepDeprecatedConditionalStyles?: boolean;
 }
 /**
  * Comparer object for Column Values - used for custom sorting

package/src/Api/ConditionalStyleApi.d.ts

@@ -2,107 +2,85 @@ import { ConditionalStyleState, ConditionalStyle } from '../PredefinedConfig/Con
 import { AdaptableColumn, AdaptableScope } from '../types';
 import { AdaptablePredicateDef } from '../PredefinedConfig/Common/AdaptablePredicate';
 /**
- * Provides run-time access to Conditional Style Module and state
+ *  Deprecated API section - use `FormatColumnAPI` instead
  */
 export interface ConditionalStyleApi {
     /**
-     * Retrieves Conditional Style section from Adaptable State
+     * @deprecated use `FormatColumnָAPI` instead
      */
     getConditionalStyleState(): ConditionalStyleState;
     /**
-     * Gets all Conditional Styles in Adaptable State
+     * @deprecated use `FormatColumnָAPI` instead
      */
     getAllConditionalStyle(config?: {
         includeLayoutNotAssociatedObjects?: boolean;
     }): ConditionalStyle[];
     /**
-     * Get conditional style by id
-     * @param id conditional style id
-     * @returns conditional style
+     * @deprecated use `FormatColumnָAPI` instead
      */
     getConditionalStyleById(id: ConditionalStyle['Uuid']): ConditionalStyle;
     /**
-     * Gets all Conditional Styles that are active (not-suspended) in Adaptable State
-     * @returns conditional styles
+     * @deprecated use `FormatColumnָAPI` instead
      */
     getAllActiveConditionalStyle(): ConditionalStyle[];
     /**
-     * Gets all Conditional Styles that are suspended in Adaptable State
-     * @returns conditional styles
+     * @deprecated use `FormatColumnָAPI` instead
      */
     getAllSuspendedConditionalStyle(): ConditionalStyle[];
     /**
-     * Opens Settings Panel with Conditional Style section selected and visible
+     * @deprecated use `FormatColumnָAPI` instead
      */
     showConditionalStylePopup(): void;
     /**
-     * Retrieves all Conditional Styles that style whole row
-     * @returns conditional styles
+     * @deprecated use `FormatColumnָAPI` instead
      */
     getRowConditionalStyles(): ConditionalStyle[] | undefined;
     /**
-     * Retrieves all Conditional Styles which have an Expression
-     * @returns conditional styles
+     * @deprecated use `FormatColumnָAPI` instead
      */
     getConditionalStylesWithExpression(): ConditionalStyle[] | undefined;
     /**
-     * Gets all Conditional Styles that style a given Column
-     * @param column Column to check
-     * @returns conditional styles
+     * @deprecated use `FormatColumnָAPI` instead
      */
     getConditionalStylesForColumn(column: AdaptableColumn): ConditionalStyle[] | undefined;
     /**
-     * Returns all Predicates usable in Conditional Styles
+     * @deprecated use `FormatColumnָAPI` instead
      */
     getConditionalStylePredicateDefs(): AdaptablePredicateDef[];
     /**
-     * Returns all Predicates appropriate for the given Scope
-     * @param scope Scope to check
+     * @deprecated use `FormatColumnָAPI` instead
      */
     getCondStylePredicateDefsForScope(scope: AdaptableScope): AdaptablePredicateDef[];
     /**
-     * Retrieves all Conditional Styles ordered by Column then Row
-     * @returns conditional style
+     * @deprecated use `FormatColumnָAPI` instead
      */
     getOrderedConditionalStyles(): ConditionalStyle[] | undefined;
     /**
-     * Replaces Conditional Style in State with given one
-     * @param conditionalStyle Conditional Style to edit
-     * @returns conditional style
+     * @deprecated use `FormatColumnָAPI` instead
      */
     editConditionalStyle(conditionalStyle: ConditionalStyle): ConditionalStyle;
     /**
-     * Replaces Conditional Styles in State with given ones
-     * @param conditionalStyles Conditional Styles to edit
-     * @returns conditional styles
+     * @deprecated use `FormatColumnָAPI` instead
      */
     editConditionalStyles(conditionalStyles: ConditionalStyle[]): ConditionalStyle[];
     /**
-     * Deletes a Conditional Style
-     * @param conditionalStyle Conditional Style to delete
+     * @deprecated use `FormatColumnָAPI` instead
      */
     deleteConditionalStyle(conditionalStyle: ConditionalStyle): void;
     /**
-     * Deletes Conditional Styles
-     * @param conditionalStyles Conditional Styles to delete
+     * @deprecated use `FormatColumnָAPI` instead
      */
     deleteConditionalStyles(conditionalStyles: ConditionalStyle[]): void;
     /**
-     * Adds new Conditional Style to State
-     * @param conditionalStyle Conditional Style to add
-     * @returns conditional style
+     * @deprecated use `FormatColumnָAPI` instead
      */
     addConditionalStyle(conditionalStyle: ConditionalStyle): ConditionalStyle;
     /**
-     * Suspends conditional style, a readonly object cannot be suspended
-     * @param conditionalStyle Conditional Style to suspend
-     * @returns conditional style
+     * @deprecated use `FormatColumnָAPI` instead
      */
     suspendConditionalStyle(conditionalStyle: ConditionalStyle): ConditionalStyle;
     /**
-     * Un-suspends or activates a suspended conditional style
-     * @param conditionalStyle Conditional Style to suspend
-     * @returns conditional style
+     * @deprecated use `FormatColumnָAPI` instead
      */
     unSuspendConditionalStyle(conditionalStyle: ConditionalStyle): ConditionalStyle;
 }

package/src/Api/ConfigApi.d.ts

@@ -116,8 +116,7 @@ export interface ConfigApi {
      */
     getCalculatedColumnState(returnJson: boolean): CalculatedColumnState;
     /**
-     * Returns Conditional Style section of Adaptable State
-     * @param returnJson return as JSON rather than object
+     * @deprecated use `getFormatColumnState` instead
      */
     getConditionalStyleState(returnJson: boolean): ConditionalStyleState;
     /**

package/src/Api/FinsembleApi.d.ts

@@ -0,0 +1,10 @@
+import { FinsemblePluginOptions } from '../AdaptableOptions/FinsemblePluginOptions';
+/**
+ * Provides run-time access to the Finsemble Plugin
+ */
+export interface FinsembleApi {
+    /**
+     * Retrieves the FinsemblePlugOptions provided in Finsemble Plugin
+     */
+    getPluginOptions(): FinsemblePluginOptions;
+}

package/src/Api/FinsembleApi.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/src/Api/FormatColumnApi.d.ts

@@ -1,5 +1,5 @@
 import { FormatColumnState, FormatColumn, ColumnStyle, ColumnComparison, CellColorRange } from '../PredefinedConfig/FormatColumnState';
-import { AdaptableColumn, AdaptableFormat } from '../types';
+import { AdaptableColumn, AdaptableFormat, AdaptablePredicateDef, AdaptableScope } from '../types';
 import { RowNode } from '@ag-grid-community/core';
 /**
  * Provides run-time access to the Format Column Module and associated state
@@ -134,12 +134,22 @@ export interface FormatColumnApi {
      * @returns format column
      */
     getFormatColumnWithStyleForColumn(column: AdaptableColumn): FormatColumn | undefined;
+    /**
+     * Retrieves all format columns with style for a column
+     * @param column The Column for which to retrieve the Format Column
+     */
+    getColumnFormatColumnsWithStyle(column: AdaptableColumn): FormatColumn[];
+    /**
+     * Retrieves all Format Columns with style for the whole row
+     * @returns format columns
+     */
+    getRowFormatColumnsWithStyle(): FormatColumn[];
     /**
      * Gets Format Column if any for given Column which includes Style element with ClassName
      * @param column The Column for which to retrieve the Format Column
-     * @returns format column
+     * @returns format columns
      */
-    getFormatColumnWithStyleClassNameForColumn(column: AdaptableColumn): FormatColumn | undefined;
+    getFormatColumnWithStyleClassNameForColumn(column: AdaptableColumn): FormatColumn[];
     /**
      * Will get the most appropriate one i.e. first named Column, then DataType, then All
      * @param column
@@ -206,4 +216,38 @@ export interface FormatColumnApi {
      * @param formatColumn Format Column
      */
     hasCustomDisplayFormatter(formatColumn: FormatColumn): boolean;
+    /**
+     * Returns all Predicates usable in Format Columns
+     */
+    getFormatColumnPredicateDefs(): AdaptablePredicateDef[];
+    /**
+     * Returns all Predicates appropriate for the given Scope
+     * @param scope Scope to check
+     */
+    getFormatColumnDefsForScope(scope: AdaptableScope): AdaptablePredicateDef[];
+    /**
+     * Checks if format column is active for a given row
+     *
+     * @param formatColumn
+     * @param params
+     */
+    isFormatColumnActiveForRow(formatColumn: FormatColumn, params: {
+        node: RowNode;
+    }): boolean;
+    /**
+     * Checks if format column is active for a given cell
+     *
+     * @param formatColumn
+     * @param column
+     * @param params
+     */
+    isFormatColumnActiveForColumn(formatColumn: FormatColumn, column: AdaptableColumn, params: {
+        node: RowNode;
+        value: any;
+    }): boolean;
+    /**
+     * Retrieves all Format Columns which have an Expression
+     * @returns Format Columns with Expression
+     */
+    getFormatColumnsWithExpression(): FormatColumn[] | undefined;
 }

package/src/Api/Implementation/ColumnApiImpl.js

@@ -89,13 +89,13 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         return false;
     }
     isNumericColumn(column) {
-        return column.dataType == 'Number';
+        return (column === null || column === void 0 ? void 0 : column.dataType) == 'Number';
     }
     isBooleanColumn(column) {
-        return column.dataType == 'Boolean';
+        return (column === null || column === void 0 ? void 0 : column.dataType) == 'Boolean';
     }
     isDateColumn(column) {
-        return column.dataType == 'Date';
+        return (column === null || column === void 0 ? void 0 : column.dataType) == 'Date';
     }
     getColumnDataTypeFromColumnId(columnId) {
         const column = this.getColumnFromId(columnId); // this.getColumns().find(c => c.ColumnId == columnId);

package/src/Api/Implementation/DashboardApiImpl.js

@@ -6,8 +6,7 @@ const DashboardRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers
 const ApiBase_1 = require("./ApiBase");
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
 const isEqual_1 = tslib_1.__importDefault(require("lodash/isEqual"));
-const react_dom_1 = tslib_1.__importDefault(require("react-dom"));
-const react_1 = tslib_1.__importDefault(require("react"));
+const React = tslib_1.__importStar(require("react"));
 const SystemRedux_1 = require("../../Redux/ActionsReducers/SystemRedux");
 class DashboardApiImpl extends ApiBase_1.ApiBase {
     constructor() {
@@ -63,7 +62,7 @@ class DashboardApiImpl extends ApiBase_1.ApiBase {
     setCustomToolbarContents(customToolbarName, contents) {
         let contentsDiv = this.getCustomToolbarContentsDiv(customToolbarName);
         if (contentsDiv) {
-            react_dom_1.default.render(react_1.default.createElement("div", { dangerouslySetInnerHTML: { __html: contents } }), contentsDiv);
+            this.adaptable.renderReactRoot(React.createElement("div", { dangerouslySetInnerHTML: { __html: contents } }), contentsDiv);
         }
     }
     getCustomToolbarByName(customToolbarName) {

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

@@ -5,6 +5,7 @@ import { FormatColumnState, FormatColumn, ColumnStyle, CellColorRange, ColumnCom
 import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
 import { RowNode } from '@ag-grid-community/core';
 import { AdaptableFormat } from '../../types';
+import { AdaptablePredicateDef, AdaptableScope } from '../../../types';
 export declare class FormatColumnApiImpl extends ApiBase implements FormatColumnApi {
     getFormatColumnState(): FormatColumnState;
     getAllFormatColumn(config?: LayoutAssociatedObjectLoadConfig): FormatColumn[];
@@ -27,12 +28,15 @@ export declare class FormatColumnApiImpl extends ApiBase implements FormatColumn
     unSuspendFormatColumn(formatColumn: FormatColumn): FormatColumn;
     applyFormatColumnDisplayFormats(): void;
     getActiveFormatColumnForColumn(column: AdaptableColumn): FormatColumn | undefined;
+    getColumnFormatColumnsWithStyle(column: AdaptableColumn): FormatColumn[];
+    getRowFormatColumnsWithStyle(): FormatColumn[];
     getFormatColumnForColumn(column: AdaptableColumn): FormatColumn | undefined;
     getFormatColumnForColumnId(columnId: string): FormatColumn | undefined;
     getFormatColumnWithStyleForColumn(column: AdaptableColumn): FormatColumn | undefined;
-    getFormatColumnWithStyleClassNameForColumn(column: AdaptableColumn): FormatColumn | undefined;
+    getFormatColumnWithStyleClassNameForColumn(column: AdaptableColumn): FormatColumn[];
     getFormatColumnWithDisplayFormatForColumn(column: AdaptableColumn): FormatColumn | undefined;
     getFormatColumnWithSingleColumnScope(columnId: string): FormatColumn | undefined;
+    private getFormatColumnInColumnScope;
     private getAppropriateFormatColumn;
     hasStyleFormatColumns(): boolean;
     showFormatColumnPopup(): void;
@@ -51,4 +55,17 @@ export declare class FormatColumnApiImpl extends ApiBase implements FormatColumn
     getStringFormattedValue(value: any, node: RowNode, abColumn: AdaptableColumn, options: AdaptableFormat['Options']): string;
     getDateFormattedValue(value: any, node: RowNode, abColumn: AdaptableColumn, options: AdaptableFormat['Options']): string;
     hasCustomDisplayFormatter(formatColumn: FormatColumn): boolean;
+    getFormatColumnPredicateDefs(): AdaptablePredicateDef[];
+    getFormatColumnDefsForScope(scope: AdaptableScope): AdaptablePredicateDef[];
+    isFormatColumnActiveForRow(formatColumn: FormatColumn, params: {
+        node: RowNode;
+    }): boolean;
+    isFormatColumnActiveForColumn(formatColumn: FormatColumn, column: AdaptableColumn, params: {
+        node: RowNode;
+        value: any;
+    }): boolean;
+    private evaluatePredicate;
+    private shouldRunStyle;
+    private evaluateExpression;
+    getFormatColumnsWithExpression(): FormatColumn[] | undefined;
 }