@adaptabletools/adaptable 22.1.1 → 23.0.0-canary.1

package/src/View/UIHelper.js

@@ -1,99 +1,46 @@
 import { WizardStatus, } from './Components/SharedProps/EditableConfigEntityState';
 import { FontWeight, FontStyle, StatusColour } from '../AdaptableState/Common/Enums';
 import { StringExtensions } from '../Utilities/Extensions/StringExtensions';
+import { getScheduleDescription as getScheduleDescriptionFromHelper } from '../Utilities/Helpers/ScheduleHelper';
 import ArrayExtensions from '../Utilities/Extensions/ArrayExtensions';
 import { resolveContainerElement } from '../Utilities/resolveContainerElement';
-export const BLACK = 'Black';
-export const WHITE = 'White';
-export const LIGHT_GRAY = 'LightGray';
-export const GRAY = 'Gray';
-export const BROWN = 'Brown';
-export const DARK_GREEN = 'DarkGreen';
-export const GREEN = 'Green';
-export const LIME_GREEN = 'LimeGreen';
-export const YELLOW = 'Yellow';
-export const LIGHT_YELLOW = 'LightYellow';
-export const DARK_BLUE = 'DarkBlue';
-export const BLUE = 'Blue';
-export const LIGHT_BLUE = 'LightBlue';
-//xport const LIGHT_GREEN: string = 'LightGreen';
-export const CYAN = 'Cyan';
-export const MAGENTA = 'Magenta';
-export const PURPLE = 'Purple';
-export const DARK_RED = 'DarkRed';
-export const RED = 'Red';
-export const LIGHT_RED = 'LightRed';
-export const ORANGE = 'Orange';
-export function getHexForName(name) {
-    switch (name) {
-        case BLACK:
-            return '#000000';
-        case WHITE:
-            return '#FFFFFF';
-        case LIGHT_GRAY:
-            return '#D3D3D3';
-        case GRAY:
-            return '#808080';
-        case BROWN:
-            return '#A52A2A';
-        case DARK_GREEN:
-            return '#006400';
-        case GREEN:
-            return '#008000';
-        case LIME_GREEN:
-            return '#32CD32';
-        case YELLOW:
-            return '#FFFF00';
-        case LIGHT_YELLOW:
-            return '#FFFFE0';
-        case DARK_BLUE:
-            return '#00008B';
-        case BLUE:
-            return '#0000FF';
-        case LIGHT_BLUE:
-            return '#87CEFA';
-        case CYAN:
-            return '#00FFFF';
-        case MAGENTA:
-            return '#FF00FF';
-        case PURPLE:
-            return '#800080';
-        case DARK_RED:
-            return '#8B0000';
-        case RED:
-            return '#FF0000';
-        case LIGHT_RED:
-            return '#DC143C';
-        case ORANGE:
-            return '#FFA500';
-        default:
-            return 'not found';
-    }
+/** Generic swatch entries for the Colour Picker (resolved at runtime per active theme). */
+export function getSwatchColorVar(index) {
+    return `var(--ab-color-swatch-${index})`;
+}
+/** Default mid-gray from the theme swatch palette (`--ab-color-swatch-4`). */
+export function getGraySwatchColor() {
+    return getSwatchColorVar(4);
 }
-export function getDefaultColors() {
+export function getSwatchColorPaletteEntries() {
+    return Array.from({ length: 20 }, (_, i) => getSwatchColorVar(i + 1));
+}
+/** Theme semantic colours for the Colour Picker (resolved at runtime per active theme). */
+export function getThemeSemanticColorPaletteEntries() {
     return [
-        getHexForName(BLACK),
-        getHexForName(WHITE),
-        getHexForName(LIGHT_GRAY),
-        getHexForName(GRAY),
-        getHexForName(BROWN),
-        getHexForName(DARK_GREEN),
-        getHexForName(GREEN),
-        getHexForName(LIME_GREEN),
-        getHexForName(YELLOW),
-        getHexForName(LIGHT_YELLOW), //  (quick search default)
-        getHexForName(DARK_BLUE),
-        getHexForName(BLUE),
-        getHexForName(LIGHT_BLUE),
-        getHexForName(CYAN),
-        getHexForName(MAGENTA),
-        getHexForName(PURPLE),
-        getHexForName(DARK_RED),
-        getHexForName(RED),
-        getHexForName(LIGHT_RED),
-        getHexForName(ORANGE),
+        'var(--ab-color-error)',
+        'var(--ab-color-warn)',
+        'var(--ab-color-success)',
+        'var(--ab-color-info)',
+        'var(--ab-color-accent)',
+        'var(--ab-color-palette-1)',
+        'var(--ab-color-palette-2)',
+        'var(--ab-color-palette-3)',
+        'var(--ab-color-palette-4)',
+        'var(--ab-color-palette-5)',
+        'var(--ab-color-palette-6)',
+        'var(--ab-color-palette-7)',
+        'var(--ab-color-palette-8)',
+        'var(--ab-color-palette-9)',
+        'var(--ab-color-palette-10)',
+        'var(--ab-color-palette-11)',
+        'var(--ab-color-palette-12)',
     ];
 }
+/** Swatch and theme semantic entries (default Colour Picker set). */
+export function getDefaultColorPalette() {
+    return [...getSwatchColorPaletteEntries(), ...getThemeSemanticColorPaletteEntries()];
+}
 export function getEmptyConfigState() {
     return {
         editedAdaptableObject: null,
@@ -305,33 +252,7 @@ export function getButtonToneForMessageType(messageType) {
     }
 }
 export function getScheduleDescription(schedule) {
-    if (schedule == null) {
-        return '[No Schedule]';
-    }
-    let dateString;
-    if (schedule.OneOffDate == null) {
-        if (ArrayExtensions.ContainsItem(schedule.DaysOfWeek, 'Monday') &&
-            ArrayExtensions.ContainsItem(schedule.DaysOfWeek, 'Tuesday') &&
-            ArrayExtensions.ContainsItem(schedule.DaysOfWeek, 'Wednesday') &&
-            ArrayExtensions.ContainsItem(schedule.DaysOfWeek, 'Thursday') &&
-            ArrayExtensions.ContainsItem(schedule.DaysOfWeek, 'Friday')) {
-            if (ArrayExtensions.ContainsItem(schedule.DaysOfWeek, 'Sunday') &&
-                ArrayExtensions.ContainsItem(schedule.DaysOfWeek, 'Saturday')) {
-                dateString = 'Everyday';
-            }
-            else {
-                dateString = 'Weekdays';
-            }
-        }
-        else {
-            const names = schedule.DaysOfWeek.sort().map((d) => getShortenedDayString(d));
-            dateString = ArrayExtensions.createCommaSeparatedString(names);
-        }
-    }
-    else {
-        dateString = new Date(schedule.OneOffDate).toDateString();
-    }
-    return `${dateString} @ ${addLeadingZero(schedule.Hour)}:${addLeadingZero(schedule.Minute)}`;
+    return getScheduleDescriptionFromHelper(schedule);
 }
 function getShortenedDayString(dayOfWeek) {
     switch (dayOfWeek) {
@@ -437,8 +358,11 @@ export function isBrowserDocumentAvailable() {
     return typeof window !== 'undefined' && typeof window.document !== 'undefined';
 }
 export const UIHelper = {
-    getHexForName,
-    getDefaultColors,
+    getSwatchColorVar,
+    getGraySwatchColor,
+    getSwatchColorPaletteEntries,
+    getThemeSemanticColorPaletteEntries,
+    getDefaultColorPalette,
     getEmptyConfigState,
     getDescriptionForDataType,
     getPlaceholderForDataType,

package/src/View/Wizard/ObjectTagsWizardSection.js

@@ -1,15 +1,12 @@
-import * as React from 'react';
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Tabs } from '../../components/Tabs';
 import { TagValueOptionsTags, TagValueSelector } from '../Components/TagValueSelector';
 import { useOnePageAdaptableWizardContext } from './OnePageAdaptableWizard';
 export const ObjectTagsWizardSection = (props) => {
     const { onChange } = props;
     const { data } = useOnePageAdaptableWizardContext();
-    return (React.createElement(Tabs, { className: "twa:h-full" },
-        React.createElement(Tabs.Tab, null, "Tags"),
-        React.createElement(Tabs.Content, null,
-            React.createElement(TagValueSelector, { selectedTags: data.Tags, onChange: (selectedTags) => onChange({ ...data, Tags: selectedTags }) }))));
+    return (_jsxs(Tabs, { className: "twa:h-full", children: [_jsx(Tabs.Tab, { children: "Tags" }), _jsx(Tabs.Content, { children: _jsx(TagValueSelector, { selectedTags: data.Tags, onChange: (selectedTags) => onChange({ ...data, Tags: selectedTags }) }) })] }));
 };
 export const renderObjectTagsSummary = (data) => {
-    return data.Tags?.length ? React.createElement(TagValueOptionsTags, { tags: data.Tags }) : null;
+    return data.Tags?.length ? _jsx(TagValueOptionsTags, { tags: data.Tags }) : null;
 };

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

@@ -44,6 +44,19 @@ export interface OnePageAdaptableWizardProps<ENTITY> {
     closeText?: React.ReactNode;
     closeTooltip?: string;
     finishText?: React.ReactNode;
+    /**
+     * Optional override for the title rendered in the wizard header. When
+     * absent we fall back to `moduleInfo.FriendlyName` (the standard
+     * "Format Column" / "Styled Column" / etc. behaviour). Use this when
+     * the wizard title should reflect the *current data* — e.g. the
+     * Styled Column wizard wants to switch from "Styled Column" to
+     * "Gradient" / "Percent Bar" once a type has been picked.
+     *
+     * Only the displayed header is affected; the kebab-case `data-name`,
+     * `moduleInfo` context value and validators keep using the canonical
+     * `FriendlyName`.
+     */
+    moduleName?: string;
 }
 export declare const OnePageAdaptableWizard: <ENTITY extends unknown>(props: OnePageAdaptableWizardProps<ENTITY>) => React.JSX.Element;
 export declare const OnePageWizardSummary: <ENTITY extends unknown>() => React.JSX.Element;

package/src/View/Wizard/OnePageAdaptableWizard.js

@@ -1,3 +1,4 @@
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import * as React from 'react';
 import { useState } from 'react';
 import { useDispatch } from 'react-redux';
@@ -10,9 +11,9 @@ import { OnePageWizard, useOnePageWizardContext } from './OnePageWizards';
 import kebabCase from '../../Utilities/utils/kebabCase';
 import { Box } from '../../components/Flex';
 import { twMerge } from '../../twMerge';
-export const SummaryTag = (props) => (React.createElement(Box, { ...props }));
-export const SummaryText = (props) => (React.createElement(Box, { ...props, className: twMerge('twa:text-2 twa:mb-3', props.className) }));
-export const FormDescriptionText = (props) => React.createElement(Box, { ...props, className: twMerge('twa:text-2 twa:mt-1', props.className) });
+export const SummaryTag = (props) => (_jsx(Box, { ...props }));
+export const SummaryText = (props) => (_jsx(Box, { ...props, className: twMerge('twa:text-2 twa:mb-3', props.className) }));
+export const FormDescriptionText = (props) => _jsx(Box, { ...props, className: twMerge('twa:text-2 twa:mt-1', props.className) });
 export const OnePageAdaptableWizardContext = React.createContext({
     data: null,
     sections: [],
@@ -70,17 +71,15 @@ export const OnePageAdaptableWizard = (props) => {
         }
         props.onFinish?.(props.data);
     };
-    return (React.createElement(OnePageAdaptableWizardContext.Provider, { value: extraContext },
-        React.createElement(NamedQueryContext.Provider, { value: { namedQuery, setNamedQuery } },
-            React.createElement(OnePageWizard, { ...props, name: name, sections: sections, onFinish: handleClickFinish, moduleName: props.moduleInfo.FriendlyName }))));
+    return (_jsx(OnePageAdaptableWizardContext.Provider, { value: extraContext, children: _jsx(NamedQueryContext.Provider, { value: { namedQuery, setNamedQuery }, children: _jsx(OnePageWizard, { ...props, name: name, sections: sections, onFinish: handleClickFinish, moduleName: props.moduleName ?? props.moduleInfo.FriendlyName }) }) }));
 };
 export const OnePageWizardSummary = () => {
     const { sections, data, api, moduleInfo } = useOnePageAdaptableWizardContext();
     const { setCurrentSection } = useOnePageWizardContext();
     const [namedQuery] = useState(false);
-    const renderEdit = (index) => (React.createElement(SimpleButton, { className: "twa:px-1 twa:inline-block twa:text-2 twa:underline", variant: "text", onClick: () => {
+    const renderEdit = (index) => (_jsx(SimpleButton, { className: "twa:px-1 twa:inline-block twa:text-2 twa:underline", variant: "text", onClick: () => {
             setCurrentSection(index);
-        } }, "edit"));
+        }, children: "edit" }));
     const extraContext = {
         data,
         api,
@@ -88,24 +87,18 @@ export const OnePageWizardSummary = () => {
         moduleInfo: moduleInfo,
         sections,
     };
-    return (React.createElement(Box, { className: "ab-OnePageWizardSummary twa:flex twa:flex-col twa:gap-2" }, sections
-        .map((section, index) => {
-        if (section === '-') {
-            return null;
-        }
-        if (!section.renderSummary) {
-            return null;
-        }
-        if (section.isVisible && !section.isVisible(data, api, extraContext)) {
-            return null;
-        }
-        return (React.createElement(React.Fragment, null,
-            React.createElement(Tabs, { keyboardNavigation: false, key: index },
-                React.createElement(Tabs.Tab, null,
-                    section.title,
-                    " ",
-                    renderEdit(index)),
-                React.createElement(Tabs.Content, null, section.renderSummary(data, api)))));
-    })
-        .filter(Boolean)));
+    return (_jsx(Box, { className: "ab-OnePageWizardSummary twa:flex twa:flex-col twa:gap-2", children: sections
+            .map((section, index) => {
+            if (section === '-') {
+                return null;
+            }
+            if (!section.renderSummary) {
+                return null;
+            }
+            if (section.isVisible && !section.isVisible(data, api, extraContext)) {
+                return null;
+            }
+            return (_jsx(_Fragment, { children: _jsxs(Tabs, { keyboardNavigation: false, children: [_jsxs(Tabs.Tab, { children: [section.title, " ", renderEdit(index)] }), _jsx(Tabs.Content, { children: section.renderSummary(data, api) })] }, index) }));
+        })
+            .filter(Boolean) }));
 };

package/src/View/Wizard/OnePageWizards.js

@@ -1,3 +1,4 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
 import { useState, useRef } from 'react';
 import clsx from 'clsx';
@@ -16,9 +17,9 @@ import { twMerge } from '../../twMerge';
 import { targetOwn } from '../../components/twUtils';
 /** Same template for header row and main row so module/details align with nav / content columns. */
 const ONE_PAGE_WIZARD_SECTION_GRID = 'twa:grid twa:grid-cols-[minmax(160px,14rem)_minmax(0,1fr)]';
-export const SummaryTag = (props) => (React.createElement(Box, { ...props }));
-export const SummaryText = (props) => (React.createElement(Box, { ...props, className: twMerge('twa:text-2 twa:mb-3', props.className) }));
-export const FormDescriptionText = (props) => React.createElement(Box, { ...props, className: twMerge('twa:text-2 twa:mt-1', props.className) });
+export const SummaryTag = (props) => (_jsx(Box, { ...props }));
+export const SummaryText = (props) => (_jsx(Box, { ...props, className: twMerge('twa:text-2 twa:mb-3', props.className) }));
+export const FormDescriptionText = (props) => _jsx(Box, { ...props, className: twMerge('twa:text-2 twa:mt-1', props.className) });
 export const OnePageWizardContext = React.createContext({
     data: null,
     sections: [],
@@ -47,12 +48,24 @@ export const OnePageWizard = (props) => {
             section.isVisible(props.data, contextValue));
     }, [props.sections]);
     contextValue.sections = visibleSections;
+    // Apply `defaultCurrentSectionName` only once per distinct value. Without
+    // this guard the effect re-fires every render (because `visibleSections` is
+    // recomputed each render whenever the parent rebuilds `sections`), which
+    // makes the wizard snap back to the default section on every interior
+    // state change — e.g. clicking a checkbox in an *earlier* step would yank
+    // the user forward to the default step again.
+    const lastAppliedDefaultSectionName = React.useRef(undefined);
     React.useEffect(() => {
-        if (props.defaultCurrentSectionName) {
-            const candidate = visibleSections.findIndex((section) => section !== '-' && section?.title === props.defaultCurrentSectionName);
-            if (candidate >= 0) {
-                setCurrentSection(candidate);
-            }
+        if (!props.defaultCurrentSectionName) {
+            return;
+        }
+        if (lastAppliedDefaultSectionName.current === props.defaultCurrentSectionName) {
+            return;
+        }
+        const candidate = visibleSections.findIndex((section) => section !== '-' && section?.title === props.defaultCurrentSectionName);
+        if (candidate >= 0) {
+            setCurrentSection(candidate);
+            lastAppliedDefaultSectionName.current = props.defaultCurrentSectionName;
         }
     }, [props.defaultCurrentSectionName, visibleSections]);
     const [namedQuery, setNamedQuery] = useState(false);
@@ -63,14 +76,13 @@ export const OnePageWizard = (props) => {
     const renderSection = (index) => {
         const section = visibleSections[index];
         if (section === '-') {
-            return React.createElement(React.Fragment, { key: index });
+            return _jsx(React.Fragment, {}, index);
         }
-        return (React.createElement(Flex, { flexDirection: "column", key: index, "data-name": `section-${index}`, className: "twa:min-h-full twa:mr-2" },
-            React.createElement(Box, { className: "ab-OnePageWizard__section twa:flex-1 twa:rounded-standard twa:overflow-auto twa:bg-defaultbackground" }, section.render(props.data, index))));
+        return (_jsx(Flex, { flexDirection: "column", "data-name": `section-${index}`, className: "twa:min-h-full twa:mr-2", children: _jsx(Box, { className: "ab-OnePageWizard__section twa:flex-1 twa:rounded-standard twa:overflow-auto twa:bg-defaultbackground", children: section.render(props.data, index) }) }, index));
     };
     const handleNavigation = useKeyboardNavigation(setCurrentSection, visibleSections);
     const selectedNodeRef = useRef(null);
-    const selectedFeedback = (React.createElement("div", { ref: selectedNodeRef, onKeyDown: (event) => handleNavigation(event), tabIndex: 0, className: clsx('ab-OnePageWizard__selected-title-overlay', 'twa:absolute twa:rounded-standard twa:select-none twa:bg-accent twa:transition-top twa:duration-200', targetOwn.focusOutline) }));
+    const selectedFeedback = (_jsx("div", { ref: selectedNodeRef, onKeyDown: (event) => handleNavigation(event), tabIndex: 0, className: clsx('ab-OnePageWizard__selected-title-overlay', 'twa:absolute twa:rounded-standard twa:select-none twa:bg-accent twa:transition-top twa:duration-200', targetOwn.focusOutline) }));
     const sizeOwnerRef = useRef(null);
     const [width, setWidth] = useState(0);
     useResizeObserver(sizeOwnerRef, ({ width }) => {
@@ -108,9 +120,7 @@ export const OnePageWizard = (props) => {
     const canFinish = !invalidCount;
     const activeSection = visibleSections[currentSection];
     const activeSectionDetails = activeSection !== '-' ? activeSection?.details : undefined;
-    return (React.createElement(NamedQueryContext.Provider, { value: { namedQuery, setNamedQuery } },
-        React.createElement(OnePageWizardContext.Provider, { value: contextValue },
-            React.createElement(Dialog, { modal: props.modal ?? true, isOpen: true, showCloseButton: false, focusOnBrowserVisible: true, className: "twa:rounded-standard twa:overflow-hidden twa:h-[90vh]", ref: dialogRef, onDismiss: () => props.onHide?.(), onKeyDown: (event) => {
+    return (_jsx(NamedQueryContext.Provider, { value: { namedQuery, setNamedQuery }, children: _jsx(OnePageWizardContext.Provider, { value: contextValue, children: _jsx(Dialog, { modal: props.modal ?? true, isOpen: true, showCloseButton: false, focusOnBrowserVisible: true, className: "twa:rounded-standard twa:overflow-hidden twa:h-[90vh]", ref: dialogRef, onDismiss: () => props.onHide?.(), onKeyDown: (event) => {
                     if (event.metaKey || event.ctrlKey) {
                         const { key } = event;
                         if (!isNaN(Number(key))) {
@@ -126,59 +136,33 @@ export const OnePageWizard = (props) => {
                             }
                         }
                     }
-                } },
-                React.createElement(Box, { className: clsx('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 },
-                    (props.moduleName || activeSectionDetails) && (React.createElement(Box, { className: clsx('ab-OnePageWizard__header', ONE_PAGE_WIZARD_SECTION_GRID, 'twa:items-start twa:mt-4 twa:mb-2 twa:px-2') },
-                        React.createElement(Box, { className: "ab-OnePageWizard__module-name twa:min-w-0 twa:pl-3 twa:font-bold" }, props.moduleName),
-                        React.createElement(Box, { className: "ab-OnePageWizard__details twa:min-w-0 twa:pr-2 twa:text-4" }, activeSectionDetails))),
-                    React.createElement(Box, { as: "hr", className: "ab-OnePageWizard__module-separator twa:w-full twa:border-0 twa:border-t twa:border-t-inputborder" }),
-                    React.createElement(Box, { className: clsx(ONE_PAGE_WIZARD_SECTION_GRID, 'twa:flex-1 twa:min-h-0 twa:overflow-auto twa:items-stretch') },
-                        React.createElement(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 },
-                            visibleSections.map((section, index) => {
-                                if (section === '-') {
-                                    return (React.createElement(Box, { as: "hr", className: "ab-OnePageWizard__section-separator twa:mt-2 twa:w-full twa:border-t twa:border-t-inputborder", key: `${index}-` }));
-                                }
-                                navIndex++;
-                                navIndexMap.set(navIndex, index);
-                                const active = index === currentSection;
-                                const disabled = false; //!active && !currentSectionValid;
-                                return (React.createElement(Flex, { className: clsx('ab-OnePageWizard__section-title twa:p-2', {
-                                        'twa:cursor-auto': disabled,
-                                        'twa:cursor-pointer': !disabled,
-                                        'twa:z-10': true,
-                                        'twa:opacity-50': disabled,
-                                        'twa:opacity-100': !disabled,
-                                        'twa:mt-2': index > 0,
-                                        'twa:mt-0': index === 0,
-                                        'twa:text-accent-foreground twa:pointer-events-none': active,
-                                    }), "data-name": section.title, flexDirection: "row", style: {
-                                        transition: 'color 0.2s',
-                                    }, key: section.title, onClick: () => {
-                                        if (disabled) {
-                                            return;
-                                        }
-                                        if (active) {
-                                            return;
-                                        }
-                                        setCurrentSection(index);
-                                    } },
-                                    React.createElement(KeyHint, { className: "twa:mr-2 twa:inline-block twa:text-color-accent-foreground" }, navIndex),
-                                    React.createElement("div", { className: "twa:flex-1" }, section.title),
-                                    React.createElement(Icon, { name: "error", className: clsx('twa:ml-2', validSectionsMap.get(index) !== true ? 'twa:visible' : 'twa:invisible') })));
-                            }),
-                            selectedFeedback,
-                            React.createElement(Box, { className: "twa:flex-1" }),
-                            React.createElement(KeyHint, { className: "ab-OnePageWizard__key-hint twa:leading-normal" },
-                                isMacLike() ? 'Cmd' : 'Ctrl',
-                                " + #",
-                                React.createElement("br", null),
-                                "or arrow keys",
-                                React.createElement("br", null),
-                                "to navigate")),
-                        React.createElement(Flex, { flexDirection: "column", className: "ab-OnePageWizard__section-container twa:min-h-0 twa:min-w-0 twa:flex-1" }, renderSection(currentSection))),
-                    React.createElement(Flex, { flexDirection: "row", alignItems: "center", className: "ab-WizardDialog__footer ab-OnePageWizard__footer twa:p-2" },
-                        React.createElement(SimpleButton, { tone: "neutral", variant: "text", "data-name": "close", onClick: () => props.onHide?.(), tooltip: props.closeTooltip ?? 'Close wizard', accessLevel: ACCESS_LEVEL_FULL }, props.closeText ?? 'CLOSE'),
-                        React.createElement(KeyHint, { className: "twa:ml-2" }, "Esc"),
-                        React.createElement(Box, { className: "ab-OnePageWizard__error twa:text-2 twa:mr-3 twa:flex-1 twa:text-error twa:text-end" }, firstErrorMessage),
-                        React.createElement(SimpleButton, { tone: "accent", "data-name": "finish", variant: "raised", disabled: canFinish !== true, onClick: () => handleClickFinish(), icon: 'check', accessLevel: ACCESS_LEVEL_FULL }, props.finishText ?? 'Finish')))))));
+                }, children: _jsxs(Box, { className: clsx('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) && (_jsxs(Box, { className: clsx('ab-OnePageWizard__header', ONE_PAGE_WIZARD_SECTION_GRID, 'twa:items-start twa:my-3 twa:px-2'), children: [_jsx(Box, { className: "ab-OnePageWizard__module-name twa:min-w-0 twa:pl-3 twa:font-bold", children: props.moduleName }), _jsx(Box, { className: "ab-OnePageWizard__details twa:min-w-0 twa:pr-2 twa:text-4", children: activeSectionDetails })] })), _jsx(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" }), _jsxs(Box, { className: clsx(ONE_PAGE_WIZARD_SECTION_GRID, 'twa:flex-1 twa:min-h-0 twa:overflow-auto twa:items-stretch'), children: [_jsxs(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 (_jsx(Box, { as: "hr", className: "ab-OnePageWizard__section-separator twa:mt-2 twa:w-full twa:border-t twa:border-t-input-border" }, `${index}-`));
+                                            }
+                                            navIndex++;
+                                            navIndexMap.set(navIndex, index);
+                                            const active = index === currentSection;
+                                            const disabled = false; //!active && !currentSectionValid;
+                                            return (_jsxs(Flex, { className: clsx('ab-OnePageWizard__section-title twa:p-2', {
+                                                    'twa:cursor-auto': disabled,
+                                                    'twa:cursor-pointer': !disabled,
+                                                    'twa:z-10': true,
+                                                    'twa:opacity-50': disabled,
+                                                    'twa:opacity-100': !disabled,
+                                                    'twa:mt-2': index > 0,
+                                                    'twa:mt-0': index === 0,
+                                                    'twa:text-accent-foreground twa:pointer-events-none': active,
+                                                }), "data-name": section.title, flexDirection: "row", style: {
+                                                    transition: 'color 0.2s',
+                                                }, onClick: () => {
+                                                    if (disabled) {
+                                                        return;
+                                                    }
+                                                    if (active) {
+                                                        return;
+                                                    }
+                                                    setCurrentSection(index);
+                                                }, children: [_jsx(KeyHint, { className: "twa:mr-2 twa:inline-block twa:text-color-accent-foreground", children: navIndex }), _jsx("div", { className: "twa:flex-1", children: section.title }), _jsx(Icon, { name: "error", className: clsx('twa:ml-2', validSectionsMap.get(index) !== true ? 'twa:visible' : 'twa:invisible') })] }, section.title));
+                                        }), selectedFeedback, _jsx(Box, { className: "twa:flex-1" }), _jsxs(KeyHint, { className: "ab-OnePageWizard__key-hint twa:leading-normal", children: [isMacLike() ? 'Cmd' : 'Ctrl', " + #", _jsx("br", {}), "or arrow keys", _jsx("br", {}), "to navigate"] })] }), _jsx(Flex, { flexDirection: "column", className: "ab-OnePageWizard__section-container twa:min-h-0 twa:min-w-0 twa:flex-1", children: renderSection(currentSection) })] }), _jsxs(Flex, { flexDirection: "row", alignItems: "center", className: "ab-WizardDialog__footer ab-OnePageWizard__footer twa:p-2", children: [_jsx(SimpleButton, { tone: "neutral", variant: "text", "data-name": "close", onClick: () => props.onHide?.(), tooltip: props.closeTooltip ?? 'Close wizard', accessLevel: ACCESS_LEVEL_FULL, children: props.closeText ?? 'CLOSE' }), _jsx(KeyHint, { className: "twa:ml-2", children: "Esc" }), _jsx(Box, { className: "ab-OnePageWizard__error twa:text-2 twa:mr-3 twa:flex-1 twa:text-error twa:text-end", children: firstErrorMessage }), _jsx(SimpleButton, { tone: "accent", "data-name": "finish", variant: "raised", disabled: canFinish !== true, onClick: () => handleClickFinish(), icon: 'check', accessLevel: ACCESS_LEVEL_FULL, children: props.finishText ?? 'Finish' })] })] }) }) }) }));
 };

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

@@ -5,4 +5,6 @@ export declare const TypeRadio: (props: {
     description: string;
     onClick?: () => void;
     value?: string;
+    disabled?: boolean;
+    disabledTooltip?: string;
 }) => React.JSX.Element;

package/src/View/Wizard/TypeRadio.js

@@ -1,7 +1,8 @@
-import * as React from 'react';
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import Radio from '../../components/Radio';
 import { Box, Flex } from '../../components/Flex';
-export const TypeRadio = (props) => (React.createElement(Radio, { onClick: () => props.onClick?.(), checked: props.checked, value: props.value },
-    React.createElement(Flex, { flexDirection: "column" },
-        React.createElement(Box, null, props.text),
-        React.createElement(Box, { className: "twa:text-2 twa:mt-1" }, props.description))));
+export const TypeRadio = (props) => (_jsx(Radio, { onClick: () => {
+        if (!props.disabled) {
+            props.onClick?.();
+        }
+    }, checked: props.checked, value: props.value, disabled: props.disabled, children: _jsxs(Flex, { flexDirection: "column", className: props.disabled ? 'twa:opacity-60' : undefined, children: [_jsx(Box, { children: props.text }), _jsx(Box, { className: "twa:text-2 twa:mt-1", children: props.description }), props.disabled && props.disabledTooltip && (_jsx(Box, { className: "twa:text-1 twa:mt-1 twa:italic twa:opacity-80", children: props.disabledTooltip }))] }) }));

package/src/View/renderWithAdaptableContext.js

@@ -1,9 +1,8 @@
-import * as React from 'react';
+import { jsx as _jsx } from "react/jsx-runtime";
 import { Provider } from 'react-redux';
 import AdaptableContext from './AdaptableContext';
 import { WithAdaptableComputedCSSVars } from './AdaptableComputedCSSVarsContext';
+import { TooltipProvider } from "../components/ui/tooltip";
 export const renderWithAdaptableContext = (children, adaptable) => {
-    return (React.createElement(Provider, { store: adaptable.adaptableStore.TheStore },
-        React.createElement(WithAdaptableComputedCSSVars, null,
-            React.createElement(AdaptableContext.Provider, { value: adaptable }, children))));
+    return (_jsx(TooltipProvider, { delay: 300, children: _jsx(Provider, { store: adaptable.adaptableStore.TheStore, children: _jsx(WithAdaptableComputedCSSVars, { children: _jsx(AdaptableContext.Provider, { value: adaptable, children: children }) }) }) }));
 };

package/src/agGrid/AdaptableAgGrid.d.ts

@@ -151,6 +151,7 @@ export declare class AdaptableAgGrid implements IAdaptable {
     private normaliseToolPanelState;
     private getCurrentLayoutModel;
     silentUpdateCurrentLayoutModel(layoutModel?: TableLayoutModel | PivotLayoutModel): void;
+    getDefaultColumnWidthForCol(columnId: string): number;
     /**
      * Returns TRUE if filtering was applied, FALSE otherwise
      * This is important in the INIT phase because applying filtering will automatically refresh AG Grids columnState,
@@ -341,6 +342,9 @@ export declare class AdaptableAgGrid implements IAdaptable {
     setAgGridQuickSearch(searchText: string): void;
     clearAgGridQuickSearch(): void;
     setAgGridFindSearchValue(searchText: string): void;
+    applyQuickSearchFindCssVars(): void;
+    refreshAgGridFind(): void;
+    private refreshAgGridFindIfNeeded;
     applyAdaptableTheme(theme: AdaptableTheme | string): void;
     setRowGroupColumns(columnIds: string[]): void;
     getAllGridColumns(): Column<any>[];
@@ -349,7 +353,7 @@ export declare class AdaptableAgGrid implements IAdaptable {
     collapseAllRowGroups(): void;
     expandRowGroupsForValues(columnValues: any[]): void;
     getAgGridColumnForColumnId(columnId: string): Column;
-    getMinMaxCachedValueForColumn(column: AdaptableColumn, minMax: 'min' | 'max'): number;
+    getMinMaxCachedValueForColumn(column: AdaptableColumn, aggregation: 'min' | 'max' | 'avg' | 'median'): number;
     destroy(config?: DestroyConfig): void;
     canExportToExcel(): boolean;
     canExportToCsv(): boolean;
@@ -357,7 +361,6 @@ export declare class AdaptableAgGrid implements IAdaptable {
     private hasFloatingFilterOnAtLeastOneColumn;
     getChartRef(chartId: string): ChartRef;
     updateLayoutInManagerAfterStoreHasChanged(layout?: Layout): void;
-    private getActiveAdaptableAggFuncForCol;
     private onRowDataChanged;
     private onCellDataChanged;
     private isUndoChange;