@adaptabletools/adaptable-cjs 23.0.0-canary.8 → 23.0.0-canary.9

package/index.css

@@ -582,9 +582,6 @@
   .twa\:inline-flex {
     display: inline-flex;
   }
-  .twa\:inline-grid {
-    display: inline-grid;
-  }
   .twa\:field-sizing-content {
     field-sizing: content;
   }
@@ -1274,9 +1271,6 @@
   .twa\:grid-cols-\[4\.5rem_1fr\] {
     grid-template-columns: 4.5rem 1fr;
   }
-  .twa\:grid-cols-\[160px_140px_140px\] {
-    grid-template-columns: 160px 140px 140px;
-  }
   .twa\:grid-cols-\[auto_1fr\] {
     grid-template-columns: auto 1fr;
   }
@@ -5852,7 +5846,18 @@
     --ab-icon-fill: currentColor;
     --ab-custom-scrollbar-size: 10px;
     --ab-grid-row-height: 35px;
-    --ab-cmp-column-tag__background: #d8e0e8;
+    --ab-cmp-column-tag__background: var(--ab-color-primary);
+  }
+  @supports (color: color-mix(in lab, red, red)) {
+    :root {
+      --ab-cmp-column-tag__background: color-mix(
+    in srgb,
+    var(--ab-color-primary) 80%,
+    var(--ab-color-accent)
+  );
+    }
+  }
+  :root {
     --ab-cmp-column-tag__foreground: var(--ab-color-primary-foreground);
     --ab-loaded: 777;
     --ab_flex-direction: column;
@@ -7488,7 +7493,7 @@
   .ab-Tag {
     max-width: 100%;
   }
-  .ab-Tag.ab-Tag--column {
+  .ab-Tag--column {
     background: var(--ab-cmp-column-tag__background);
     color: var(--ab-cmp-column-tag__foreground, inherit);
   }
@@ -9007,11 +9012,16 @@
   .ab--theme-dark {
     --ab-color-secondary: oklch(0.269 0 0);
     --ab-color-secondary-foreground: oklch(0.985 0 0);
-    --ab-color-destructive: oklch(0.396 0.141 25.723);
-    --ab-color-destructive-foreground: oklch(0.637 0.237 25.331);
     --ab-color-border: oklch(0.269 0 0);
     --ab-theme-loaded: dark;
-    --ab-color-input-background: color-mix(in srgb, var(--ab-color-background) 95%, black);
+    --ab-color-input-background: var(--ab-color-background);
+  }
+  @supports (color: color-mix(in lab, red, red)) {
+    .ab--theme-dark {
+      --ab-color-input-background: color-mix(in srgb, var(--ab-color-background) 95%, black);
+    }
+  }
+  .ab--theme-dark {
     --ab-cmp-input--disabled__background: #232323;
     --ab-color-background: var(--ab-color-defaultbackground, #474c52);
     --ab-color-foreground: var(--ab-color-text-on-defaultbackground, #e2e2e2);
@@ -9021,13 +9031,18 @@
     --ab-color-primarydark: #1c2021;
     --ab-color-card: #51555a;
     --ab-color-card-foreground: var(--ab-color-foreground);
-    --ab-cmp-draggable-list-item__background: color-mix(
+    --ab-cmp-draggable-list-item__background: var(--ab-color-primary);
+  }
+  @supports (color: color-mix(in lab, red, red)) {
+    .ab--theme-dark {
+      --ab-cmp-draggable-list-item__background: color-mix(
       in srgb,
       var(--ab-color-primary) 72%,
       var(--ab-color-primarylight)
     );
-    --ab-cmp-column-tag__background: #6f7882;
-    --ab-cmp-column-tag__foreground: var(--ab-color-primary-foreground);
+    }
+  }
+  .ab--theme-dark {
     --ab-color-palette-1: #5c1a1a;
     --ab-color-palette-2: #ffb4b4;
     --ab-color-palette-3: #4a3b00;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable-cjs",
-  "version": "23.0.0-canary.8",
+  "version": "23.0.0-canary.9",
   "description": "Powerful AG Grid extension which provides advanced, cutting-edge functionality to meet all DataGrid requirements",
   "keywords": [
     "web-components",

package/src/{Utilities → AdaptableState/Aggregations}/weightedAverage.js

@@ -1,13 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.weightedAverage = exports.getNumericValue = void 0;
-const tslib_1 = require("tslib");
-const toNumber_1 = tslib_1.__importDefault(require("./utils/toNumber"));
+const NumberExtensions_1 = require("../../Utilities/Extensions/NumberExtensions");
 const getNumericValue = (input) => {
     if (typeof input === 'number') {
         return input;
     }
-    const numericValue = (0, toNumber_1.default)(input);
+    const numericValue = (0, NumberExtensions_1.toNumber)(input);
     return isNaN(numericValue) ? null : numericValue;
 };
 exports.getNumericValue = getNumericValue;

package/src/AdaptableState/Common/Enums.d.ts

@@ -4,17 +4,10 @@ export declare enum MathOperation {
     Multiply = "Multiply",
     Divide = "Divide"
 }
-export declare enum ScheduleType {
-    Reminder = "Reminder"
-}
 export declare enum SortOrder {
     Asc = "Asc",
     Desc = "Desc"
 }
-export declare enum SelectionMode {
-    Multi = "Multi",
-    Single = "Single"
-}
 export declare enum FontWeight {
     Normal = "Normal",
     Bold = "Bold"
@@ -49,8 +42,3 @@ export declare enum SummaryOperation {
     Std_Deviation = "Std Deviation",
     Only = "Only"
 }
-export declare enum ChangeDirection {
-    Up = "Up",
-    Down = "Down",
-    Neutral = "Neutral"
-}

package/src/AdaptableState/Common/Enums.js

@@ -1,7 +1,7 @@
 "use strict";
 // General Enums
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ChangeDirection = exports.SummaryOperation = exports.StatusColour = exports.FontSize = exports.FontStyle = exports.FontWeight = exports.SelectionMode = exports.SortOrder = exports.ScheduleType = exports.MathOperation = void 0;
+exports.SummaryOperation = exports.StatusColour = exports.FontSize = exports.FontStyle = exports.FontWeight = exports.SortOrder = exports.MathOperation = void 0;
 var MathOperation;
 (function (MathOperation) {
     MathOperation["Add"] = "Add";
@@ -10,20 +10,11 @@ var MathOperation;
     MathOperation["Divide"] = "Divide";
 })(MathOperation || (exports.MathOperation = MathOperation = {}));
 // Enums used in Strategies
-var ScheduleType;
-(function (ScheduleType) {
-    ScheduleType["Reminder"] = "Reminder";
-})(ScheduleType || (exports.ScheduleType = ScheduleType = {}));
 var SortOrder;
 (function (SortOrder) {
     SortOrder["Asc"] = "Asc";
     SortOrder["Desc"] = "Desc";
 })(SortOrder || (exports.SortOrder = SortOrder = {}));
-var SelectionMode;
-(function (SelectionMode) {
-    SelectionMode["Multi"] = "Multi";
-    SelectionMode["Single"] = "Single";
-})(SelectionMode || (exports.SelectionMode = SelectionMode = {}));
 var FontWeight;
 (function (FontWeight) {
     FontWeight["Normal"] = "Normal";
@@ -64,9 +55,3 @@ var SummaryOperation;
     SummaryOperation["Std_Deviation"] = "Std Deviation";
     SummaryOperation["Only"] = "Only";
 })(SummaryOperation || (exports.SummaryOperation = SummaryOperation = {}));
-var ChangeDirection;
-(function (ChangeDirection) {
-    ChangeDirection["Up"] = "Up";
-    ChangeDirection["Down"] = "Down";
-    ChangeDirection["Neutral"] = "Neutral";
-})(ChangeDirection || (exports.ChangeDirection = ChangeDirection = {}));

package/src/{Utilities → AdaptableState/Common}/MenuItem.d.ts

@@ -1,8 +1,8 @@
 import * as Redux from 'redux';
-import { ModuleParams } from '../View/Components/SharedProps/ModuleViewPopupProps';
-import { AdaptableMenuItem, AdaptableContextMenuItemName, AdaptableColumnMenuItemName } from '../AdaptableState/Common/Menu';
-import { AdaptableModule } from '../AdaptableState/Common/Types';
-import { AdaptableIcon, AdaptableSystemIconName } from '../AdaptableState/Common/AdaptableIcon';
+import { ModuleParams } from '../../View/Components/SharedProps/ModuleViewPopupProps';
+import { AdaptableMenuItem, AdaptableContextMenuItemName, AdaptableColumnMenuItemName } from './Menu';
+import { AdaptableModule } from './Types';
+import { AdaptableIcon, AdaptableSystemIconName } from './AdaptableIcon';
 export declare class MenuItemDoReduxAction<MENU_TYPE_NAME extends AdaptableColumnMenuItemName | AdaptableContextMenuItemName = AdaptableColumnMenuItemName | AdaptableContextMenuItemName> implements AdaptableMenuItem<MENU_TYPE_NAME> {
     constructor(name: MENU_TYPE_NAME, label: string, module: AdaptableModule, reduxAction: Redux.Action, icon: AdaptableSystemIconName, isVisible: boolean);
     name: MENU_TYPE_NAME;

package/src/{Utilities → AdaptableState/Common}/MenuItem.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MenuItemShowPopup = exports.MenuItemDoClickFunction = exports.MenuItemDoReduxAction = void 0;
 const tslib_1 = require("tslib");
-const PopupRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/PopupRedux"));
+const PopupRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/PopupRedux"));
 // A menu item which performs a Redux Action when it is clicke
 class MenuItemDoReduxAction {
     constructor(name, label, module, reduxAction, icon, isVisible) {

package/src/AdaptableState/StyledColumns/BulletChartStyle.d.ts

@@ -1,6 +1,6 @@
 import { CellFontStyle } from '../Common/AdaptableStyle';
-import { BarChartCellTextProperties } from './Common/BarChartCellText';
-import { BarChartMarker } from './Common/BarChartMarker';
+import { BarStyleCellTextProperties } from './Common/BarStyleProperties';
+import { BarStyleMarker } from './Common/BarStyleProperties';
 import { CellTextOptions } from './Common/CellTextOptions';
 import { NumericStyledColumn } from './Common/NumericStyledColumn';
 /**
@@ -61,7 +61,7 @@ export interface BulletChartStyle extends NumericStyledColumn {
     /**
      * Optional cell-text overlay configuration.
      */
-    CellTextProperties?: BarChartCellTextProperties;
+    CellTextProperties?: BarStyleCellTextProperties;
     /**
      * Tooltip content - same tokens (`'CellValue'`, `'PercentageValue'`) as
      * Percent Bar.
@@ -119,7 +119,7 @@ export interface BulletChartTargetProperties {
      * When `Target` is an array, this style applies to all markers; pass a
      * `Target` object with its own `Marker` property to override per-marker.
      */
-    Marker?: BarChartMarker;
+    Marker?: BarStyleMarker;
 }
 /**
  * A single Bullet Chart target. Either a primitive resolvable value (number /
@@ -139,7 +139,7 @@ export interface BulletChartTargetDefinition {
     /**
      * Per-target marker override. Falls back to `BulletChartTargetProperties.Marker`.
      */
-    Marker?: BarChartMarker;
+    Marker?: BarStyleMarker;
     /**
      * Optional label displayed in the tooltip alongside the marker value.
      */

package/src/AdaptableState/StyledColumns/Common/{BarChartCellText.d.ts → BarStyleProperties.d.ts}

@@ -1,3 +1,27 @@
+/**
+ * Marker primitives shared by bar-chart-style Styled Columns —
+ * Bullet Chart target markers and Range Bar value / reference markers.
+ */
+/**
+ * Visual style of a marker drawn on a bar-chart-style track or bar — used by
+ * Bullet Chart target markers and Range Bar value / reference markers.
+ */
+export interface BarStyleMarker {
+    /**
+     * Marker shape.
+     */
+    Shape?: 'Line' | 'Triangle' | 'Dot' | 'Diamond';
+    /**
+     * Marker colour. Defaults to the current text colour.
+     *
+     * @defaultValue 'var(--ab-color-text)'
+     */
+    Color?: string;
+    /**
+     * Line thickness (for `Shape: 'Line'`) or shape size in px.
+     */
+    Size?: number;
+}
 /**
  * Per-value cell-text overlay layout shared by Percent Bar, Bullet Chart
  * and Range Bar styles. Each token (`CellValue`, `PercentValue`) can be
@@ -6,29 +30,29 @@
 /**
  * Horizontal alignment for cell text (Cell or Percent) in Percent, Range Bar & Bullet styles (Left, Center, Right)
  */
-export type BarChartCellTextHorizontalAlignment = 'Left' | 'Center' | 'Right';
+export type BarStyleCellTextHorizontalAlignment = 'Left' | 'Center' | 'Right';
 /**
  * Vertical alignment for cell text value relative to bar/chart (Above, Below, Merged)
  */
-export type BarChartCellTextVerticalAlignment = 'Above' | 'Below' | 'Merged';
+export type BarStyleCellTextVerticalAlignment = 'Above' | 'Below' | 'Merged';
 /**
  * Placement of cell text value (Cell or Percent) around the bar/chart
  *
  * @defaultValue `{ Horizontal: 'Left', Vertical: 'Below' }`
  */
-export interface BarChartCellTextPlacement {
+export interface BarStyleCellTextPlacement {
     /**
      * Horizontal alignment within its vertical band.
      *
      * @defaultValue 'Left'
      */
-    Horizontal?: BarChartCellTextHorizontalAlignment;
+    Horizontal?: BarStyleCellTextHorizontalAlignment;
     /**
      * Vertical position relative to the bar/chart.
      *
      * @defaultValue 'Below'
      */
-    Vertical?: BarChartCellTextVerticalAlignment;
+    Vertical?: BarStyleCellTextVerticalAlignment;
 }
 /**
  * Per-value cell-text layout: each value (Cell Value, Percent Value) can be
@@ -38,23 +62,23 @@ export interface BarChartCellTextPlacement {
  * same horizontal slot at the same vertical position they are concatenated with
  * a single space (Cell Value first, then Percent Value).
  */
-export interface BarChartCellTextLayout {
+export interface BarStyleCellTextLayout {
     /**
      * Placement of the formatted cell value.
      */
-    CellValue?: BarChartCellTextPlacement;
+    CellValue?: BarStyleCellTextPlacement;
     /**
      * Placement of the percent value (the cell value's position along the bar's
      * `[min, max]` scale as a 0–100% reading).
      */
-    PercentValue?: BarChartCellTextPlacement;
+    PercentValue?: BarStyleCellTextPlacement;
 }
 /**
  * Cell-text overlay configuration shared by Percent Bar, Range Bar and Bullet Chart.
  */
-export interface BarChartCellTextProperties {
+export interface BarStyleCellTextProperties {
     /**
      * Per-value placement on the 3 × 3 grid around / on the bar/chart.
      */
-    CellTextLayout?: BarChartCellTextLayout;
+    CellTextLayout?: BarStyleCellTextLayout;
 }

package/src/AdaptableState/StyledColumns/GradientStyle.d.ts

@@ -4,7 +4,7 @@ import { NumericStyledColumn } from './Common/NumericStyledColumn';
 /**
  * Colours for a zero-centred diverging gradient: negative and positive bands that meet at `0`
  */
-export interface GradientZeroCentredColors {
+export interface ZeroCentredColors {
     /**
      * Colour applied to negative cell values (`Col-Min`…`0`)
      */
@@ -21,7 +21,7 @@ export interface GradientStyle extends NumericStyledColumn {
     /**
      * Zero-centred diverging gradient (`Col-Min`…`0` and `0`…`Col-Max`
      */
-    ZeroCentred?: GradientZeroCentredColors;
+    ZeroCentred?: ZeroCentredColors;
     /**
      * Alpha (0–1) at **low** end of the matched range’s scale
      *

package/src/AdaptableState/StyledColumns/PercentBarStyle.d.ts

@@ -1,5 +1,5 @@
 import { CellFontStyle } from '../Common/AdaptableStyle';
-import { BarChartCellTextProperties } from './Common/BarChartCellText';
+import { BarStyleCellTextProperties } from './Common/BarStyleProperties';
 import { CellTextOptions } from './Common/CellTextOptions';
 import { NumericStyledColumn } from './Common/NumericStyledColumn';
 /**
@@ -9,7 +9,7 @@ export interface PercentBarStyle extends NumericStyledColumn {
     /**
      * Optional cell-text overlay configuration (display tokens, position, layout, alignment).
      */
-    CellTextProperties?: BarChartCellTextProperties;
+    CellTextProperties?: BarStyleCellTextProperties;
     /**
      * Whether Tooltip shows Cell Value, Percent Value, both or none
      */

package/src/AdaptableState/StyledColumns/RangeBarStyle.d.ts

@@ -1,5 +1,5 @@
-import { BarChartCellTextProperties } from './Common/BarChartCellText';
-import { BarChartMarker } from './Common/BarChartMarker';
+import { BarStyleCellTextProperties } from './Common/BarStyleProperties';
+import { BarStyleMarker } from './Common/BarStyleProperties';
 import { CellTextOptions } from './Common/CellTextOptions';
 import { DynamicRangeEndpoint, NumericStyledColumn } from './Common/NumericStyledColumn';
 /**
@@ -62,7 +62,7 @@ export interface RangeBarStyle extends NumericStyledColumn {
      *
      * @defaultValue `{ Shape: 'Diamond', Color: 'var(--ab-color-accent)', Size: 8 }`
      */
-    Marker?: BarChartMarker;
+    Marker?: BarStyleMarker;
     /**
      * Behaviour when the cell value falls outside `[Min, Max]`, plus the
      * optional marker colour override used by `Mode: 'Clamp'`.
@@ -88,7 +88,7 @@ export interface RangeBarStyle extends NumericStyledColumn {
     /**
      * Optional cell-text overlay configuration.
      */
-    CellTextProperties?: BarChartCellTextProperties;
+    CellTextProperties?: BarStyleCellTextProperties;
     /**
      * Tooltip content — same tokens (`'CellValue'`, `'PercentageValue'`)
      * as Percent Bar / Bullet Chart.
@@ -110,7 +110,7 @@ export interface RangeBarReferenceProperties {
      *
      * @defaultValue `{ Shape: 'Line', Color: 'var(--ab-color-foreground)', Size: 2 }`
      */
-    Marker?: BarChartMarker;
+    Marker?: BarStyleMarker;
 }
 /**
  * Out-of-range behaviour for a Range Bar.

package/src/Api/Implementation/AlertApiImpl.js

@@ -12,7 +12,7 @@ const AdaptableAlert_1 = require("../../AdaptableState/Common/AdaptableAlert");
 const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
 const AlertInternalApi_1 = require("../Internal/AlertInternalApi");
 const resolveContainerElement_1 = require("../../Utilities/resolveContainerElement");
-const ScheduledAlertHelper_1 = require("../../Utilities/Helpers/ScheduledAlertHelper");
+const ScheduledAlertHelper_1 = require("../../Utilities/Helpers/Scheduling/ScheduledAlertHelper");
 class AlertApiImpl extends ApiBase_1.ApiBase {
     internalApi;
     constructor(_adaptable) {

package/src/Api/Implementation/ChartingApiImpl.js

@@ -8,7 +8,7 @@ const ChartingRedux_1 = require("./../../Redux/ActionsReducers/ChartingRedux");
 const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
 const ChartingInternalApi_1 = require("../Internal/ChartingInternalApi");
 const ObjectFactory_1 = tslib_1.__importDefault(require("../../Utilities/ObjectFactory"));
-const chartingHelper_1 = require("../../Utilities/Helpers/chartingHelper");
+const ChartHelper_1 = require("../../Utilities/Helpers/ChartHelper");
 class ChartingApiImpl extends ApiBase_1.ApiBase {
     /**
      * @internal
@@ -76,7 +76,7 @@ class ChartingApiImpl extends ApiBase_1.ApiBase {
         }
     }
     editChartDefinition(editedChartDefinition) {
-        const nameValidation = (0, chartingHelper_1.validateChartName)(this.getAdaptableApi(), editedChartDefinition.Name, editedChartDefinition.Uuid);
+        const nameValidation = (0, ChartHelper_1.validateChartName)(this.getAdaptableApi(), editedChartDefinition.Name, editedChartDefinition.Uuid);
         if (nameValidation !== true) {
             this.getAdatableLogger().consoleLogByMessageType(nameValidation, 'Warning');
             return;
@@ -88,7 +88,7 @@ class ChartingApiImpl extends ApiBase_1.ApiBase {
         this._adaptable.updateChart(chartDefinition);
     }
     addChartDefinition(chart) {
-        const nameValidation = (0, chartingHelper_1.validateChartName)(this.getAdaptableApi(), chart.Name, chart.Uuid);
+        const nameValidation = (0, ChartHelper_1.validateChartName)(this.getAdaptableApi(), chart.Name, chart.Uuid);
         if (nameValidation !== true) {
             this.getAdatableLogger().consoleLogByMessageType(nameValidation, 'Warning');
             return;
@@ -130,7 +130,7 @@ class ChartingApiImpl extends ApiBase_1.ApiBase {
         const saveChartBehaviour = options?.saveChartBehaviour ?? 'manual';
         const chartName = chartDefinition.Name?.trim() || this.internalApi.getUniqueChartName();
         if (saveChartBehaviour === 'auto') {
-            const nameValidation = (0, chartingHelper_1.validateChartName)(this.getAdaptableApi(), chartName, chartDefinition.Uuid);
+            const nameValidation = (0, ChartHelper_1.validateChartName)(this.getAdaptableApi(), chartName, chartDefinition.Uuid);
             if (nameValidation !== true) {
                 this.getAdatableLogger().consoleLogByMessageType(nameValidation, 'Warning');
                 return;
@@ -190,7 +190,7 @@ class ChartingApiImpl extends ApiBase_1.ApiBase {
         }
     }
     editExternalChartDefinition(chartDefinition) {
-        const nameValidation = (0, chartingHelper_1.validateChartName)(this.getAdaptableApi(), chartDefinition.Name, chartDefinition.Uuid);
+        const nameValidation = (0, ChartHelper_1.validateChartName)(this.getAdaptableApi(), chartDefinition.Name, chartDefinition.Uuid);
         if (nameValidation !== true) {
             this.getAdatableLogger().consoleLogByMessageType(nameValidation, 'Warning');
             return;

package/src/Api/Implementation/ExportApiImpl.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExportApiImpl = void 0;
 const tslib_1 = require("tslib");
 const ExportRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/ExportRedux"));
-const ScheduledReportHelper_1 = require("../../Utilities/Helpers/ScheduledReportHelper");
+const ScheduledReportHelper_1 = require("../../Utilities/Helpers/Scheduling/ScheduledReportHelper");
 const ApiBase_1 = require("./ApiBase");
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
 const ExportInternalApi_1 = require("../Internal/ExportInternalApi");

package/src/Api/Implementation/LayoutHelpers.js

@@ -2,8 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isPivotLayout = exports.pivotLayoutModelToPivotLayout = exports.tableLayoutModelToTableLayout = exports.pivotLayoutToPivotLayoutModel = exports.tableLayoutToTableLayoutModel = exports.checkForDuplicateColumns = exports.toRowGroupValuesForLayoutModel = exports.toRowGroupValuesForLayoutState = exports.getLayoutRowGroupValuesExceptionGroupKeys = exports.resetLayoutHelperErrorOnceMessages = exports.normalizePivotLayout = exports.normalizeTableLayout = exports.normalizeLayout = exports.areLayoutsEqual = exports.layoutModelToLayoutState = exports.layoutStateToLayoutModel = void 0;
 exports.columnWidthsToColumnSizing = columnWidthsToColumnSizing;
-const tslib_1 = require("tslib");
-const isEqual_1 = tslib_1.__importDefault(require("../../Utilities/utils/isEqual"));
+const ObjectExtensions_1 = require("../../Utilities/Extensions/ObjectExtensions");
 const isPivotLayoutModel_1 = require("../../layout-manager/src/isPivotLayoutModel");
 const normalizeLayoutModel_1 = require("../../layout-manager/src/normalizeLayoutModel");
 const simplifyLayoutModel_1 = require("../../layout-manager/src/simplifyLayoutModel");
@@ -69,7 +68,7 @@ const areLayoutsEqual = (layout1, layout2) => {
     if (!layout1 || !layout2) {
         return false;
     }
-    return (0, isEqual_1.default)((0, exports.normalizeLayout)(layout1), (0, exports.normalizeLayout)(layout2));
+    return (0, ObjectExtensions_1.isEqual)((0, exports.normalizeLayout)(layout1), (0, exports.normalizeLayout)(layout2));
 };
 exports.areLayoutsEqual = areLayoutsEqual;
 const normalizeLayout = (layout, options) => {

package/src/Api/Implementation/QuickSearchApiImpl.js

@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
 const QuickSearchRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/QuickSearchRedux"));
 const InternalRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/InternalRedux"));
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
-const QuickSearchStyleHelper_1 = require("../../Utilities/Helpers/QuickSearchStyleHelper");
+const QuickSearchHelper_1 = require("../../Utilities/Helpers/QuickSearchHelper");
 const ApiBase_1 = require("./ApiBase");
 class QuickSearchApiImpl extends ApiBase_1.ApiBase {
     getQuickSearchState() {
@@ -27,13 +27,13 @@ class QuickSearchApiImpl extends ApiBase_1.ApiBase {
         return this.getQuickSearchState().QuickSearchText;
     }
     getQuickSearchCellMatchStyle() {
-        return (0, QuickSearchStyleHelper_1.resolveQuickSearchCellMatchStyle)(this.getQuickSearchState());
+        return (0, QuickSearchHelper_1.resolveQuickSearchCellMatchStyle)(this.getQuickSearchState());
     }
     getQuickSearchTextMatchStyle() {
-        return (0, QuickSearchStyleHelper_1.resolveQuickSearchTextMatchStyle)(this.getQuickSearchState());
+        return (0, QuickSearchHelper_1.resolveQuickSearchTextMatchStyle)(this.getQuickSearchState());
     }
     getQuickSearchCurrentTextMatchStyle() {
-        return (0, QuickSearchStyleHelper_1.resolveQuickSearchCurrentTextMatchStyle)(this.getQuickSearchState());
+        return (0, QuickSearchHelper_1.resolveQuickSearchCurrentTextMatchStyle)(this.getQuickSearchState());
     }
     setQuickSearchCellMatchStyle(style) {
         this.dispatchAction(QuickSearchRedux.QuickSearchSetCellMatchingStyle(style));

package/src/Api/Implementation/ThemeApiImpl.js

@@ -8,7 +8,7 @@ const ApiBase_1 = require("./ApiBase");
 const ThemeInternalApi_1 = require("../Internal/ThemeInternalApi");
 const AdaptableHelper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/AdaptableHelper"));
 const logDeprecation_1 = require("../../Utilities/logDeprecation");
-const ThemeHelpers_1 = require("../../Utilities/Helpers/ThemeHelpers");
+const ThemeHelper_1 = require("../../Utilities/Helpers/ThemeHelper");
 class ThemeApiImpl extends ApiBase_1.ApiBase {
     internalApi;
     constructor(_adaptable) {
@@ -43,7 +43,7 @@ class ThemeApiImpl extends ApiBase_1.ApiBase {
     }
     getSystemThemes() {
         const themes = this.getAdaptableState().Theme.SystemThemes ?? [];
-        return themes.map((theme) => (0, ThemeHelpers_1.systemThemeEntryToAdaptableTheme)(theme, this._adaptable.logger));
+        return themes.map((theme) => (0, ThemeHelper_1.systemThemeEntryToAdaptableTheme)(theme, this._adaptable.logger));
     }
     applyCurrentTheme() {
         const currentThemeName = this.getCurrentTheme();

package/src/Api/Internal/ActionColumnInternalApi.js

@@ -5,7 +5,7 @@ const ApiBase_1 = require("../Implementation/ApiBase");
 const Uuid_1 = require("../../AdaptableState/Uuid");
 const ActionColumnRenderer_1 = require("../../agGrid/cellRenderers/ActionColumnRenderer");
 const AdaptableColumn_1 = require("../../AdaptableState/Common/AdaptableColumn");
-const ActionColumnWidthHelper_1 = require("../../Utilities/Helpers/ActionColumnWidthHelper");
+const ActionColumnHelper_1 = require("../../Utilities/Helpers/ActionColumnHelper");
 class ActionColumnInternalApi extends ApiBase_1.ApiBase {
     getColDefsForActionColumns() {
         const defaultSpecialColumnSettings = this.getGridApi().internalApi.deriveSpecialColumnSettingsFromAgGridDefaultColDef();
@@ -25,7 +25,7 @@ class ActionColumnInternalApi extends ApiBase_1.ApiBase {
             const actionButtons = Array.isArray(actionColumn.actionColumnButton)
                 ? actionColumn.actionColumnButton
                 : [actionColumn.actionColumnButton];
-            const resolvedWidth = (0, ActionColumnWidthHelper_1.calculateActionColumnWidth)(actionColumn, actionButtons);
+            const resolvedWidth = (0, ActionColumnHelper_1.calculateActionColumnWidth)(actionColumn, actionButtons);
             const newColDef = {
                 headerName: actionColumn.friendlyName ? actionColumn.friendlyName : actionColumn.columnId,
                 colId: actionColumn.columnId,

package/src/Api/Internal/AlertInternalApi.js

@@ -9,7 +9,7 @@ const ArrayExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Exten
 const ModuleConstants_1 = require("../../Utilities/Constants/ModuleConstants");
 const IAlertService_1 = require("../../Utilities/Services/Interface/IAlertService");
 const ObjectFactory_1 = tslib_1.__importDefault(require("../../Utilities/ObjectFactory"));
-const ScheduledAlertHelper_1 = require("../../Utilities/Helpers/ScheduledAlertHelper");
+const ScheduledAlertHelper_1 = require("../../Utilities/Helpers/Scheduling/ScheduledAlertHelper");
 const Helper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/Helper"));
 const InternalRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/InternalRedux"));
 const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));

package/src/Api/Internal/ChartingInternalApi.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ChartingInternalApi = void 0;
 const ApiBase_1 = require("../Implementation/ApiBase");
-const chartingHelper_1 = require("../../Utilities/Helpers/chartingHelper");
+const ChartHelper_1 = require("../../Utilities/Helpers/ChartHelper");
 class ChartingInternalApi extends ApiBase_1.ApiBase {
     getContainerElement(chartContainer) {
         const element = typeof chartContainer?.element === 'string'
@@ -22,7 +22,7 @@ class ChartingInternalApi extends ApiBase_1.ApiBase {
     getUniqueChartName() {
         let index = 1;
         let candidate = `Chart ${index}`;
-        while ((0, chartingHelper_1.isChartNameTaken)(this.getAdaptableApi(), candidate)) {
+        while ((0, ChartHelper_1.isChartNameTaken)(this.getAdaptableApi(), candidate)) {
             index += 1;
             candidate = `Chart ${index}`;
         }

package/src/Api/Internal/ColumnInternalApi.js

@@ -5,7 +5,7 @@ exports.getAutoRowGroupColumnIdFor = getAutoRowGroupColumnIdFor;
 const tslib_1 = require("tslib");
 const ApiBase_1 = require("../Implementation/ApiBase");
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
-const uniq_1 = tslib_1.__importDefault(require("../../Utilities/utils/uniq"));
+const ArrayExtensions_1 = require("../../Utilities/Extensions/ArrayExtensions");
 const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
 const ColumnApiImpl_1 = require("../Implementation/ColumnApiImpl");
 const destructurePivotColumnId_1 = require("../../layout-manager/src/destructurePivotColumnId");
@@ -39,7 +39,7 @@ class ColumnInternalApi extends ApiBase_1.ApiBase {
                 colTypes.push(agGridColType);
             }
         });
-        return (0, uniq_1.default)(colTypes).filter((c) => StringExtensions_1.default.IsNotNullOrEmptyOrWhiteSpace(c));
+        return (0, ArrayExtensions_1.uniq)(colTypes).filter((c) => StringExtensions_1.default.IsNotNullOrEmptyOrWhiteSpace(c));
     }
     /**
      * Retrieves a list providing the Friendly Name / Caption for all columns

package/src/Api/Internal/EventInternalApi.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EventInternalApi = void 0;
-const tslib_1 = require("tslib");
 const ApiBase_1 = require("../Implementation/ApiBase");
-const isEqual_1 = tslib_1.__importDefault(require("../../Utilities/utils/isEqual"));
+const ObjectExtensions_1 = require("../../Utilities/Extensions/ObjectExtensions");
 class EventInternalApi extends ApiBase_1.ApiBase {
     fireGridSortedEvent() {
         if (this.isAdapTableReady()) {
@@ -64,7 +63,7 @@ class EventInternalApi extends ApiBase_1.ApiBase {
             isToolbarStateChangedToVisible,
             isToolbarStateChangedToHidden,
         };
-        if (!(0, isEqual_1.default)(oldDashboardState, newDashboardState)) {
+        if (!(0, ObjectExtensions_1.isEqual)(oldDashboardState, newDashboardState)) {
             setTimeout(() => {
                 const eventApi = this.getEventApi();
                 if (eventApi) {
@@ -96,7 +95,7 @@ class EventInternalApi extends ApiBase_1.ApiBase {
         this.getEventApi().emit('ThemeChanged', themeChangedInfo);
     }
     fireLayoutChangedEvent(trigger, oldState, newState) {
-        if ((0, isEqual_1.default)(oldState, newState)) {
+        if ((0, ObjectExtensions_1.isEqual)(oldState, newState)) {
             return;
         }
         const layoutChangedInfo = {