@adaptabletools/adaptable 23.0.5 → 23.0.7

package/src/View/PlusMinus/Wizard/KeyComboCaptureInput.js

@@ -0,0 +1,161 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import * as React from 'react';
+import { cn } from '../../../lib/utils';
+import { Box, Flex } from '../../../components/Flex';
+import SimpleButton from '../../../components/SimpleButton';
+import { capturePlusMinusTriggerFromEvent, plusMinusKeyLabel, plusMinusTriggerDisplayParts, } from '../../../Utilities/Helpers/PlusMinusHelper';
+import { targetOwn } from '../../../components/twUtils';
+const Kbd = ({ children }) => (_jsx(Box, { as: "kbd", className: "twa:px-2 twa:py-[2px] twa:rounded-standard twa:bg-primary twa:text-2 twa:leading-none twa:font-medium twa:whitespace-nowrap", children: children }));
+const renderTokens = (tokens) => tokens.map((token, index) => (_jsxs(React.Fragment, { children: [index > 0 ? _jsx(Box, { className: "twa:opacity-50 twa:text-2", children: "+" }) : null, _jsx(Kbd, { children: token })] }, `${token}-${index}`)));
+export const KeyComboCaptureInput = (props) => {
+    const { value, isUsingDefault, placeholder, disabled, onCapture, onReset, validateCapture } = props;
+    const ref = React.useRef(null);
+    const [focused, setFocused] = React.useState(false);
+    const [editing, setEditing] = React.useState(false);
+    const [pendingModifiers, setPendingModifiers] = React.useState([]);
+    const [staged, setStaged] = React.useState(undefined);
+    const [error, setError] = React.useState(undefined);
+    const stopEditing = React.useCallback(() => {
+        setEditing(false);
+        setPendingModifiers([]);
+        setStaged(undefined);
+    }, []);
+    const handleKeyDown = (event) => {
+        if (disabled) {
+            return;
+        }
+        if (!editing) {
+            if (event.key === 'Enter') {
+                event.preventDefault();
+                event.stopPropagation();
+                setError(undefined);
+                setPendingModifiers([]);
+                setStaged(undefined);
+                setEditing(true);
+            }
+            return;
+        }
+        if (event.key === 'Escape') {
+            event.preventDefault();
+            event.stopPropagation();
+            setError(undefined);
+            stopEditing();
+            return;
+        }
+        if (event.key === 'Tab') {
+            if (staged && !validateCapture?.(staged)) {
+                onCapture(staged);
+            }
+            stopEditing();
+            setError(undefined);
+            return;
+        }
+        event.preventDefault();
+        event.stopPropagation();
+        const noModifiers = !event.ctrlKey && !event.altKey && !event.metaKey && !event.shiftKey;
+        if (event.key === 'Enter' && noModifiers) {
+            if (!staged) {
+                return;
+            }
+            const validationError = validateCapture?.(staged);
+            if (validationError) {
+                setError(validationError);
+                return;
+            }
+            const confirmed = staged;
+            setError(undefined);
+            stopEditing();
+            onCapture(confirmed);
+            return;
+        }
+        const result = capturePlusMinusTriggerFromEvent({
+            key: event.key,
+            ctrlKey: event.ctrlKey,
+            altKey: event.altKey,
+            metaKey: event.metaKey,
+            shiftKey: event.shiftKey,
+        });
+        if (result.kind === 'pending') {
+            setPendingModifiers(result.modifiers);
+            setError(undefined);
+            return;
+        }
+        if (result.kind === 'invalid') {
+            setPendingModifiers([]);
+            setStaged(undefined);
+            setError(result.reason);
+            return;
+        }
+        const validationError = validateCapture?.(result.trigger);
+        if (validationError) {
+            setPendingModifiers([]);
+            setStaged(undefined);
+            setError(validationError);
+            return;
+        }
+        setPendingModifiers([]);
+        setError(undefined);
+        setStaged(result.trigger);
+    };
+    const handleReset = (event) => {
+        event.preventDefault();
+        event.stopPropagation();
+        setError(undefined);
+        stopEditing();
+        onReset?.();
+    };
+    const handleEnterEdit = (event) => {
+        event.preventDefault();
+        event.stopPropagation();
+        setError(undefined);
+        setPendingModifiers([]);
+        setStaged(undefined);
+        setEditing(true);
+        ref.current?.focus();
+    };
+    const valueParts = plusMinusTriggerDisplayParts(value);
+    let content;
+    if (editing) {
+        if (staged) {
+            content = (_jsx(Flex, { className: "twa:items-center twa:gap-1", children: renderTokens(plusMinusTriggerDisplayParts(staged)) }));
+        }
+        else if (pendingModifiers.length) {
+            content = (_jsxs(Flex, { className: "twa:items-center twa:gap-1", children: [renderTokens(pendingModifiers.map(plusMinusKeyLabel)), _jsx(Box, { className: "twa:opacity-50 twa:text-2", children: "+ \u2026" })] }));
+        }
+        else {
+            content = _jsx(Box, { className: "twa:opacity-60 twa:text-2", children: "Press a key combination\u2026" });
+        }
+    }
+    else if (valueParts.length) {
+        content = (_jsxs(Flex, { className: "twa:items-center twa:gap-1", children: [renderTokens(valueParts), isUsingDefault ? (_jsx(Box, { className: "twa:opacity-60 twa:text-2 twa:ml-1", children: "(default)" })) : null] }));
+    }
+    else {
+        content = _jsx(Box, { className: "twa:opacity-60 twa:text-2", children: placeholder ?? 'Hit Enter to edit' });
+    }
+    return (_jsxs(Flex, { flexDirection: "column", className: "twa:gap-1 twa:max-w-[300px] twa:w-full", children: [_jsxs(Flex, { ref: ref, role: "button", tabIndex: disabled ? -1 : 0, "data-name": props['data-name'], "aria-label": "Record keyboard shortcut", onFocus: () => {
+                    if (!disabled) {
+                        setFocused(true);
+                    }
+                }, onBlur: (event) => {
+                    if (ref.current && event.relatedTarget && ref.current.contains(event.relatedTarget)) {
+                        return;
+                    }
+                    if (editing && staged && !validateCapture?.(staged)) {
+                        onCapture(staged);
+                    }
+                    setFocused(false);
+                    stopEditing();
+                    setError(undefined);
+                }, onClick: () => ref.current?.focus(), onKeyDown: handleKeyDown, className: cn('twa:min-h-input twa:rounded-input twa:px-2 twa:items-center twa:gap-2 twa:w-full', 'twa:border-input twa:border', targetOwn.focusWithinOutline, disabled
+                    ? 'twa:opacity-60 twa:cursor-not-allowed'
+                    : 'twa:cursor-pointer twa:bg-input-background', editing ? 'twa:border-accent' : '', error ? 'twa:border-destructive' : ''), children: [_jsx(Flex, { className: "twa:flex-1 twa:flex-wrap twa:items-center twa:gap-1 twa:py-1", children: content }), !disabled && !editing ? (onReset && !isUsingDefault ? (_jsx(SimpleButton, { variant: "text", icon: "undo", tooltip: "Revert to default", "data-name": "plus-minus-reset-key", tabIndex: -1, onMouseDown: handleReset, onKeyDown: (event) => {
+                            if (event.key === 'Enter') {
+                                handleReset(event);
+                                ref.current?.focus();
+                            }
+                        } })) : (_jsx(SimpleButton, { variant: "text", icon: "edit", tooltip: "Edit keyboard shortcut", "data-name": "plus-minus-edit-key", tabIndex: -1, onMouseDown: handleEnterEdit, onKeyDown: (event) => {
+                            if (event.key === 'Enter') {
+                                handleEnterEdit(event);
+                            }
+                        } }))) : null] }), _jsx(Box, { "data-name": error ? 'key-capture-error' : 'key-capture-hint', className: cn('twa:text-2', error ? 'twa:text-destructive' : 'twa:opacity-60', !focused && !error ? 'twa:invisible' : ''), children: error ? error : editing ? 'ENTER to confirm, ESCAPE to cancel' : 'Hit Enter to edit' })] }));
+};

