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

package/src/View/StyledColumn/Wizard/StyledColumnWizardStyleSection/StyledColumnWizardStyleSection.js

@@ -7,13 +7,13 @@ const CheckBox_1 = require("../../../../components/CheckBox");
 const ErrorBox_1 = tslib_1.__importDefault(require("../../../../components/ErrorBox"));
 const FormLayout_1 = tslib_1.__importStar(require("../../../../components/FormLayout"));
 const Tag_1 = require("../../../../components/Tag");
+const BarStylesHelper_1 = require("../../../../Utilities/Helpers/StyledColumns/BarStylesHelper");
+const BarStyleCellTextLayoutEditor_1 = require("./Components/BarStyleCellTextLayoutEditor");
 const ColorPicker_1 = require("../../../../components/ColorPicker");
 const UIHelper_1 = require("../../../UIHelper");
 const OnePageAdaptableWizard_1 = require("../../../Wizard/OnePageAdaptableWizard");
-const ArrayExtensions_1 = tslib_1.__importDefault(require("../../../../Utilities/Extensions/ArrayExtensions"));
 const Flex_1 = require("../../../../components/Flex");
 const Radio_1 = tslib_1.__importStar(require("../../../../components/Radio"));
-const Toggle_1 = require("../../../../components/Toggle");
 const StyledColumnSliceStyleEditors_1 = require("../StyledColumnSliceStyleEditors");
 const Card_1 = require("../../../../components/Card");
 const SummaryColorTag_1 = require("../../../Wizard/SummaryColorTag");
@@ -34,19 +34,16 @@ const formatOriginLabel = (origin) => {
     }
     return origin;
 };
