@adaptabletools/adaptable 14.0.0-canary.0 → 14.0.0-canary.2

package/src/PredefinedConfig/Common/AdaptablePredicate.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SystemFilterPredicateIds = exports.SystemPredicateDefs = void 0;
+exports.SystemFlashingCellPredicateIds = exports.SystemFormatColumnPredicateIds = exports.SystemAlertPredicateIds = exports.SystemFilterPredicateIds = exports.SystemPredicateDefs = void 0;
 const tslib_1 = require("tslib");
 const Helper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/Helper"));
 const isToday_1 = tslib_1.__importDefault(require("date-fns/isToday"));
@@ -15,7 +15,6 @@ const isFuture_1 = tslib_1.__importDefault(require("date-fns/isFuture"));
 const isAfter_1 = tslib_1.__importDefault(require("date-fns/isAfter"));
 const isBefore_1 = tslib_1.__importDefault(require("date-fns/isBefore"));
 const isSameDay_1 = tslib_1.__importDefault(require("date-fns/isSameDay"));
-const CalendarHelper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/CalendarHelper"));
 const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
 const DateHelper_1 = require("../../Utilities/Helpers/DateHelper");
 /**
@@ -27,7 +26,7 @@ exports.SystemPredicateDefs = [
         label: 'Values',
         icon: { text: 'IN' },
         columnScope: { DataTypes: ['String', 'Number', 'Date'] },
-        moduleScope: ['filter', 'conditionalstyle', 'alert'],
+        moduleScope: ['filter', 'formatColumn', 'alert'],
         handler: ({ inputs, column, value }) => {
             if (inputs.length === 0) {
                 return true;
@@ -53,7 +52,7 @@ exports.SystemPredicateDefs = [
         label: 'Exclude Values',
         icon: { text: '!IN' },
         columnScope: { DataTypes: ['String', 'Number', 'Date'] },
-        moduleScope: ['filter', 'conditionalstyle', 'alert'],
+        moduleScope: ['filter', 'formatColumn', 'alert'],
         handler: ({ inputs, column, value }) => {
             // basically negation of IN
             if (inputs.length === 0) {
@@ -79,7 +78,7 @@ exports.SystemPredicateDefs = [
         label: 'Blanks',
         icon: { name: 'blanks' },
         columnScope: { All: true },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value }) => Helper_1.default.IsInputNullOrEmpty(value),
     },
     {
@@ -87,7 +86,7 @@ exports.SystemPredicateDefs = [
         label: 'Non Blanks',
         icon: { name: 'non-blanks' },
         columnScope: { All: true },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value }) => Helper_1.default.IsInputNotNullOrEmpty(value),
     },
     // Numeric System Filters
@@ -96,7 +95,7 @@ exports.SystemPredicateDefs = [
         label: 'Greater Than',
         icon: { name: 'greater-than' },
         columnScope: { DataTypes: ['Number'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         inputs: [{ type: 'number' }],
         handler: ({ value, inputs }) => Number(value) > Number(inputs[0]),
         toString: ({ inputs }) => `> ${inputs[0]}`,
@@ -107,7 +106,7 @@ exports.SystemPredicateDefs = [
         label: 'Less Than',
         icon: { name: 'less-than' },
         columnScope: { DataTypes: ['Number'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         inputs: [{ type: 'number' }],
         handler: ({ value, inputs }) => Number(value) < Number(inputs[0]),
         toString: ({ inputs }) => `< ${inputs[0]}`,
@@ -118,7 +117,7 @@ exports.SystemPredicateDefs = [
         label: 'Positive',
         icon: { text: '>0' },
         columnScope: { DataTypes: ['Number'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value }) => Number(value) > 0,
     },
     {
@@ -126,7 +125,7 @@ exports.SystemPredicateDefs = [
         label: 'Negative',
         icon: { text: '<0' },
         columnScope: { DataTypes: ['Number'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value }) => Number(value) < 0,
     },
     {
@@ -134,7 +133,7 @@ exports.SystemPredicateDefs = [
         label: 'Zero',
         icon: { text: '=0' },
         columnScope: { DataTypes: ['Number'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value }) => {
             if (typeof value === 'string' && !StringExtensions_1.default.IsNumeric(value)) {
                 return false;
@@ -147,7 +146,7 @@ exports.SystemPredicateDefs = [
         label: 'Equals',
         icon: { name: 'equal' },
         columnScope: { DataTypes: ['Number'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         inputs: [{ type: 'number' }],
         handler: ({ value, inputs }) => {
             const input = inputs[0];
@@ -165,7 +164,7 @@ exports.SystemPredicateDefs = [
         label: 'Not Equals',
         icon: { name: 'not-equal' },
         columnScope: { DataTypes: ['Number'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         inputs: [{ type: 'number' }],
         handler: ({ value, inputs }) => {
             const input = inputs[0];
@@ -183,7 +182,7 @@ exports.SystemPredicateDefs = [
         label: 'Between',
         icon: { text: 'BE' },
         columnScope: { DataTypes: ['Number'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         inputs: [{ type: 'number' }, { type: 'number' }],
         handler: ({ value, inputs }) => Number(value) >= Number(inputs[0]) && Number(value) <= Number(inputs[1]),
         toString: ({ inputs }) => `Between ${inputs[0]}:${inputs[1]}`,
@@ -194,7 +193,7 @@ exports.SystemPredicateDefs = [
         label: 'Not Between',
         icon: { text: '!BE' },
         columnScope: { DataTypes: ['Number'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         inputs: [{ type: 'number' }, { type: 'number' }],
         handler: ({ value, inputs }) => Number(value) < Number(inputs[0]) || Number(value) > Number(inputs[1]),
         toString: ({ inputs }) => `Not Between ${inputs[0]}:${inputs[1]}`,
@@ -222,7 +221,7 @@ exports.SystemPredicateDefs = [
         label: 'Equals',
         icon: { name: 'equal' },
         columnScope: { DataTypes: ['String'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         inputs: [{ type: 'text' }],
         handler: ({ value, inputs, api }) => {
             if (!value) {
@@ -241,7 +240,7 @@ exports.SystemPredicateDefs = [
         label: 'Not Equals',
         icon: { name: 'not-equal' },
         columnScope: { DataTypes: ['String'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         inputs: [{ type: 'text' }],
         handler: ({ value, inputs, api }) => {
             if (!value) {
@@ -260,7 +259,7 @@ exports.SystemPredicateDefs = [
         label: 'Contains',
         icon: { name: 'contains' },
         columnScope: { DataTypes: ['String'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         inputs: [{ type: 'text' }],
         handler: ({ value, inputs, api }) => {
             if (!value) {
@@ -278,7 +277,7 @@ exports.SystemPredicateDefs = [
         label: 'Not Contains',
         icon: { name: 'not-contains' },
         columnScope: { DataTypes: ['String'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         inputs: [{ type: 'text' }],
         handler: ({ value, inputs, api }) => {
             if (!value) {
@@ -296,7 +295,7 @@ exports.SystemPredicateDefs = [
         label: 'Starts With',
         icon: { name: 'starts-with' },
         columnScope: { DataTypes: ['String'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         inputs: [{ type: 'text' }],
         handler: ({ value, inputs, api }) => {
             if (!value) {
@@ -314,7 +313,7 @@ exports.SystemPredicateDefs = [
         label: 'Ends With',
         icon: { name: 'ends-with' },
         columnScope: { DataTypes: ['String'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         inputs: [{ type: 'text' }],
         handler: ({ value, inputs, api }) => {
             if (!value) {
@@ -332,7 +331,7 @@ exports.SystemPredicateDefs = [
         label: 'Regex',
         icon: { name: 'regex' },
         columnScope: { DataTypes: ['String'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         inputs: [{ type: 'text' }],
         handler: ({ value, inputs }) => new RegExp(inputs[0]).test(value),
         toString: ({ inputs }) => `Regex ${inputs[0]}`,
@@ -343,7 +342,7 @@ exports.SystemPredicateDefs = [
         label: 'Today',
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value }) => (0, isToday_1.default)((0, DateHelper_1.parseDateValue)(value)),
     },
     {
@@ -351,7 +350,7 @@ exports.SystemPredicateDefs = [
         label: 'Yesterday',
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value }) => (0, isYesterday_1.default)((0, DateHelper_1.parseDateValue)(value)),
     },
     {
@@ -359,7 +358,7 @@ exports.SystemPredicateDefs = [
         label: 'Tomorrow',
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value }) => (0, isTomorrow_1.default)((0, DateHelper_1.parseDateValue)(value)),
     },
     {
@@ -367,7 +366,7 @@ exports.SystemPredicateDefs = [
         label: 'This Week',
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value }) => (0, isThisWeek_1.default)((0, DateHelper_1.parseDateValue)(value)),
     },
     {
@@ -375,7 +374,7 @@ exports.SystemPredicateDefs = [
         label: 'This Month',
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value }) => (0, isThisMonth_1.default)((0, DateHelper_1.parseDateValue)(value)),
     },
     {
@@ -383,7 +382,7 @@ exports.SystemPredicateDefs = [
         label: 'This Quarter',
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value }) => (0, isThisQuarter_1.default)((0, DateHelper_1.parseDateValue)(value)),
     },
     {
@@ -391,7 +390,7 @@ exports.SystemPredicateDefs = [
         label: 'This Year',
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value }) => (0, isThisYear_1.default)((0, DateHelper_1.parseDateValue)(value)),
     },
     {
@@ -399,7 +398,7 @@ exports.SystemPredicateDefs = [
         label: 'In Past',
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value }) => (0, isPast_1.default)((0, DateHelper_1.parseDateValue)(value)),
     },
     {
@@ -407,7 +406,7 @@ exports.SystemPredicateDefs = [
         label: 'In Future',
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value }) => (0, isFuture_1.default)((0, DateHelper_1.parseDateValue)(value)),
     },
     {
@@ -415,7 +414,7 @@ exports.SystemPredicateDefs = [
         label: 'After',
         icon: { name: 'greater-than' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         inputs: [{ type: 'date' }],
         handler: ({ value, inputs }) => (0, isAfter_1.default)((0, DateHelper_1.parseDateValue)(value), (0, DateHelper_1.parseDateValue)(inputs[0])),
         toString: ({ inputs }) => `> ${inputs[0]}`,
@@ -425,7 +424,7 @@ exports.SystemPredicateDefs = [
         label: 'Before',
         icon: { name: 'less-than' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         inputs: [{ type: 'date' }],
         handler: ({ value, inputs }) => (0, isBefore_1.default)((0, DateHelper_1.parseDateValue)(value), (0, DateHelper_1.parseDateValue)(inputs[0])),
         toString: ({ inputs }) => `< ${inputs[0]}`,
@@ -435,7 +434,7 @@ exports.SystemPredicateDefs = [
         label: 'Equals',
         icon: { name: 'equal' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         inputs: [{ type: 'date' }],
         handler: ({ value, inputs }) => (0, isSameDay_1.default)((0, DateHelper_1.parseDateValue)(value), (0, DateHelper_1.parseDateValue)(inputs[0])),
         toString: ({ inputs }) => `= ${inputs[0]}`,
@@ -445,7 +444,7 @@ exports.SystemPredicateDefs = [
         label: 'NotEquals',
         icon: { name: 'not-equal' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         inputs: [{ type: 'date' }],
         handler: ({ value, inputs }) => !(0, isSameDay_1.default)((0, DateHelper_1.parseDateValue)(value), (0, DateHelper_1.parseDateValue)(inputs[0])),
         toString: ({ inputs }) => `!= ${inputs[0]}`,
@@ -455,16 +454,32 @@ exports.SystemPredicateDefs = [
         label: 'Next Work Day',
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
-        handler: ({ value, api }) => (0, isSameDay_1.default)((0, DateHelper_1.parseDateValue)(value), CalendarHelper_1.default.getNextWorkingDay()),
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
+        handler: ({ value, api }) => (0, isSameDay_1.default)((0, DateHelper_1.parseDateValue)(value), api.calendarApi.getNextWorkingDay()),
     },
     {
         id: 'LastWorkDay',
         label: 'Last Work Day',
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
-        handler: ({ value, api }) => (0, isSameDay_1.default)((0, DateHelper_1.parseDateValue)(value), CalendarHelper_1.default.getPreviousWorkingDay()),
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
+        handler: ({ value, api }) => (0, isSameDay_1.default)((0, DateHelper_1.parseDateValue)(value), api.calendarApi.getPreviousWorkingDay()),
+    },
+    {
+        id: 'WorkDay',
+        label: 'Working Day',
+        icon: { name: 'calendar' },
+        columnScope: { DataTypes: ['Date'] },
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
+        handler: ({ value, api }) => api.calendarApi.isWorkingDay(value),
+    },
+    {
+        id: 'Holiday',
+        label: 'Holiday',
+        icon: { name: 'calendar' },
+        columnScope: { DataTypes: ['Date'] },
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
+        handler: ({ value, api }) => api.calendarApi.isHoliday(value),
     },
     {
         id: 'InRange',
@@ -474,7 +489,6 @@ exports.SystemPredicateDefs = [
         moduleScope: ['filter'],
         inputs: [{ type: 'date' }, { type: 'date' }],
         handler: ({ value, inputs }) => new Date(value) >= new Date(inputs[0]) && new Date(value) <= new Date(inputs[1]),
-        // toString: ({ inputs }) => `From ${inputs[0]} To ${inputs[1]}`,
     },
     // Boolean System Filters
     {
@@ -482,7 +496,7 @@ exports.SystemPredicateDefs = [
         label: 'True',
         icon: { text: 'T' },
         columnScope: { DataTypes: ['Boolean'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value }) => Boolean(value) === true,
     },
     {
@@ -490,7 +504,7 @@ exports.SystemPredicateDefs = [
         label: 'False',
         icon: { text: 'F' },
         columnScope: { DataTypes: ['Boolean'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value }) => Boolean(value) === false,
     },
     {
@@ -539,7 +553,9 @@ exports.SystemPredicateDefs = [
         moduleScope: ['alert'],
         handler: ({ value, column, api, node }) => {
             return (column === null || column === void 0 ? void 0 : column.isPrimaryKey)
-                ? api.columnApi.getDistinctRawValuesForColumn(column.columnId, node).includes(value)
+                ? api.gridApi.internalApi
+                    .getDistinctRawValuesForColumn(column.columnId, node)
+                    .includes(value)
                 : false;
         },
     },
@@ -550,7 +566,7 @@ exports.SystemPredicateDefs = [
         moduleScope: ['alert'],
         handler: ({ value, api, column, node }) => {
             const distinctValues = column
-                ? api.columnApi.getDistinctRawValuesForColumn(column.columnId, node)
+                ? api.gridApi.internalApi.getDistinctRawValuesForColumn(column.columnId, node)
                 : [];
             return !distinctValues.includes(value);
         },
@@ -562,7 +578,7 @@ exports.SystemPredicateDefs = [
         moduleScope: ['alert'],
         handler: ({ value, api, column, node }) => {
             const distinctValues = column
-                ? api.columnApi.getDistinctRawValuesForColumn(column.columnId, node)
+                ? api.gridApi.internalApi.getDistinctRawValuesForColumn(column.columnId, node)
                 : [];
             return distinctValues.includes(value);
         },
@@ -589,3 +605,6 @@ exports.SystemPredicateDefs = [
     },
 ];
 exports.SystemFilterPredicateIds = exports.SystemPredicateDefs.filter((p) => p.moduleScope.includes('filter')).map((p) => p.id);
+exports.SystemAlertPredicateIds = exports.SystemPredicateDefs.filter((p) => p.moduleScope.includes('alert')).map((p) => p.id);
+exports.SystemFormatColumnPredicateIds = exports.SystemPredicateDefs.filter((p) => p.moduleScope.includes('formatColumn')).map((p) => p.id);
+exports.SystemFlashingCellPredicateIds = exports.SystemPredicateDefs.filter((p) => p.moduleScope.includes('flashingcell')).map((p) => p.id);

package/src/PredefinedConfig/Common/AdaptableStyle.d.ts

@@ -3,13 +3,17 @@
  */
 export interface AdaptableStyle {
     /**
-     * Colour background of cell: provide hex value or name
+     * Colour background of cell: hex, rgb(a) or name
      */
     BackColor?: string;
     /**
-     * Font colour in cell: provide hex value or name
+     * Font colour in cell: hex, rgb(a) or name
      */
     ForeColor?: string;
+    /**
+     * Colour of cell border: hex, rgb(a) or name
+     */
+    BorderColor?: string;
     /**
      * Weight of font: `Normal` or `Bold`
      */
@@ -22,10 +26,6 @@ export interface AdaptableStyle {
      * Size of font: `XSmall`, `Small`, `Medium`, `Large` or `XLarge`
      */
     FontSize?: 'XSmall' | 'Small' | 'Medium' | 'Large' | 'XLarge';
-    /**
-     * Colour of cell border: provide hex value or name
-     */
-    BorderColor?: string;
     /**
      * Existing CSS Class; use instead of setting other object properties
      */

package/src/PredefinedConfig/Common/ColumnFilter.d.ts

@@ -24,6 +24,6 @@ export interface ColumnFilterPredicate extends AdaptablePredicate {
  */
 export declare type SystemFilterPredicateIds = SystemFilterPredicateId[];
 /**
- * List of all the Filter Predicates shipped by AdapTable
+ * List of System Predicates available for Filters
  */
-export declare type SystemFilterPredicateId = 'Values' | 'ExcludeValues' | 'Blanks' | 'NonBlanks' | 'Equals' | 'NotEquals' | 'GreaterThan' | 'LessThan' | 'Positive' | 'Negative' | 'Zero' | 'Between' | 'NotBetween' | 'Is' | 'IsNot' | 'Contains' | 'NotContains' | 'StartsWith' | 'EndsWith' | 'Regex' | 'Today' | 'Yesterday' | 'Tomorrow' | 'ThisWeek' | 'ThisMonth' | 'ThisQuarter' | 'ThisYear' | 'InPast' | 'InFuture' | 'Before' | 'After' | 'InRange' | 'On' | 'NotOn' | 'NextWorkDay' | 'LastWorkDay' | 'True' | 'False' | 'BooleanToggle';
+export declare type SystemFilterPredicateId = 'Values' | 'ExcludeValues' | 'Blanks' | 'NonBlanks' | 'Equals' | 'NotEquals' | 'GreaterThan' | 'LessThan' | 'Positive' | 'Negative' | 'Zero' | 'Between' | 'NotBetween' | 'Is' | 'IsNot' | 'Contains' | 'NotContains' | 'StartsWith' | 'EndsWith' | 'Regex' | 'Today' | 'Yesterday' | 'Tomorrow' | 'ThisWeek' | 'ThisMonth' | 'ThisQuarter' | 'ThisYear' | 'InPast' | 'InFuture' | 'Before' | 'After' | 'InRange' | 'On' | 'NotOn' | 'NextWorkDay' | 'LastWorkDay' | 'WorkDay' | 'Holiday' | 'True' | 'False' | 'BooleanToggle';

package/src/PredefinedConfig/Common/FDC3Context.d.ts

@@ -25,11 +25,6 @@ export interface FDC3Context {
     id?: {
         [key: string]: string | undefined;
     };
-    /**
-     * @internal
-     * Custom properties and metadata. This can be extended in specific context object.
-     */
-    [key: string]: unknown;
 }
 /**
  * FDC3 Context to define a financial Instrument
@@ -219,9 +214,9 @@ export interface CountryContext extends FDC3Context {
  */
 export interface AdaptableFDC3EventInfo extends BaseEventInfo {
     /**
-     * Type of Event: `RaiseIntent` or `BroadcastMessage`
+     * Type of Event: `RaiseIntent`, `RaiseIntentForContext` or `BroadcastMessage`
      */
-    eventType: 'RaiseIntent' | 'BroadcastMessage';
+    eventType: 'RaiseIntent' | 'RaiseIntentForContext' | 'BroadcastMessage';
     /**
      * The FDC3 Intent which caused Event to fire (if type is `RaiseIntent`)
      */
@@ -241,3 +236,4 @@ export declare type FDC3ContextType = 'fdc3.instrument' | 'fdc3.instrumentList'
 export interface CustomFDC3Context extends FDC3Context {
     type: any;
 }
+export declare type ContextData = Record<string, unknown>;

package/src/PredefinedConfig/Common/Types.d.ts

@@ -6,12 +6,12 @@ export declare type AdaptableDashboardToolbars = AdaptableDashboardToolbar[];
 /**
  * List of all the Toolbars that Adaptable provides
  */
-export declare type AdaptableDashboardToolbar = 'Alert' | 'BulkUpdate' | 'CellSummary' | 'DataChangeHistory' | 'DataSet' | 'Export' | 'Filter' | 'Glue42' | 'IPushPull' | 'Layout' | 'OpenFin' | 'Query' | 'QuickSearch' | 'SmartEdit' | 'StateManagement' | 'SystemStatus' | 'Theme';
+export declare type AdaptableDashboardToolbar = 'Alert' | 'BulkUpdate' | 'CellSummary' | 'DataChangeHistory' | 'DataSet' | 'Export' | 'Filter' | 'Glue42' | 'IPushPull' | 'Layout' | 'OpenFin' | 'Query' | 'QuickSearch' | 'SmartEdit' | 'StateManagement' | 'SystemStatus' | 'Theme' | 'Charting';
 export declare const ALL_TOOLBARS: AdaptableDashboardToolbar[];
-export declare type AdaptableStatusBarPanel = 'CellSummary' | 'Alert' | 'GridInfo' | 'Dashboard' | 'ToolPanel' | 'StatusBar' | 'StateManagement' | 'Alert' | 'CalculatedColumn' | 'ConditionalStyle' | 'CustomSort' | 'DataSet' | 'Export' | 'Filter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'Layout' | 'PlusMinus' | 'Query' | 'QuickSearch' | 'Schedule' | 'Shortcut' | 'SystemStatus' | 'DataChangeHistory' | 'TeamSharing' | 'Theme' | 'BulkUpdate' | 'SettingsPanel' | 'SmartEdit';
+export declare type AdaptableStatusBarPanel = 'CellSummary' | 'Alert' | 'GridInfo' | 'Dashboard' | 'ToolPanel' | 'StatusBar' | 'StateManagement' | 'Alert' | 'CalculatedColumn' | 'ConditionalStyle' | 'CustomSort' | 'DataSet' | 'Export' | 'Filter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'Layout' | 'PlusMinus' | 'Query' | 'QuickSearch' | 'Schedule' | 'Shortcut' | 'SystemStatus' | 'DataChangeHistory' | 'TeamSharing' | 'Theme' | 'BulkUpdate' | 'SettingsPanel' | 'SmartEdit' | 'Charting';
 export declare const ALL_STATUS_SUB_PANELS: AdaptableStatusBarPanel[];
 export declare type AdaptableToolPanels = AdaptableToolPanel[];
-export declare type AdaptableToolPanel = 'Alert' | 'BulkUpdate' | 'CellSummary' | 'Dashboard' | 'DataChangeHistory' | 'Export' | 'Filter' | 'IPushPull' | 'Layout' | 'OpenFin' | 'Query' | 'QuickSearch' | 'SmartEdit' | 'StateManagement' | 'SystemStatus' | 'Theme';
+export declare type AdaptableToolPanel = 'Alert' | 'BulkUpdate' | 'CellSummary' | 'Dashboard' | 'DataChangeHistory' | 'Export' | 'Filter' | 'IPushPull' | 'Layout' | 'OpenFin' | 'Query' | 'QuickSearch' | 'SmartEdit' | 'StateManagement' | 'SystemStatus' | 'Theme' | 'Charting';
 export declare const ALL_TOOL_PANELS: AdaptableToolPanels;
 /**
  * Adaptable Module Button collection
@@ -22,18 +22,18 @@ export declare type AdaptableModuleButtons = AdaptableModuleButton[];
 /**
  * List of all the Module buttons Adaptable provides - each Module has a popup for which this is a shortcut button
  */
-export declare type AdaptableModuleButton = 'Alert' | 'BulkUpdate' | 'CalculatedColumn' | 'CellSummary' | 'ConditionalStyle' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataSet' | 'Export' | 'Filter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'Glue42' | 'GridInfo' | 'Layout' | 'OpenFin' | 'PlusMinus' | 'Query' | 'QuickSearch' | 'Schedule' | 'SettingsPanel' | 'Shortcut' | 'SmartEdit' | 'StateManagement' | 'StatusBar' | 'SystemStatus' | 'TeamSharing' | 'Theme';
+export declare type AdaptableModuleButton = 'Alert' | 'BulkUpdate' | 'CalculatedColumn' | 'CellSummary' | 'ConditionalStyle' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataSet' | 'Export' | 'Filter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'Glue42' | 'GridInfo' | 'Layout' | 'OpenFin' | 'PlusMinus' | 'Query' | 'QuickSearch' | 'Schedule' | 'SettingsPanel' | 'Shortcut' | 'SmartEdit' | 'StyledColumn' | 'StateManagement' | 'StatusBar' | 'SystemStatus' | 'TeamSharing' | 'Theme';
 export declare type AdaptableStateKeys = AdaptableStateKey[];
 export declare type AdaptableStateKey = keyof AdaptablePersistentState | 'OpenFin' | 'Glue42' | 'IPushPull';
 /**
  * Modules provided by AdapTable, subject to Entitlements and usually have Predefined Config
  */
-export declare type AdaptableModule = 'Alert' | 'BulkUpdate' | 'CalculatedColumn' | 'CellSummary' | 'Charting' | 'ConditionalStyle' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataSet' | 'Export' | 'Filter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'Glue42' | 'GridInfo' | 'IPushPull' | 'Layout' | 'OpenFin' | 'PlusMinus' | 'Query' | 'QuickSearch' | 'Schedule' | 'SettingsPanel' | 'Shortcut' | 'SmartEdit' | 'StateManagement' | 'StatusBar' | 'SystemStatus' | 'TeamSharing' | 'Theme' | 'ToolPanel';
+export declare type AdaptableModule = 'Alert' | 'BulkUpdate' | 'CalculatedColumn' | 'CellSummary' | 'Charting' | 'ConditionalStyle' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataSet' | 'Export' | 'Filter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'Glue42' | 'GridInfo' | 'IPushPull' | 'Layout' | 'OpenFin' | 'PlusMinus' | 'Query' | 'QuickSearch' | 'Schedule' | 'SettingsPanel' | 'Shortcut' | 'SmartEdit' | 'StyledColumn' | 'StateManagement' | 'StatusBar' | 'SystemStatus' | 'TeamSharing' | 'Theme' | 'ToolPanel';
 export declare const ALL_MODULES: AdaptableModule[];
-export declare type AdaptableSettingsPanel = 'Alert' | 'CalculatedColumn' | 'ConditionalStyle' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataSet' | 'Export' | 'Filter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'GridInfo' | 'Layout' | 'PlusMinus' | 'Query' | 'QuickSearch' | 'Schedule' | 'Shortcut' | 'StateManagement' | 'StatusBar' | 'SystemStatus' | 'TeamSharing' | 'Theme' | 'ToolPanel';
+export declare type AdaptableSettingsPanel = 'Alert' | 'CalculatedColumn' | 'ConditionalStyle' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataSet' | 'Export' | 'Filter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'GridInfo' | 'Layout' | 'PlusMinus' | 'Query' | 'QuickSearch' | 'Schedule' | 'Shortcut' | 'StyledColumn' | 'StateManagement' | 'StatusBar' | 'SystemStatus' | 'TeamSharing' | 'Theme' | 'ToolPanel' | 'Charting';
 export declare type TypeHint<Base, Literals> = (Base & {
     __subType?: true;
 }) | Literals;
 export declare type AdaptableQLModules = AdaptableQLModule[];
 export declare type AdaptableQLModule = 'CalculatedColumn' | 'Filter' | 'Query';
-export declare type AdaptableColumnType = 'abColDefBoolean' | 'abColDefDate' | 'abColDefNumber' | 'abColDefString' | 'abColDefObject' | 'abColDefCustom' | 'abSpecialColumn';
+export declare type AdaptableColumnType = 'abColDefBoolean' | 'abColDefDate' | 'abColDefNumber' | 'abColDefString' | 'abColDefObject' | 'abColDefNumberArray' | 'abColDefTupleNumberArray' | 'abColDefObjectNumberArray' | 'abColDefCustom' | 'abSpecialColumn';

package/src/PredefinedConfig/Common/Types.js

@@ -10,6 +10,7 @@ exports.ALL_TOOLBARS = [
     'Alert',
     'BulkUpdate',
     'CellSummary',
+    'Charting',
     'DataChangeHistory',
     'DataSet',
     'Export',
@@ -32,6 +33,7 @@ exports.ALL_STATUS_SUB_PANELS = [
     'CellSummary',
     'ConditionalStyle',
     'CustomSort',
+    'Charting',
     'Dashboard',
     'DataChangeHistory',
     'DataSet',
@@ -73,6 +75,7 @@ exports.ALL_TOOL_PANELS = [
     'StateManagement',
     'SystemStatus',
     'Theme',
+    'Charting',
 ];
 exports.ALL_MODULES = [
     ModuleConstants.AlertModuleId,
@@ -102,6 +105,7 @@ exports.ALL_MODULES = [
     ModuleConstants.SettingsPanelModuleId,
     ModuleConstants.ShortcutModuleId,
     ModuleConstants.SmartEditModuleId,
+    ModuleConstants.StyledColumnModuleId,
     ModuleConstants.StateManagementModuleId,
     ModuleConstants.StatusBarModuleId,
     ModuleConstants.SystemStatusModuleId,

package/src/PredefinedConfig/ConditionalStyleState.d.ts

@@ -7,41 +7,32 @@ import { XOR } from '../Utilities/Extensions/TypeExtensions';
 import { AdaptableBooleanQuery } from './Common/AdaptableQuery';
 import { SuspendableObject } from './Common/SuspendableObject';
 /**
- * Predefined Configuration for the Conditional Style Module
+ * Deprecated section of Adaptable State - use `FormatColumnState` instead
+ * @deprecated use `FormatColumnState` instead
  **/
 export interface ConditionalStyleState extends ConfigState {
-    /**
-     * Array of Conditional Styles to ship with AdapTable
-     */
     ConditionalStyles?: ConditionalStyle[];
 }
 /**
- * Object used in Conditional Style function - contains Scope, a Rule and a Style
+ * Deprecated Adaptable Object - use `FormatColumn` instead
+ * @deprecated use `FormatColumn` instead
  */
 export interface ConditionalStyle extends SuspendableObject {
-    /**
-     * Where Style is applied - can be whole Row, some Columns or all Columns of given DataType
-     */
     Scope: AdaptableScope;
-    /**
-     * Predicate-based Rule to use for deciding if a style needs to be applied.
-     */
     Rule: ConditionalStyleRule;
-    /**
-     * Adaptable Style (e.g. font properties and colurs) to apply.
-     */
     Style: AdaptableStyle;
-    /**
-     * Whether to apply Style in Grouped Rows and when Pivoting
-     * @defaultValue false
-     */
     IncludeGroupedRows?: boolean;
 }
+/**
+ * Deprecated - use `FormatColumnPredicate` instead
+ * @deprecated use `FormatColumnPredicate` instead
+ */
 export interface ConditionalStylePredicate extends AdaptablePredicate {
     PredicateId: TypeHint<string, SystemConditionalStylePredicateId>;
 }
 /**
- * The Conditional Style Rule - can be either a Predicate or an Expression
+ * Deprecated - use `FormatColumnRule` instead
+ * @deprecated use `FormatColumnRule` instead
  */
 export declare type ConditionalStyleRule = XOR<{
     Predicate: ConditionalStylePredicate;

package/src/PredefinedConfig/FlashingCellState.d.ts

@@ -12,7 +12,7 @@ export interface FlashingCellDefinitionPredicate extends AdaptablePredicate {
  * The Flashing Cell Rule - either an AdaptablePredicate or an AdaptableQuery
  */
 export declare type FlashingCellRule = XOR<{
-    Predicate: FlashingCellDefinitionPredicate;
+    Predicates: FlashingCellDefinitionPredicate[];
 }, AdaptableBooleanQuery>;
 /**
  * Predefined Configuration for Flashing Cell module
@@ -65,4 +65,11 @@ export interface FlashingCellDefinition extends SuspendableObject {
      */
     FlashDuration?: number | 'always';
 }
-export declare type SystemFlashingCellPredicateId = 'Blanks' | 'NonBlanks' | 'Equals' | 'NotEquals' | 'GreaterThan' | 'LessThan' | 'Positive' | 'Negative' | 'Zero' | 'Between' | 'NotBetween' | 'Is' | 'IsNot' | 'Contains' | 'NotContains' | 'StartsWith' | 'EndsWith' | 'Regex' | 'Today' | 'Yesterday' | 'Tomorrow' | 'ThisWeek' | 'ThisMonth' | 'ThisQuarter' | 'ThisYear' | 'InPast' | 'InFuture' | 'Before' | 'After' | 'On' | 'NotOn' | 'NextWorkDay' | 'LastWorkDay' | 'True' | 'False' | 'PercentChange' | 'IsNumeric' | 'IsNotNumeric' | 'Any';
+/**
+ * Array containing all System Flashing Cell Predicates
+ */
+export declare type SystemFlashingCellPredicateIds = SystemFlashingCellPredicateId[];
+/**
+ * List of System Predicates available for Flashing Cells
+ */
+export declare type SystemFlashingCellPredicateId = 'Blanks' | 'NonBlanks' | 'Equals' | 'NotEquals' | 'GreaterThan' | 'LessThan' | 'Positive' | 'Negative' | 'Zero' | 'Between' | 'NotBetween' | 'Is' | 'IsNot' | 'Contains' | 'NotContains' | 'StartsWith' | 'EndsWith' | 'Regex' | 'Today' | 'Yesterday' | 'Tomorrow' | 'ThisWeek' | 'ThisMonth' | 'ThisQuarter' | 'ThisYear' | 'InPast' | 'InFuture' | 'Before' | 'After' | 'On' | 'NotOn' | 'NextWorkDay' | 'LastWorkDay' | 'WorkDay' | 'Holiday' | 'True' | 'False' | 'PercentChange' | 'IsNumeric' | 'IsNotNumeric' | 'Any';