@adaptabletools/adaptable-cjs 23.0.0-canary.0 → 23.0.0-canary.10

package/src/View/Wizard/OnePageWizards.js

@@ -6,7 +6,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 clsx_1 = tslib_1.__importDefault(require("clsx"));
+const utils_1 = require("../../lib/utils");
 const Dialog_1 = tslib_1.__importDefault(require("../../components/Dialog"));
 const SimpleButton_1 = tslib_1.__importDefault(require("../../components/SimpleButton"));
 const useProperty_1 = tslib_1.__importDefault(require("../../components/utils/useProperty"));
@@ -86,11 +86,11 @@ const OnePageWizard = (props) => {
         if (section === '-') {
             return (0, jsx_runtime_1.jsx)(React.Fragment, {}, index);
         }
-        return ((0, jsx_runtime_1.jsx)(Flex_1.Flex, { flexDirection: "column", "data-name": `section-${index}`, className: "twa:min-h-full twa:mr-2", children: (0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "ab-OnePageWizard__section twa:flex-1 twa:rounded-standard twa:overflow-auto twa:bg-defaultbackground", children: section.render(props.data, index) }) }, index));
+        return ((0, jsx_runtime_1.jsx)(Flex_1.Flex, { flexDirection: "column", "data-name": `section-${index}`, className: "twa:min-h-full twa:mr-2", children: (0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "ab-OnePageWizard__section twa:flex-1 twa:rounded-standard twa:overflow-auto twa:bg-background", children: section.render(props.data, index) }) }, index));
     };
     const handleNavigation = (0, useKeyboardNavigation_1.useKeyboardNavigation)(setCurrentSection, visibleSections);
     const selectedNodeRef = (0, react_1.useRef)(null);
-    const selectedFeedback = ((0, jsx_runtime_1.jsx)("div", { ref: selectedNodeRef, onKeyDown: (event) => handleNavigation(event), tabIndex: 0, className: (0, clsx_1.default)('ab-OnePageWizard__selected-title-overlay', 'twa:absolute twa:rounded-standard twa:select-none twa:bg-accent twa:transition-top twa:duration-200', twUtils_1.targetOwn.focusOutline) }));
+    const selectedFeedback = ((0, jsx_runtime_1.jsx)("div", { ref: selectedNodeRef, onKeyDown: (event) => handleNavigation(event), tabIndex: 0, className: (0, utils_1.cn)('ab-OnePageWizard__selected-title-overlay', 'twa:absolute twa:rounded-standard twa:select-none twa:bg-accent twa:transition-top twa:duration-200', twUtils_1.targetOwn.focusOutline) }));
     const sizeOwnerRef = (0, react_1.useRef)(null);
     const [width, setWidth] = (0, react_1.useState)(0);
     (0, ResizeObserver_1.useResizeObserver)(sizeOwnerRef, ({ width }) => {
@@ -144,7 +144,7 @@ const OnePageWizard = (props) => {
                             }
                         }
                     }
