@adaptabletools/adaptable 13.0.0-canary.14 → 13.0.0-canary.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "13.0.0-canary.14",
+  "version": "13.0.0-canary.16",
   "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: 1663788105379;
+declare const _default: 1663819851210;
 export default _default;

package/publishTimestamp.js

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

package/src/AdaptableOptions/GeneralOptions.d.ts

@@ -65,11 +65,6 @@ 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/ColumnApi.d.ts

@@ -140,7 +140,7 @@ export interface ColumnApi {
      * Does Column have a numeric style (e.g. Percent Bar or Gradient)
      * @param columnId Column to check
      */
-    isFormatNumericStyleColumn(column: AdaptableColumn): boolean;
+    isStyledNumericColumn(column: AdaptableColumn): boolean;
     /**
      * Is Column Numeric
      * @param columnId Column to check

package/src/Api/FormatColumnApi.d.ts

@@ -1,4 +1,4 @@
-import { FormatColumnState, FormatColumn, ColumnComparison } from '../PredefinedConfig/FormatColumnState';
+import { FormatColumnState, FormatColumn } from '../PredefinedConfig/FormatColumnState';
 import { AdaptableColumn, AdaptableFormat, AdaptablePredicateDef, AdaptableScope } from '../types';
 import { RowNode } from '@ag-grid-community/core';
 /**
@@ -37,16 +37,6 @@ export interface FormatColumnApi {
      * @returns format columns
      */
     getAllFormatColumnWithStyle(): FormatColumn[];
-    /**
-     * Retrieves the ColumnComparison property, if there, from a Format Column (Column Style)
-     * @param formatColumn Format Column to Add
-     */
-    getColumnComparisonForFormatColumn(formatColumn: FormatColumn): ColumnComparison | undefined;
-    /**
-     * Returns any ColumnIds referenced in a Column Comparison
-     * @param columnComparision Column Comparison to check
-     */
-    getColumnIdsFromColumnComparison(columnComparision: ColumnComparison): string[];
     /**
      * Retrieves all Format Columns in Adaptable State with `DisplayFormat` property set
      * @returns format columns
@@ -155,20 +145,6 @@ export interface FormatColumnApi {
      * Returns true if Format State includes Format Columns with a Style property
      */
     hasStyleFormatColumns(): boolean;
-    /**
-     * Returns first Format Column that contains checkbox style
-     * @param columnId column to check
-     */
-    getCheckBoxStyleFormatColumn(column: AdaptableColumn): FormatColumn | undefined;
-    /**
-     * Whether given column is a (boolean) checkbox column
-     * @param columnId column to check
-     */
-    isCheckBoxStyleFormatColumn(column: AdaptableColumn): boolean;
-    /**
-     * Publishes the CheckboxColumnClickedEvent - when the checkbox in an Checkbox Column is clicked
-     */
-    fireCheckboxColumnClickedEvent(columnId: string, rowData: any, primaryKeyValue: any, isChecked: boolean): void;
     /**
      * Format value according to format options.
      *

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

@@ -22,7 +22,7 @@ export declare class ColumnApiImpl extends ApiBase implements ColumnApi {
     isCalculatedColumn(columnId: string): boolean;
     isFreeTextColumn(columnId: string): boolean;
     isActionColumn(columnId: string): boolean;
-    isFormatNumericStyleColumn(column: AdaptableColumn): boolean;
+    isStyledNumericColumn(column: AdaptableColumn): boolean;
     isNumericColumn(column: AdaptableColumn): boolean;
     isBooleanColumn(column: AdaptableColumn): boolean;
     isDateColumn(column: AdaptableColumn): boolean;

package/src/Api/Implementation/ColumnApiImpl.js

@@ -79,12 +79,12 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         return (((_a = this.adaptable.api.actionApi.getAllActionColumn()) === null || _a === void 0 ? void 0 : _a.find((cc) => cc.columnId == columnId)) !=
             null);
     }
-    isFormatNumericStyleColumn(column) {
+    isStyledNumericColumn(column) {
         if (column) {
-            return this.adaptable.api.formatColumnApi
-                .getAllFormatColumn()
-                .filter((fc) => { var _a, _b; return ((_a = fc.ColumnStyle) === null || _a === void 0 ? void 0 : _a.GradientStyle) || ((_b = fc.ColumnStyle) === null || _b === void 0 ? void 0 : _b.PercentBarStyle); })
-                .some((formatColumn) => this.adaptable.api.scopeApi.isColumnInScope(column, formatColumn.Scope));
+            const styledColmn = this.adaptable.api.styledColumnApi
+                .getAllActiveStyledColumn()
+                .find((sc) => !sc.CheckBoxStyle && sc.ColumnId == column.columnId);
+            return styledColmn != null;
         }
         return false;
     }

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

@@ -1,7 +1,7 @@
 import { AdaptableStyle } from '../../PredefinedConfig/Common/AdaptableStyle';
 import { ApiBase, LayoutAssociatedObjectLoadConfig } from './ApiBase';
 import { FormatColumnApi } from '../FormatColumnApi';
-import { FormatColumnState, FormatColumn, ColumnComparison } from '../../PredefinedConfig/FormatColumnState';
+import { FormatColumnState, FormatColumn } from '../../PredefinedConfig/FormatColumnState';
 import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
 import { RowNode } from '@ag-grid-community/core';
 import { AdaptableFormat } from '../../types';
@@ -13,8 +13,6 @@ export declare class FormatColumnApiImpl extends ApiBase implements FormatColumn
     getAllActiveFormatColumn(): FormatColumn[];
     getAllSuspendedFormatColumn(): FormatColumn[];
     getAllFormatColumnWithStyle(): FormatColumn[];
-    getColumnComparisonForFormatColumn(formatColumn: FormatColumn): ColumnComparison | undefined;
-    getColumnIdsFromColumnComparison(columnComparison: ColumnComparison): string[];
     getAllFormatColumnWithDisplayFormat(): FormatColumn[];
     getAllFormatColumnWithCellAlignment(): FormatColumn[];
     addFormatColumn(formatColumn: FormatColumn): FormatColumn;
@@ -42,9 +40,6 @@ export declare class FormatColumnApiImpl extends ApiBase implements FormatColumn
     getFormatColumnsWithAllScope(formatColumns: FormatColumn[]): FormatColumn[] | undefined;
     getFormatColumnsWithDataTypeScope(formatColumns: FormatColumn[]): FormatColumn[] | undefined;
     getFormatColumnsWithColumnScope(formatColumns: FormatColumn[]): FormatColumn[] | undefined;
-    getCheckBoxStyleFormatColumn(column: AdaptableColumn): FormatColumn | undefined;
-    isCheckBoxStyleFormatColumn(column: AdaptableColumn): boolean;
-    fireCheckboxColumnClickedEvent(columnId: string, rowData: any, primaryKeyValue: any, isChecked: boolean): void;
     private applyCustomFormatters;
     getNumberFormattedValue(value: any, node: RowNode, abColumn: AdaptableColumn, options: AdaptableFormat['Options']): string;
     getStringFormattedValue(value: any, node: RowNode, abColumn: AdaptableColumn, options: AdaptableFormat['Options']): string;

package/src/Api/Implementation/FormatColumnApiImpl.js

@@ -7,7 +7,6 @@ const ApiBase_1 = require("./ApiBase");
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/ArrayExtensions"));
 const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
-const Helper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/Helper"));
 const FormatHelper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/FormatHelper"));
 const ObjectFactory_1 = tslib_1.__importDefault(require("../../Utilities/ObjectFactory"));
 class FormatColumnApiImpl extends ApiBase_1.ApiBase {
@@ -30,34 +29,6 @@ class FormatColumnApiImpl extends ApiBase_1.ApiBase {
     getAllFormatColumnWithStyle() {
         return this.getAllFormatColumn().filter((fc) => fc.Style != null || fc.CellAlignment);
     }
-    getColumnComparisonForFormatColumn(formatColumn) {
-        var _a, _b;
-        if (formatColumn.ColumnStyle) {
-            if ((_a = formatColumn.ColumnStyle.GradientStyle) === null || _a === void 0 ? void 0 : _a.ColumnComparison) {
-                return formatColumn.ColumnStyle.GradientStyle.ColumnComparison;
-            }
-            if ((_b = formatColumn.ColumnStyle.PercentBarStyle) === null || _b === void 0 ? void 0 : _b.ColumnComparison) {
-                return formatColumn.ColumnStyle.PercentBarStyle.ColumnComparison;
-            }
-        }
-        return undefined;
-    }
-    getColumnIdsFromColumnComparison(columnComparison) {
-        let returnValues = [];
-        if (typeof columnComparison.MinValue === 'string') {
-            let minIds = this.adaptable.api.columnApi.getColumnIdsFromId(columnComparison.MinValue, false);
-            if (ArrayExtensions_1.default.IsNotNullOrEmpty(minIds)) {
-                returnValues.push(...minIds);
-            }
-        }
-        if (typeof columnComparison.MaxValue === 'string') {
-            let maxIds = this.adaptable.api.columnApi.getColumnIdsFromId(columnComparison.MaxValue, false);
-            if (ArrayExtensions_1.default.IsNotNullOrEmpty(maxIds)) {
-                returnValues.push(...maxIds);
-            }
-        }
-        return returnValues;
-    }
     getAllFormatColumnWithDisplayFormat() {
         return this.getAllFormatColumn().filter((fc) => fc.DisplayFormat != null);
     }
@@ -185,29 +156,6 @@ class FormatColumnApiImpl extends ApiBase_1.ApiBase {
     getFormatColumnsWithColumnScope(formatColumns) {
         return formatColumns.filter((fc) => this.adaptable.api.scopeApi.scopeHasColumns(fc.Scope));
     }
-    getCheckBoxStyleFormatColumn(column) {
-        var _a;
-        if (column.dataType != 'Boolean') {
-            return undefined;
-        }
-        const checkBoxFormatColumns = (_a = this.getFormatColumnState().FormatColumns) === null || _a === void 0 ? void 0 : _a.filter((fc) => { var _a; return (_a = fc.ColumnStyle) === null || _a === void 0 ? void 0 : _a.CheckBoxStyle; });
-        const formatColumn = checkBoxFormatColumns.find((fc) => this.getAdaptableApi().scopeApi.isColumnInScope(column, fc.Scope));
-        return formatColumn;
-    }
-    isCheckBoxStyleFormatColumn(column) {
-        const formatColumn = this.getCheckBoxStyleFormatColumn(column);
-        return Helper_1.default.objectExists(formatColumn);
-    }
-    fireCheckboxColumnClickedEvent(columnId, rowData, primaryKeyValue, isChecked) {
-        let checkboxColumnClickedInfo = {
-            adaptableApi: this.adaptable.api,
-            column: this.adaptable.api.columnApi.getColumnFromId(columnId),
-            rowData: rowData,
-            primaryKeyValue: primaryKeyValue,
-            isChecked: isChecked,
-        };
-        this.adaptable.api.eventApi.emit('CheckboxColumnClicked', checkboxColumnClickedInfo);
-    }
     applyCustomFormatters(value, node, abColumn, options) {
         var _a, _b, _c;
         const columnCustomFormatters = (_a = options === null || options === void 0 ? void 0 : options.CustomDisplayFormats) !== null && _a !== void 0 ? _a : [];

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

@@ -142,5 +142,4 @@ export declare class InternalApiImpl extends ApiBase implements InternalApi {
     getValueForTag(adaptableObjectTag: AdaptableObjectTag): string | number;
     getEditLookUpValuesForColumn(editLookUpItem: EditLookUpPermittedValues, column: AdaptableColumn, gridCell?: GridCell): any[] | undefined;
     getAdaptableQueryExpressionText(query: Partial<AdaptableQuery>): string;
-    shouldKeepDeprecatedConditionalStyles(): boolean;
 }

package/src/Api/Implementation/InternalApiImpl.js

@@ -650,9 +650,5 @@ class InternalApiImpl extends ApiBase_1.ApiBase {
             ? this.adaptable.api.queryLanguageApi.getAdaptableQueryExpressionWithColumnFriendlyNames(query)
             : this.adaptable.api.queryLanguageApi.getAdaptableQueryExpression(query);
     }
-    shouldKeepDeprecatedConditionalStyles() {
-        var _a, _b;
-        return (_b = (_a = this.getOptions()) === null || _a === void 0 ? void 0 : _a.generalOptions) === null || _b === void 0 ? void 0 : _b.keepDeprecatedConditionalStyles;
-    }
 }
 exports.InternalApiImpl = InternalApiImpl;

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

@@ -2,7 +2,7 @@ import { ApiBase } from './ApiBase';
 import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
 import { AdaptableScope, ScopeDataType } from '../../PredefinedConfig/Common/AdaptableScope';
 import { ScopeApi } from '../ScopeApi';
-import { CellColorRange } from '../../PredefinedConfig/FormatColumnState';
+import { CellColorRange } from '../../PredefinedConfig/StyledColumnState';
 export declare class ScopeApiImpl extends ApiBase implements ScopeApi {
     isColumnInScope(column: AdaptableColumn | undefined, scope: AdaptableScope | undefined): boolean;
     getColumnsForScope(scope: AdaptableScope): AdaptableColumn[];

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

@@ -1,7 +1,7 @@
 import { ApiBase, LayoutAssociatedObjectLoadConfig } from './ApiBase';
 import { StyledColumnApi } from '../StyledColumnApi';
 import { StyledColumnState, StyledColumn } from '../../PredefinedConfig/StyledColumnState';
-import { AdaptableColumn, CellColorRange } from '../../types';
+import { AdaptableColumn, CellColorRange, ColumnComparison } from '../../types';
 import { RowNode } from '@ag-grid-community/core';
 export declare class StyledColumnApiImpl extends ApiBase implements StyledColumnApi {
     getStyledColumnState(): StyledColumnState;
@@ -12,8 +12,14 @@ export declare class StyledColumnApiImpl extends ApiBase implements StyledColumn
     getAllSuspendedStyledColumn(): StyledColumn[];
     deleteStyledColumn(styledColumn: StyledColumn): void;
     addStyledColumn(styledColumn: StyledColumn): void;
-    getNumericStyleMinValue(numericStyle: any, column: AdaptableColumn, rowNode: RowNode, cellValue: any): number;
-    getNumericStyleMaxValue(numericStyle: any, column: AdaptableColumn, rowNode: RowNode, cellValue: any): number | undefined;
+    getNumericStyleMinValue(styledColumn: Omit<StyledColumn, 'ColumnId'>, column: AdaptableColumn, rowNode: RowNode, cellValue: any): number;
+    getNumericStyleMaxValue(styledColumn: Omit<StyledColumn, 'ColumnId'>, column: AdaptableColumn, rowNode: RowNode, cellValue: any): number | undefined;
     getCellColorRangeMinValue(range: CellColorRange, column: AdaptableColumn): number | undefined;
     getCellColorRangeMaxValue(range: CellColorRange, column: AdaptableColumn): number | undefined;
+    getColumnComparisonForStyledColumn(styledColumn: StyledColumn): ColumnComparison | undefined;
+    getColumnIdsFromColumnComparison(columnComparison: ColumnComparison): string[];
+    getCheckBoxStyleStyledColumn(column: AdaptableColumn): StyledColumn | undefined;
+    isCheckBoxStyleStyledColumn(column: AdaptableColumn): boolean;
+    fireCheckboxColumnClickedEvent(columnId: string, rowData: any, primaryKeyValue: any, isChecked: boolean): void;
+    getActiveStyledColumnForColumn(column: AdaptableColumn): StyledColumn | undefined;
 }

package/src/Api/Implementation/StyledColumnApiImpl.js

@@ -4,6 +4,8 @@ exports.StyledColumnApiImpl = void 0;
 const tslib_1 = require("tslib");
 const ApiBase_1 = require("./ApiBase");
 const StyledColumnRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/StyledColumnRedux"));
+const ArrayExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/ArrayExtensions"));
+const Helper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/Helper"));
 class StyledColumnApiImpl extends ApiBase_1.ApiBase {
     getStyledColumnState() {
         return this.getAdaptableState().StyledColumn;
@@ -30,11 +32,11 @@ class StyledColumnApiImpl extends ApiBase_1.ApiBase {
     addStyledColumn(styledColumn) {
         this.dispatchAction(StyledColumnRedux.StyledColumnAdd(styledColumn));
     }
-    getNumericStyleMinValue(numericStyle, column, rowNode, cellValue) {
+    getNumericStyleMinValue(styledColumn, column, rowNode, cellValue) {
         var _a, _b;
-        const columnComparison = numericStyle.GradientStyle
-            ? numericStyle.GradientStyle.ColumnComparison
-            : (_a = numericStyle.PercentBarStyle) === null || _a === void 0 ? void 0 : _a.ColumnComparison;
+        const columnComparison = styledColumn.GradientStyle
+            ? styledColumn.GradientStyle.ColumnComparison
+            : (_a = styledColumn.PercentBarStyle) === null || _a === void 0 ? void 0 : _a.ColumnComparison;
         if (columnComparison) {
             if (!isNaN(Number(columnComparison.MinValue))) {
                 return Number(columnComparison.MinValue);
@@ -50,9 +52,9 @@ class StyledColumnApiImpl extends ApiBase_1.ApiBase {
             }
         }
         // for Gradient Column we want just the range that contains cell value
-        if (numericStyle.GradientStyle) {
+        if (styledColumn.GradientStyle) {
             let range;
-            numericStyle.GradientStyle.CellRanges.forEach((cellRange) => {
+            styledColumn.GradientStyle.CellRanges.forEach((cellRange) => {
                 if (!range) {
                     if ((cellRange.Min == 'Col-Min' || cellValue >= cellRange.Min) &&
                         (cellRange.Max == 'Col-Max' || cellValue <= cellRange.Max)) {
@@ -63,18 +65,18 @@ class StyledColumnApiImpl extends ApiBase_1.ApiBase {
             return this.getCellColorRangeMinValue(range, column);
         }
         // for percentbar we want to get the whole Ranges
-        if (numericStyle.PercentBarStyle) {
-            const ranges = (_b = numericStyle.PercentBarStyle) === null || _b === void 0 ? void 0 : _b.CellRanges;
+        if (styledColumn.PercentBarStyle) {
+            const ranges = (_b = styledColumn.PercentBarStyle) === null || _b === void 0 ? void 0 : _b.CellRanges;
             if (ranges) {
                 return this.getCellColorRangeMinValue(ranges[0], column);
             }
         }
     }
-    getNumericStyleMaxValue(numericStyle, column, rowNode, cellValue) {
+    getNumericStyleMaxValue(styledColumn, column, rowNode, cellValue) {
         var _a, _b;
-        const columnComparison = numericStyle.GradientStyle
-            ? numericStyle.GradientStyle.ColumnComparison
-            : (_a = numericStyle.PercentBarStyle) === null || _a === void 0 ? void 0 : _a.ColumnComparison;
+        const columnComparison = styledColumn.GradientStyle
+            ? styledColumn.GradientStyle.ColumnComparison
+            : (_a = styledColumn.PercentBarStyle) === null || _a === void 0 ? void 0 : _a.ColumnComparison;
         if (columnComparison) {
             if (!isNaN(Number(columnComparison.MaxValue))) {
                 return Number(columnComparison.MaxValue);
@@ -89,9 +91,9 @@ class StyledColumnApiImpl extends ApiBase_1.ApiBase {
                 }
             }
         }
-        if (numericStyle.GradientStyle) {
+        if (styledColumn.GradientStyle) {
             let range;
-            numericStyle.GradientStyle.CellRanges.forEach((cellRange) => {
+            styledColumn.GradientStyle.CellRanges.forEach((cellRange) => {
                 if (!range) {
                     if ((cellRange.Min == 'Col-Min' || cellValue >= cellRange.Min) &&
                         (cellRange.Max == 'Col-Max' || cellValue <= cellRange.Max)) {
@@ -101,8 +103,8 @@ class StyledColumnApiImpl extends ApiBase_1.ApiBase {
             });
             return this.getCellColorRangeMaxValue(range, column);
         }
-        if (numericStyle.PercentBarStyle) {
-            const ranges = (_b = numericStyle.PercentBarStyle) === null || _b === void 0 ? void 0 : _b.CellRanges;
+        if (styledColumn.PercentBarStyle) {
+            const ranges = (_b = styledColumn.PercentBarStyle) === null || _b === void 0 ? void 0 : _b.CellRanges;
             if (ranges) {
                 return this.getCellColorRangeMaxValue(ranges[ranges.length - 1], column);
             }
@@ -130,5 +132,62 @@ class StyledColumnApiImpl extends ApiBase_1.ApiBase {
             ? this.getAdaptableApi().columnApi.getMaxValueForNumericColumn(column)
             : range.Max;
     }
+    getColumnComparisonForStyledColumn(styledColumn) {
+        var _a, _b;
+        if (styledColumn.GradientStyle) {
+            if ((_a = styledColumn.GradientStyle) === null || _a === void 0 ? void 0 : _a.ColumnComparison) {
+                return styledColumn.GradientStyle.ColumnComparison;
+            }
+        }
+        if (styledColumn.PercentBarStyle) {
+            if ((_b = styledColumn.PercentBarStyle) === null || _b === void 0 ? void 0 : _b.ColumnComparison) {
+                return styledColumn.PercentBarStyle.ColumnComparison;
+            }
+        }
+        return undefined;
+    }
+    getColumnIdsFromColumnComparison(columnComparison) {
+        let returnValues = [];
+        if (typeof columnComparison.MinValue === 'string') {
+            let minIds = this.adaptable.api.columnApi.getColumnIdsFromId(columnComparison.MinValue, false);
+            if (ArrayExtensions_1.default.IsNotNullOrEmpty(minIds)) {
+                returnValues.push(...minIds);
+            }
+        }
+        if (typeof columnComparison.MaxValue === 'string') {
+            let maxIds = this.adaptable.api.columnApi.getColumnIdsFromId(columnComparison.MaxValue, false);
+            if (ArrayExtensions_1.default.IsNotNullOrEmpty(maxIds)) {
+                returnValues.push(...maxIds);
+            }
+        }
+        return returnValues;
+    }
+    getCheckBoxStyleStyledColumn(column) {
+        var _a;
+        if (column.dataType != 'Boolean') {
+            return undefined;
+        }
+        const checkBoxFormatColumns = (_a = this.getStyledColumnState().StyledColumns) === null || _a === void 0 ? void 0 : _a.filter((sc) => sc === null || sc === void 0 ? void 0 : sc.CheckBoxStyle);
+        const styledColumn = checkBoxFormatColumns.find((sc) => sc.ColumnId == column.columnId);
+        return styledColumn;
+    }
+    isCheckBoxStyleStyledColumn(column) {
+        const styledColumn = this.getCheckBoxStyleStyledColumn(column);
+        return Helper_1.default.objectExists(styledColumn);
+    }
+    fireCheckboxColumnClickedEvent(columnId, rowData, primaryKeyValue, isChecked) {
+        let checkboxColumnClickedInfo = {
+            adaptableApi: this.adaptable.api,
+            column: this.adaptable.api.columnApi.getColumnFromId(columnId),
+            rowData: rowData,
+            primaryKeyValue: primaryKeyValue,
+            isChecked: isChecked,
+        };
+        this.adaptable.api.eventApi.emit('CheckboxColumnClicked', checkboxColumnClickedInfo);
+    }
+    getActiveStyledColumnForColumn(column) {
+        const styledColumns = this.getAllActiveStyledColumn();
+        return styledColumns.find((sc) => sc.ColumnId == column.columnId);
+    }
 }
 exports.StyledColumnApiImpl = StyledColumnApiImpl;

package/src/Api/InternalApi.d.ts

@@ -144,5 +144,4 @@ export interface InternalApi {
     getValueForTag(adaptableObjectTag: AdaptableObjectTag): string | number;
     getEditLookUpValuesForColumn(editLookUpItem: EditLookUpPermittedValues, column: AdaptableColumn, gridCell?: GridCell): any[] | undefined;
     getAdaptableQueryExpressionText(query: Partial<AdaptableQuery>): string;
-    shouldKeepDeprecatedConditionalStyles(): boolean;
 }

package/src/Api/ScopeApi.d.ts

@@ -1,6 +1,6 @@
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
 import { AdaptableScope, ScopeDataType } from '../PredefinedConfig/Common/AdaptableScope';
-import { CellColorRange } from '../PredefinedConfig/FormatColumnState';
+import { CellColorRange } from '../PredefinedConfig/StyledColumnState';
 /**
  * Provides access to a suite of functions related to the `Scope` object
  */

package/src/Api/StyledColumnApi.d.ts

@@ -1,9 +1,8 @@
 import { RowNode } from '@ag-grid-community/core/dist/cjs/es5/entities/rowNode';
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
-import { CellColorRange } from '../PredefinedConfig/FormatColumnState';
-import { StyledColumnState, StyledColumn } from '../PredefinedConfig/StyledColumnState';
+import { StyledColumnState, StyledColumn, CellColorRange, ColumnComparison } from '../PredefinedConfig/StyledColumnState';
 /**
- * Provides run-time access to the Format Column Module and associated state
+ * Provides run-time access to the Styled Column Module and associated state
  */
 export interface StyledColumnApi {
     /**
@@ -17,52 +16,77 @@ export interface StyledColumnApi {
      */
     addStyledColumn(styledColumn: StyledColumn): void;
     /**
-     * Retrieves Format Column section from Adaptable State
+     * Retrieves Styled Column section from Adaptable State
      */
     getStyledColumnState(): StyledColumnState;
     /**
-     * Retrieves all Format Columns in Adaptable State
-     * @returns format columns
+     * Retrieves all Styled Columns in Adaptable State
+     * @returns Styled Columns
      */
     getAllStyledColumn(config?: {
         includeLayoutNotAssociatedObjects?: boolean;
     }): StyledColumn[];
     /**
-     * Retrieves Format Column by Id
-     * @param id Format Column id
-     * @returns format column
+     * Retrieves Styled Column by Id
+     * @param id Styled Column id
+     * @returns Styled Column
      */
     getStyledColumnById(id: StyledColumn['Uuid']): StyledColumn;
     /**
-     * Retrieves Format Column by Column Id
-     * @param columnId Format Column id
-     * @returns format column
+     * Retrieves Styled Column by Column Id
+     * @param columnId Styled Column id
+     * @returns Styled Column
      */
     getStyledColumnByColumnId(columnId: StyledColumn['ColumnId']): StyledColumn;
     /**
-     * Retrieves all active (not-suspended) Format Columns in Adaptable State
-     * @returns format columns
+     * Retrieves all active (not-suspended) Styled Columns in Adaptable State
+     * @returns Styled Columns
      */
     getAllActiveStyledColumn(): StyledColumn[];
     /**
-     * Retrieves all suspended Format Columns in Adaptable State
-     * @returns format columns
+     * Retrieves all suspended Styled Columns in Adaptable State
+     * @returns Styled Columns
      */
     getAllSuspendedStyledColumn(): StyledColumn[];
     /**
-     * Gets the Minimum Value to display for a Numeric Style
-     * @param numericStyle Numeric Style to check
+     * Gets the Minimum Value to display for a Styled Column
+     * @param styledColumn Styled Column to check
      * @param rowNode current Row Node
      * @param cellValue current Cell Value
      */
-    getNumericStyleMinValue(numericStyle: Omit<StyledColumn, 'ColumnId'>, column: AdaptableColumn, rowNode: RowNode, cellValue: any): number;
+    getNumericStyleMinValue(styledColumn: Omit<StyledColumn, 'ColumnId'>, column: AdaptableColumn, rowNode: RowNode, cellValue: any): number;
     /**
-     * Gets the Maximum Value to display for a Numeric Style
-     * @param numericStyle Numeric Style to check
+     * Gets the Maximum Value to display for a Styled Column
+     * @param styledColumn Styled Column to check
      * @param rowNode current Row Node
      * @param cellValue current Cell Value
      */
-    getNumericStyleMaxValue(numericStyle: Omit<StyledColumn, 'ColumnId'>, column: AdaptableColumn, rowNode: RowNode, cellValue: any): number;
+    getNumericStyleMaxValue(styledColumn: Omit<StyledColumn, 'ColumnId'>, column: AdaptableColumn, rowNode: RowNode, cellValue: any): number;
     getCellColorRangeMinValue(range: CellColorRange, column: AdaptableColumn): number | undefined;
     getCellColorRangeMaxValue(range: CellColorRange, column: AdaptableColumn): number | undefined;
+    /**
+     * Retrieves the ColumnComparison property, if there, from a Styled Column
+     * @param formatColumn Styled Column to Add
+     */
+    getColumnComparisonForStyledColumn(formatColumn: StyledColumn): ColumnComparison | undefined;
+    /**
+     * Returns any ColumnIds referenced in a Column Comparison
+     * @param columnComparision Column Comparison to check
+     */
+    getColumnIdsFromColumnComparison(columnComparision: ColumnComparison): string[];
+    /**
+     * Returns first Styled Column that contains checkbox style
+     * @param columnId column to check
+     */
+    getCheckBoxStyleStyledColumn(column: AdaptableColumn): StyledColumn | undefined;
+    /**
+     * Whether given column is a (boolean) checkbox column
+     * @param columnId column to check
+     */
+    isCheckBoxStyleStyledColumn(column: AdaptableColumn): boolean;
+    /**
+     * Publishes the CheckboxColumnClickedEvent - when the checkbox in an Checkbox Column is clicked
+     */
+    fireCheckboxColumnClickedEvent(columnId: string, rowData: any, primaryKeyValue: any, isChecked: boolean): void;
+    getActiveStyledColumnForColumn(column: AdaptableColumn): StyledColumn | undefined;
 }

package/src/PredefinedConfig/FormatColumnState.d.ts

@@ -5,7 +5,7 @@ import { AdaptableScope } from './Common/AdaptableScope';
 import { SuspendableObject } from './Common/SuspendableObject';
 import { XOR } from '../Utilities/Extensions/TypeExtensions';
 import { TypeHint } from './Common/Types';
-import { AdaptableBooleanQuery, AdaptablePredicate } from '../types';
+import { AdaptableBooleanQuery, AdaptablePredicate, GradientStyle, PercentBarStyle } from '../types';
 /**
  * Predefined Configuration for Format Column Module
  */
@@ -33,7 +33,7 @@ export interface FormatColumn extends SuspendableObject {
      */
     Style?: AdaptableStyle;
     /**
-     * Applies Gradient, Percent Bar or CheckBox style to a Column
+     * @deprecated now in StyledColumn Module
      */
     ColumnStyle?: ColumnStyle;
     /**
@@ -77,89 +77,4 @@ export interface ColumnStyle {
      */
     CheckBoxStyle?: boolean;
 }
-/**
- * Style used to display Percent Bars in Format Column
- */
-export interface PercentBarStyle {
-    /**
-     * Ranges (e.g. to allow a traffic light effect)
-     */
-    CellRanges?: CellColorRange[];
-    /**
-     * Compares cell values to another Column
-     */
-    ColumnComparison?: ColumnComparison;
-    /**
-     * Whether Cell shows Cell Value, Percent Value, both or none
-     */
-    CellText?: CellTextOptions;
-    /**
-     * Whether Tooltip shows Cell Value, Percent Value, both or none
-     */
-    ToolTipText?: CellTextOptions;
-    /**
-     * Back colour - only used for 'Percent Bar' Numeric style; leave unset if none required
-     * @defaultValue Gray
-     */
-    BackColor?: string;
-}
-/**
- * Used to display Gradient Styles in Format Column
- */
-export interface GradientStyle {
-    /**
-     * Ranges (e.g. to allow a traffic light effect)
-     */
-    CellRanges?: CellColorRange[];
-    /**
-     * Compares cell values to another Column
-     */
-    ColumnComparison?: ColumnComparison;
-}
-/**
- * Defines which Colours to show in Gradient and Percent Bar Styles
- */
-export interface CellColorRange {
-    /**
-     * Start number of Range
-     */
-    Min: number | 'Col-Min';
-    /**
-     * End number of Range
-     */
-    Max: number | 'Col-Max';
-    /**
-     * Cell colour to use for values that fall inside Range
-     */
-    Color: string;
-    /**
-     * Reverses the Gradient so the lower the cell value the darker the colour
-     */
-    ReverseGradient?: boolean;
-}
-/**
- * Enables a Percent Bar or Gradient Style to use another column in its calculations
- */
-export interface ColumnComparison {
-    /**
-     * Start value - either numeric or Column name
-     */
-    MinValue: number | string;
-    /**
-     * End value - either numeric or Column name
-     */
-    MaxValue: number | string;
-    /**
-     * Colour to use for the Comparison
-     */
-    Color: string;
-}
-/**
- * Array of CellTextOption available in Format Columns
- */
-export declare type CellTextOptions = CellTextOption[];
-/**
- * Text optionally to show in a Format Column special style: 'CellValue' or 'PercentageValue'
- */
-export declare type CellTextOption = 'CellValue' | 'PercentageValue';
 export {};