package/src/View/PlusMinus/Wizard/PlusMinusSettingsWizardSection.js

@@ -5,7 +5,8 @@ import { SummaryText, useOnePageAdaptableWizardContext, } from '../../Wizard/One
 import { Tag } from '../../../components/Tag';
 import { Box, Flex } from '../../../components/Flex';
 import { Card } from '../../../components/Card';
-import { plusMinusDecrementKeyFromOptionsOnly, plusMinusIncrementKeyFromOptionsOnly, plusMinusResolvedKeysConflict, plusMinusTriggerSameAsBaseline, resolvePlusMinusTriggerKeysForNudge, } from '../../../Utilities/Helpers/PlusMinusHelper';
+import { normalizePlusMinusTrigger, plusMinusDecrementKeyFromOptionsOnly, plusMinusIncrementKeyFromOptionsOnly, plusMinusResolvedKeysConflict, plusMinusTriggerSameAsBaseline, resolvePlusMinusTriggerKeysForNudge, } from '../../../Utilities/Helpers/PlusMinusHelper';
+import { KeyComboCaptureInput } from './KeyComboCaptureInput';
 export const PlusMinusSettingsSummary = () => {
     const { data, api } = useOnePageAdaptableWizardContext();
     const { incrementKey, decrementKey } = resolvePlusMinusTriggerKeysForNudge(data, api.optionsApi.getEditOptions().plusMinusOptions ?? {});
@@ -36,42 +37,35 @@ export const PlusMinusSettingsWizardSection = (props) => {
     const pmOpts = api.optionsApi.getEditOptions().plusMinusOptions ?? {};
     const incrementBaseline = plusMinusIncrementKeyFromOptionsOnly(pmOpts);
     const decrementBaseline = plusMinusDecrementKeyFromOptionsOnly(pmOpts);
-    const [incrementEdit, setIncrementEdit] = React.useState(undefined);
-    const [decrementEdit, setDecrementEdit] = React.useState(undefined);
-    React.useEffect(() => {
-        setIncrementEdit(undefined);
-        setDecrementEdit(undefined);
-    }, [data.Uuid]);
-    const incrementDisplayValue = incrementEdit !== undefined
-        ? incrementEdit
-        : data.IncrementKey?.trim()
-            ? (data.IncrementKey ?? '').trim()
-            : incrementBaseline;
-    const decrementDisplayValue = decrementEdit !== undefined
-        ? decrementEdit
-        : data.DecrementKey?.trim()
-            ? (data.DecrementKey ?? '').trim()
-            : decrementBaseline;
-    const commitIncrementKey = React.useCallback((raw) => {
-        const trimmed = raw.trim();
-        const next = trimmed === '' || plusMinusTriggerSameAsBaseline(trimmed, incrementBaseline)
-            ? undefined
-            : trimmed;
-        const prev = data.IncrementKey?.trim() || undefined;
-        if (next !== prev) {
-            props.onChange({ ...data, IncrementKey: next });
-        }
+    const incrementUsingDefault = !data.IncrementKey?.trim();
+    const decrementUsingDefault = !data.DecrementKey?.trim();
+    const incrementDisplayValue = incrementUsingDefault
+        ? incrementBaseline
+        : (data.IncrementKey ?? '').trim();
+    const decrementDisplayValue = decrementUsingDefault
+        ? decrementBaseline
+        : (data.DecrementKey ?? '').trim();
+    const commitIncrementKey = React.useCallback((trigger) => {
+        const next = plusMinusTriggerSameAsBaseline(trigger, incrementBaseline) ? undefined : trigger;
+        props.onChange({ ...data, IncrementKey: next });
     }, [data, incrementBaseline, props.onChange]);
-    const commitDecrementKey = React.useCallback((raw) => {
-        const trimmed = raw.trim();
-        const next = trimmed === '' || plusMinusTriggerSameAsBaseline(trimmed, decrementBaseline)
-            ? undefined
-            : trimmed;
-        const prev = data.DecrementKey?.trim() || undefined;
-        if (next !== prev) {
-            props.onChange({ ...data, DecrementKey: next });
-        }
+    const commitDecrementKey = React.useCallback((trigger) => {
+        const next = plusMinusTriggerSameAsBaseline(trigger, decrementBaseline) ? undefined : trigger;
+        props.onChange({ ...data, DecrementKey: next });
     }, [data, decrementBaseline, props.onChange]);
+    const resetIncrementKey = React.useCallback(() => {
+        props.onChange({ ...data, IncrementKey: undefined });
+    }, [data, props.onChange]);
+    const resetDecrementKey = React.useCallback(() => {
+        props.onChange({ ...data, DecrementKey: undefined });
+    }, [data, props.onChange]);
+    const SAME_KEYS_MESSAGE = 'Increment and decrement keys cannot be the same.';
+    const validateIncrementCapture = React.useCallback((trigger) => normalizePlusMinusTrigger(trigger) === normalizePlusMinusTrigger(decrementDisplayValue)
+        ? SAME_KEYS_MESSAGE
+        : undefined, [decrementDisplayValue]);
+    const validateDecrementCapture = React.useCallback((trigger) => normalizePlusMinusTrigger(trigger) === normalizePlusMinusTrigger(incrementDisplayValue)
+        ? SAME_KEYS_MESSAGE
+        : undefined, [incrementDisplayValue]);
     const handleNameChange = (event) => {
         props.onChange({
             ...data,
@@ -85,29 +79,5 @@ export const PlusMinusSettingsWizardSection = (props) => {
             NudgeValue: isNaN(newValue) ? '' : newValue,
         });
     };
-    const handleIncrementKeyFocus = () => {
-        setIncrementEdit(data.IncrementKey?.trim() ? (data.IncrementKey ?? '').trim() : incrementBaseline);
-    };
-    const handleIncrementKeyChange = (event) => {
-        const raw = event.target.value;
-        setIncrementEdit(raw);
-        commitIncrementKey(raw);
-    };
-    const handleIncrementKeyBlur = (event) => {
-        commitIncrementKey(event.target.value);
-        setIncrementEdit(undefined);
-    };
-    const handleDecrementKeyFocus = () => {
-        setDecrementEdit(data.DecrementKey?.trim() ? (data.DecrementKey ?? '').trim() : decrementBaseline);
-    };
-    const handleDecrementKeyChange = (event) => {
-        const raw = event.target.value;
-        setDecrementEdit(raw);
-        commitDecrementKey(raw);
-    };
-    const handleDecrementKeyBlur = (event) => {
-        commitDecrementKey(event.target.value);
-        setDecrementEdit(undefined);
-    };
-    return (_jsx(Box, { "data-name": "plus-minus-column-settings", children: _jsxs(Flex, { flexDirection: "column", className: "twa:gap-3 twa:p-3", children: [_jsxs(Card, { shadow: false, children: [_jsxs(Card.Title, { children: [_jsx(Box, { className: "twa:font-medium", children: "Name" }), _jsx(Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: "Provide a unique name for the Plus/Minus Nudge" })] }), _jsx(Card.Body, { className: "twa:p-1", children: _jsx(Input, { "data-name": "plus-minus-name", className: "twa:max-w-[300px] twa:w-full", onChange: handleNameChange, placeholder: "Enter Name", value: data.Name ?? '' }) })] }), _jsxs(Card, { shadow: false, children: [_jsxs(Card.Title, { children: [_jsx(Box, { className: "twa:font-medium", children: "Nudge Value" }), _jsx(Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: "Amount added to or subtracted from the cell value when Plus/Minus is used" })] }), _jsx(Card.Body, { className: "twa:p-1", children: _jsx(Input, { "data-name": "nudge-value", className: "twa:max-w-[300px] twa:w-full", onChange: handleNudgeValueChange, placeholder: "Enter Number", type: "number", value: data.NudgeValue ?? '' }) })] }), _jsxs(Card, { shadow: false, children: [_jsxs(Card.Title, { children: [_jsx(Box, { className: "twa:font-medium", children: "Trigger Keys" }), _jsx(Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: "Keyboard keys that trigger increment and decrement" })] }), _jsx(Card.Body, { className: "twa:p-1", children: _jsxs(Flex, { flexDirection: "column", className: "twa:gap-3", children: [_jsxs(Box, { children: [_jsx(Box, { className: "twa:text-2 twa:mb-1 twa:opacity-80", children: "Increment key" }), _jsx(Input, { "data-name": "plus-minus-increment-key", className: "twa:max-w-[300px] twa:w-full", onBlur: handleIncrementKeyBlur, onChange: handleIncrementKeyChange, onFocus: handleIncrementKeyFocus, value: incrementDisplayValue })] }), _jsxs(Box, { children: [_jsx(Box, { className: "twa:text-2 twa:mb-1 twa:opacity-80", children: "Decrement key" }), _jsx(Input, { "data-name": "plus-minus-decrement-key", className: "twa:max-w-[300px] twa:w-full", onBlur: handleDecrementKeyBlur, onChange: handleDecrementKeyChange, onFocus: handleDecrementKeyFocus, value: decrementDisplayValue })] })] }) })] })] }) }));
+    return (_jsx(Box, { "data-name": "plus-minus-column-settings", children: _jsxs(Flex, { flexDirection: "column", className: "twa:gap-3 twa:p-3", children: [_jsxs(Card, { shadow: false, children: [_jsxs(Card.Title, { children: [_jsx(Box, { className: "twa:font-medium", children: "Name" }), _jsx(Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: "Provide a unique name for the Plus / Minus Nudge" })] }), _jsx(Card.Body, { className: "twa:p-1", children: _jsx(Input, { "data-name": "plus-minus-name", className: "twa:max-w-[300px] twa:w-full", onChange: handleNameChange, placeholder: "Enter Name", value: data.Name ?? '' }) })] }), _jsxs(Card, { shadow: false, children: [_jsxs(Card.Title, { children: [_jsx(Box, { className: "twa:font-medium", children: "Nudge Value" }), _jsx(Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: "Amount added to or subtracted from the cell value when Plus / Minus is used" })] }), _jsx(Card.Body, { className: "twa:p-1", children: _jsx(Input, { "data-name": "nudge-value", className: "twa:max-w-[300px] twa:w-full", onChange: handleNudgeValueChange, placeholder: "Enter Number", type: "number", value: data.NudgeValue ?? '' }) })] }), _jsxs(Card, { shadow: false, children: [_jsxs(Card.Title, { children: [_jsx(Box, { className: "twa:font-medium", children: "Trigger Keys" }), _jsx(Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: "Click a field and press the keys that should trigger increment / decrement." })] }), _jsx(Card.Body, { className: "twa:p-1", children: _jsxs(Flex, { flexDirection: "column", className: "twa:gap-3", children: [_jsxs(Box, { children: [_jsx(Box, { className: "twa:text-2 twa:mb-1 twa:opacity-80", children: "Increment key" }), _jsx(KeyComboCaptureInput, { "data-name": "plus-minus-increment-key", value: incrementDisplayValue, isUsingDefault: incrementUsingDefault, onCapture: commitIncrementKey, onReset: resetIncrementKey, validateCapture: validateIncrementCapture })] }), _jsxs(Box, { children: [_jsx(Box, { className: "twa:text-2 twa:mb-1 twa:opacity-80", children: "Decrement key" }), _jsx(KeyComboCaptureInput, { "data-name": "plus-minus-decrement-key", value: decrementDisplayValue, isUsingDefault: decrementUsingDefault, onCapture: commitDecrementKey, onReset: resetDecrementKey, validateCapture: validateDecrementCapture })] })] }) })] })] }) }));
 };