-                }, children: (0, jsx_runtime_1.jsxs)(Flex_1.Box, { className: (0, clsx_1.default)('ab-OnePageWizard twa:flex twa:flex-col twa:h-full twa:w-[90vw] twa:max-w-[1200px]', 'twa:bg-primarylight twa:text-primary-foreground'), "data-name": props.name, style: props.style, children: [(props.moduleName || activeSectionDetails) && ((0, jsx_runtime_1.jsxs)(Flex_1.Box, { className: (0, clsx_1.default)('ab-OnePageWizard__header', ONE_PAGE_WIZARD_SECTION_GRID, 'twa:items-start twa:my-3 twa:px-2'), children: [(0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "ab-OnePageWizard__module-name twa:min-w-0 twa:pl-3 twa:font-bold", children: props.moduleName }), (0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "ab-OnePageWizard__details twa:min-w-0 twa:pr-2 twa:text-4", children: activeSectionDetails })] })), (0, jsx_runtime_1.jsx)(Flex_1.Box, { as: "hr", className: "ab-OnePageWizard__module-separator twa:w-full twa:border-0 twa:border-t twa:border-t-input-border twa:mb-2" }), (0, jsx_runtime_1.jsxs)(Flex_1.Box, { className: (0, clsx_1.default)(ONE_PAGE_WIZARD_SECTION_GRID, 'twa:flex-1 twa:min-h-0 twa:overflow-auto twa:items-stretch'), children: [(0, jsx_runtime_1.jsxs)(Flex_1.Flex, { flexDirection: "column", className: "ab-OnePageWizard__section-title-container twa:min-h-0 twa:min-w-0 twa:overflow-auto twa:p-3 twa:relative", ref: sizeOwnerRef, style: props.titleContainerStyle, children: [visibleSections.map((section, index) => {
+                }, children: (0, jsx_runtime_1.jsxs)(Flex_1.Box, { className: (0, utils_1.cn)('ab-OnePageWizard twa:flex twa:flex-col twa:h-full twa:w-[90vw] twa:max-w-[1200px]', 'twa:bg-primarylight twa:text-primary-foreground'), "data-name": props.name, style: props.style, children: [(props.moduleName || activeSectionDetails) && ((0, jsx_runtime_1.jsxs)(Flex_1.Box, { className: (0, utils_1.cn)('ab-OnePageWizard__header', ONE_PAGE_WIZARD_SECTION_GRID, 'twa:items-start twa:my-3 twa:px-2'), children: [(0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "ab-OnePageWizard__module-name twa:min-w-0 twa:pl-3 twa:font-bold", children: props.moduleName }), (0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "ab-OnePageWizard__details twa:min-w-0 twa:pr-2 twa:text-4", children: activeSectionDetails })] })), (0, jsx_runtime_1.jsx)(Flex_1.Box, { as: "hr", className: "ab-OnePageWizard__module-separator twa:w-full twa:border-0 twa:border-t twa:border-t-input-border twa:mb-2" }), (0, jsx_runtime_1.jsxs)(Flex_1.Box, { className: (0, utils_1.cn)(ONE_PAGE_WIZARD_SECTION_GRID, 'twa:flex-1 twa:min-h-0 twa:overflow-auto twa:items-stretch'), children: [(0, jsx_runtime_1.jsxs)(Flex_1.Flex, { flexDirection: "column", className: "ab-OnePageWizard__section-title-container twa:min-h-0 twa:min-w-0 twa:overflow-auto twa:p-3 twa:relative", ref: sizeOwnerRef, style: props.titleContainerStyle, children: [visibleSections.map((section, index) => {
                                             if (section === '-') {
                                                 return ((0, jsx_runtime_1.jsx)(Flex_1.Box, { as: "hr", className: "ab-OnePageWizard__section-separator twa:mt-2 twa:w-full twa:border-t twa:border-t-input-border" }, `${index}-`));
                                             }
@@ -152,7 +152,7 @@ const OnePageWizard = (props) => {
                                             navIndexMap.set(navIndex, index);
                                             const active = index === currentSection;
                                             const disabled = false; //!active && !currentSectionValid;
-                                            return ((0, jsx_runtime_1.jsxs)(Flex_1.Flex, { className: (0, clsx_1.default)('ab-OnePageWizard__section-title twa:p-2', {
+                                            return ((0, jsx_runtime_1.jsxs)(Flex_1.Flex, { className: (0, utils_1.cn)('ab-OnePageWizard__section-title twa:p-2', {
                                                     'twa:cursor-auto': disabled,
                                                     'twa:cursor-pointer': !disabled,
                                                     'twa:z-10': true,
@@ -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-color-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, clsx_1.default)('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-error 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' })] })] }) }) }) }));
+                                                }, 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.jsxs)(Flex_1.Flex, { flexDirection: "column", className: "ab-OnePageWizard__section-container twa:min-h-0 twa:min-w-0 twa:flex-1", children: [props.headerPreview ? ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "ab-OnePageWizard__header-preview twa:px-3 twa:pb-2", children: props.headerPreview }), (0, jsx_runtime_1.jsx)(Flex_1.Box, { as: "hr", className: "ab-OnePageWizard__header-preview-separator twa:w-full twa:border-0 twa:border-t twa:border-t-input-border twa:mb-2" })] })) : null, 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/View/Wizard/SummaryColorTag.d.ts

@@ -0,0 +1,24 @@
+import * as React from 'react';
+import type { AdaptableIcon } from '../../types';
+export type SummaryLabelValueItem = {
+    label: string;
+    value: string;
+    /** When set on an Icon summary row, renders the icon glyph instead of the name. */
+    icon?: AdaptableIcon;
+};
+export declare const isSummaryColorLabel: (label: string) => boolean;
+/** Labels whose label + value render together inside a single tag (colours, font traits). */
+export declare const isSummaryInTagLabel: (label: string) => boolean;
+export declare const ColorSummarySquare: React.FC<{
+    color: string;
+    className?: string;
+}>;
+export declare const renderSummaryLabelValueTagContent: (label: string, value: string, icon?: AdaptableIcon) => React.ReactNode;
+export declare const parseSummaryLabelValueString: (item: string) => {
+    label: string;
+    value: string;
+} | null;
+export declare const renderSummaryStringTagContent: (item: string) => React.ReactNode;
+export declare const renderSummaryStringTags: (items: string[]) => React.JSX.Element;
+export declare const summaryStringsToTagContents: (items: string[]) => React.ReactNode[];
+export declare const renderSummaryLabelValueTags: (items: SummaryLabelValueItem[]) => React.JSX.Element;

package/src/View/Wizard/SummaryColorTag.js

@@ -0,0 +1,79 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.renderSummaryLabelValueTags = exports.summaryStringsToTagContents = exports.renderSummaryStringTags = exports.renderSummaryStringTagContent = exports.parseSummaryLabelValueString = exports.renderSummaryLabelValueTagContent = exports.ColorSummarySquare = exports.isSummaryInTagLabel = exports.isSummaryColorLabel = void 0;
+const jsx_runtime_1 = require("react/jsx-runtime");
+const Flex_1 = require("../../components/Flex");
+const Tag_1 = require("../../components/Tag");
+const StyleHelper_1 = require("../../Utilities/Helpers/StyleHelper");
+const icons_1 = require("../../components/icons");
+const AdaptableIconComponent_1 = require("../Components/AdaptableIconComponent");
+const COLOR_SQUARE_CLASS = 'twa:h-3 twa:w-3 twa:rounded-sm twa:shrink-0 twa:border twa:border-[color-mix(in_srgb,var(--ab-color-foreground)_20%,transparent)]';
+const isSummaryColorLabel = (label) => /\bColou?r$/i.test(label.trim());
+exports.isSummaryColorLabel = isSummaryColorLabel;
+const isIconSummaryLabel = (label) => label.trim() === 'Icon';
+/** Labels whose label + value render together inside a single tag (colours, font traits). */
+const isSummaryInTagLabel = (label) => {
+    const trimmed = label.trim();
+    return ((0, exports.isSummaryColorLabel)(trimmed) ||
+        isIconSummaryLabel(trimmed) ||
+        trimmed === 'Font Weight' ||
+        trimmed === 'Font Style');
+};
+exports.isSummaryInTagLabel = isSummaryInTagLabel;
+const ColorSummarySquare = ({ color, className, }) => ((0, jsx_runtime_1.jsx)(Flex_1.Box, { className: className ?? COLOR_SQUARE_CLASS, style: { background: (0, StyleHelper_1.getVariableColor)(color) }, "aria-hidden": true }));
+exports.ColorSummarySquare = ColorSummarySquare;
+const SummaryIconVisual = ({ icon, value }) => {
+    if (icon) {
+        return ((0, jsx_runtime_1.jsx)(AdaptableIconComponent_1.AdaptableIconComponent, { icon: { ...icon, size: icon.size ?? 14 } }));
+    }
+    if (value && value in icons_1.allIcons) {
+        return ((0, jsx_runtime_1.jsx)(icons_1.Icon, { "aria-hidden": true, name: value, size: 14, className: "twa:shrink-0" }));
+    }
+    return null;
+};
+const isSummaryIconVisualAvailable = (icon, value) => Boolean(icon || (value && value in icons_1.allIcons));
+const isFontWeightLabel = (label) => label.trim() === 'Font Weight';
+const isFontStyleLabel = (label) => label.trim() === 'Font Style';
+const renderSummaryLabelValueTagContent = (label, value, icon) => {
+    if ((0, exports.isSummaryColorLabel)(label)) {
+        return ((0, jsx_runtime_1.jsxs)(Flex_1.Flex, { alignItems: "center", className: "twa:gap-1.5", children: [label, (0, jsx_runtime_1.jsx)(exports.ColorSummarySquare, { color: value })] }));
+    }
+    if (isIconSummaryLabel(label)) {
+        if (isSummaryIconVisualAvailable(icon, value)) {
+            return ((0, jsx_runtime_1.jsxs)(Flex_1.Flex, { alignItems: "center", className: "twa:gap-1.5", children: [label, (0, jsx_runtime_1.jsx)(SummaryIconVisual, { icon: icon, value: value })] }));
+        }
+    }
+    if (isFontWeightLabel(label) && value === 'Bold') {
+        return (0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:font-bold", children: `${label}: ${value}` });
+    }
+    if (isFontStyleLabel(label) && value === 'Italic') {
+        return (0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:italic", children: `${label}: ${value}` });
+    }
+    return `${label}: ${value}`;
+};
+exports.renderSummaryLabelValueTagContent = renderSummaryLabelValueTagContent;
+const parseSummaryLabelValueString = (item) => {
+    const colonIndex = item.indexOf(': ');
+    if (colonIndex <= 0) {
+        return null;
+    }
+    return {
+        label: item.slice(0, colonIndex),
+        value: item.slice(colonIndex + 2),
+    };
+};
+exports.parseSummaryLabelValueString = parseSummaryLabelValueString;
+const renderSummaryStringTagContent = (item) => {
+    const parsed = (0, exports.parseSummaryLabelValueString)(item);
+    if (!parsed) {
+        return item;
+    }
+    return (0, exports.renderSummaryLabelValueTagContent)(parsed.label, parsed.value);
+};
+exports.renderSummaryStringTagContent = renderSummaryStringTagContent;
+const renderSummaryStringTags = (items) => ((0, jsx_runtime_1.jsx)(Flex_1.Flex, { alignItems: "center", className: "twa:flex-wrap twa:gap-2", children: items.map((item) => ((0, jsx_runtime_1.jsx)(Tag_1.Tag, { children: (0, exports.renderSummaryStringTagContent)(item) }, item))) }));
+exports.renderSummaryStringTags = renderSummaryStringTags;
+const summaryStringsToTagContents = (items) => items.map((item) => (0, exports.renderSummaryStringTagContent)(item));
+exports.summaryStringsToTagContents = summaryStringsToTagContents;
+const renderSummaryLabelValueTags = (items) => ((0, jsx_runtime_1.jsx)(Flex_1.Flex, { alignItems: "center", className: "twa:gap-1 twa:flex-wrap", children: items.map(({ label, value, icon }) => ((0, jsx_runtime_1.jsx)(Tag_1.Tag, { children: (0, exports.renderSummaryLabelValueTagContent)(label, value, icon) }, `${label}-${value}`))) }));
+exports.renderSummaryLabelValueTags = renderSummaryLabelValueTags;

package/src/View/Wizard/WizardTypeSelection.d.ts

@@ -0,0 +1,34 @@
+import * as React from 'react';
+export declare const WIZARD_TYPE_SELECTION_PREVIEW_FRAME_CLASS = "twa:flex twa:w-full twa:min-h-[32px] twa:items-center twa:justify-center twa:overflow-hidden twa:rounded-standard twa:border twa:border-[color-mix(in_srgb,var(--ab-color-foreground)_15%,transparent)] twa:bg-[color-mix(in_srgb,var(--ab-color-primary)_35%,transparent)] twa:px-2 twa:py-1";
+export declare const getWizardTypeSelectionGridColumns: (choiceCount: number) => 2 | 3;
+export type WizardTypeSelectionCardProps = {
+    label: string;
+    description?: string;
+    selected: boolean;
+    disabled?: boolean;
+    disabledTooltip?: string;
+    dataName: string;
+    minHeightClassName?: string;
+    onSelect: () => void;
+    children?: React.ReactNode;
+    footer?: React.ReactNode;
+};
+export declare const WizardTypeSelectionCard: React.FunctionComponent<WizardTypeSelectionCardProps>;
+export type WizardTypeSelectionSectionProps = {
+    headingId: string;
+    title: string;
+    intro: React.ReactNode;
+    columns: 2 | 3;
+    dataName?: string;
+    className?: string;
+    children: React.ReactNode;
+};
+export declare const WizardTypeSelectionSection: React.FunctionComponent<WizardTypeSelectionSectionProps>;
+export type WizardNameFieldSectionProps = {
+    value: string;
+    onChange: (event: React.SyntheticEvent) => void;
+    inputDataName?: string;
+    placeholder?: string;
+};
+export declare const WizardNameFieldSection: React.FunctionComponent<WizardNameFieldSectionProps>;
+export declare const WizardTypeSelectionPreviewFrame: React.FunctionComponent<React.PropsWithChildren>;

package/src/View/Wizard/WizardTypeSelection.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WizardTypeSelectionPreviewFrame = exports.WizardNameFieldSection = exports.WizardTypeSelectionSection = exports.WizardTypeSelectionCard = exports.getWizardTypeSelectionGridColumns = exports.WIZARD_TYPE_SELECTION_PREVIEW_FRAME_CLASS = void 0;
+const tslib_1 = require("tslib");
+const jsx_runtime_1 = require("react/jsx-runtime");
+const Input_1 = tslib_1.__importDefault(require("../../components/Input"));
+const Flex_1 = require("../../components/Flex");
+const Card_1 = require("../../components/Card");
+const utils_1 = require("../../lib/utils");
+exports.WIZARD_TYPE_SELECTION_PREVIEW_FRAME_CLASS = 'twa:flex twa:w-full twa:min-h-[32px] twa:items-center twa:justify-center twa:overflow-hidden twa:rounded-standard twa:border twa:border-[color-mix(in_srgb,var(--ab-color-foreground)_15%,transparent)] twa:bg-[color-mix(in_srgb,var(--ab-color-primary)_35%,transparent)] twa:px-2 twa:py-1';
+const getWizardTypeSelectionGridColumns = (choiceCount) => choiceCount === 4 ? 2 : 3;
+exports.getWizardTypeSelectionGridColumns = getWizardTypeSelectionGridColumns;
+const WizardTypeSelectionCard = ({ label, description, selected, disabled, disabledTooltip, dataName, minHeightClassName = 'twa:min-h-[108px]', onSelect, children, footer, }) => {
+    const handleActivate = () => {
+        if (!disabled) {
+            onSelect();
+        }
+    };
+    return ((0, jsx_runtime_1.jsxs)(Flex_1.Box, { role: "radio", tabIndex: disabled ? -1 : 0, "aria-checked": selected, "aria-disabled": disabled, "data-name": dataName, className: (0, utils_1.cn)('ab-WizardTypeSelectionCard group twa:relative twa:h-full twa:rounded-standard twa:border twa:border-primarydark/32 twa:bg-card twa:text-card-foreground twa:outline-none twa:transition-colors twa:focus-visible:ring-2 twa:focus-visible:ring-accent', minHeightClassName, disabled
+            ? 'twa:cursor-not-allowed twa:opacity-60'
+            : 'twa:cursor-pointer hover:twa:border-accent/55 hover:twa:bg-accent/5', selected &&
+            'twa:after:pointer-events-none twa:after:absolute twa:after:inset-0 twa:after:rounded-standard twa:after:border-2 twa:after:border-[var(--ab-cmp-wizard-type-selection-card__selected-border)] twa:after:bg-[var(--ab-cmp-wizard-type-selection-card__selected-overlay)]'), onClick: handleActivate, onKeyDown: (event) => {
+            if (disabled) {
+                return;
+            }
+            if (event.key === 'Enter' || event.key === ' ') {
+                event.preventDefault();
+                onSelect();
+            }
+        }, children: [(0, jsx_runtime_1.jsx)(Flex_1.Box, { "aria-hidden": true, className: (0, utils_1.cn)('twa:pointer-events-none twa:absolute twa:top-2.5 twa:right-2.5 twa:z-10 twa:size-4 twa:rounded-full twa:border-2 twa:transition-colors', selected
+                    ? 'twa:border-[var(--ab-cmp-wizard-type-selection-card__selected-border)] twa:bg-[var(--ab-cmp-wizard-type-selection-card__selected-border)]'
+                    : 'twa:border-primarydark/35 twa:bg-base group-hover:twa:border-accent/55'), children: selected ? ((0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:absolute twa:inset-0 twa:m-auto twa:size-1.5 twa:rounded-full twa:bg-[var(--ab-cmp-wizard-type-selection-card__selected-indicator-inner)]" })) : null }), (0, jsx_runtime_1.jsxs)(Card_1.Card, { shadow: false, style: { backgroundColor: 'transparent' }, className: "twa:flex twa:h-full twa:flex-col twa:justify-between twa:p-3 twa:pr-7", gap: 0, children: [(0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:font-medium", children: label }), children, description || disabledTooltip ? ((0, jsx_runtime_1.jsxs)(Flex_1.Box, { children: [description ? ((0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:text-xs twa:leading-snug twa:opacity-70", children: description })) : null, disabled && disabledTooltip ? ((0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:mt-1 twa:text-1 twa:leading-snug twa:italic twa:opacity-80", children: disabledTooltip })) : null] })) : null, footer] })] }));
+};
+exports.WizardTypeSelectionCard = WizardTypeSelectionCard;
+const WizardTypeSelectionSection = ({ headingId, title, intro, columns, dataName, className, children }) => ((0, jsx_runtime_1.jsxs)(Card_1.Card, { shadow: false, gap: 1, className: (0, utils_1.cn)('twa:flex-1 twa:min-h-0', className), children: [(0, jsx_runtime_1.jsxs)(Card_1.Card.Title, { gap: 1, border: false, className: "twa:flex-col twa:items-start twa:px-1 twa:pb-1", children: [(0, jsx_runtime_1.jsx)(Flex_1.Box, { id: headingId, className: "twa:font-medium", children: title }), (0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:mt-1.5 twa:text-xs twa:font-normal twa:opacity-70", children: intro })] }), (0, jsx_runtime_1.jsx)(Card_1.Card.Body, { className: "twa:min-h-0 twa:overflow-y-auto twa:p-1 twa:pt-0", children: (0, jsx_runtime_1.jsx)(Flex_1.Box, { "data-name": dataName, className: (0, utils_1.cn)('twa:grid twa:gap-2', columns === 2 ? 'twa:grid-cols-2' : 'twa:grid-cols-3'), role: "radiogroup", "aria-labelledby": headingId, children: children }) })] }));
+exports.WizardTypeSelectionSection = WizardTypeSelectionSection;
+const WizardNameFieldSection = ({ value, onChange, inputDataName = 'wizard-name', placeholder = 'Enter Name', }) => ((0, jsx_runtime_1.jsxs)(Card_1.Card, { shadow: false, gap: 1, className: "twa:bg-card twa:text-card-foreground", children: [(0, jsx_runtime_1.jsx)(Card_1.Card.Title, { gap: 1, border: false, className: "twa:px-1 twa:pb-1", children: (0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:font-medium", children: "Name" }) }), (0, jsx_runtime_1.jsx)(Card_1.Card.Body, { className: "twa:p-1", children: (0, jsx_runtime_1.jsx)(Input_1.default, { className: "twa:w-full twa:max-w-[420px]", "data-name": inputDataName, onChange: onChange, placeholder: placeholder, value: value }) })] }));
+exports.WizardNameFieldSection = WizardNameFieldSection;
+const WizardTypeSelectionPreviewFrame = ({ children, }) => ((0, jsx_runtime_1.jsx)(Flex_1.Box, { "aria-hidden": true, className: exports.WIZARD_TYPE_SELECTION_PREVIEW_FRAME_CLASS, children: children }));
+exports.WizardTypeSelectionPreviewFrame = WizardTypeSelectionPreviewFrame;

package/src/View/Wizard/rowGroupSummaryTags.d.ts

@@ -0,0 +1,18 @@
+import * as React from 'react';
+import { AdaptableApi, Layout } from '../../types';
+export declare const TableRowGroupSummaryTags: React.FC<{
+    layout: Layout;
+    api: AdaptableApi;
+}>;
+export declare const PivotRowGroupSummaryTags: React.FC<{
+    layout: Layout;
+    api: AdaptableApi;
+}>;
+export declare const TableRowGroupSummaryView: React.FC<{
+    layout: Layout;
+    api: AdaptableApi;
+}>;
+export declare const PivotRowGroupSummaryView: React.FC<{
+    layout: Layout;
+    api: AdaptableApi;
+}>;

package/src/View/Wizard/rowGroupSummaryTags.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PivotRowGroupSummaryView = exports.TableRowGroupSummaryView = exports.PivotRowGroupSummaryTags = exports.TableRowGroupSummaryTags = void 0;
+const jsx_runtime_1 = require("react/jsx-runtime");
+const Tag_1 = require("../../components/Tag");
+const Flex_1 = require("../../components/Flex");
+const rowGroupSummaryHelpers_1 = require("../../Strategy/Utilities/Layout/rowGroupSummaryHelpers");
+const TableRowGroupSummaryTags = ({ layout, api, }) => {
+    const columnIds = layout.RowGroupedColumns ?? [];
+    return ((0, jsx_runtime_1.jsxs)(Flex_1.Flex, { flexWrap: "wrap", alignItems: "center", className: "twa:gap-1", children: [!columnIds.length ? ((0, jsx_runtime_1.jsx)(Tag_1.Tag, { children: "No Row Grouped Columns" })) : (columnIds.map((columnId) => ((0, jsx_runtime_1.jsx)(Tag_1.ColumnTag, { children: api.columnApi.getFriendlyNameForColumnId(columnId) }, columnId)))), (0, jsx_runtime_1.jsxs)(Tag_1.Tag, { children: ["Display Type: ", (0, rowGroupSummaryHelpers_1.getRowGroupDisplayTypeLabel)(layout)] }), (0, jsx_runtime_1.jsxs)(Tag_1.Tag, { children: ["Behaviour: ", (0, rowGroupSummaryHelpers_1.getRowGroupBehaviorLabel)(layout)] })] }));
+};
+exports.TableRowGroupSummaryTags = TableRowGroupSummaryTags;
+const PivotRowGroupSummaryTags = ({ layout, api, }) => {
+    const columnIds = layout.PivotGroupedColumns ?? [];
+    return ((0, jsx_runtime_1.jsxs)(Flex_1.Flex, { flexWrap: "wrap", alignItems: "center", className: "twa:gap-1", children: [!columnIds.length ? ((0, jsx_runtime_1.jsx)(Tag_1.Tag, { children: "No Row Grouped Columns" })) : (columnIds.map((columnId) => ((0, jsx_runtime_1.jsx)(Tag_1.ColumnTag, { children: api.columnApi.getFriendlyNameForColumnId(columnId) }, columnId)))), (0, jsx_runtime_1.jsxs)(Tag_1.Tag, { children: ["Behaviour: ", (0, rowGroupSummaryHelpers_1.getRowGroupBehaviorLabel)(layout)] })] }));
+};
+exports.PivotRowGroupSummaryTags = PivotRowGroupSummaryTags;
+const TableRowGroupSummaryView = (props) => (0, jsx_runtime_1.jsx)(exports.TableRowGroupSummaryTags, { ...props });
+exports.TableRowGroupSummaryView = TableRowGroupSummaryView;
+const PivotRowGroupSummaryView = (props) => (0, jsx_runtime_1.jsx)(exports.PivotRowGroupSummaryTags, { ...props });
+exports.PivotRowGroupSummaryView = PivotRowGroupSummaryView;

package/src/View/Wizard/scopeSummaryTags.d.ts

@@ -0,0 +1,6 @@
+import * as React from 'react';
+import { ColumnScope } from '../../AdaptableState/Common/ColumnScope';
+export { getScopeViewItemsTagVariant as getScopeSummaryTagVariant } from '../../components/Tag/columnScopeTagHelpers';
+export declare const ScopeSummaryTags: React.FC<{
+    scope: ColumnScope;
+}>;

package/src/View/Wizard/scopeSummaryTags.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ScopeSummaryTags = exports.getScopeSummaryTagVariant = void 0;
+const jsx_runtime_1 = require("react/jsx-runtime");
+const AdaptableColumn_1 = require("../../AdaptableState/Common/AdaptableColumn");
+const Tag_1 = require("../../components/Tag");
+const Flex_1 = require("../../components/Flex");
+const AdaptableContext_1 = require("../AdaptableContext");
+var columnScopeTagHelpers_1 = require("../../components/Tag/columnScopeTagHelpers");
+Object.defineProperty(exports, "getScopeSummaryTagVariant", { enumerable: true, get: function () { return columnScopeTagHelpers_1.getScopeViewItemsTagVariant; } });
+const ScopeSummaryTags = ({ scope }) => {
+    const { api } = (0, AdaptableContext_1.useAdaptable)();
+    const scopeApi = api.columnScopeApi;
+    const columnsInScope = scopeApi.getColumnsInScope(scope);
+    if (scopeApi.scopeIsAll(scope)) {
+        return (0, jsx_runtime_1.jsx)(Tag_1.Tag, { children: "All Columns" });
+    }
+    if ('ColumnIds' in scope) {
+        if (!columnsInScope.length) {
+            return (0, jsx_runtime_1.jsx)(Tag_1.Tag, { children: "None" });
+        }
+        return ((0, jsx_runtime_1.jsx)(Tag_1.TagList, { tags: columnsInScope.map((c) => c.friendlyName), variant: "column" }));
+    }
+    if ('DataTypes' in scope) {
+        if (!scope.DataTypes.length) {
+            return (0, jsx_runtime_1.jsx)(Tag_1.Tag, { children: "None" });
+        }
+        return ((0, jsx_runtime_1.jsx)(Flex_1.Flex, { flexWrap: "wrap", className: "twa:gap-1", children: scope.DataTypes.map((dataType) => ((0, jsx_runtime_1.jsx)(Tag_1.Tag, { children: (0, AdaptableColumn_1.getColumnTypeFriendlyName)(dataType) }, dataType))) }));
+    }
+    if ('ColumnTypes' in scope) {
+        if (!scope.ColumnTypes.length) {
+            return (0, jsx_runtime_1.jsx)(Tag_1.Tag, { children: "None" });
+        }
+        return ((0, jsx_runtime_1.jsx)(Flex_1.Flex, { flexWrap: "wrap", className: "twa:gap-1", children: scope.ColumnTypes.map((columnType) => ((0, jsx_runtime_1.jsx)(Tag_1.Tag, { children: columnType }, columnType))) }));
+    }
+    return (0, jsx_runtime_1.jsx)(Tag_1.Tag, { children: "None" });
+};
+exports.ScopeSummaryTags = ScopeSummaryTags;

package/src/View/renderWithAdaptableContext.js

@@ -5,9 +5,8 @@ const tslib_1 = require("tslib");
 const jsx_runtime_1 = require("react/jsx-runtime");
 const react_redux_1 = require("react-redux");
 const AdaptableContext_1 = tslib_1.__importDefault(require("./AdaptableContext"));
-const AdaptableComputedCSSVarsContext_1 = require("./AdaptableComputedCSSVarsContext");
-const tooltip_1 = require("~/components/ui/tooltip");
+const tooltip_1 = require("../components/ui/tooltip");
 const renderWithAdaptableContext = (children, adaptable) => {
-    return ((0, jsx_runtime_1.jsx)(tooltip_1.TooltipProvider, { delay: 300, children: (0, jsx_runtime_1.jsx)(react_redux_1.Provider, { store: adaptable.adaptableStore.TheStore, children: (0, jsx_runtime_1.jsx)(AdaptableComputedCSSVarsContext_1.WithAdaptableComputedCSSVars, { children: (0, jsx_runtime_1.jsx)(AdaptableContext_1.default.Provider, { value: adaptable, children: children }) }) }) }));
+    return ((0, jsx_runtime_1.jsx)(tooltip_1.TooltipProvider, { delay: 300, children: (0, jsx_runtime_1.jsx)(react_redux_1.Provider, { store: adaptable.adaptableStore.TheStore, children: (0, jsx_runtime_1.jsx)(AdaptableContext_1.default.Provider, { value: adaptable, children: children }) }) }));
 };
 exports.renderWithAdaptableContext = renderWithAdaptableContext;

package/src/agGrid/AdaptableAgGrid.d.ts

@@ -97,7 +97,6 @@ export declare class AdaptableAgGrid implements IAdaptable {
     private LicenseService;
     private ChartingService;
     private rowListeners;
-    private throttleFilterOnDataChange;
     private debouncedSetSelectedRows;
     private debouncedSetSelectedCells;
     private agGridListenerKeydown;
@@ -361,6 +360,7 @@ export declare class AdaptableAgGrid implements IAdaptable {
     private hasFloatingFilterOnAtLeastOneColumn;
     getChartRef(chartId: string): ChartRef;
     updateLayoutInManagerAfterStoreHasChanged(layout?: Layout): void;
+    private getActiveAdaptableAggFuncForCol;
     private onRowDataChanged;
     private onCellDataChanged;
     private isUndoChange;

package/src/agGrid/AdaptableAgGrid.js

@@ -2,13 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AdaptableAgGrid = void 0;
 const tslib_1 = require("tslib");
-const throttle_1 = tslib_1.__importDefault(require("../Utilities/utils/throttle"));
-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");
@@ -25,6 +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 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");
@@ -83,23 +83,21 @@ const DateHelper_1 = require("../Utilities/Helpers/DateHelper");
 const AgGridColumnAdapter_1 = require("./AgGridColumnAdapter");
 const getScrollbarSize_1 = tslib_1.__importDefault(require("../Utilities/getScrollbarSize"));
 const AggregationColumns_1 = require("../AdaptableState/Common/AggregationColumns");
-const ParameterizedAggregationRegistry_1 = require("../Aggregation/ParameterizedAggregationRegistry");
-const parameterizedAggregationHelpers_1 = require("../Aggregation/parameterizedAggregationHelpers");
-const parameterizedAggregationHeader_1 = require("../Aggregation/parameterizedAggregationHeader");
 const RowFormService_1 = require("../Utilities/Services/RowFormService");
-const Enums_1 = require("../AdaptableState/Common/Enums");
 const EnvVars_1 = require("../EnvVars");
 const AdaptableUpgradeHelper_1 = require("../migration/AdaptableUpgradeHelper");
 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 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");
 const LayoutHelpers_1 = require("../Api/Implementation/LayoutHelpers");
 const src_1 = require("../layout-manager/src");
+const rowGroupDisplayType_1 = require("../layout-manager/src/rowGroupDisplayType");
 const isPivotLayoutModel_1 = require("../layout-manager/src/isPivotLayoutModel");
 const AdaptableColumn_1 = require("../AdaptableState/Common/AdaptableColumn");
 const agGridDataTypeDefinitions_1 = require("./agGridDataTypeDefinitions");
@@ -109,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");
@@ -207,7 +205,6 @@ class AdaptableAgGrid {
     LicenseService;
     ChartingService;
     rowListeners;
-    throttleFilterOnDataChange;
     debouncedSetSelectedRows;
     debouncedSetSelectedCells;
     agGridListenerKeydown;
@@ -359,6 +356,7 @@ class AdaptableAgGrid {
             this._rawAdaptableOptions.adaptableId = `adaptable_id_${Date.now()}`;
         }
         this.logger = this.logger ?? new AdaptableLogger_1.AdaptableLogger(this._rawAdaptableOptions.adaptableId);
+        (0, LayoutHelpers_1.resetLayoutHelperErrorOnceMessages)();
         const adaptableId = this._rawAdaptableOptions.adaptableId;
         const initMarker = (0, devTools_1.getMarker)(adaptableId).track.Init.label.Init.start();
         const perfInitAdaptableAgGrid = this.logger.beginPerf(`Adaptable._initAdaptableAgGrid()`);
@@ -465,8 +463,7 @@ class AdaptableAgGrid {
             if ((0, isPivotLayoutModel_1.isPivotLayoutModel)(layoutModel)) {
                 gridOptions.pivotDefaultExpanded = layoutModel.PivotExpandLevel;
             }
-            gridOptions.groupDisplayType =
-                layoutModel.RowGroupDisplayType === 'multi' ? 'multipleColumns' : 'singleColumn';
+            gridOptions.groupDisplayType = (0, rowGroupDisplayType_1.rowGroupDisplayTypeToGridOption)(layoutModel.RowGroupDisplayType);
             // fixes issue #3053
             gridOptions.suppressAggFuncInHeader = !!layoutModel.SuppressAggFuncInHeader;
             if (!(0, isPivotLayoutModel_1.isPivotLayoutModel)(layoutModel) &&
@@ -905,16 +902,7 @@ class AdaptableAgGrid {
             // #customize_header
             const defaultColDef = { ...original_defaultColDef };
             defaultColDef.headerValueGetter = (0, adaptableOverrideCheck_1.tagProvidedByAdaptable)((params) => {
-                let columnHeaderName = this.api.columnApi.internalApi.getColumnHeaderName(params);
-                const currentLayout = this.api.layoutApi.getCurrentLayout();
-                if (params.column &&
-                    !currentLayout.SuppressAggFuncInHeader &&
-                    params.location === 'header') {
-                    const parameterizedParenthesisValue = (0, parameterizedAggregationHeader_1.getParameterizedAggregationHeaderParenthesisValue)(this.api, params.column.getColId(), currentLayout);
-                    if (parameterizedParenthesisValue) {
-                        columnHeaderName = parameterizedParenthesisValue;
-                    }
-                }
+                const columnHeaderName = this.api.columnApi.internalApi.getColumnHeaderName(params);
                 const formattedHeaderName = this.api.formatColumnApi.internalApi.formatColumnHeaderName(columnHeaderName, params);
                 return formattedHeaderName;
             });
@@ -1128,16 +1116,17 @@ class AdaptableAgGrid {
             aggregationFunctions[AggregationColumns_1.ONLY_AGG_FN_NAME] = (params) => {
                 return (0, only_1.only)(params);
             };
-            (0, ParameterizedAggregationRegistry_1.getParameterizedAggregationDefinitions)().forEach((definition) => {
-                aggregationFunctions[definition.agGridAggFuncName] = (params) => {
-                    const columnId = params.column.getColId();
-                    const parameterizedAggFunc = (0, parameterizedAggregationHelpers_1.getParameterizedAggForColumn)(columnId, this.api.layoutApi.getCurrentLayout());
-                    if (!parameterizedAggFunc || parameterizedAggFunc.type !== definition.type) {
-                        return undefined;
-                    }
-                    return (0, ParameterizedAggregationRegistry_1.computeParameterizedAggregation)(params, params.colDef.colId, parameterizedAggFunc);
-                };
-            });
+            aggregationFunctions[AggregationColumns_1.WEIGHTED_AVERAGE_AGG_FN_NAME] = (params) => {
+                const columnId = params.column.getColId();
+                const adaptableAggFunc = this.getActiveAdaptableAggFuncForCol(columnId);
+                if (!adaptableAggFunc) {
+                    return undefined;
+                }
+                if (adaptableAggFunc.type === 'weightedAverage') {
+                    return (0, weightedAverage_1.weightedAverage)(params, params.colDef.colId, adaptableAggFunc.weightedColumnId);
+                }
+                return undefined;
+            };
             return aggregationFunctions;
         });
         /**
@@ -1453,7 +1442,7 @@ class AdaptableAgGrid {
                 // dataType: 'Number',
                 // AG Grid requires either dataType or numberFormat to be set for Numbers
                 numberFormat: {
-                    format: '0.###############',
+                    format: `#,##0.00`,
                 },
             });
             // store original excel styles, we will have to revert to them after each VISUAL EXPORT
@@ -1703,12 +1692,6 @@ class AdaptableAgGrid {
             }), true);
             gridContainerElement.addEventListener('mouseleave', (this.agGridListenerMouseLeave = (event) => this._emit('MouseLeave', event)));
         }
-        this.throttleFilterOnDataChange = (0, throttle_1.default)(
-        // the extra function is to make sure we have a reference to ag-grid-api
-        () => this.agGridAdapter.getAgGridApi()?.onFilterChanged(), this.adaptableOptions.filterOptions.filterActionOnDataChange.throttleDelay, {
-            trailing: true,
-            leading: false,
-        });
         /**
          * Use Case: User has started inline editing but its disabled in Row Form Options
          * Action: Stop editing
@@ -1759,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;
             }
@@ -1779,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;
             }
@@ -3030,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);
@@ -3602,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')) {
@@ -3817,7 +3800,6 @@ class AdaptableAgGrid {
             this.listenerCellSelectionChanged = null;
             this.listenerGlobalSetRowSelection = null;
             this.listenerSortChanged = null;
-            this.throttleFilterOnDataChange = null;
             const liveGridOptions = this.agGridAdapter.DANGER_getLiveGridOptions();
             if (liveGridOptions) {
                 this.agGridOptionsService.revertGridOptionsPropertiesToUserValue(liveGridOptions, [
@@ -4053,6 +4035,25 @@ class AdaptableAgGrid {
             ],
         });
     }
+    getActiveAdaptableAggFuncForCol(columnId) {
+        if (!columnId) {
+            return null;
+        }
+        const currentLayout = this.api.layoutApi.getCurrentLayout();
+        const aggregationFunctionsColumnsMap = ((0, LayoutHelpers_1.isPivotLayout)(currentLayout)
+            ? currentLayout.PivotAggregationColumns
+            : currentLayout.TableAggregationColumns).reduce((acc, col) => {
+            acc[col.ColumnId] = col.AggFunc;
+            return acc;
+        }, {});
+        const adaptableAggFunc = aggregationFunctionsColumnsMap[columnId];
+        if (typeof adaptableAggFunc === 'object' &&
+            'type' in adaptableAggFunc &&
+            adaptableAggFunc.type === 'weightedAverage') {
+            return adaptableAggFunc;
+        }
+        return null;
+    }
     onRowDataChanged({ rowNode, oldData, newData, }) {
         if (oldData == null || oldData == undefined) {
             return;
@@ -4137,6 +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, CalculatedColumnExpressionService_2.expandCellDataChangedInfosWithCalculatedColumns)(this.api, cellDataChangedInfos);
         cellDataChangedInfos.forEach((cellDataChangedInfo) => {
             // if a Cell Data Change is undone, log to the Console
             if (cellDataChangedInfo.trigger === 'undo') {
@@ -4294,14 +4296,7 @@ class AdaptableAgGrid {
         }
     }
     filterOnDataChange() {
-        if (this.adaptableOptions.filterOptions.filterActionOnDataChange.applyFilter ==
-            Enums_1.FilterOnDataChangeOptions.Always) {
-            this.agGridAdapter.getAgGridApi()?.onFilterChanged();
-        }
-        else if (this.adaptableOptions.filterOptions.filterActionOnDataChange.applyFilter ==
-            Enums_1.FilterOnDataChangeOptions.Throttle) {
-            this.throttleFilterOnDataChange();
-        }
+        this.agGridAdapter.getAgGridApi()?.onFilterChanged();
     }
     refreshLayout() {
         const columnDefs = this.agGridAdapter.getColumnDefinitionsInclSpecialColumns();