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

package/src/agGrid/cellRenderers/BulletChartRenderer.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getBulletChartRendererForColumn = void 0;
 const tslib_1 = require("tslib");
 const Helper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/Helper"));
-const clamp_1 = tslib_1.__importDefault(require("../../Utilities/utils/clamp"));
-const barChartCellText_1 = require("../../Utilities/Helpers/barChartCellText");
-const shouldRenderStyledColumnOnRow_1 = require("./shouldRenderStyledColumnOnRow");
+const NumberExtensions_1 = require("../../Utilities/Extensions/NumberExtensions");
+const BarStylesHelper_1 = require("../../Utilities/Helpers/StyledColumns/BarStylesHelper");
+const StyledColumnHelper_1 = require("../../Utilities/Helpers/StyledColumns/StyledColumnHelper");
 const SVG_NS = 'http://www.w3.org/2000/svg';
 const DEFAULT_BAR_HEIGHT = 8;
 const DEFAULT_BAND_HEIGHT = 14;
@@ -106,7 +106,7 @@ const toFraction = (value, min, max) => {
     if (max === min) {
         return 0;
     }
-    return (0, clamp_1.default)((value - min) / (max - min), 0, 1);
+    return (0, NumberExtensions_1.clamp)((value - min) / (max - min), 0, 1);
 };
 const getBulletChartRendererForColumn = (styledColumn, abColumn, api) => {
     if (!styledColumn.BulletChartStyle) {
@@ -117,7 +117,7 @@ const getBulletChartRendererForColumn = (styledColumn, abColumn, api) => {
         eGui;
         init(params) {
             // Defer to the shared row-scope helper.
-            if (!(0, shouldRenderStyledColumnOnRow_1.shouldRenderStyledColumnOnRow)(styledColumn, params.node, api)) {
+            if (!(0, StyledColumnHelper_1.shouldRenderStyledColumnOnRow)(styledColumn, params.node, api)) {
                 if (params.value != undefined) {
                     this.eGui = document.createElement('div');
                     this.eGui.append(String(params.value));
@@ -159,7 +159,7 @@ const getBulletChartRendererForColumn = (styledColumn, abColumn, api) => {
             const barThickness = bulletStyle.Bar?.Height ?? DEFAULT_BAR_HEIGHT;
             const bandThickness = Math.max(barThickness + 6, DEFAULT_BAND_HEIGHT);
             const cellTextProperties = bulletStyle.CellTextProperties;
-            const hasCellText = (0, barChartCellText_1.hasBarChartCellTextConfigured)(cellTextProperties);
+            const hasCellText = (0, BarStylesHelper_1.hasBarStyleCellTextConfigured)(cellTextProperties);
             // Map a 0..1 value fraction onto the long-axis viewBox (0..100).
             // In horizontal: 0 -> left, 1 -> right.
             // In vertical:   0 -> bottom, 1 -> top (SVG y origin is at the top so
@@ -285,8 +285,8 @@ const getBulletChartRendererForColumn = (styledColumn, abColumn, api) => {
                 // `valueFormatter` returns the raw value (a number here), so coerce
                 // to string before it flows into the helpers.
                 const formattedCellValue = String(params.formatValue?.(cellValue) ?? cellValue);
-                const labels = (0, barChartCellText_1.buildBarChartCellTextLabels)(cellTextProperties, formattedCellValue, `${(valueFraction * 100).toFixed(0)}%`);
-                (0, barChartCellText_1.mountBarChartCellText)({
+                const labels = (0, BarStylesHelper_1.buildBarStyleCellTextLabels)(cellTextProperties, formattedCellValue, `${(valueFraction * 100).toFixed(0)}%`);
+                (0, BarStylesHelper_1.mountBarStyleCellText)({
                     wrapperEl: this.eGui,
                     mergedOverlayEl: svgContainer,
                     textClassName: 'ab-BulletChart__text',

package/src/agGrid/cellRenderers/IconRenderer.js

@@ -6,9 +6,8 @@ const React = tslib_1.__importStar(require("react"));
 const Icon_1 = require("../../components/Icon");
 const renderWithAdaptableContext_1 = require("../../View/renderWithAdaptableContext");
 const Helper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/Helper"));
-const IconStylePresets_1 = require("../../Utilities/Helpers/IconStylePresets");
-const shouldRenderStyledColumnOnRow_1 = require("./shouldRenderStyledColumnOnRow");
-const iconStyledColumnColumnSupport_1 = require("../../Utilities/Helpers/iconStyledColumnColumnSupport");
+const IconStyleHelper_1 = require("../../Utilities/Helpers/StyledColumns/IconStyleHelper");
+const StyledColumnHelper_1 = require("../../Utilities/Helpers/StyledColumns/StyledColumnHelper");
 const AdaptableLogger_1 = require("../AdaptableLogger");
 const DEFAULT_SIZE = 18;
 const DEFAULT_GAP = 4;
@@ -20,7 +19,7 @@ const normaliseIconMappingKey = (key, matchMode) => {
 };
 const resolveIconStyleMappingParts = (iconStyle) => {
     const presetMappings = iconStyle.Preset
-        ? (0, IconStylePresets_1.getIconStylePresetMappings)(iconStyle.Preset)
+        ? (0, IconStyleHelper_1.getIconStylePresetMappings)(iconStyle.Preset)
         : [];
     const userMappings = iconStyle.Mappings ?? [];
     if (presetMappings.length === 0 || userMappings.length === 0) {
@@ -54,7 +53,7 @@ const resolveEffectiveIconStyleMappings = (iconStyle) => {
     if (presetMappings.length === 0)
         return userMappings;
     if (userMappings.length === 0) {
-        return iconStyle.Preset ? (0, IconStylePresets_1.getIconStylePresetMappings)(iconStyle.Preset) : [];
+        return iconStyle.Preset ? (0, IconStyleHelper_1.getIconStylePresetMappings)(iconStyle.Preset) : [];
     }
     return [...presetMappings, ...userMappings];
 };
@@ -72,7 +71,7 @@ const resolveIconStyleMappingsForSummaryPreview = (iconStyle) => {
         if (presetMappings.length > 0) {
             return presetMappings;
         }
-        return iconStyle.Preset ? (0, IconStylePresets_1.getIconStylePresetMappings)(iconStyle.Preset) : [];
+        return iconStyle.Preset ? (0, IconStyleHelper_1.getIconStylePresetMappings)(iconStyle.Preset) : [];
     }
     if (presetMappings.length === 0) {
         return userMappings;
@@ -192,7 +191,7 @@ const getIconRendererForColumn = (styledColumn, abColumn, api) => {
     if (!styledColumn.IconStyle) {
         return;
     }
-    if ((0, iconStyledColumnColumnSupport_1.isUnsupportedColumnDataTypeForIconStyle)(abColumn.dataType)) {
+    if ((0, IconStyleHelper_1.isUnsupportedColumnDataTypeForIconStyle)(abColumn.dataType)) {
         (0, AdaptableLogger_1.errorOnce)(`[AdapTable] Icon Styled Column (“${styledColumn.Name || styledColumn.ColumnId || 'unnamed'}” on column ${styledColumn.ColumnId}) is not supported when the column data type is ${abColumn.dataType}. Use Badge Style for array columns, or remove IconStyle from this column.`);
         return undefined;
     }
@@ -224,7 +223,7 @@ const getIconRendererForColumn = (styledColumn, abColumn, api) => {
             // Defer to the shared row-scope helper so behaviour is uniform
             // across every Styled Column type and `StyledColumn.RowScope` can
             // override the default ("leaf rows only" for Icon).
-            if (!(0, shouldRenderStyledColumnOnRow_1.shouldRenderStyledColumnOnRow)(styledColumn, params.node, adaptableApi)) {
+            if (!(0, StyledColumnHelper_1.shouldRenderStyledColumnOnRow)(styledColumn, params.node, adaptableApi)) {
                 if (params.value != undefined) {
                     this.eGui.append(String(params.value));
                 }

package/src/agGrid/cellRenderers/PercentBarRenderer.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPercentBarRendererForColumn = void 0;
 const tslib_1 = require("tslib");
 const Helper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/Helper"));
-const clamp_1 = tslib_1.__importDefault(require("../../Utilities/utils/clamp"));
-const shouldRenderStyledColumnOnRow_1 = require("./shouldRenderStyledColumnOnRow");
-const barChartCellText_1 = require("../../Utilities/Helpers/barChartCellText");
+const NumberExtensions_1 = require("../../Utilities/Extensions/NumberExtensions");
+const StyledColumnHelper_1 = require("../../Utilities/Helpers/StyledColumns/StyledColumnHelper");
+const BarStylesHelper_1 = require("../../Utilities/Helpers/StyledColumns/BarStylesHelper");
 /**
  * Resolve the origin value (in the same numeric space as `min`/`max`) the bar
  * should grow from.
@@ -36,7 +36,7 @@ const toFraction = (value, min, max) => {
     if (max === min) {
         return 0;
     }
-    return (0, clamp_1.default)((value - min) / (max - min), 0, 1);
+    return (0, NumberExtensions_1.clamp)((value - min) / (max - min), 0, 1);
 };
 /** Column-comparison mode: centred 50% axis when Origin is Auto or Zero. */
 const columnComparisonUsesCentredAxis = (origin) => {
@@ -56,7 +56,7 @@ const getPercentBarRendererForColumn = (styledColumn, abColumn, api) => {
             // Defer to the shared row-scope helper. Default behaviour
             // ("group rows fall back to plain text") is preserved when
             // `RowScope` is unset.
-            if (!(0, shouldRenderStyledColumnOnRow_1.shouldRenderStyledColumnOnRow)(styledColumn, params.node, api)) {
+            if (!(0, StyledColumnHelper_1.shouldRenderStyledColumnOnRow)(styledColumn, params.node, api)) {
                 if (params.value != undefined) {
                     this.eGui = document.createElement('div');
                     this.eGui.append(String(params.value));
@@ -123,7 +123,7 @@ const getPercentBarRendererForColumn = (styledColumn, abColumn, api) => {
             }
             else {
                 // Linear value-on-scale.
-                percentageValue = (((0, clamp_1.default)(numericValue, min, max) - min) / (max - min)) * 100;
+                percentageValue = (((0, NumberExtensions_1.clamp)(numericValue, min, max) - min) / (max - min)) * 100;
                 const origin = resolveOrigin(percentBarStyle, numericValue, min, max);
                 const valueFrac = toFraction(numericValue, min, max);
                 const originFrac = toFraction(origin, min, max);
@@ -145,7 +145,7 @@ const getPercentBarRendererForColumn = (styledColumn, abColumn, api) => {
             }
             // ----- Build the DOM -------------------------------------------------
             const cellTextProperties = percentBarStyle.CellTextProperties;
-            const hasCellText = (0, barChartCellText_1.hasBarChartCellTextConfigured)(cellTextProperties);
+            const hasCellText = (0, BarStylesHelper_1.hasBarStyleCellTextConfigured)(cellTextProperties);
             // Wrapper always fills the cell. The bar is the flex-grow child so it
             // claims whatever space the (compact) text rows leave, with a small
             // floor to stay visible even on short rows.
@@ -193,8 +193,8 @@ const getPercentBarRendererForColumn = (styledColumn, abColumn, api) => {
                 // columns), which then propagates through the helpers as a non-string
                 // and breaks string-only operations (e.g. `.length` checks).
                 const formattedCellValue = String(params.formatValue?.(rawCellValue) ?? rawCellValue);
-                const labels = (0, barChartCellText_1.buildBarChartCellTextLabels)(cellTextProperties, formattedCellValue, `${percentageValue.toFixed(0)}%`);
-                (0, barChartCellText_1.mountBarChartCellText)({
+                const labels = (0, BarStylesHelper_1.buildBarStyleCellTextLabels)(cellTextProperties, formattedCellValue, `${percentageValue.toFixed(0)}%`);
+                (0, BarStylesHelper_1.mountBarStyleCellText)({
                     wrapperEl: this.eGui,
                     mergedOverlayEl: barEl,
                     textClassName: 'ab-PercentBar__text',

package/src/agGrid/cellRenderers/RangeBarRenderer.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRangeBarRendererForColumn = void 0;
 const tslib_1 = require("tslib");
 const Helper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/Helper"));
-const clamp_1 = tslib_1.__importDefault(require("../../Utilities/utils/clamp"));
-const barChartCellText_1 = require("../../Utilities/Helpers/barChartCellText");
-const shouldRenderStyledColumnOnRow_1 = require("./shouldRenderStyledColumnOnRow");
+const NumberExtensions_1 = require("../../Utilities/Extensions/NumberExtensions");
+const BarStylesHelper_1 = require("../../Utilities/Helpers/StyledColumns/BarStylesHelper");
+const StyledColumnHelper_1 = require("../../Utilities/Helpers/StyledColumns/StyledColumnHelper");
 const SVG_NS = 'http://www.w3.org/2000/svg';
 const DEFAULT_TRACK_HEIGHT = 4;
 const DEFAULT_BAND_HEIGHT = 14;
@@ -51,8 +51,7 @@ const normaliseMarker = (override, defaults) => {
     return {
         Shape: shape,
         Color: override?.Color ?? defaults.Color,
-        Size: override?.Size ??
-            (shape === 'Line' ? DEFAULT_LINE_MARKER_THICKNESS : defaults.Size),
+        Size: override?.Size ?? (shape === 'Line' ? DEFAULT_LINE_MARKER_THICKNESS : defaults.Size),
     };
 };
 /**
@@ -64,7 +63,7 @@ const toFraction = (value, min, max) => {
     if (max === min) {
         return 0;
     }
-    return (0, clamp_1.default)((value - min) / (max - min), 0, 1);
+    return (0, NumberExtensions_1.clamp)((value - min) / (max - min), 0, 1);
 };
 const getRangeBarRendererForColumn = (styledColumn, abColumn, api) => {
     if (!styledColumn.RangeBarStyle) {
@@ -75,7 +74,7 @@ const getRangeBarRendererForColumn = (styledColumn, abColumn, api) => {
         eGui;
         init(params) {
             // Defer to the shared row-scope helper.
-            if (!(0, shouldRenderStyledColumnOnRow_1.shouldRenderStyledColumnOnRow)(styledColumn, params.node, api)) {
+            if (!(0, StyledColumnHelper_1.shouldRenderStyledColumnOnRow)(styledColumn, params.node, api)) {
                 if (params.value != undefined) {
                     this.eGui = document.createElement('div');
                     this.eGui.append(String(params.value));
@@ -128,7 +127,7 @@ const getRangeBarRendererForColumn = (styledColumn, abColumn, api) => {
             const trackThickness = trackProperties?.Height ?? DEFAULT_TRACK_HEIGHT;
             const bandThickness = Math.max(trackThickness + 6, DEFAULT_BAND_HEIGHT);
             const cellTextProperties = rangeStyle.CellTextProperties;
-            const hasCellText = (0, barChartCellText_1.hasBarChartCellTextConfigured)(cellTextProperties);
+            const hasCellText = (0, BarStylesHelper_1.hasBarStyleCellTextConfigured)(cellTextProperties);
             // Map a 0..1 fraction onto the long-axis viewBox (0..100). Vertical
             // orientation inverts so that lower values appear at the bottom of
             // the cell, matching user expectation.
@@ -261,13 +260,13 @@ const getRangeBarRendererForColumn = (styledColumn, abColumn, api) => {
             svgContainer.appendChild(svg);
             this.eGui.appendChild(svgContainer);
             if (hasCellText) {
-                const pct = (0, clamp_1.default)((numericValue - min) / (max - min), 0, 1) * 100;
+                const pct = (0, NumberExtensions_1.clamp)((numericValue - min) / (max - min), 0, 1) * 100;
                 // See PercentBarRenderer: `params.formatValue` on a column without a
                 // `valueFormatter` returns the raw value (a number here), so coerce
                 // to string before it flows into the helpers.
                 const formattedCellValue = String(params.formatValue?.(numericValue) ?? numericValue);
-                const labels = (0, barChartCellText_1.buildBarChartCellTextLabels)(cellTextProperties, formattedCellValue, `${pct.toFixed(0)}%`);
-                (0, barChartCellText_1.mountBarChartCellText)({
+                const labels = (0, BarStylesHelper_1.buildBarStyleCellTextLabels)(cellTextProperties, formattedCellValue, `${pct.toFixed(0)}%`);
+                (0, BarStylesHelper_1.mountBarStyleCellText)({
                     wrapperEl: this.eGui,
                     mergedOverlayEl: svgContainer,
                     textClassName: 'ab-RangeBar__text',

package/src/agGrid/cellRenderers/RatingRenderer.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRatingRendererForColumn = void 0;
 const tslib_1 = require("tslib");
 const Helper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/Helper"));
-const clamp_1 = tslib_1.__importDefault(require("../../Utilities/utils/clamp"));
-const shouldRenderStyledColumnOnRow_1 = require("./shouldRenderStyledColumnOnRow");
+const NumberExtensions_1 = require("../../Utilities/Extensions/NumberExtensions");
+const StyledColumnHelper_1 = require("../../Utilities/Helpers/StyledColumns/StyledColumnHelper");
 const SVG_NS = 'http://www.w3.org/2000/svg';
 const DEFAULT_MAX = 5;
 const DEFAULT_SIZE = 14;
@@ -71,7 +71,7 @@ const createIconElement = (shape, fill, filledColor, emptyColor, size, uid) => {
         const clipRect = document.createElementNS(SVG_NS, 'rect');
         clipRect.setAttribute('x', '0');
         clipRect.setAttribute('y', '0');
-        clipRect.setAttribute('width', String(24 * (0, clamp_1.default)(fill, 0, 1)));
+        clipRect.setAttribute('width', String(24 * (0, NumberExtensions_1.clamp)(fill, 0, 1)));
         clipRect.setAttribute('height', '24');
         clipPath.appendChild(clipRect);
         defs.appendChild(clipPath);
@@ -95,7 +95,7 @@ const getRatingRendererForColumn = (styledColumn, _abColumn, api) => {
             // Defer to the shared row-scope helper. Default (no `RowScope`)
             // matches the previous "group rows only fall back to plain text"
             // behaviour; users can opt other row kinds in / out explicitly.
-            if (!(0, shouldRenderStyledColumnOnRow_1.shouldRenderStyledColumnOnRow)(styledColumn, params.node, api)) {
+            if (!(0, StyledColumnHelper_1.shouldRenderStyledColumnOnRow)(styledColumn, params.node, api)) {
                 this.eGui = document.createElement('div');
                 if (params.value != undefined) {
                     this.eGui.append(String(params.value));
@@ -118,7 +118,7 @@ const getRatingRendererForColumn = (styledColumn, _abColumn, api) => {
             const emptyColor = ratingStyle.EmptyColor ?? DEFAULT_EMPTY_COLOR;
             const showValue = ratingStyle.ShowValue ?? false;
             // Quantise the value if half-icons aren't allowed.
-            const clampedValue = (0, clamp_1.default)(value, 0, max);
+            const clampedValue = (0, NumberExtensions_1.clamp)(value, 0, max);
             const effectiveValue = allowHalf
                 ? clampedValue
                 : Math.round(clampedValue);
@@ -136,7 +136,7 @@ const getRatingRendererForColumn = (styledColumn, _abColumn, api) => {
             for (let i = 0; i < max; i++) {
                 // Fill ratio for icon `i`: full when value >= i+1, partial when
                 // value falls between i and i+1, empty otherwise.
-                const fill = (0, clamp_1.default)(effectiveValue - i, 0, 1);
+                const fill = (0, NumberExtensions_1.clamp)(effectiveValue - i, 0, 1);
                 const iconEl = createIconElement(icon, fill, filledColor, emptyColor, size, `${uid}-${i}`);
                 iconEl.setAttribute('class', 'ab-Rating__icon');
                 this.eGui.appendChild(iconEl);

package/src/agGrid/editors/AdaptableDateEditor/index.js

@@ -6,7 +6,7 @@ const renderWithAdaptableContext_1 = require("../../../View/renderWithAdaptableC
 const InternalAdaptableDateEditor_1 = require("./InternalAdaptableDateEditor");
 const ag_grid_enterprise_1 = require("ag-grid-enterprise");
 const react_1 = require("react");
-const FormatHelper_1 = require("../../../Utilities/Helpers/FormatHelper");
+const DisplayFormatHelper_1 = require("../../../Utilities/Helpers/DisplayFormatHelper");
 function shouldClearExistingValue(params) {
     return params.eventKey === ag_grid_enterprise_1.KeyCode.BACKSPACE || params.eventKey === ag_grid_enterprise_1.KeyCode.DELETE;
 }
@@ -56,7 +56,7 @@ exports.AdaptableReactDateEditor = (0, react_1.forwardRef)((props, ref) => {
                         if (!Pattern) {
                             return value;
                         }
-                        return (0, FormatHelper_1.DateFormatter)(value, {
+                        return (0, DisplayFormatHelper_1.DateFormatter)(value, {
                             Pattern,
                         });
                     },
@@ -149,7 +149,7 @@ class AdaptableDateEditor {
                             if (!Pattern) {
                                 return value;
                             }
-                            return (0, FormatHelper_1.DateFormatter)(value, {
+                            return (0, DisplayFormatHelper_1.DateFormatter)(value, {
                                 Pattern,
                             });
                         },

package/src/components/ColorPicker/ColorPicker.js

@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
 const jsx_runtime_1 = require("react/jsx-runtime");
 const React = tslib_1.__importStar(require("react"));
 const react_1 = require("react");
-const debounce_1 = tslib_1.__importDefault(require("../../Utilities/utils/debounce"));
+const TimingHelper_1 = require("../../Utilities/Helpers/TimingHelper");
 const utils_1 = require("../../lib/utils");
 const Input_1 = tslib_1.__importDefault(require("../Input"));
 const StyleHelper_1 = require("../../Utilities/Helpers/StyleHelper");
@@ -17,7 +17,7 @@ exports.ColorPicker = React.forwardRef((props, ref) => {
     let { value, includeAlpha = true, className, ...restProps } = props;
     // Create a debounced version of onChange
     // we need this because moving the mouse A LOT in the custom color picker can break the React rendering
-    const debouncedOnChange = (0, react_1.useCallback)((0, debounce_1.default)((color) => {
+    const debouncedOnChange = (0, react_1.useCallback)((0, TimingHelper_1.debounce)((color) => {
         props.onChange(color);
     }, 30), [props.onChange]);
     // Clean up the debounce on unmount

package/src/components/Datepicker/index.js

@@ -8,7 +8,7 @@ const react_1 = require("react");
 const useProperty_1 = tslib_1.__importDefault(require("../utils/useProperty"));
 const SimpleButton_1 = tslib_1.__importDefault(require("../SimpleButton"));
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
-const FormatHelper_1 = require("../../Utilities/Helpers/FormatHelper");
+const DisplayFormatHelper_1 = require("../../Utilities/Helpers/DisplayFormatHelper");
 const DatepickerContext_1 = require("./DatepickerContext");
 const AdaptableDateInlineInput_1 = require("../../View/Components/AdaptableInput/AdaptableDateInlineInput");
 const date_fns_1 = require("date-fns");
@@ -66,7 +66,7 @@ exports.Datepicker = React.forwardRef((props, ref) => {
         setValue(next);
         setMonth(next ?? new Date());
     };
-    const inputValue = (0, FormatHelper_1.DateFormatter)(value, { Pattern: dateProps.format }) ?? '';
+    const inputValue = (0, DisplayFormatHelper_1.DateFormatter)(value, { Pattern: dateProps.format }) ?? '';
     // ── DOM refs for focus ownership ────────────────────────────────
     const triggerRef = React.useRef(null);
     const popupRef = React.useRef(null);

package/src/components/FormLayout/index.js

@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
 const jsx_runtime_1 = require("react/jsx-runtime");
 const React = tslib_1.__importStar(require("react"));
 const react_1 = require("react");
-const merge_1 = tslib_1.__importDefault(require("../../Utilities/utils/merge"));
+const ObjectExtensions_1 = require("../../Utilities/Extensions/ObjectExtensions");
 const join_1 = tslib_1.__importDefault(require("../utils/join"));
 const Flex_1 = require("../Flex");
 const FormLayoutContext = (0, react_1.createContext)(null);
@@ -27,7 +27,7 @@ const FormLayout = (props) => {
             };
         }
         if (defaultColumns[c.name]) {
-            c = (0, merge_1.default)({}, defaultColumns[c.name], c);
+            c = (0, ObjectExtensions_1.merge)({}, defaultColumns[c.name], c);
         }
         c.component = c.component === undefined ? defaultComponent : c.component;
         return c;

package/src/components/OverlayTrigger/index.js

@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
 const jsx_runtime_1 = require("react/jsx-runtime");
 const React = tslib_1.__importStar(require("react"));
 const react_1 = require("react");
-const debounce_1 = tslib_1.__importDefault(require("../../Utilities/utils/debounce"));
+const TimingHelper_1 = require("../../Utilities/Helpers/TimingHelper");
 const batchUpdate_1 = tslib_1.__importDefault(require("../utils/batchUpdate"));
 const selectParent_1 = tslib_1.__importDefault(require("../utils/selectParent"));
 const useProperty_1 = tslib_1.__importDefault(require("../utils/useProperty"));
@@ -100,7 +100,7 @@ const OverlayTrigger = React.forwardRef((givenProps, ref) => {
     // visible state may quickly change from true -> false -> true
     // when moving the mouse cursor from the trigger to the overlay
     // for this case we debounce the visible change for a very small amount of time
-    (0, debounce_1.default)((visible) => {
+    (0, TimingHelper_1.debounce)((visible) => {
         // if (!visible) {
         //   return;
         // }

package/src/env.js

@@ -2,6 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = {
     NEXT_PUBLIC_INFINITE_TABLE_LICENSE_KEY: "StartDate=2021-06-29|EndDate=2030-01-01|Owner=Adaptable|Type=distribution|TS=1624971462479|C=137829811,1004007071,2756196225,1839832928,3994409405,636616862" || '',
-    PUBLISH_TIMESTAMP: 1782067371054 || Date.now(),
-    VERSION: "23.0.0-canary.8" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1782138914072 || Date.now(),
+    VERSION: "23.0.0-canary.9" || '--current-version--',
 };

package/src/layout-manager/src/isLayoutEqual.js

@@ -4,8 +4,7 @@ exports.logChanges = exports.getChanges = void 0;
 exports.isTableLayoutEqual = isTableLayoutEqual;
 exports.isPivotLayoutEqual = isPivotLayoutEqual;
 exports.isLayoutEqual = isLayoutEqual;
-const tslib_1 = require("tslib");
-const isEqual_1 = tslib_1.__importDefault(require("../../Utilities/utils/isEqual"));
+const ObjectExtensions_1 = require("../../Utilities/Extensions/ObjectExtensions");
 const infinite_react_1 = require("@infinite-table/infinite-react");
 const isPivotLayoutModel_1 = require("./isPivotLayoutModel");
 const normalizeLayoutModel_1 = require("./normalizeLayoutModel");
@@ -25,7 +24,7 @@ const getChanges = (l1, l2) => {
     const allKeys = new Set([...k1, ...k2]);
     const changes = [];
     for (const key of allKeys) {
-        if (!(0, isEqual_1.default)(l1[key], l2[key])) {
+        if (!(0, ObjectExtensions_1.isEqual)(l1[key], l2[key])) {
             changes.push({ key, value1: l1[key], value2: l2[key] });
         }
     }
@@ -48,7 +47,7 @@ function isTableLayoutEqual(l1, l2) {
     l2 = (0, normalizeLayoutModel_1.normalizeTableLayoutModel)(l2);
     clearIgnoredProperties(l1);
     clearIgnoredProperties(l2);
-    const res = (0, isEqual_1.default)(l1, l2);
+    const res = (0, ObjectExtensions_1.isEqual)(l1, l2);
     if (!res) {
         (0, exports.logChanges)(l1, l2);
     }
@@ -73,7 +72,7 @@ function isPivotLayoutEqual(l1, l2) {
     l2 = (0, normalizeLayoutModel_1.normalizePivotLayoutModel)(l2);
     clearIgnoredProperties(l1);
     clearIgnoredProperties(l2);
-    const res = (0, isEqual_1.default)(l1, l2);
+    const res = (0, ObjectExtensions_1.isEqual)(l1, l2);
     if (!res) {
         (0, exports.logChanges)(l1, l2);
     }

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

@@ -1170,7 +1170,40 @@ export declare const ADAPTABLE_METAMODEL: {
     BadgeStylePredicate: {
         k: string;
     };
-    BarChartMarker: {
+    BarStyleCellTextHorizontalAlignment: {
+        k: string;
+    };
+    BarStyleCellTextLayout: {
+        k: string;
+        p: {
+            n: string;
+            k: string;
+            o: boolean;
+            r: string;
+        }[];
+    };
+    BarStyleCellTextPlacement: {
+        k: string;
+        p: {
+            n: string;
+            k: string;
+            o: boolean;
+            r: string;
+        }[];
+    };
+    BarStyleCellTextProperties: {
+        k: string;
+        p: {
+            n: string;
+            k: string;
+            o: boolean;
+            r: string;
+        }[];
+    };
+    BarStyleCellTextVerticalAlignment: {
+        k: string;
+    };
+    BarStyleMarker: {
         k: string;
         p: {
             n: string;
@@ -3226,13 +3259,6 @@ export declare const ADAPTABLE_METAMODEL: {
             r: string;
         })[];
     };
-    GradientZeroCentredColors: {
-        k: string;
-        p: {
-            n: string;
-            k: string;
-        }[];
-    };
     GridApi: {
         k: string;
         p: {
@@ -5269,4 +5295,11 @@ export declare const ADAPTABLE_METAMODEL: {
     WindowSize: {
         k: string;
     };
+    ZeroCentredColors: {
+        k: string;
+        p: {
+            n: string;
+            k: string;
+        }[];
+    };
 };