package/src/View/Wizard/OnePageWizards.js

@@ -1,6 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import * as React from 'react';
 import { useState, useRef } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
 import { cn } from '../../lib/utils';
 import Dialog from '../../components/Dialog';
 import SimpleButton from '../../components/SimpleButton';
@@ -15,6 +16,9 @@ import { useKeyboardNavigation } from './useKeyboardNavigation';
 import { Box, Flex } from '../../components/Flex';
 import { twMerge } from '../../twMerge';
 import { targetOwn } from '../../components/twUtils';
+import { useAdaptable } from '../AdaptableContext';
+import { getMiddlePosition, getWizardSize } from '../Components/Popups/Utilities';
+import { SettingsPanelSet } from '../../Redux/ActionsReducers/InternalRedux';
 const ONE_PAGE_WIZARD_SECTION_GRID = 'twa:grid twa:grid-cols-[minmax(160px,14rem)_minmax(0,1fr)]';
 export const SummaryTag = (props) => (_jsx(Box, { ...props }));
 export const SummaryText = (props) => (_jsx(Box, { ...props, className: twMerge('twa:text-2 twa:mb-3', props.className) }));
@@ -113,7 +117,28 @@ export const OnePageWizard = (props) => {
     const canFinish = !invalidCount;
     const activeSection = visibleSections[currentSection];
     const activeSectionDetails = activeSection !== '-' ? activeSection?.details : undefined;
-    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) => {
+    const adaptable = useAdaptable();
+    const wizardOptions = adaptable.adaptableOptions.wizardOptions;
+    const isWindowMode = wizardOptions?.popupType === 'window' && props.modal !== false;
+    const wizardSettingsKey = `wizard-${props.name || 'unnamed'}`;
+    const dispatch = useDispatch();
+    const persistedWizardSettings = useSelector((state) => state?.Internal?.SettingsPanel?.[wizardSettingsKey]);
+    let windowModalProps;
+    if (isWindowMode) {
+        const size = persistedWizardSettings?.size ?? wizardOptions?.size ?? getWizardSize();
+        const position = persistedWizardSettings?.position ?? wizardOptions?.position ?? getMiddlePosition(size);
+        windowModalProps = {
+            handleSelector: '.ab-OnePageWizard__header',
+            minHeight: 460,
+            minWidth: 400,
+            size,
+            position,
+            onChange: (settings) => {
+                dispatch(SettingsPanelSet(wizardSettingsKey, settings));
+            },
+        };
+    }
+    return (_jsx(NamedQueryContext.Provider, { value: { namedQuery, setNamedQuery }, children: _jsx(OnePageWizardContext.Provider, { value: contextValue, children: _jsx(Dialog, { modal: isWindowMode ? false : props.modal ?? true, windowModal: isWindowMode, windowModalProps: windowModalProps, fixed: !isWindowMode, isOpen: true, showCloseButton: false, focusOnBrowserVisible: true, className: cn('twa:rounded-standard twa:overflow-hidden', isWindowMode ? 'twa:h-full' : 'twa:h-[90vh]'), ref: dialogRef, onDismiss: () => props.onHide?.(), onKeyDown: (event) => {
                     if (event.metaKey || event.ctrlKey) {
                         const { key } = event;
                         if (!isNaN(Number(key))) {
@@ -129,7 +154,7 @@ export const OnePageWizard = (props) => {
                             }
                         }
                     }
-                }, children: _jsxs(Box, { className: 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) && (_jsxs(Box, { className: cn('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: cn(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) => {
+                }, children: _jsxs(Box, { className: cn('ab-OnePageWizard twa:flex twa:flex-col twa:h-full', isWindowMode ? 'twa:w-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: cn('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: cn(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}-`));
                                             }

package/src/agGrid/AdaptableAgGrid.js

@@ -81,6 +81,7 @@ import { ONLY_AGG_FN_NAME, WEIGHTED_AVERAGE_AGG_FN_NAME, } from '../AdaptableSta
 import { RowFormService } from '../Utilities/Services/RowFormService';
 import { ADAPTABLE_PUBLISH_TIMESTAMP } from '../EnvVars';
 import { AdaptableUpgradeHelper } from '../migration/AdaptableUpgradeHelper';
+import { stripDeprecatedStateKeys } from '../migration/DeprecatedStateKeys';
 import { ensureLoadingScreenPortalElement } from '../components/Modal';
 import { AdaptableLoadingScreen } from '../View/Components/Popups/AdaptableLoadingScreen';
 import { createElement } from 'react';
@@ -521,6 +522,7 @@ export class AdaptableAgGrid {
         });
     }
     normalizeAdaptableState(state, agGridOptions) {
+        state = stripDeprecatedStateKeys(state, this.logger);
         state = this.normaliseLayoutState(state, agGridOptions);
         state = this.normaliseToolPanelState(state);
         return state;

package/src/components/ui/input-group.js

@@ -1,4 +1,3 @@
-'use client';
 import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
 import { cva } from 'class-variance-authority';

package/src/env.js

@@ -1,5 +1,5 @@
 export default {
     NEXT_PUBLIC_INFINITE_TABLE_LICENSE_KEY: "StartDate=2021-06-29|EndDate=2030-01-01|Owner=Adaptable|Type=distribution|TS=1624971462479|C=137829811,1004007071,2756196225,1839832928,3994409405,636616862" || '',
-    PUBLISH_TIMESTAMP: 1782478280705 || Date.now(),
-    VERSION: "23.0.5" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1782993623253 || Date.now(),
+    VERSION: "23.0.7" || '--current-version--',
 };

package/src/migration/DeprecatedStateKeys.d.ts

@@ -0,0 +1,37 @@
+import { AdaptableLogger } from '../agGrid/AdaptableLogger';
+export interface DeprecatedStateKeyInfo {
+    /** AdapTable major version in which the key was removed from `AdaptableState`. */
+    removedInVersion: number;
+    /**
+     * Optional short pointer to the replacement feature(s). Only appended to the
+     * info message when the deprecated slice actually had content (i.e. the
+     * value is a non-empty object). Empty slices — e.g. someone leaving
+     * `Schedule: {}` in their `initialState` — get the base message only, since
+     * they have nothing to migrate.
+     */
+    replacement?: string;
+}
+/**
+ * Top-level `AdaptableState` keys that used to exist but have since been
+ * removed from AdapTable's state shape.
+ *
+ * On load, `stripDeprecatedStateKeys` quietly removes any of these keys from
+ * the incoming state and logs a single friendly `info` line per key — instead
+ * of letting Redux's `combineReducers` surface its more alarming
+ * `Unexpected key "…" found in previous state received by the reducer` warning.
+ *
+ * When you drop a top-level state slice, add it here so upgrading users with
+ * either an older persisted state or a stale `initialState` block in their
+ * `AdaptableOptions` see a soft, actionable message rather than a raw Redux
+ * dev-tools warning.
+ */
+export declare const DEPRECATED_TOP_LEVEL_STATE_KEYS: Readonly<Record<string, DeprecatedStateKeyInfo>>;
+/**
+ * Remove any known-deprecated top-level keys from an incoming state object and
+ * log a friendly `info` message per stripped key. Unknown keys are left alone
+ * so Redux still surfaces genuinely unexpected state entries.
+ *
+ * Returns a shallow-cloned state with the deprecated keys removed, or the
+ * original state reference when nothing needed stripping.
+ */
+export declare function stripDeprecatedStateKeys<T extends Record<string, any>>(state: T, logger?: Pick<AdaptableLogger, 'consoleInfo'>): T;

package/src/migration/DeprecatedStateKeys.js

@@ -0,0 +1,42 @@
+export const DEPRECATED_TOP_LEVEL_STATE_KEYS = {
+    Schedule: {
+        removedInVersion: 23,
+        replacement: 'Use Scheduled Alerts for time-based triggers, or move Report schedules onto Export state.',
+    },
+};
+const INTERNAL_STATE_METADATA_KEYS = new Set([
+    'Uuid',
+    'AdaptableVersion',
+    'Source',
+    'Revision',
+]);
+export function stripDeprecatedStateKeys(state, logger) {
+    if (!state || typeof state !== 'object') {
+        return state;
+    }
+    let cleanedState = state;
+    let didStrip = false;
+    for (const [key, info] of Object.entries(DEPRECATED_TOP_LEVEL_STATE_KEYS)) {
+        const value = state[key];
+        if (value === undefined) {
+            continue;
+        }
+        if (!didStrip) {
+            cleanedState = { ...state };
+            didStrip = true;
+        }
+        delete cleanedState[key];
+        const hasContent = value !== null &&
+            typeof value === 'object' &&
+            Object.keys(value).some((k) => !INTERNAL_STATE_METADATA_KEYS.has(k));
+        const message = `Deprecated state key "${key}" was removed in AdapTable v${info.removedInVersion} and will be ignored.` +
+            (hasContent && info.replacement ? ` ${info.replacement}` : '');
+        if (logger?.consoleInfo) {
+            logger.consoleInfo(message);
+        }
+        else {
+            console.info(message);
+        }
+    }
+    return cleanedState;
+}

package/src/migration/VersionUpgrade23.d.ts

@@ -2,6 +2,15 @@ import { VersionUpgrade } from './VersionUpgrade';
 import { AdaptableState } from '../AdaptableState/AdaptableState';
 export declare class VersionUpgrade23 extends VersionUpgrade {
     migrateState(state: AdaptableState): AdaptableState;
+    /**
+     * Logs a one-line summary of each populated sub-collection on the legacy
+     * `Schedule` slice so users can see exactly what they had before v23 removed
+     * the slice. The actual key removal is done later by
+     * `stripDeprecatedStateKeys` (in `normalizeAdaptableState`) so that the
+     * friendly "Schedule was removed…" info line always fires whenever `Schedule`
+     * is present — even when the slice is empty (e.g. someone left
+     * `Schedule: {}` in their `initialState`) or when `autoMigrateState` is off.
+     */
     private migrateSchedulingState;
     /**
      * v22 Percent Bar stored cell-text overlay settings as flat

package/src/migration/VersionUpgrade23.js

@@ -43,8 +43,7 @@ export class VersionUpgrade23 extends VersionUpgrade {
         if (removedReminderCount > 0) {
             this.logger.info(`Removed ${removedReminderCount} legacy Reminders from Schedule state.`);
         }
-        const { Schedule: _removed, ...stateWithoutSchedule } = state;
-        return stateWithoutSchedule;
+        return state;
     }
     migratePercentBarCellText(state) {
         const columns = state.StyledColumn?.StyledColumns;

package/src/types.d.ts

@@ -51,7 +51,8 @@ export type { ToolPanelOptions, CustomToolPanel, ToolPanelButtonContext, CustomT
 export type { UserInterfaceOptions, LoadingScreenOptions, ObjectTagsContext, CustomIcon, } from './AdaptableOptions/UserInterfaceOptions';
 export type { ContextMenuOptions, AdaptableSystemContextMenuItem, CustomContextMenuContext, CustomContextMenuItem, UserContextMenuItem, AgGridContextMenuItemType, DefaultAdaptableMenuStructure, DefaultAgGridMenuStructure, CustomGroupContextMenuItem, } from './AdaptableOptions/ContextMenuOptions';
 export type { ColumnMenuOptions, CustomColumnMenuContext, CustomColumnMenuItem, UserColumnMenuItem, AdaptableSystemColumnMenuItem, AgGridColumnMenuItemType, CustomGroupColumnMenuItem, } from './AdaptableOptions/ColumnMenuOptions';
-export type { CustomSettingsPanel, SettingsPanelOptions, SettingsPanelNavigation, SettingsPanelNavigationGroup, SettingsPanelNavigationContext, SettingsPanelNavigationConfigurer, LegacyFlatSettingsPanelNavigation, SettingsPanelPosition, SettingsPanelSize, PopupType, } from './AdaptableOptions/SettingsPanelOptions';
+export type { CustomSettingsPanel, SettingsPanelOptions, SettingsPanelNavigation, SettingsPanelNavigationGroup, SettingsPanelNavigationContext, SettingsPanelNavigationConfigurer, LegacyFlatSettingsPanelNavigation, PopupType, } from './AdaptableOptions/SettingsPanelOptions';
+export type { WizardOptions } from './AdaptableOptions/WizardOptions';
 export type { EntitlementOptions, EntitlementContext, DefaultAccessLevelContext, } from './AdaptableOptions/EntitlementOptions';
 export type { EvaluateExpressionExternallyContext, ExpressionOptions, ModuleExpressionFunctions, ModuleExpressionFunctionsMap, GlobalExpressionFunctionsContext, ModuleExpressionFunctionsContext, CustomQueryVariableContext, QueryableColumnContext, AdaptableFieldContext, } from './AdaptableOptions/ExpressionOptions';
 export type { PredicateOptions, SystemPredicatesContext, } from './AdaptableOptions/PredicateOptions';
@@ -231,5 +232,6 @@ export type { Fdc3Options, GridDataContextMapping, ActionColumnDefaultConfigurat
 export type { CommentState, CommentThread, AdaptableComment } from './AdaptableState/CommentState';
 export type { UpgradeConfig } from '../agGrid';
 export type { ProgressIndicatorConfig } from './AdaptableState/Common/ProgressIndicatorConfig';
-export type { CustomWindowConfig, WindowPosition, WindowSize, } from './AdaptableState/Common/CustomWindowConfig';
+export type { CustomWindowConfig } from './AdaptableState/Common/CustomWindowConfig';
+export type { WindowPosition, WindowSize } from './AdaptableState/Common/Window';
 export type { TransposeConfig } from './AdaptableState/Common/TransposeConfig';