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

package/src/View/Components/ValueSelector/index.js

@@ -12,7 +12,7 @@ const icons_1 = require("../../../components/icons");
 const Radio_1 = tslib_1.__importDefault(require("../../../components/Radio"));
 const AdaptableFormControlTextClear_1 = require("../Forms/AdaptableFormControlTextClear");
 const Flex_1 = require("../../../components/Flex");
-const clsx_1 = tslib_1.__importDefault(require("clsx"));
+const utils_1 = require("../../../lib/utils");
 function useValuesMap({ options, value, toIdentifier, selectedMap, }) {
     const optionsMap = (0, react_1.useMemo)(() => {
         if (selectedMap) {
@@ -37,9 +37,23 @@ function useValuesMap({ options, value, toIdentifier, selectedMap, }) {
     return { selectedMap: result, optionsMap };
 }
 const baseClassName = 'ab-ValueSelector';
+/** Clicks on these targets must not toggle row selection (`toggleSelectionOnRowClick`). */
+const ROW_CLICK_IGNORE_SELECTOR = 'button, input, select, textarea, a, [data-drag-handle], [data-slot=select-trigger], [data-slot=select-content], [data-slot=select-item], .ab-Select';
+const ROW_TOGGLE_SUPPRESS_MS = 150;
 function ValueSelector(props) {
-    const { options, value, filter, onChange, allowReorder = true, singleSelect, toLabel, toListLabel, toIdentifier, showSelectedOnlyLabel, showFilterInput, onShowSelectedOnlyChange, isOptionDisabled, disabled, } = props;
+    const { options, value, filter, onChange, allowReorder = true, singleSelect, toLabel, toListLabel, toIdentifier, renderOptionTrailing, toggleSelectionOnRowClick, showSelectedOnlyLabel, showFilterInput, filterPlaceholder, compact, optionLayout = 'label-in-checkbox', hideShowSelectedOnly, compactHeaderClassName, compactFilterClassName, onShowSelectedOnlyChange, isOptionDisabled, disabled, optionClassName, className, style, } = props;
     const [searchInputValue, setSearchInputValue] = React.useState('');
+    const suppressRowToggleUntilRef = (0, react_1.useRef)(0);
+    (0, react_1.useEffect)(() => {
+        const markSelectInteraction = (event) => {
+            const target = event.target;
+            if (target.closest(ROW_CLICK_IGNORE_SELECTOR)) {
+                suppressRowToggleUntilRef.current = Date.now() + ROW_TOGGLE_SUPPRESS_MS;
+            }
+        };
+        document.addEventListener('pointerdown', markSelectInteraction, true);
+        return () => document.removeEventListener('pointerdown', markSelectInteraction, true);
+    }, []);
     const preparedToLabel = toListLabel ?? toLabel;
     const [selectedOnly, doSetSelectedOnly] = (0, react_1.useState)(false);
     const setSelectedOnly = (0, react_1.useCallback)((selectedOnly) => {
@@ -51,40 +65,102 @@ function ValueSelector(props) {
         toIdentifier,
         value,
     });
-    const notifyChange = (0, react_1.useCallback)(() => {
-        const newSelection = [...selectedMap.keys()];
+    const reorderEnabled = allowReorder !== false;
+    const commitSelection = (0, react_1.useCallback)((nextMap) => {
+        const newSelection = [...nextMap.keys()];
         if (!newSelection.length && selectedOnly) {
             setSelectedOnly(false);
         }
-        onChange(newSelection, new Map(selectedMap));
-    }, [onChange, selectedOnly, selectedMap]);
-    const renderOption = (option, index) => {
+        onChange(newSelection, nextMap);
+    }, [onChange, selectedOnly, setSelectedOnly]);
+    const updateSelection = (0, react_1.useCallback)((updater) => {
+        const nextMap = new Map(selectedMap);
+        updater(nextMap);
+        commitSelection(nextMap);
+    }, [commitSelection, selectedMap]);
+    const filteredOptions = (0, react_1.useMemo)(() => {
+        return options.filter((option) => {
+            let result = true;
+            if (filter) {
+                result = filter(option, searchInputValue);
+            }
+            result = result && (selectedOnly ? selectedMap.has(toIdentifier(option)) : true);
+            return result;
+        });
+    }, [filter, options, searchInputValue, selectedMap, selectedOnly, toIdentifier]);
+    const handleOptionRowClick = (0, react_1.useCallback)((option, identifier, optionDisabled, event) => {
+        if (Date.now() < suppressRowToggleUntilRef.current) {
+            return;
+        }
+        const target = event.target;
+        if (target.closest(ROW_CLICK_IGNORE_SELECTOR)) {
+            return;
+        }
+        if (optionDisabled) {
+            return;
+        }
+        updateSelection((next) => {
+            if (next.has(identifier)) {
+                next.delete(identifier);
+            }
+            else {
+                next.set(identifier, option);
+            }
+        });
+    }, [updateSelection]);
+    const renderOptionRow = (option, index, reorderable, itemDomProps) => {
         const identifier = toIdentifier(option);
-        const label = !allowReorder ? preparedToLabel(option) : null;
-        const reorderable = typeof allowReorder === 'function' ? allowReorder(option) : allowReorder;
-        return ((0, jsx_runtime_1.jsx)(dnd_1.DragList.DraggableItem, { id: `${identifier}`, children: (itemDomProps) => {
-                const { onPointerDown, ...restDomProps } = itemDomProps;
-                return ((0, jsx_runtime_1.jsx)(Flex_1.Flex, { alignItems: "center", "data-index": index, "data-id": identifier, "data-name": "option", ...restDomProps, className: (0, clsx_1.default)('twa:bg-primary twa:text-text-on-primary twa:rounded-standard twa:p-2', {
-                        'twa:mt-1': index,
-                        'twa:mt-0': !index,
-                    }, restDomProps.className, `${baseClassName}__option`), children: (0, jsx_runtime_1.jsxs)(Flex_1.Flex, { flexDirection: "row", alignItems: "center", className: "twa:flex-1", children: [reorderable ? ((0, jsx_runtime_1.jsx)(Flex_1.Box, { onPointerDown: onPointerDown, className: "twa:mr-3", children: (0, jsx_runtime_1.jsx)(icons_1.Icon, { name: "drag", style: { cursor: 'grab' } }) })) : null, singleSelect ? ((0, jsx_runtime_1.jsx)(Radio_1.default, { checked: selectedMap.has(identifier), "data-name": identifier, onChange: (checked) => {
+        const label = preparedToLabel(option);
+        const { onPointerDown, onClick: itemOnClick, className: itemClassName, ...restDomProps } = itemDomProps ?? {};
+        const optionDisabled = disabled || (isOptionDisabled ? isOptionDisabled(option) : false);
+        return ((0, jsx_runtime_1.jsxs)(Flex_1.Flex, { alignItems: "center", "data-index": index, "data-id": identifier, "data-name": "option", ...restDomProps, onClick: toggleSelectionOnRowClick
+                ? (event) => {
+                    itemOnClick?.(event);
+                    handleOptionRowClick(option, identifier, optionDisabled, event);
+                }
+                : itemOnClick, className: (0, utils_1.cn)(toggleSelectionOnRowClick && 'twa:cursor-pointer', reorderable ? 'ab-DraggableListItem' : 'twa:bg-primary twa:text-primary-foreground', 'twa:rounded-standard', compact ? (singleSelect ? 'twa:py-1.5 twa:px-1.5' : 'twa:py-1 twa:px-1.5') : 'twa:p-2', {
+                'twa:mt-0.5': compact && index,
+                'twa:mt-1': !compact && index,
+                'twa:mt-0': !index,
+            }, itemClassName, optionClassName, `${baseClassName}__option`), children: [(0, jsx_runtime_1.jsxs)(Flex_1.Flex, { flexDirection: "row", alignItems: "center", className: "twa:flex-1 twa:min-w-0", children: [reorderable ? ((0, jsx_runtime_1.jsx)(Flex_1.Box, { "data-drag-handle": true, onPointerDown: onPointerDown, className: (0, utils_1.cn)('twa:shrink-0', compact ? 'twa:mr-2' : 'twa:mr-3'), children: (0, jsx_runtime_1.jsx)(icons_1.Icon, { name: "drag", style: { cursor: 'grab' } }) })) : null, singleSelect ? ((0, jsx_runtime_1.jsx)(Radio_1.default, { className: (0, utils_1.cn)('twa:flex-1 twa:min-w-0', compact && !singleSelect && 'twa:my-0!'), checked: selectedMap.has(identifier), "data-name": identifier, disabled: optionDisabled, onClick: toggleSelectionOnRowClick ? (event) => event.stopPropagation() : undefined, onChange: (checked) => {
+                                updateSelection((next) => {
+                                    next.clear();
                                     if (checked) {
-                                        selectedMap.clear();
-                                        selectedMap.set(identifier, option);
+                                        next.set(identifier, option);
                                     }
-                                    else {
-                                        selectedMap.delete(identifier);
-                                    }
-                                    notifyChange();
-                                }, children: label })) : ((0, jsx_runtime_1.jsx)(CheckBox_1.CheckBox, { "data-name": identifier, disabled: disabled || (isOptionDisabled ? isOptionDisabled(option) : false), onChange: (checked) => {
+                                });
+                            }, children: label })) : optionLayout === 'label-beside-checkbox' ? ((0, jsx_runtime_1.jsxs)(Flex_1.Flex, { alignItems: "center", className: "twa:flex-1 twa:min-w-0", children: [(0, jsx_runtime_1.jsx)(CheckBox_1.CheckBox, { className: "twa:shrink-0", "data-name": identifier, disabled: optionDisabled, onClick: toggleSelectionOnRowClick ? (event) => event.stopPropagation() : undefined, onChange: (checked) => {
+                                        updateSelection((next) => {
+                                            if (checked) {
+                                                next.set(identifier, option);
+                                            }
+                                            else {
+                                                next.delete(identifier);
+                                            }
+                                        });
+                                    }, checked: selectedMap.has(identifier) }), (0, jsx_runtime_1.jsx)(Flex_1.Flex, { alignItems: "center", className: "twa:mx-1.5 twa:text-3 twa:min-w-0", "data-name": "option-label", children: label })] })) : ((0, jsx_runtime_1.jsx)(CheckBox_1.CheckBox, { className: (0, utils_1.cn)('twa:flex-1 twa:min-w-0', compact && 'twa:my-0!'), "data-name": identifier, disabled: optionDisabled, onClick: toggleSelectionOnRowClick ? (event) => event.stopPropagation() : undefined, onChange: (checked) => {
+                                updateSelection((next) => {
                                     if (checked) {
-                                        selectedMap.set(identifier, option);
+                                        next.set(identifier, option);
                                     }
                                     else {
-                                        selectedMap.delete(identifier);
+                                        next.delete(identifier);
                                     }
-                                    notifyChange();
-                                }, checked: selectedMap.has(identifier), children: label })), (0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:ml-2 twa:flex-1", children: allowReorder ? preparedToLabel(option) : null })] }) }));
+                                });
+                            }, checked: selectedMap.has(identifier), children: label }))] }), renderOptionTrailing ? ((0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:shrink-0", children: renderOptionTrailing(option) })) : null] }));
+    };
+    const renderOption = (option, index) => {
+        const identifier = toIdentifier(option);
+        const reorderable = typeof allowReorder === 'function' ? allowReorder(option) : allowReorder;
+        if (!reorderEnabled) {
+            return ((0, jsx_runtime_1.jsx)(React.Fragment, { children: renderOptionRow(option, index, false) }, identifier));
+        }
+        return ((0, jsx_runtime_1.jsx)(dnd_1.DragList.DraggableItem, { id: `${identifier}`, children: (itemDomProps) => {
+                const { onPointerDown, ...restDomProps } = itemDomProps;
+                return renderOptionRow(option, index, reorderable, {
+                    onPointerDown: reorderable ? onPointerDown : undefined,
+                    ...restDomProps,
+                });
             } }, identifier));
     };
     const showOnlySelectedCheckbox = ((0, jsx_runtime_1.jsx)(CheckBox_1.CheckBox, { disabled: !value.length, checked: selectedOnly, onChange: setSelectedOnly, children: showSelectedOnlyLabel ?? 'Show Selected Only' }));
@@ -92,64 +168,84 @@ function ValueSelector(props) {
         ...props,
         showOnlySelectedCheckbox,
         onSelectAll: () => {
-            options.forEach((option) => {
-                selectedMap.set(toIdentifier(option), option);
+            updateSelection((next) => {
+                options.forEach((option) => {
+                    next.set(toIdentifier(option), option);
+                });
             });
-            notifyChange();
         },
         onClearOption: (id) => {
-            selectedMap.delete(id);
-            notifyChange();
+            updateSelection((next) => {
+                next.delete(id);
+            });
         },
         onClear: () => {
-            selectedMap.clear();
-            notifyChange();
+            updateSelection((next) => {
+                next.clear();
+            });
         },
     };
-    return ((0, jsx_runtime_1.jsxs)(Flex_1.Flex, { style: props.style, className: (0, clsx_1.default)('twa:flex-1', baseClassName), flexDirection: "column", children: [(0, jsx_runtime_1.jsx)(Flex_1.Flex, { className: "twa:mb-1", children: showFilterInput && filter ? ((0, jsx_runtime_1.jsx)(AdaptableFormControlTextClear_1.AdaptableFormControlTextClear, { value: searchInputValue, OnTextChange: setSearchInputValue, placeholder: "Type to search", inputClassName: "twa:p-3", className: "twa:flex-1 twa:border-0 twa:m-[3px]" })) : ((0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:flex-1" })) }), (0, exports.renderSelectionSection)(selectionSectionProps), (0, jsx_runtime_1.jsx)(dnd_1.DragDropProvider, { children: (0, jsx_runtime_1.jsx)(Flex_1.Flex, { className: `${baseClassName}__body twa:flex-1 twa:overflow-auto`, flexDirection: "column", children: (0, jsx_runtime_1.jsx)(dnd_1.DragList, { dragListId: "value-selector", orientation: "vertical", onDragProxyMove: dnd_1.defaultDragProxyMove, onDragProxySetup: ({ proxyElement }) => {
+    const optionList = ((0, jsx_runtime_1.jsx)(Flex_1.Flex, { className: `${baseClassName}__body twa:flex-1 twa:min-h-0 twa:overflow-auto`, flexDirection: "column", children: (0, jsx_runtime_1.jsx)("div", { children: filteredOptions.map(renderOption) }) }));
+    return ((0, jsx_runtime_1.jsxs)(Flex_1.Flex, { style: style, className: (0, utils_1.cn)('twa:flex-1 twa:min-h-0', compact && 'twa:overflow-hidden', baseClassName, compact && `${baseClassName}--compact`, className), flexDirection: "column", children: [!compact && ((0, jsx_runtime_1.jsx)(Flex_1.Flex, { className: "twa:mb-1", children: showFilterInput && filter ? ((0, jsx_runtime_1.jsx)(AdaptableFormControlTextClear_1.AdaptableFormControlTextClear, { value: searchInputValue, OnTextChange: setSearchInputValue, placeholder: filterPlaceholder ?? 'Type to search', inputClassName: "twa:p-3", className: "twa:flex-1 twa:m-[3px]" })) : ((0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:flex-1" })) })), (0, exports.renderSelectionSection)({
+                ...selectionSectionProps,
+                compact,
+                showFilterInput,
+                filter,
+                searchInputValue,
+                setSearchInputValue,
+                filterPlaceholder,
+                hideShowSelectedOnly,
+                compactHeaderClassName,
+                compactFilterClassName,
+            }), reorderEnabled ? ((0, jsx_runtime_1.jsx)(dnd_1.DragDropProvider, { children: (0, jsx_runtime_1.jsx)(Flex_1.Flex, { className: `${baseClassName}__body twa:flex-1 twa:min-h-0 twa:overflow-auto`, flexDirection: "column", children: (0, jsx_runtime_1.jsx)(dnd_1.DragList, { dragListId: "value-selector", orientation: "vertical", onDragProxyMove: dnd_1.defaultDragProxyMove, onDragProxySetup: ({ proxyElement }) => {
                             proxyElement.classList.add('twa:shadow-md');
                         }, onDrop: (_sortedIndexes) => {
                             const selection = [];
                             const extraKeys = [];
-                            for (const [key, value] of selectedMap) {
-                                if (value != null) {
+                            for (const [key, mapValue] of selectedMap) {
+                                if (mapValue != null) {
                                     selection.push(key);
                                 }
                                 else {
-                                    // null/non-existent keys have to be stored separately
                                     extraKeys.push(key);
                                 }
                             }
-                            const clone = new Map(selectedMap);
-                            // const newSelection: ID_TYPE[] = ArrayExtensions.reorderArray(
-                            //   selection,
-                            //   dragIndex,
-                            //   dropIndex
-                            // );
                             const newSelection = _sortedIndexes
                                 .map((index) => selection[index])
                                 .filter((x) => x != null);
                             newSelection.push(...extraKeys);
-                            selectedMap.clear();
+                            const nextMap = new Map();
                             newSelection.forEach((key) => {
-                                selectedMap.set(key, clone.get(key));
+                                nextMap.set(key, selectedMap.get(key));
                             });
-                            notifyChange();
-                        }, children: (listDomProps) => ((0, jsx_runtime_1.jsx)("div", { ...listDomProps, children: options
-                                .filter((option) => {
-                                let result = true;
-                                if (filter) {
-                                    result = filter(option, searchInputValue);
-                                }
-                                result =
-                                    result && (selectedOnly ? selectedMap.has(toIdentifier(option)) : true);
-                                return result;
-                            })
-                                .map(renderOption) })) }) }) })] }));
+                            commitSelection(nextMap);
+                        }, children: (listDomProps) => (0, jsx_runtime_1.jsx)("div", { ...listDomProps, children: filteredOptions.map(renderOption) }) }) }) })) : (optionList)] }));
 }
 const renderSelectionSection = (props) => {
-    const { value, options, disabled, singleSelect, toLabel, toIdentifier, } = props;
-    const selectionBox = ((0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:flex twa:flex-col twa:gap-2 twa:py-2", children: (0, jsx_runtime_1.jsxs)(Flex_1.Box, { className: (0, clsx_1.default)('twa:flex twa:flex-row', 'twa:border-b twa:border-primarydark/30 twa:rounded-standard'), children: [singleSelect ? ((0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:flex twa:flex-row twa:text-3 twa:font-normal twa:items-center", children: (() => {
+    const { value, options, singleSelect, toLabel, toIdentifier, compact, showFilterInput, filter, searchInputValue, setSearchInputValue, filterPlaceholder, hideShowSelectedOnly, compactHeaderClassName, compactFilterClassName, } = props;
+    const compactFilterClass = compactFilterClassName ?? 'twa:flex-1 twa:min-w-0';
+    const compactFilterUsesSpacer = compactFilterClassName != null && !/\bflex-1\b/.test(compactFilterClassName);
+    const headerRowClassName = (0, utils_1.cn)('twa:mb-1', 'twa:p-1', 'twa:border-b twa:border-primarydark/30', compact
+        ? (0, utils_1.cn)('twa:w-full twa:min-w-0 twa:gap-2 twa:font-bold twa:shrink-0', compactHeaderClassName)
+        : 'twa:flex twa:flex-row ');
+    const selectionBox = compact ? ((0, jsx_runtime_1.jsxs)(Flex_1.Flex, { alignItems: "center", className: headerRowClassName, children: [singleSelect ? ((0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:flex twa:flex-row twa:text-3 twa:font-normal twa:items-center", children: (() => {
+                    if (!value.length) {
+                        return (0, jsx_runtime_1.jsx)("span", { className: "twa:opacity-70", children: "(none selected)" });
+                    }
+                    const selectedId = value[0];
+                    const selectedOption = options.find((o) => toIdentifier(o) === selectedId);
+                    if (!selectedOption) {
+                        return (0, jsx_runtime_1.jsx)("span", { className: "twa:opacity-70", children: "(none selected)" });
+                    }
+                    return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)("span", { className: "twa:opacity-70 twa:mr-1", children: "Selected:" }), (0, jsx_runtime_1.jsx)("span", { className: "twa:font-medium", children: toLabel(selectedOption) })] }));
+                })() })) : ((0, jsx_runtime_1.jsx)(CheckBox_1.CheckBox, { className: "twa:shrink-0", checked: !value.length ? false : value.length === options.length ? true : null, onChange: (checked) => {
+                    if (checked) {
+                        props.onSelectAll();
+                    }
+                    else {
+                        props.onClear();
+                    }
+                }, children: "Select All" })), hideShowSelectedOnly ? null : ((0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:shrink-0 twa:text-2 twa:font-normal", children: props.showOnlySelectedCheckbox })), showFilterInput && filter ? ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [compactFilterUsesSpacer ? (0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:flex-1 twa:min-w-0" }) : null, (0, jsx_runtime_1.jsx)(AdaptableFormControlTextClear_1.AdaptableFormControlTextClear, { value: searchInputValue ?? '', OnTextChange: setSearchInputValue ?? (() => undefined), placeholder: filterPlaceholder ?? 'Search...', className: compactFilterClass })] })) : null] })) : ((0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:flex twa:flex-col twa:gap-2 twa:py-2", children: (0, jsx_runtime_1.jsxs)(Flex_1.Box, { className: headerRowClassName, children: [singleSelect ? ((0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:flex twa:flex-row twa:text-3 twa:font-normal twa:items-center", children: (() => {
                         // For single-select we show the *name* of the selected option
                         // rather than a (1 of N) counter — useful when the list is
                         // long enough to scroll past the chosen row.
@@ -169,7 +265,7 @@ const renderSelectionSection = (props) => {
                         else {
                             props.onClear();
                         }
-                    }, children: (0, jsx_runtime_1.jsxs)(Flex_1.Box, { className: "twa:flex twa:flex-row twa:items-center twa:gap-3", children: ["Select All", (0, jsx_runtime_1.jsxs)(Flex_1.Box, { className: "twa:text-2 twa:font-normal", children: ["(", value.length, " of ", options.length, " selected)"] })] }) })), (0, jsx_runtime_1.jsx)("div", { className: "twa:flex-1" }), (0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:mr-2 twa:text-2 twa:font-normal", children: props.showOnlySelectedCheckbox })] }) }));
-    return (0, jsx_runtime_1.jsx)(Flex_1.Box, { className: (0, clsx_1.default)(`${baseClassName}__header `), children: selectionBox });
+                    }, children: (0, jsx_runtime_1.jsxs)(Flex_1.Box, { className: "twa:flex twa:flex-row twa:items-center twa:gap-3", children: ["Select All", (0, jsx_runtime_1.jsxs)(Flex_1.Box, { className: "twa:text-2 twa:font-normal", children: ["(", value.length, " of ", options.length, " selected)"] })] }) })), hideShowSelectedOnly ? null : (0, jsx_runtime_1.jsx)("div", { className: "twa:flex-1" }), hideShowSelectedOnly ? null : ((0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:mr-2 twa:text-2 twa:font-normal", children: props.showOnlySelectedCheckbox }))] }) }));
+    return (0, jsx_runtime_1.jsx)(Flex_1.Box, { className: (0, utils_1.cn)(`${baseClassName}__header`), children: selectionBox });
 };
 exports.renderSelectionSection = renderSelectionSection;

package/src/View/Components/wizardColumnListStyles.d.ts

@@ -0,0 +1,10 @@
+/** ValueSelector row sizing — matches Visibility and Order list rows. */
+export declare const WIZARD_COLUMN_LIST_OPTION_CLASS = "twa:!py-1 twa:!px-1.5";
+/** Single-select column lists — ~50% taller than multi-select compact rows. */
+export declare const WIZARD_COLUMN_LIST_OPTION_CLASS_SINGLE_SELECT = "twa:!py-1.5 twa:!px-1.5";
+/** Taller rows when ultra-compact one-line cards are not required (e.g. Custom Sort wizard). */
+export declare const WIZARD_COLUMN_LIST_OPTION_CLASS_RELAXED = "twa:!py-2 twa:!px-2";
+/** Compact list header — spacing between Select All, Show Selected Only, and search. */
+export declare const WIZARD_COLUMN_LIST_HEADER_CLASS = "twa:gap-4";
+/** Narrow search field (matches Visibility list column width, not full card width). */
+export declare const WIZARD_COLUMN_LIST_SEARCH_CLASS = "twa:w-[12rem] twa:shrink-0 twa:min-w-0";

package/src/View/Components/wizardColumnListStyles.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WIZARD_COLUMN_LIST_SEARCH_CLASS = exports.WIZARD_COLUMN_LIST_HEADER_CLASS = exports.WIZARD_COLUMN_LIST_OPTION_CLASS_RELAXED = exports.WIZARD_COLUMN_LIST_OPTION_CLASS_SINGLE_SELECT = exports.WIZARD_COLUMN_LIST_OPTION_CLASS = void 0;
+/** ValueSelector row sizing — matches Visibility and Order list rows. */
+exports.WIZARD_COLUMN_LIST_OPTION_CLASS = 'twa:!py-1 twa:!px-1.5';
+/** Single-select column lists — ~50% taller than multi-select compact rows. */
+exports.WIZARD_COLUMN_LIST_OPTION_CLASS_SINGLE_SELECT = 'twa:!py-1.5 twa:!px-1.5';
+/** Taller rows when ultra-compact one-line cards are not required (e.g. Custom Sort wizard). */
+exports.WIZARD_COLUMN_LIST_OPTION_CLASS_RELAXED = 'twa:!py-2 twa:!px-2';
+/** Compact list header — spacing between Select All, Show Selected Only, and search. */
+exports.WIZARD_COLUMN_LIST_HEADER_CLASS = 'twa:gap-4';
+/** Narrow search field (matches Visibility list column width, not full card width). */
+exports.WIZARD_COLUMN_LIST_SEARCH_CLASS = 'twa:w-[12rem] twa:shrink-0 twa:min-w-0';

package/src/View/CustomSort/Wizard/CustomSortColumnWizardSection.d.ts

@@ -1,10 +1,11 @@
 import * as React from 'react';
 import { CustomSort } from '../../../AdaptableState/CustomSortState';
+import { AdaptableApi } from '../../../Api/AdaptableApi';
 export type CustomSortColumnWizardSectionProps = {
     onChange: (data: CustomSort) => void;
     isNew: boolean;
     allCustomSorts: CustomSort[];
 };
-export declare const renderCustomSortColumn: (data: CustomSort) => React.JSX.Element;
+export declare const renderCustomSortColumn: (data: CustomSort, api: AdaptableApi) => React.JSX.Element;
 export declare const isValidCustomSortColumn: (data: CustomSort, allCustomSorts: CustomSort[]) => true | string;
 export declare const CustomSortColumnWizardSection: (props: CustomSortColumnWizardSectionProps) => React.JSX.Element;

package/src/View/CustomSort/Wizard/CustomSortColumnWizardSection.js

@@ -4,17 +4,15 @@ exports.CustomSortColumnWizardSection = exports.isValidCustomSortColumn = export
 const tslib_1 = require("tslib");
 const jsx_runtime_1 = require("react/jsx-runtime");
 const React = tslib_1.__importStar(require("react"));
-const Tabs_1 = require("../../../components/Tabs");
 const Tag_1 = require("../../../components/Tag");
 const ColumnSelector_1 = require("../../Components/ColumnSelector");
+const wizardColumnListStyles_1 = require("../../Components/wizardColumnListStyles");
 const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
 const Flex_1 = require("../../../components/Flex");
-const FormLayout_1 = tslib_1.__importStar(require("../../../components/FormLayout"));
 const Input_1 = tslib_1.__importDefault(require("../../../components/Input"));
-const AdaptableFormControlTextClear_1 = require("../../Components/Forms/AdaptableFormControlTextClear");
-const renderCustomSortColumn = (data) => {
-    const { api } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
-    return ((0, jsx_runtime_1.jsxs)(Flex_1.Box, { className: "twa:text-2 twa:py-2 twa:pr-2", children: [(0, jsx_runtime_1.jsxs)(Tag_1.Tag, { className: "twa:mr-2", children: ["Name: ", data.Name] }), (0, jsx_runtime_1.jsxs)(Tag_1.Tag, { children: ["Column: ", api.columnApi.getFriendlyNameForColumnId(data.ColumnId)] })] }));
+const Card_1 = require("../../../components/Card");
+const renderCustomSortColumn = (data, api) => {
+    return ((0, jsx_runtime_1.jsxs)(Flex_1.Box, { className: "twa:text-2 twa:py-2 twa:pr-2", children: [(0, jsx_runtime_1.jsxs)(Tag_1.Tag, { className: "twa:mr-2", children: ["Name: ", data.Name] }), (0, jsx_runtime_1.jsxs)(Tag_1.ColumnTag, { children: ["Column: ", api.columnApi.getFriendlyNameForColumnId(data.ColumnId)] })] }));
 };
 exports.renderCustomSortColumn = renderCustomSortColumn;
 const isValidCustomSortColumn = (data, allCustomSorts) => {
@@ -34,16 +32,12 @@ const CustomSortColumnWizardSection = (props) => {
     const { data, api } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
     const sortableCols = React.useMemo(() => {
         const sortableColumns = api.columnApi.getSortableColumns();
-        const nonComparerSortableColumns = sortableColumns.filter((c) => {
-            return api.customSortApi.internalApi.columnHasCustomSortComparer(c.columnId);
-        });
         const customSorts = api.customSortApi.getCustomSorts();
         const columnSortComparers = api.optionsApi.getCustomSortOptions().customSortComparers || [];
         const usedColumnIds = [
             ...customSorts.map((customSort) => customSort.ColumnId),
             ...columnSortComparers.map((comparer) => api.columnScopeApi.getColumnIdsInScope(comparer.scope)),
         ];
-        // filter out used colum ids, but include the current one
         return sortableColumns.filter((column) => {
             if (api.customSortApi.internalApi.columnHasCustomSortComparer(column.columnId)) {
                 return false;
@@ -56,19 +50,18 @@ const CustomSortColumnWizardSection = (props) => {
             });
         });
     }, []);
-    const [columnsSearchText, setColumnsSearchText] = React.useState('');
     const onNameChange = (event) => {
         props.onChange({
             ...data,
             Name: event.target.value,
         });
     };
-    return ((0, jsx_runtime_1.jsxs)(Flex_1.Flex, { flexDirection: "column", style: { height: '100%' }, children: [(0, jsx_runtime_1.jsxs)(Tabs_1.Tabs, { className: "twa:mb-3", children: [(0, jsx_runtime_1.jsx)(Tabs_1.Tabs.Tab, { children: "Settings" }), (0, jsx_runtime_1.jsx)(Tabs_1.Tabs.Content, { children: (0, jsx_runtime_1.jsx)(Flex_1.Flex, { flexDirection: "row", children: (0, jsx_runtime_1.jsx)(FormLayout_1.default, { className: "twa:max-w-[300px] twa:w-full", children: (0, jsx_runtime_1.jsx)(FormLayout_1.FormRow, { label: "Name", children: (0, jsx_runtime_1.jsx)(Input_1.default, { className: "twa:w-full", "data-name": "custom-sort-name", onChange: onNameChange, value: data?.Name ?? '' }) }) }) }) })] }), (0, jsx_runtime_1.jsxs)(Tabs_1.Tabs, { style: { flex: 1, minHeight: 0 }, children: [(0, jsx_runtime_1.jsx)(Tabs_1.Tabs.Tab, { children: "Column" }), (0, jsx_runtime_1.jsxs)(Tabs_1.Tabs.Content, { children: [(0, jsx_runtime_1.jsxs)(Flex_1.Flex, { flexDirection: "row", alignItems: "center", className: "twa:p-2", children: [(0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:text-2", children: "Columns" }), (0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:flex-3" }), (0, jsx_runtime_1.jsx)(AdaptableFormControlTextClear_1.AdaptableFormControlTextClear, { value: columnsSearchText, OnTextChange: setColumnsSearchText, placeholder: "Type to search columns", style: { flex: 1 } })] }), (0, jsx_runtime_1.jsx)(ColumnSelector_1.NewColumnSelector, { columnFilterText: columnsSearchText, availableColumns: sortableCols, selected: data.ColumnId ? [data.ColumnId] : [], singleSelect: true, onChange: (ids) => {
-                                    props.onChange({
-                                        ...data,
-                                        SortedValues: [],
-                                        ColumnId: ids[0],
-                                    });
-                                }, allowReorder: false })] })] })] }));
+    return ((0, jsx_runtime_1.jsxs)(Flex_1.Flex, { flexDirection: "column", className: "twa:h-full twa:min-h-0", children: [(0, jsx_runtime_1.jsx)(Flex_1.Flex, { flexDirection: "column", className: "twa:gap-3 twa:p-3 twa:shrink-0", children: (0, jsx_runtime_1.jsxs)(Card_1.Card, { shadow: false, children: [(0, jsx_runtime_1.jsxs)(Card_1.Card.Title, { children: [(0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:font-medium", children: "Name" }), (0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: "Provide a unique name for the Custom Sort" })] }), (0, jsx_runtime_1.jsx)(Card_1.Card.Body, { className: "twa:p-1", children: (0, jsx_runtime_1.jsx)(Input_1.default, { className: "twa:max-w-[300px] twa:w-full", "data-name": "custom-sort-name", onChange: onNameChange, value: data?.Name ?? '' }) })] }) }), (0, jsx_runtime_1.jsxs)(Flex_1.Flex, { flexDirection: "column", className: "twa:flex-1 twa:min-h-0 twa:overflow-hidden", children: [(0, jsx_runtime_1.jsxs)(Flex_1.Flex, { flexDirection: "row", alignItems: "center", className: "twa:p-2 twa:gap-3 twa:border-b twa:mb-2 twa:border-b-foreground/20 twa:shrink-0", children: [(0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:text-5 twa:font-medium", children: "Column" }), (0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:text-xs twa:opacity-70 twa:max-w-[520px]", children: "Select the column to apply the Custom Sort to" })] }), (0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:flex-1 twa:min-h-0 twa:overflow-hidden twa:px-2 twa:pb-2 twa:flex twa:flex-col", children: (0, jsx_runtime_1.jsx)(ColumnSelector_1.NewColumnSelector, { compactColumnList: true, className: "twa:h-full", optionClassName: wizardColumnListStyles_1.WIZARD_COLUMN_LIST_OPTION_CLASS_RELAXED, availableColumns: sortableCols, selected: data.ColumnId ? [data.ColumnId] : [], singleSelect: true, onChange: (ids) => {
+                                props.onChange({
+                                    ...data,
+                                    SortedValues: [],
+                                    ColumnId: ids[0],
+                                });
+                            }, allowReorder: false }) })] })] }));
 };
 exports.CustomSortColumnWizardSection = CustomSortColumnWizardSection;

package/src/View/CustomSort/Wizard/CustomSortValuesWizardSection.js

@@ -6,7 +6,6 @@ const jsx_runtime_1 = require("react/jsx-runtime");
 const React = tslib_1.__importStar(require("react"));
 const react_1 = require("react");
 const Loader_1 = require("../../../components/Loader");
-const Tabs_1 = require("../../../components/Tabs");
 const join_1 = tslib_1.__importDefault(require("../../../components/utils/join"));
 const runIfNotResolvedIn_1 = require("../../../Utilities/runIfNotResolvedIn");
 const ValueSelector_1 = require("../../Components/ValueSelector");
@@ -14,6 +13,8 @@ const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../../.././Utilities/Extensions/ArrayExtensions"));
 const DateHelper_1 = require("../../../Utilities/Helpers/DateHelper");
 const Tag_1 = require("../../../components/Tag");
+const Flex_1 = require("../../../components/Flex");
+const Card_1 = require("../../../components/Card");
 const isValidCustomSortOrder = (data) => {
     if (!data.SortedValues || !data.SortedValues.length) {
         return 'At least one value is required for the Custom Sort order.';
@@ -33,7 +34,6 @@ const CustomSortValuesWizardSection = (props) => {
     (0, react_1.useEffect)(() => {
         let isMounted = true;
         (async () => {
-            // for sync and very fast resolving promises does not make sense to show a loader
             setDistinctValues([]);
             const newValues = (await (0, runIfNotResolvedIn_1.runIfNotResolvedIn)(api.gridApi.internalApi.getDistinctValuesForColumn(data.ColumnId), () => isMounted && setIsDistinctValuesLoading(true))) ?? [];
             if (!isMounted) {
@@ -76,11 +76,11 @@ const CustomSortValuesWizardSection = (props) => {
     }, [allowReorder, distinctValues, data.SortedValues]);
     const baseClassName = 'ab-CustomSortWizard__SortOrder';
     const className = (0, join_1.default)(baseClassName, isDistinctValuesLoading && `${baseClassName}--loading`);
-    return ((0, jsx_runtime_1.jsxs)(Tabs_1.Tabs, { style: { height: '100%' }, className: className, children: [(0, jsx_runtime_1.jsx)(Tabs_1.Tabs.Tab, { children: "Sort Order" }), (0, jsx_runtime_1.jsxs)(Tabs_1.Tabs.Content, { children: [isDistinctValuesLoading && (0, jsx_runtime_1.jsx)(Loader_1.Loader, { children: "Loading" }), (0, jsx_runtime_1.jsx)(ValueSelector_1.ValueSelector, { toIdentifier: toIdentifier, toLabel: toLabel, options: options, value: data.SortedValues, allowReorder: allowReorder, onChange: (SortedValues) => {
-                            props.onChange({
-                                ...data,
-                                SortedValues,
-                            });
-                        } })] })] }));
+    return ((0, jsx_runtime_1.jsx)(Flex_1.Flex, { flexDirection: "column", className: "twa:h-full twa:p-3", children: (0, jsx_runtime_1.jsxs)(Card_1.Card, { shadow: false, className: (0, join_1.default)('twa:flex-1 twa:min-h-0', className), children: [(0, jsx_runtime_1.jsxs)(Card_1.Card.Title, { children: [(0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:font-medium", children: "Sort Order" }), (0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: "Specify the custom sort order \u2014 drag selected items to modify order" })] }), (0, jsx_runtime_1.jsxs)(Card_1.Card.Body, { className: "twa:flex-1 twa:min-h-0", children: [isDistinctValuesLoading && (0, jsx_runtime_1.jsx)(Loader_1.Loader, { children: "Loading" }), (0, jsx_runtime_1.jsx)(ValueSelector_1.ValueSelector, { toIdentifier: toIdentifier, toLabel: toLabel, options: options, value: data.SortedValues, allowReorder: allowReorder, onChange: (SortedValues) => {
+                                props.onChange({
+                                    ...data,
+                                    SortedValues,
+                                });
+                            } })] })] }) }));
 };
 exports.CustomSortValuesWizardSection = CustomSortValuesWizardSection;

package/src/View/CustomSort/Wizard/CustomSortWizard.js

@@ -45,9 +45,9 @@ const CustomSortWizard = (props) => {
                 renderSummary: CustomSortColumnWizardSection_1.renderCustomSortColumn,
                 details: 'Enter Name and select a Column to Sort',
                 render: () => {
-                    return ((0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:p-2 twa:h-full", children: (0, jsx_runtime_1.jsx)(CustomSortColumnWizardSection_1.CustomSortColumnWizardSection, { isNew: props.isNew, onChange: setCustomSort, allCustomSorts: allCustomSorts }) }));
+                    return ((0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:p-2 twa:h-full twa:min-h-0 twa:flex twa:flex-col", children: (0, jsx_runtime_1.jsx)(CustomSortColumnWizardSection_1.CustomSortColumnWizardSection, { isNew: props.isNew, onChange: setCustomSort, allCustomSorts: allCustomSorts }) }));
                 },
-                title: 'Name & Column',
+                title: 'Settings',
             },
             {
                 title: 'Sort Order',

package/src/View/Dashboard/CustomDashboardButton.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CustomDashboardButton = void 0;
-const tslib_1 = require("tslib");
 const jsx_runtime_1 = require("react/jsx-runtime");
-const kebabCase_1 = tslib_1.__importDefault(require("../../Utilities/utils/kebabCase"));
+const StringExtensions_1 = require("../../Utilities/Extensions/StringExtensions");
 const AdaptableButton_1 = require("../Components/AdaptableButton");
 const CustomDashboardButton = (props) => {
     const { button } = props;
@@ -12,6 +11,6 @@ const CustomDashboardButton = (props) => {
         dashboardState: props.api.dashboardApi.getDashboardState(),
     };
     const buttonLabel = props.api.internalApi.getLabelForButton(button, dashboardContext) ?? '';
-    return ((0, jsx_runtime_1.jsx)(AdaptableButton_1.AdaptableButtonView, { button: button, context: dashboardContext, api: props.api, accessLevel: props.accessLevel, defaults: AdaptableButton_1.ADAPTABLE_BUTTON_SURFACE_DEFAULTS.dashboard, buttonKey: buttonLabel, ariaLabel: buttonLabel, className: `ab-DashboardToolbar__Home__${(0, kebabCase_1.default)(buttonLabel)}` }));
+    return ((0, jsx_runtime_1.jsx)(AdaptableButton_1.AdaptableButtonView, { button: button, context: dashboardContext, api: props.api, accessLevel: props.accessLevel, defaults: AdaptableButton_1.ADAPTABLE_BUTTON_SURFACE_DEFAULTS.dashboard, buttonKey: buttonLabel, ariaLabel: buttonLabel, className: `ab-DashboardToolbar__Home__${(0, StringExtensions_1.kebabCase)(buttonLabel)}` }));
 };
 exports.CustomDashboardButton = CustomDashboardButton;

package/src/View/Dashboard/Dashboard.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Dashboard = void 0;
 const tslib_1 = require("tslib");
 const jsx_runtime_1 = require("react/jsx-runtime");
-const kebabCase_1 = tslib_1.__importDefault(require("../../Utilities/utils/kebabCase"));
+const StringExtensions_1 = require("../../Utilities/Extensions/StringExtensions");
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 const react_redux_1 = require("react-redux");
 const Dashboard_1 = require("../../components/Dashboard");
@@ -65,7 +65,7 @@ const DashboardComponent = (props) => {
             shortcuts = shortcutsArray.map((x, index) => {
                 let menuItem = props.InternalState.Dashboard.DashboardModuleButtons.find((y) => y.isVisible && y.category == x);
                 if (menuItem) {
-                    return ((0, jsx_runtime_1.jsx)(AdaptableButton_1.AdaptableButtonComponent, { "data-name": `dashboard-module-button-${menuItem.category ?? 'custom-' + index}`, "aria-label": menuItem.label, variant: menuItem.category === 'SystemStatus' ? 'outlined' : 'text', tone: menuItem.category === 'SystemStatus' ? 'neutral' : 'none', className: `ab-DashboardToolbar__Home__${(0, kebabCase_1.default)(menuItem.label)}`, icon: menuItem.icon, tooltip: menuItem.label, disabled: props.accessLevel == GeneralConstants_1.ACCESS_LEVEL_READ_ONLY, onClick: () => props.dispatch(menuItem.reduxAction), accessLevel: GeneralConstants_1.ACCESS_LEVEL_FULL, style: menuItem.category === 'SystemStatus'
+                    return ((0, jsx_runtime_1.jsx)(AdaptableButton_1.AdaptableButtonComponent, { "data-name": `dashboard-module-button-${menuItem.category ?? 'custom-' + index}`, "aria-label": menuItem.label, variant: menuItem.category === 'SystemStatus' ? 'outlined' : 'text', tone: menuItem.category === 'SystemStatus' ? 'neutral' : 'none', className: `ab-DashboardToolbar__Home__${(0, StringExtensions_1.kebabCase)(menuItem.label)}`, icon: menuItem.icon, tooltip: menuItem.label, disabled: props.accessLevel == GeneralConstants_1.ACCESS_LEVEL_READ_ONLY, onClick: () => props.dispatch(menuItem.reduxAction), accessLevel: GeneralConstants_1.ACCESS_LEVEL_FULL, style: menuItem.category === 'SystemStatus'
                             ? {
                                 ...UIHelper_1.default.getStyleForMessageType(props.api.systemStatusApi.getCurrentSystemStatusMessageInfo()?.statusType ??
                                     'Success'),

package/src/View/Dashboard/DashboardPopup.d.ts

@@ -15,18 +15,8 @@ interface DashboardPopupComponentProps extends ModuleViewPopupProps<DashboardPop
     onSetDashboardFloating: (isFloating: boolean) => DashboardRedux.DashboardSetIsFloatingAction;
     onSetDashboardHidden: (isHidden: boolean) => DashboardRedux.DashboardSetIsHiddenAction;
 }
-export declare enum DashboardConfigView {
-    Toolbars = "Toolbars",
-    Buttons = "Buttons",
-    PinnedToolbars = "PinnedToolbars"
-}
-export interface DashboardPopupState {
-    DashboardConfigView: DashboardConfigView;
-}
-declare class DashboardPopupComponent extends React.Component<DashboardPopupComponentProps, DashboardPopupState> {
-    constructor(props: DashboardPopupComponentProps);
+declare class DashboardPopupComponent extends React.Component<DashboardPopupComponentProps> {
     render(): React.JSX.Element;
-    onDashboardConfigViewChanged(event: React.FormEvent<any>): void;
 }
 export declare let DashboardPopup: import("react-redux").ConnectedComponent<typeof DashboardPopupComponent, {
     [x: string]: any;