-const formatPercentBarCellTextSummary = (cellText) => cellText
-    ?.map((t) => (t === 'CellValue' ? 'Cell Value' : 'Percent Value'))
-    .join(' + ') ?? '';
-const formatPercentBarToolTipSummary = (toolTipText) => toolTipText
-    ?.map((t) => (t === 'CellValue' ? 'Cell Value' : 'Percent Value'))
-    .join(' + ') ?? '';
+const formatPercentBarCellTextSummary = (cellText) => cellText?.map((t) => (t === 'CellValue' ? 'Cell Value' : 'Percent Value')).join(' + ') ?? '';
+const formatPercentBarToolTipSummary = (toolTipText) => toolTipText?.map((t) => (t === 'CellValue' ? 'Cell Value' : 'Percent Value')).join(' + ') ?? '';
 const buildStyledColumnPercentBarStyleSummaryStrings = (pb, options) => {
     const items = [`Origin: ${formatOriginLabel(pb.Origin)}`];
-    if (pb.CellText?.length) {
-        items.push(`Cell Text: ${formatPercentBarCellTextSummary(pb.CellText)}`);
-        items.push(`Cell Text Position: ${pb.CellTextPosition ?? 'Below'}`);
-        if (pb.CellTextAlignment != null) {
-            items.push(`Cell Text Alignment: ${pb.CellTextAlignment}`);
+    if ((0, BarStylesHelper_1.hasBarStyleCellTextConfigured)(pb.CellTextProperties)) {
+        const tokens = (0, BarStylesHelper_1.getActiveBarStyleCellTextTokens)(pb.CellTextProperties);
+        items.push(`Cell Text: ${formatPercentBarCellTextSummary(tokens)}`);
+        const layoutSummary = (0, BarStylesHelper_1.formatBarStyleCellTextLayoutSummary)((0, BarStylesHelper_1.resolveBarStyleCellTextLayout)(pb.CellTextProperties));
+        if (layoutSummary) {
+            items.push(`Placement: ${layoutSummary}`);
         }
     }
     else if (options.includeEmptyCellText) {
@@ -101,11 +98,6 @@ exports.renderFormatColumnStyleWizardSummary = renderFormatColumnStyleWizardSumm
 // Pinning the width forces colons to line up vertically across cards rather than
 // each FormLayout sizing its label column independently from its own longest label.
 const STYLE_FORM_SIZES = ['200px', '1fr'];
-const CELL_TEXT_POSITION_CHOICES = [
-    { value: 'Above', label: 'Above Bar' },
-    { value: 'Below', label: 'Below Bar' },
-    { value: 'Merged', label: 'Merged' },
-];
 const ORIGIN_CHOICES = [
     {
         value: 'Auto',
@@ -130,6 +122,7 @@ const StyledColumnWizardStyleSection = (props) => {
         return ((0, jsx_runtime_1.jsx)(Flex_1.Box, { children: !data.ColumnId && ((0, jsx_runtime_1.jsx)(ErrorBox_1.default, { className: "twa:mt-2", children: "You need to select a column before styling." })) }));
     }
     const pb = data.PercentBarStyle;
+    const cellTextProperties = pb.CellTextProperties;
     // ---- updaters -----------------------------------------------------------
     const update = (patch) => {
         props.onChange({
@@ -137,12 +130,13 @@ const StyledColumnWizardStyleSection = (props) => {
             PercentBarStyle: { ...pb, ...patch },
         });
     };
-    const onCellTextChanged = (token, checked) => {
-        const current = pb.CellText ?? [];
-        const next = checked
-            ? Array.from(new Set([...current, token]))
-            : current.filter((t) => t !== token);
-        update({ CellText: next });
+    const onCellTextLayoutToggle = (token, show) => {
+        update((0, BarStylesHelper_1.toggleBarStyleCellTextToken)(cellTextProperties, token, show));
+    };
+    const onCellTextPlacementChange = (token, patch) => {
+        update({
+            CellTextProperties: (0, BarStylesHelper_1.patchBarStyleCellTextPlacement)(cellTextProperties, token, patch),
+        });
     };
     const onToolTipTextChanged = (token, checked) => {
         const current = pb.ToolTipText ?? [];
@@ -151,38 +145,7 @@ const StyledColumnWizardStyleSection = (props) => {
             : current.filter((t) => t !== token);
         update({ ToolTipText: next });
     };
-    const handleCellTextPositionChange = (pos) => update({ CellTextPosition: pos });
     const handleOriginChange = (origin) => update({ Origin: origin });
-    const handleCellTextAlignmentChange = (choice) => {
-        if (choice === 'Inherit') {
-            const next = { ...pb };
-            delete next.CellTextAlignment;
-            props.onChange({ ...data, PercentBarStyle: next });
-            return;
-        }
-        update({ CellTextAlignment: choice });
-    };
-    const onAutoCellTextAlignmentChecked = (checked) => {
-        if (!checked) {
-            handleCellTextAlignmentChange('Inherit');
-            return;
-        }
-        let nextFont = pb.Font ? { ...pb.Font } : undefined;
-        if (nextFont) {
-            delete nextFont.Alignment;
-            if (Object.keys(nextFont).length === 0) {
-                nextFont = undefined;
-            }
-        }
-        props.onChange({
-            ...data,
-            PercentBarStyle: {
-                ...pb,
-                CellTextAlignment: 'Auto',
-                Font: nextFont,
-            },
-        });
-    };
     const onBackColorChange = (color) => {
         if (color) {
             update({ BackColor: color });
@@ -191,14 +154,11 @@ const StyledColumnWizardStyleSection = (props) => {
         const { BackColor: _removed, ...rest } = pb;
         props.onChange({ ...data, PercentBarStyle: rest });
     };
-    const cellTextDisabled = ArrayExtensions_1.default.IsNullOrEmpty(pb.CellText) || disabled;
-    const currentAlignment = pb.CellTextAlignment ?? 'Inherit';
+    const cellTextDisabled = !(0, BarStylesHelper_1.hasBarStyleCellTextConfigured)(cellTextProperties) || disabled;
     const currentOrigin = typeof pb.Origin === 'number'
         ? 'Min' // numeric origin doesn't fit the radio set; treat as Min for selection state
         : pb.Origin ?? 'Auto';
-    return ((0, jsx_runtime_1.jsxs)(Flex_1.Box, { children: [(0, jsx_runtime_1.jsxs)(Card_1.Card, { shadow: false, className: "twa:mb-3", children: [(0, jsx_runtime_1.jsxs)(Card_1.Card.Title, { children: [(0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:font-medium", children: "Bar Position" }), (0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: "Set the position of the cell text relative to the bar" })] }), (0, jsx_runtime_1.jsx)(Card_1.Card.Body, { children: (0, jsx_runtime_1.jsx)(Radio_1.RadioGroup, { orientation: "vertical", name: "ab-percentbar-origin", value: currentOrigin, onRadioChange: handleOriginChange, children: ORIGIN_CHOICES.map((choice) => ((0, jsx_runtime_1.jsx)(Radio_1.default, { value: choice.value, disabled: disabled, children: (0, jsx_runtime_1.jsxs)(Flex_1.Flex, { alignItems: "center", children: [(0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:min-w-[60px]", children: choice.label }), (0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:text-xs twa:opacity-70", children: choice.hint })] }) }, choice.value))) }) })] }), (0, jsx_runtime_1.jsxs)(Card_1.Card, { shadow: false, className: "twa:mb-3", children: [(0, jsx_runtime_1.jsxs)(Card_1.Card.Title, { children: [(0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:font-medium", children: "Cell Text" }), (0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[540px]", children: "Choose whether and how to display cell text (font properties take precedence over Format Column)" })] }), (0, jsx_runtime_1.jsxs)(Card_1.Card.Body, { children: [(0, jsx_runtime_1.jsxs)(FormLayout_1.default, { sizes: [...STYLE_FORM_SIZES], children: [(0, jsx_runtime_1.jsxs)(FormLayout_1.FormRow, { label: "Cell Display:", children: [(0, jsx_runtime_1.jsx)(CheckBox_1.CheckBox, { disabled: disabled, checked: pb.CellText?.includes('CellValue'), onChange: (checked) => onCellTextChanged('CellValue', checked), children: "Cell Value" }), ' ', (0, jsx_runtime_1.jsx)(CheckBox_1.CheckBox, { disabled: disabled, className: "twa:ml-3", checked: pb.CellText?.includes('PercentageValue'), onChange: (checked) => onCellTextChanged('PercentageValue', checked), children: "Percent Value" })] }), (0, jsx_runtime_1.jsx)(FormLayout_1.FormRow, { label: "Cell Display Position:", children: (0, jsx_runtime_1.jsx)(Radio_1.RadioGroup, { orientation: "horizontal", name: "ab-percentbar-cell-text-position", value: pb.CellTextPosition ?? 'Below', onRadioChange: handleCellTextPositionChange, className: "twa:gap-4", children: CELL_TEXT_POSITION_CHOICES.map((choice) => ((0, jsx_runtime_1.jsx)(Radio_1.default, { value: choice.value, disabled: cellTextDisabled, children: choice.label }, choice.value))) }) }), (0, jsx_runtime_1.jsx)(FormLayout_1.FormRow, { label: "Auto Text Alignment:", children: (0, jsx_runtime_1.jsxs)(Flex_1.Flex, { alignItems: "center", className: "twa:gap-2", children: [(0, jsx_runtime_1.jsx)(CheckBox_1.CheckBox, { disabled: cellTextDisabled, checked: pb.CellTextAlignment === 'Auto', onChange: onAutoCellTextAlignmentChecked }), (0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:text-xs twa:opacity-70 twa:max-w-[420px]", children: "Follows bar (if Position is Auto or Zero); overrides fixed alignment below" })] }) }), (0, jsx_runtime_1.jsx)(FormLayout_1.FormRow, { label: "Cell Text Alignment:", children: (0, jsx_runtime_1.jsx)(Flex_1.Flex, { alignItems: "center", className: "twa:gap-2", children: (0, jsx_runtime_1.jsx)(Flex_1.Box, { className: cellTextDisabled || pb.CellTextAlignment === 'Auto'
-                                                    ? 'twa:opacity-50 twa:pointer-events-none'
-                                                    : '', children: (0, jsx_runtime_1.jsx)(Flex_1.Flex, { alignItems: "center", className: "twa:gap-2", children: (0, jsx_runtime_1.jsxs)(Toggle_1.ToggleGroup, { children: [(0, jsx_runtime_1.jsx)(Toggle_1.Toggle, { icon: "align-left", pressed: currentAlignment === 'Left', onPressedChange: (pressed) => handleCellTextAlignmentChange(pressed ? 'Left' : 'Inherit') }), (0, jsx_runtime_1.jsx)(Toggle_1.Toggle, { icon: "align-center", pressed: currentAlignment === 'Center', onPressedChange: (pressed) => handleCellTextAlignmentChange(pressed ? 'Center' : 'Inherit') }), (0, jsx_runtime_1.jsx)(Toggle_1.Toggle, { icon: "align-right", pressed: currentAlignment === 'Right', onPressedChange: (pressed) => handleCellTextAlignmentChange(pressed ? 'Right' : 'Inherit') })] }) }) }) }) })] }), (0, jsx_runtime_1.jsx)(Flex_1.Box, { className: `twa:mt-3 twa:pt-3 twa:border-t twa:border-foreground/15 ${cellTextDisabled ? 'twa:opacity-50' : ''}`, children: (0, jsx_runtime_1.jsx)(StyledColumnSliceStyleEditors_1.StyledColumnFontStyleEditor, { api: api, disabled: cellTextDisabled, hideAlignment: true, value: pb.Font, onChange: (next) => {
+    return ((0, jsx_runtime_1.jsxs)(Flex_1.Box, { children: [(0, jsx_runtime_1.jsxs)(Card_1.Card, { shadow: false, className: "twa:mb-3", children: [(0, jsx_runtime_1.jsxs)(Card_1.Card.Title, { children: [(0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:font-medium", children: "Bar Position" }), (0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: "Set the position of the cell text relative to the bar" })] }), (0, jsx_runtime_1.jsx)(Card_1.Card.Body, { children: (0, jsx_runtime_1.jsx)(Radio_1.RadioGroup, { orientation: "vertical", name: "ab-percentbar-origin", value: currentOrigin, onRadioChange: handleOriginChange, children: ORIGIN_CHOICES.map((choice) => ((0, jsx_runtime_1.jsx)(Radio_1.default, { value: choice.value, disabled: disabled, children: (0, jsx_runtime_1.jsxs)(Flex_1.Flex, { alignItems: "center", children: [(0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:min-w-[60px]", children: choice.label }), (0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:text-xs twa:opacity-70", children: choice.hint })] }) }, choice.value))) }) })] }), (0, jsx_runtime_1.jsxs)(Card_1.Card, { shadow: false, className: "twa:mb-3", children: [(0, jsx_runtime_1.jsxs)(Card_1.Card.Title, { children: [(0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:font-medium", children: "Cell Text" }), (0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[540px]", children: "Pick which values to display and where each one sits around the bar (font properties take precedence over Format Column)" })] }), (0, jsx_runtime_1.jsxs)(Card_1.Card.Body, { children: [(0, jsx_runtime_1.jsx)(FormLayout_1.default, { sizes: [...STYLE_FORM_SIZES], children: (0, jsx_runtime_1.jsx)(BarStyleCellTextLayoutEditor_1.BarStyleCellTextLayoutEditor, { disabled: disabled, cellTextProperties: cellTextProperties, onToggle: onCellTextLayoutToggle, onPlacementChange: onCellTextPlacementChange }) }), (0, jsx_runtime_1.jsx)(Flex_1.Box, { className: `twa:mt-3 twa:pt-3 twa:border-t twa:border-foreground/15 ${cellTextDisabled ? 'twa:opacity-50' : ''}`, children: (0, jsx_runtime_1.jsx)(StyledColumnSliceStyleEditors_1.StyledColumnFontStyleEditor, { api: api, disabled: cellTextDisabled, value: pb.Font, onChange: (next) => {
                                         if (next) {
                                             update({ Font: next });
                                         }

package/src/View/UIHelper.js

@@ -36,7 +36,7 @@ const tslib_1 = require("tslib");
 const EditableConfigEntityState_1 = require("./Components/SharedProps/EditableConfigEntityState");
 const Enums_1 = require("../AdaptableState/Common/Enums");
 const StringExtensions_1 = require("../Utilities/Extensions/StringExtensions");
-const ScheduleHelper_1 = require("../Utilities/Helpers/ScheduleHelper");
+const ScheduleHelper_1 = require("../Utilities/Helpers/Scheduling/ScheduleHelper");
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/ArrayExtensions"));
 const resolveContainerElement_1 = require("../Utilities/resolveContainerElement");
 /** Generic swatch entries for the Colour Picker (resolved at runtime per active theme). */

package/src/View/Wizard/OnePageAdaptableWizard.js

@@ -13,7 +13,7 @@ const Card_1 = require("../../components/Card");
 const ButtonEdit_1 = require("../Components/Buttons/ButtonEdit");
 const NamedQueryContext_1 = require("../../components/ExpressionEditor/NamedQueryContext");
 const OnePageWizards_1 = require("./OnePageWizards");
-const kebabCase_1 = tslib_1.__importDefault(require("../../Utilities/utils/kebabCase"));
+const StringExtensions_1 = require("../../Utilities/Extensions/StringExtensions");
 const Flex_1 = require("../../components/Flex");
 const twMerge_1 = require("../../twMerge");
 const SummaryTag = (props) => ((0, jsx_runtime_1.jsx)(Flex_1.Box, { ...props }));
@@ -38,7 +38,7 @@ const OnePageAdaptableWizard = (props) => {
     const saveNamedQuery = React.useCallback((namedQuery) => dispatch(NamedQueryRedux.NamedQueryAdd(namedQuery)), []);
     const [namedQuery, setNamedQuery] = (0, react_1.useState)(false);
     const name = props.moduleInfo.FriendlyName
-        ? `${(0, kebabCase_1.default)(props.moduleInfo.FriendlyName)}-wizard`
+        ? `${(0, StringExtensions_1.kebabCase)(props.moduleInfo.FriendlyName)}-wizard`
         : '';
     const extraContext = {
         data: props.data,

package/src/View/Wizard/OnePageWizards.js

@@ -171,7 +171,9 @@ const OnePageWizard = (props) => {
                                                         return;
                                                     }
                                                     setCurrentSection(index);
-                                                }, children: [(0, jsx_runtime_1.jsx)(KeyHint_1.KeyHint, { className: "twa:mr-2 twa:inline-block twa:text-accent-foreground", children: navIndex }), (0, jsx_runtime_1.jsx)("div", { className: "twa:flex-1", children: section.title }), (0, jsx_runtime_1.jsx)(icons_1.Icon, { name: "error", className: (0, utils_1.cn)('twa:ml-2', validSectionsMap.get(index) !== true ? 'twa:visible' : 'twa:invisible') })] }, section.title));
+                                                }, children: [(0, jsx_runtime_1.jsx)(KeyHint_1.KeyHint, { className: (0, utils_1.cn)('twa:mr-2 twa:inline-block', {
+                                                            'twa:text-accent-foreground': active,
+                                                        }), children: navIndex }), (0, jsx_runtime_1.jsx)("div", { className: "twa:flex-1", children: section.title }), (0, jsx_runtime_1.jsx)(icons_1.Icon, { name: "error", className: (0, utils_1.cn)('twa:ml-2', validSectionsMap.get(index) !== true ? 'twa:visible' : 'twa:invisible') })] }, section.title));
                                         }), selectedFeedback, (0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:flex-1" }), (0, jsx_runtime_1.jsxs)(KeyHint_1.KeyHint, { className: "ab-OnePageWizard__key-hint twa:leading-normal", children: [(0, isMacLike_1.isMacLike)() ? 'Cmd' : 'Ctrl', " + #", (0, jsx_runtime_1.jsx)("br", {}), "or arrow keys", (0, jsx_runtime_1.jsx)("br", {}), "to navigate"] })] }), (0, jsx_runtime_1.jsx)(Flex_1.Flex, { flexDirection: "column", className: "ab-OnePageWizard__section-container twa:min-h-0 twa:min-w-0 twa:flex-1", children: renderSection(currentSection) })] }), (0, jsx_runtime_1.jsxs)(Flex_1.Flex, { flexDirection: "row", alignItems: "center", className: "ab-WizardDialog__footer ab-OnePageWizard__footer twa:p-2", children: [(0, jsx_runtime_1.jsx)(SimpleButton_1.default, { tone: "neutral", variant: "text", "data-name": "close", onClick: () => props.onHide?.(), tooltip: props.closeTooltip ?? 'Close wizard', accessLevel: GeneralConstants_1.ACCESS_LEVEL_FULL, children: props.closeText ?? 'CLOSE' }), (0, jsx_runtime_1.jsx)(KeyHint_1.KeyHint, { className: "twa:ml-2", children: "Esc" }), (0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "ab-OnePageWizard__error twa:text-2 twa:mr-3 twa:flex-1 twa:text-destructive twa:text-end", children: firstErrorMessage }), (0, jsx_runtime_1.jsx)(SimpleButton_1.default, { tone: "accent", "data-name": "finish", variant: "raised", disabled: canFinish !== true, onClick: () => handleClickFinish(), icon: 'check', accessLevel: GeneralConstants_1.ACCESS_LEVEL_FULL, children: props.finishText ?? 'Finish' })] })] }) }) }) }));
 };
 exports.OnePageWizard = OnePageWizard;

package/src/agGrid/AdaptableAgGrid.js

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AdaptableAgGrid = void 0;
 const tslib_1 = require("tslib");
-const debounce_1 = tslib_1.__importDefault(require("../Utilities/utils/debounce"));
+const TimingHelper_1 = require("../Utilities/Helpers/TimingHelper");
 const ag_grid_enterprise_1 = require("ag-grid-enterprise");
 const AdaptableLogger_1 = require("./AdaptableLogger");
 const DocumentationLinkConstants_1 = require("../Utilities/Constants/DocumentationLinkConstants");
 const StringExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/StringExtensions"));
-const QuickSearchStyleHelper_1 = require("../Utilities/Helpers/QuickSearchStyleHelper");
+const QuickSearchHelper_1 = require("../Utilities/Helpers/QuickSearchHelper");
 const Emitter_1 = tslib_1.__importDefault(require("../Utilities/Emitter"));
 const DefaultAdaptableOptions_1 = require("../AdaptableOptions/DefaultAdaptableOptions");
 const resolveContainerElement_1 = require("../Utilities/resolveContainerElement");
@@ -24,7 +24,7 @@ const ThemeService_1 = require("../Utilities/Services/ThemeService");
 const ValidationService_1 = require("../Utilities/Services/ValidationService");
 const ModuleService_1 = require("../Utilities/Services/ModuleService");
 const CalculatedColumnExpressionService_1 = require("../Utilities/Services/CalculatedColumnExpressionService");
-const CalculatedColumnSyntheticChange_1 = require("../Utilities/Services/CalculatedColumnSyntheticChange");
+const CalculatedColumnExpressionService_2 = require("../Utilities/Services/CalculatedColumnExpressionService");
 const QueryLanguageService_1 = require("../Utilities/Services/QueryLanguageService");
 const AlertService_1 = require("../Utilities/Services/AlertService");
 const TeamSharingService_1 = require("../Utilities/Services/TeamSharingService");
@@ -90,8 +90,8 @@ const Modal_1 = require("../components/Modal");
 const AdaptableLoadingScreen_1 = require("../View/Components/Popups/AdaptableLoadingScreen");
 const react_1 = require("react");
 const createAgStatusPanelComponent_1 = require("../Utilities/createAgStatusPanelComponent");
-const only_1 = require("../Utilities/only");
-const weightedAverage_1 = require("../Utilities/weightedAverage");
+const only_1 = require("../AdaptableState/Aggregations/only");
+const weightedAverage_1 = require("../AdaptableState/Aggregations/weightedAverage");
 const RowSummary_1 = require("../AdaptableState/Common/RowSummary");
 const FlashingCellService_1 = require("../Utilities/Services/FlashingCellService");
 const AgGridExportAdapter_1 = require("./AgGridExportAdapter");
@@ -107,7 +107,7 @@ const adaptableOverrideCheck_1 = require("../Utilities/adaptableOverrideCheck");
 const AgGridModulesAdapter_1 = require("./AgGridModulesAdapter");
 const devTools_1 = require("../devTools");
 const infinite_react_1 = require("@infinite-table/infinite-react");
-const FormatHelper_1 = require("../Utilities/Helpers/FormatHelper");
+const DisplayFormatHelper_1 = require("../Utilities/Helpers/DisplayFormatHelper");
 const PredicateApiImpl_1 = require("../Api/Implementation/PredicateApiImpl");
 const AgGridFilterAdapter_1 = require("./AgGridFilterAdapter");
 const AdaptableFilterHandler_1 = require("./AdaptableFilterHandler");
@@ -1742,7 +1742,7 @@ class AdaptableAgGrid {
          * Use Case: User has selected Rows or opened a Row Group
          * Action: Set Selected Rows (on a debounce of 500ms)
          */
-        this.debouncedSetSelectedRows = (0, debounce_1.default)(() => {
+        this.debouncedSetSelectedRows = (0, TimingHelper_1.debounce)(() => {
             if (!this.isReady) {
                 return;
             }
@@ -1762,7 +1762,7 @@ class AdaptableAgGrid {
          * Use Case: User has selected a range of cells
          * Action: Set Selected Cells (on a debounce of 250ms)
          */
-        this.debouncedSetSelectedCells = (0, debounce_1.default)(() => {
+        this.debouncedSetSelectedCells = (0, TimingHelper_1.debounce)(() => {
             if (!this.isReady) {
                 return;
             }
@@ -3013,7 +3013,7 @@ class AdaptableAgGrid {
                 const monthCells = treeDeepMap.get([year, month]) || [];
                 const monthCell = this.createGridCell(rowNode, colId, {
                     rawValue: monthRawValue,
-                    displayValue: (0, FormatHelper_1.DateFormatter)(`${monthRawValue}-01`, { Pattern: 'LLLL' }),
+                    displayValue: (0, DisplayFormatHelper_1.DateFormatter)(`${monthRawValue}-01`, { Pattern: 'LLLL' }),
                     normalisedValue: monthRawValue,
                 });
                 monthCells.push(monthCell);
@@ -3585,7 +3585,7 @@ class AdaptableAgGrid {
         this.agGridAdapter.setGridOption('findSearchValue', searchText);
     }
     applyQuickSearchFindCssVars() {
-        (0, QuickSearchStyleHelper_1.applyQuickSearchFindCssVars)(this.getAgGridContainerElement(), this.api.stateApi.getQuickSearchState());
+        (0, QuickSearchHelper_1.applyQuickSearchFindCssVars)(this.getAgGridContainerElement(), this.api.stateApi.getQuickSearchState());
     }
     refreshAgGridFind() {
         if (!this.agGridModulesAdapter.isAgGridModuleRegistered('FindModule')) {
@@ -4138,7 +4138,7 @@ class AdaptableAgGrid {
      * There are a few things we need to do AFTER we edit a cell and it makes sense to put them in one place
      */
     performPostEditChecks(rowNode, cellDataChangedInfos) {
-        cellDataChangedInfos = (0, CalculatedColumnSyntheticChange_1.expandCellDataChangedInfosWithCalculatedColumns)(this.api, cellDataChangedInfos);
+        cellDataChangedInfos = (0, CalculatedColumnExpressionService_2.expandCellDataChangedInfosWithCalculatedColumns)(this.api, cellDataChangedInfos);
         cellDataChangedInfos.forEach((cellDataChangedInfo) => {
             // if a Cell Data Change is undone, log to the Console
             if (cellDataChangedInfo.trigger === 'undo') {

package/src/agGrid/AgGridColumnAdapter.js

@@ -3,12 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AgGridColumnAdapter = void 0;
 exports.getEditorForColumnDataType = getEditorForColumnDataType;
 const tslib_1 = require("tslib");
-const kebabCase_1 = tslib_1.__importDefault(require("../Utilities/utils/kebabCase"));
+const StringExtensions_1 = require("../Utilities/Extensions/StringExtensions");
 const AdaptableFormatPresets_1 = require("../AdaptableState/Common/AdaptableFormatPresets");
-const merge_1 = tslib_1.__importDefault(require("../Utilities/utils/merge"));
-const SparklineOptionsHelper_1 = require("../Utilities/Helpers/SparklineOptionsHelper");
+const ObjectExtensions_1 = require("../Utilities/Extensions/ObjectExtensions");
+const SparklineStyleHelper_1 = require("../Utilities/Helpers/StyledColumns/SparklineStyleHelper");
+const BarStylesHelper_1 = require("../Utilities/Helpers/StyledColumns/BarStylesHelper");
 const StyleHelper_1 = require("../Utilities/Helpers/StyleHelper");
-const StringExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/StringExtensions"));
+const StringExtensions_2 = tslib_1.__importDefault(require("../Utilities/Extensions/StringExtensions"));
 const AdaptableColumn_1 = require("../AdaptableState/Common/AdaptableColumn");
 const tinycolor2_1 = tslib_1.__importDefault(require("tinycolor2"));
 const UIHelper_1 = tslib_1.__importDefault(require("../View/UIHelper"));
@@ -17,11 +18,11 @@ const BadgeRenderer_1 = require("./cellRenderers/BadgeRenderer");
 const BulletChartRenderer_1 = require("./cellRenderers/BulletChartRenderer");
 const RangeBarRenderer_1 = require("./cellRenderers/RangeBarRenderer");
 const RatingRenderer_1 = require("./cellRenderers/RatingRenderer");
-const shouldRenderStyledColumnOnRow_1 = require("./cellRenderers/shouldRenderStyledColumnOnRow");
+const StyledColumnHelper_1 = require("../Utilities/Helpers/StyledColumns/StyledColumnHelper");
 const IconRenderer_1 = require("./cellRenderers/IconRenderer");
-const Helper_1 = tslib_1.__importDefault(require("../Utilities/Helpers/Helper"));
-const ScheduledAlertHelper_1 = require("../Utilities/Helpers/ScheduledAlertHelper");
-const StyledColumnGradientHelper_1 = require("../Utilities/Helpers/StyledColumnGradientHelper");
+const NumberExtensions_1 = require("../Utilities/Extensions/NumberExtensions");
+const ScheduledAlertHelper_1 = require("../Utilities/Helpers/Scheduling/ScheduledAlertHelper");
+const GradientStyleHelper_1 = require("../Utilities/Helpers/StyledColumns/GradientStyleHelper");
 const AdaptableNumberEditor_1 = require("./editors/AdaptableNumberEditor");
 const AdaptableDateEditor_1 = require("./editors/AdaptableDateEditor");
 const AgGridExportAdapter_1 = require("./AgGridExportAdapter");
@@ -31,7 +32,7 @@ const AdaptableFilterHandler_1 = require("./AdaptableFilterHandler");
 const AgGridFilterAdapter_1 = require("./AgGridFilterAdapter");
 const AgGridFloatingFilterAdapter_1 = require("./AgGridFloatingFilterAdapter");
 const AdaptableLogger_1 = require("./AdaptableLogger");
-const iconStyledColumnColumnSupport_1 = require("../Utilities/Helpers/iconStyledColumnColumnSupport");
+const IconStyleHelper_1 = require("../Utilities/Helpers/StyledColumns/IconStyleHelper");
 const AggregationColumns_1 = require("../AdaptableState/Common/AggregationColumns");
 /**
  * CSS property keys produced by `convertAdaptableStyleToCSS` from a
@@ -375,7 +376,7 @@ class AgGridColumnAdapter {
         return Object.entries(style).reduce((acc, [key, value]) => {
             // needed as AG-Grid vanilla turns all CSS props to kebab, while AG Grid React does not
             // @ts-ignore
-            acc[`--ab-dynamic-${(0, kebabCase_1.default)(key)}`] = value;
+            acc[`--ab-dynamic-${(0, StringExtensions_1.kebabCase)(key)}`] = value;
             return acc;
         }, {});
     }
@@ -558,7 +559,7 @@ class AgGridColumnAdapter {
             if (styledColumn && !styledColumn.IsSuspended) {
                 if (styledColumn.SparklineStyle) {
                     const sanitizedSparklineOptions = AdaptableHelper_1.AdaptableHelper.removeAdaptableObjectPrimitives(styledColumn.SparklineStyle.options);
-                    const sparklineOptions = (0, SparklineOptionsHelper_1.resolveSparklineOptionsForRender)((0, merge_1.default)({}, userDefined?.sparklineOptions, sanitizedSparklineOptions));
+                    const sparklineOptions = (0, SparklineStyleHelper_1.resolveSparklineOptionsForRender)((0, ObjectExtensions_1.merge)({}, userDefined?.sparklineOptions, sanitizedSparklineOptions));
                     return {
                         ...userDefined,
                         sparklineOptions,
@@ -577,7 +578,7 @@ class AgGridColumnAdapter {
             // Icon Style has its own tooltip vocabulary (`'CellValue'` /
             // `'IconDescription'`) so we handle it before falling through to the
             // numeric tooltip branch.
-            if (styledColumn.IconStyle && !(0, iconStyledColumnColumnSupport_1.isUnsupportedColumnDataTypeForIconStyle)(abColumn.dataType)) {
+            if (styledColumn.IconStyle && !(0, IconStyleHelper_1.isUnsupportedColumnDataTypeForIconStyle)(abColumn.dataType)) {
                 const iconTokens = styledColumn.IconStyle.ToolTipText ?? [];
                 if (iconTokens.length === 0) {
                     return undefined;
@@ -615,7 +616,7 @@ class AgGridColumnAdapter {
                     if (ratingToolTip.includes('PercentageValue') && ratingMax > 0) {
                         const n = Number(params.value);
                         if (!isNaN(n)) {
-                            const clamped = Helper_1.default.clamp(n, 0, ratingMax);
+                            const clamped = (0, NumberExtensions_1.clamp)(n, 0, ratingMax);
                             const percentageValue = (clamped / ratingMax) * 100;
                             const pct = `${percentageValue.toFixed(0)}%`;
                             returnValue = returnValue ? `${returnValue} (${pct})` : pct;
@@ -663,7 +664,7 @@ class AgGridColumnAdapter {
                     }
                     else {
                         const scaleSpan = max - min;
-                        const clamped = Helper_1.default.clamp(Number(params.value), min, max);
+                        const clamped = (0, NumberExtensions_1.clamp)(Number(params.value), min, max);
                         percentageValue = scaleSpan === 0 ? 0 : ((clamped - min) / scaleSpan) * 100;
                     }
                     returnValue += ` (${percentageValue.toFixed(0)}%)`;
@@ -1260,7 +1261,7 @@ class AgGridColumnAdapter {
     }
     getQuickSearchCellStyle() {
         const quickSearchStyle = this.adaptableApi.quickSearchApi.getQuickSearchCellMatchStyle();
-        if (!quickSearchStyle || StringExtensions_1.default.IsNotNullOrEmpty(quickSearchStyle.ClassName)) {
+        if (!quickSearchStyle || StringExtensions_2.default.IsNotNullOrEmpty(quickSearchStyle.ClassName)) {
             return undefined;
         }
         return (0, StyleHelper_1.convertAdaptableStyleToCSS)(quickSearchStyle);
@@ -1363,7 +1364,7 @@ class AgGridColumnAdapter {
      */
     styledColumnClaimsFontStyle(styledColumn, abColumn) {
         const iconFontClaims = !!styledColumn?.IconStyle &&
-            !(0, iconStyledColumnColumnSupport_1.isUnsupportedColumnDataTypeForIconStyle)(abColumn.dataType) &&
+            !(0, IconStyleHelper_1.isUnsupportedColumnDataTypeForIconStyle)(abColumn.dataType) &&
             (0, StyleHelper_1.hasCellFontStyle)(styledColumn.IconStyle.Font);
         return ((0, StyleHelper_1.hasCellFontStyle)(styledColumn?.GradientStyle?.Font) ||
             (0, StyleHelper_1.hasCellFontStyle)(styledColumn?.PercentBarStyle?.Font) ||
@@ -1377,7 +1378,7 @@ class AgGridColumnAdapter {
      */
     styledColumnClaimsCellBoxStyle(styledColumn, abColumn) {
         const iconCellClaims = !!styledColumn?.IconStyle &&
-            !(0, iconStyledColumnColumnSupport_1.isUnsupportedColumnDataTypeForIconStyle)(abColumn.dataType) &&
+            !(0, IconStyleHelper_1.isUnsupportedColumnDataTypeForIconStyle)(abColumn.dataType) &&
             (0, StyleHelper_1.hasCellBoxStyle)(styledColumn.IconStyle.Cell);
         return ((0, StyleHelper_1.hasCellBoxStyle)(styledColumn?.RatingStyle?.Cell) ||
             (0, StyleHelper_1.hasCellBoxStyle)(styledColumn?.SparklineStyle?.Cell) ||
@@ -1405,7 +1406,7 @@ class AgGridColumnAdapter {
         // Row-kind filtering: defer to the shared row-scope helper so the
         // cellStyle path (Gradient background, Font/Cell slots) follows the
         // same `StyledColumn.RowScope` rules as every cellRenderer.
-        if (!(0, shouldRenderStyledColumnOnRow_1.shouldRenderStyledColumnOnRow)(styledColumn, params.node, this.adaptableApi)) {
+        if (!(0, StyledColumnHelper_1.shouldRenderStyledColumnOnRow)(styledColumn, params.node, this.adaptableApi)) {
             return style;
         }
         let colValue = params.value;
@@ -1418,24 +1419,24 @@ class AgGridColumnAdapter {
                 cellBackColor = gradientStyle.ColumnComparison.Color;
             }
             else {
-                const matchingRange = this.adaptableApi.styledColumnApi.internalApi.findRangeForColumn((0, StyledColumnGradientHelper_1.expandGradientCellRanges)(gradientStyle), abColumn, (0, StyledColumnGradientHelper_1.gradientStyleRangeLookupValueType)(gradientStyle), colValue);
+                const matchingRange = this.adaptableApi.styledColumnApi.internalApi.findRangeForColumn((0, GradientStyleHelper_1.expandGradientCellRanges)(gradientStyle), abColumn, (0, GradientStyleHelper_1.gradientStyleRangeLookupValueType)(gradientStyle), colValue);
                 if (matchingRange) {
                     cellBackColor = matchingRange.Color;
                     // Flip the alpha ramp when (a) it's the negative band of a
                     // ZeroCentred diverging gradient, OR (b) the user has explicitly
                     // marked this band as `ReverseGradient` (lower-is-darker).
                     reverseGradient =
-                        (!!gradientStyle.ZeroCentred && (0, StyledColumnGradientHelper_1.isNegativeZeroCentredBand)(matchingRange)) ||
+                        (!!gradientStyle.ZeroCentred && (0, GradientStyleHelper_1.isNegativeZeroCentredBand)(matchingRange)) ||
                             !!matchingRange.ReverseGradient;
                 }
             }
-            const minAlphaBound = gradientStyle.MinAlpha ?? StyledColumnGradientHelper_1.DEFAULT_GRADIENT_MIN_ALPHA;
-            const maxAlphaBound = gradientStyle.MaxAlpha ?? StyledColumnGradientHelper_1.DEFAULT_GRADIENT_MAX_ALPHA;
-            const lo = Math.min(Helper_1.default.clamp(minAlphaBound, 0, 1), Helper_1.default.clamp(maxAlphaBound, 0, 1));
-            const hi = Math.max(Helper_1.default.clamp(minAlphaBound, 0, 1), Helper_1.default.clamp(maxAlphaBound, 0, 1));
+            const minAlphaBound = gradientStyle.MinAlpha ?? GradientStyleHelper_1.DEFAULT_GRADIENT_MIN_ALPHA;
+            const maxAlphaBound = gradientStyle.MaxAlpha ?? GradientStyleHelper_1.DEFAULT_GRADIENT_MAX_ALPHA;
+            const lo = Math.min((0, NumberExtensions_1.clamp)(minAlphaBound, 0, 1), (0, NumberExtensions_1.clamp)(maxAlphaBound, 0, 1));
+            const hi = Math.max((0, NumberExtensions_1.clamp)(minAlphaBound, 0, 1), (0, NumberExtensions_1.clamp)(maxAlphaBound, 0, 1));
             const span = Math.abs(max - min);
             let t = span === 0 ? 0.5 : (Number(colValue) - min) / span;
-            t = Helper_1.default.clamp(t, 0, 1);
+            t = (0, NumberExtensions_1.clamp)(t, 0, 1);
             if (reverseGradient) {
                 t = 1 - t;
             }
@@ -1450,7 +1451,8 @@ class AgGridColumnAdapter {
                 }
             }
         }
-        if (styledColumn.PercentBarStyle && styledColumn.PercentBarStyle.CellText) {
+        if (styledColumn.PercentBarStyle &&
+            (0, BarStylesHelper_1.hasBarStyleCellTextConfigured)(styledColumn.PercentBarStyle.CellTextProperties)) {
             style.paddingTop = 0;
             style.paddingBottom = 0;
         }
@@ -1464,7 +1466,7 @@ class AgGridColumnAdapter {
         // basis when a Gradient cell has a tinted background, even if the user
         // also set `Font.ForeColor` as a baseline.
         const autoContrastColor = gradientStyle?.AutoContrastText && style.color ? style.color : undefined;
-        const iconStyleFontApplies = styledColumn.IconStyle && !(0, iconStyledColumnColumnSupport_1.isUnsupportedColumnDataTypeForIconStyle)(abColumn.dataType);
+        const iconStyleFontApplies = styledColumn.IconStyle && !(0, IconStyleHelper_1.isUnsupportedColumnDataTypeForIconStyle)(abColumn.dataType);
         const fontSlot = styledColumn.GradientStyle?.Font ??
             styledColumn.PercentBarStyle?.Font ??
             styledColumn.BulletChartStyle?.Font ??
@@ -1476,7 +1478,7 @@ class AgGridColumnAdapter {
         if (fontSlot) {
             style = { ...style, ...(0, StyleHelper_1.convertAdaptableStyleToCSS)(fontSlot) };
         }
-        const iconStyleCellApplies = styledColumn.IconStyle && !(0, iconStyledColumnColumnSupport_1.isUnsupportedColumnDataTypeForIconStyle)(abColumn.dataType);
+        const iconStyleCellApplies = styledColumn.IconStyle && !(0, IconStyleHelper_1.isUnsupportedColumnDataTypeForIconStyle)(abColumn.dataType);
         const cellSlot = styledColumn.RatingStyle?.Cell ??
             styledColumn.SparklineStyle?.Cell ??
             styledColumn.BadgeStyle?.Cell ??

package/src/agGrid/AgGridExportAdapter.js

@@ -9,7 +9,7 @@ const Uuid_1 = require("../AdaptableState/Uuid");
 const GeneralConstants_1 = require("../Utilities/Constants/GeneralConstants");
 const ModuleConstants_1 = require("../Utilities/Constants/ModuleConstants");
 const StringExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/StringExtensions"));
-const FormatHelper_1 = tslib_1.__importStar(require("../Utilities/Helpers/FormatHelper"));
+const DisplayFormatHelper_1 = tslib_1.__importStar(require("../Utilities/Helpers/DisplayFormatHelper"));
 const StyleHelper_1 = require("../Utilities/Helpers/StyleHelper");
 const waitForTimeout_1 = require("../Utilities/waitForTimeout");
 class AgGridExportAdapter {
@@ -661,7 +661,7 @@ class AgGridExportAdapter {
                             // we have to pass the date in the ISO format to Excel
                             // see https://www.ag-grid.com/javascript-data-grid/excel-export-data-types/#dates
                             // we can NOT use Date.toISOString() because we don't want the timezone corrections to kick in
-                            const isoFormattedValue = (0, FormatHelper_1.DateFormatter)(normalisedValue, {
+                            const isoFormattedValue = (0, DisplayFormatHelper_1.DateFormatter)(normalisedValue, {
                                 Pattern: `yyyy-MM-dd'T'HH:mm:ss.SSS`,
                             });
                             if (isoFormattedValue) {
@@ -900,7 +900,7 @@ class AgGridExportAdapter {
         if (isDateColumn) {
             const customExportDateFormat = this.getCustomExportDateFormat(column, exportContext);
             if (!!customExportDateFormat) {
-                return FormatHelper_1.default.DateFormatter(cellRawValue, {
+                return DisplayFormatHelper_1.default.DateFormatter(cellRawValue, {
                     Pattern: customExportDateFormat,
                 });
             }