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

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

@@ -1,13 +1,13 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import * as React from 'react';
-import { useState, useMemo, useCallback } from 'react';
+import { useState, useMemo, useCallback, useEffect, useRef } from 'react';
 import { defaultDragProxyMove, DragDropProvider, DragList } from '../../../components/dnd';
 import { CheckBox } from '../../../components/CheckBox';
 import { Icon } from '../../../components/icons';
 import Radio from '../../../components/Radio';
 import { AdaptableFormControlTextClear } from '../Forms/AdaptableFormControlTextClear';
 import { Box, Flex } from '../../../components/Flex';
-import clsx from 'clsx';
+import { cn } from '../../../lib/utils';
 function useValuesMap({ options, value, toIdentifier, selectedMap, }) {
     const optionsMap = useMemo(() => {
         if (selectedMap) {
@@ -32,9 +32,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;
 export 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 = useRef(0);
+    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] = useState(false);
     const setSelectedOnly = useCallback((selectedOnly) => {
@@ -46,40 +60,102 @@ export function ValueSelector(props) {
         toIdentifier,
         value,
     });
-    const notifyChange = useCallback(() => {
-        const newSelection = [...selectedMap.keys()];
+    const reorderEnabled = allowReorder !== false;
+    const commitSelection = 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 = useCallback((updater) => {
+        const nextMap = new Map(selectedMap);
+        updater(nextMap);
+        commitSelection(nextMap);
+    }, [commitSelection, selectedMap]);
+    const filteredOptions = 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 = 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 (_jsx(DragList.DraggableItem, { id: `${identifier}`, children: (itemDomProps) => {
-                const { onPointerDown, ...restDomProps } = itemDomProps;
-                return (_jsx(Flex, { alignItems: "center", "data-index": index, "data-id": identifier, "data-name": "option", ...restDomProps, className: clsx('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: _jsxs(Flex, { flexDirection: "row", alignItems: "center", className: "twa:flex-1", children: [reorderable ? (_jsx(Box, { onPointerDown: onPointerDown, className: "twa:mr-3", children: _jsx(Icon, { name: "drag", style: { cursor: 'grab' } }) })) : null, singleSelect ? (_jsx(Radio, { 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 (_jsxs(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: 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: [_jsxs(Flex, { flexDirection: "row", alignItems: "center", className: "twa:flex-1 twa:min-w-0", children: [reorderable ? (_jsx(Box, { "data-drag-handle": true, onPointerDown: onPointerDown, className: cn('twa:shrink-0', compact ? 'twa:mr-2' : 'twa:mr-3'), children: _jsx(Icon, { name: "drag", style: { cursor: 'grab' } }) })) : null, singleSelect ? (_jsx(Radio, { className: 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 })) : (_jsx(CheckBox, { "data-name": identifier, disabled: disabled || (isOptionDisabled ? isOptionDisabled(option) : false), onChange: (checked) => {
+                                });
+                            }, children: label })) : optionLayout === 'label-beside-checkbox' ? (_jsxs(Flex, { alignItems: "center", className: "twa:flex-1 twa:min-w-0", children: [_jsx(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) }), _jsx(Flex, { alignItems: "center", className: "twa:mx-1.5 twa:text-3 twa:min-w-0", "data-name": "option-label", children: label })] })) : (_jsx(CheckBox, { className: 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 })), _jsx(Box, { className: "twa:ml-2 twa:flex-1", children: allowReorder ? preparedToLabel(option) : null })] }) }));
+                                });
+                            }, checked: selectedMap.has(identifier), children: label }))] }), renderOptionTrailing ? (_jsx(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 (_jsx(React.Fragment, { children: renderOptionRow(option, index, false) }, identifier));
+        }
+        return (_jsx(DragList.DraggableItem, { id: `${identifier}`, children: (itemDomProps) => {
+                const { onPointerDown, ...restDomProps } = itemDomProps;
+                return renderOptionRow(option, index, reorderable, {
+                    onPointerDown: reorderable ? onPointerDown : undefined,
+                    ...restDomProps,
+                });
             } }, identifier));
     };
     const showOnlySelectedCheckbox = (_jsx(CheckBox, { disabled: !value.length, checked: selectedOnly, onChange: setSelectedOnly, children: showSelectedOnlyLabel ?? 'Show Selected Only' }));
@@ -87,64 +163,84 @@ export 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 (_jsxs(Flex, { style: props.style, className: clsx('twa:flex-1', baseClassName), flexDirection: "column", children: [_jsx(Flex, { className: "twa:mb-1", children: showFilterInput && filter ? (_jsx(AdaptableFormControlTextClear, { value: searchInputValue, OnTextChange: setSearchInputValue, placeholder: "Type to search", inputClassName: "twa:p-3", className: "twa:flex-1 twa:border-0 twa:m-[3px]" })) : (_jsx(Box, { className: "twa:flex-1" })) }), renderSelectionSection(selectionSectionProps), _jsx(DragDropProvider, { children: _jsx(Flex, { className: `${baseClassName}__body twa:flex-1 twa:overflow-auto`, flexDirection: "column", children: _jsx(DragList, { dragListId: "value-selector", orientation: "vertical", onDragProxyMove: defaultDragProxyMove, onDragProxySetup: ({ proxyElement }) => {
+    const optionList = (_jsx(Flex, { className: `${baseClassName}__body twa:flex-1 twa:min-h-0 twa:overflow-auto`, flexDirection: "column", children: _jsx("div", { children: filteredOptions.map(renderOption) }) }));
+    return (_jsxs(Flex, { style: style, className: cn('twa:flex-1 twa:min-h-0', compact && 'twa:overflow-hidden', baseClassName, compact && `${baseClassName}--compact`, className), flexDirection: "column", children: [!compact && (_jsx(Flex, { className: "twa:mb-1", children: showFilterInput && filter ? (_jsx(AdaptableFormControlTextClear, { value: searchInputValue, OnTextChange: setSearchInputValue, placeholder: filterPlaceholder ?? 'Type to search', inputClassName: "twa:p-3", className: "twa:flex-1 twa:m-[3px]" })) : (_jsx(Box, { className: "twa:flex-1" })) })), renderSelectionSection({
+                ...selectionSectionProps,
+                compact,
+                showFilterInput,
+                filter,
+                searchInputValue,
+                setSearchInputValue,
+                filterPlaceholder,
+                hideShowSelectedOnly,
+                compactHeaderClassName,
+                compactFilterClassName,
+            }), reorderEnabled ? (_jsx(DragDropProvider, { children: _jsx(Flex, { className: `${baseClassName}__body twa:flex-1 twa:min-h-0 twa:overflow-auto`, flexDirection: "column", children: _jsx(DragList, { dragListId: "value-selector", orientation: "vertical", onDragProxyMove: 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) => (_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) => _jsx("div", { ...listDomProps, children: filteredOptions.map(renderOption) }) }) }) })) : (optionList)] }));
 }
 export const renderSelectionSection = (props) => {
-    const { value, options, disabled, singleSelect, toLabel, toIdentifier, } = props;
-    const selectionBox = (_jsx(Box, { className: "twa:flex twa:flex-col twa:gap-2 twa:py-2", children: _jsxs(Box, { className: clsx('twa:flex twa:flex-row', 'twa:border-b twa:border-primarydark/30 twa:rounded-standard'), children: [singleSelect ? (_jsx(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 = cn('twa:mb-1', 'twa:p-1', 'twa:border-b twa:border-primarydark/30', compact
+        ? 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 ? (_jsxs(Flex, { alignItems: "center", className: headerRowClassName, children: [singleSelect ? (_jsx(Box, { className: "twa:flex twa:flex-row twa:text-3 twa:font-normal twa:items-center", children: (() => {
+                    if (!value.length) {
+                        return _jsx("span", { className: "twa:opacity-70", children: "(none selected)" });
+                    }
+                    const selectedId = value[0];
+                    const selectedOption = options.find((o) => toIdentifier(o) === selectedId);
+                    if (!selectedOption) {
+                        return _jsx("span", { className: "twa:opacity-70", children: "(none selected)" });
+                    }
+                    return (_jsxs(_Fragment, { children: [_jsx("span", { className: "twa:opacity-70 twa:mr-1", children: "Selected:" }), _jsx("span", { className: "twa:font-medium", children: toLabel(selectedOption) })] }));
+                })() })) : (_jsx(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 : (_jsx(Box, { className: "twa:shrink-0 twa:text-2 twa:font-normal", children: props.showOnlySelectedCheckbox })), showFilterInput && filter ? (_jsxs(_Fragment, { children: [compactFilterUsesSpacer ? _jsx(Box, { className: "twa:flex-1 twa:min-w-0" }) : null, _jsx(AdaptableFormControlTextClear, { value: searchInputValue ?? '', OnTextChange: setSearchInputValue ?? (() => undefined), placeholder: filterPlaceholder ?? 'Search...', className: compactFilterClass })] })) : null] })) : (_jsx(Box, { className: "twa:flex twa:flex-col twa:gap-2 twa:py-2", children: _jsxs(Box, { className: headerRowClassName, children: [singleSelect ? (_jsx(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.
@@ -164,6 +260,6 @@ export const renderSelectionSection = (props) => {
                         else {
                             props.onClear();
                         }
-                    }, children: _jsxs(Box, { className: "twa:flex twa:flex-row twa:items-center twa:gap-3", children: ["Select All", _jsxs(Box, { className: "twa:text-2 twa:font-normal", children: ["(", value.length, " of ", options.length, " selected)"] })] }) })), _jsx("div", { className: "twa:flex-1" }), _jsx(Box, { className: "twa:mr-2 twa:text-2 twa:font-normal", children: props.showOnlySelectedCheckbox })] }) }));
-    return _jsx(Box, { className: clsx(`${baseClassName}__header `), children: selectionBox });
+                    }, children: _jsxs(Box, { className: "twa:flex twa:flex-row twa:items-center twa:gap-3", children: ["Select All", _jsxs(Box, { className: "twa:text-2 twa:font-normal", children: ["(", value.length, " of ", options.length, " selected)"] })] }) })), hideShowSelectedOnly ? null : _jsx("div", { className: "twa:flex-1" }), hideShowSelectedOnly ? null : (_jsx(Box, { className: "twa:mr-2 twa:text-2 twa:font-normal", children: props.showOnlySelectedCheckbox }))] }) }));
+    return _jsx(Box, { className: cn(`${baseClassName}__header`), children: selectionBox });
 };

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,10 @@
+/** ValueSelector row sizing — matches Visibility and Order list rows. */
+export 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 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 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 const WIZARD_COLUMN_LIST_HEADER_CLASS = 'twa:gap-4';
+/** Narrow search field (matches Visibility list column width, not full card width). */
+export const 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

@@ -1,16 +1,14 @@
 import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
-import { Tabs } from '../../../components/Tabs';
-import { Tag } from '../../../components/Tag';
+import { ColumnTag, Tag } from '../../../components/Tag';
 import { NewColumnSelector } from '../../Components/ColumnSelector';
+import { WIZARD_COLUMN_LIST_OPTION_CLASS_RELAXED } from '../../Components/wizardColumnListStyles';
 import { useOnePageAdaptableWizardContext } from '../../Wizard/OnePageAdaptableWizard';
 import { Box, Flex } from '../../../components/Flex';
-import FormLayout, { FormRow } from '../../../components/FormLayout';
 import Input from '../../../components/Input';
-import { AdaptableFormControlTextClear } from '../../Components/Forms/AdaptableFormControlTextClear';
-export const renderCustomSortColumn = (data) => {
-    const { api } = useOnePageAdaptableWizardContext();
-    return (_jsxs(Box, { className: "twa:text-2 twa:py-2 twa:pr-2", children: [_jsxs(Tag, { className: "twa:mr-2", children: ["Name: ", data.Name] }), _jsxs(Tag, { children: ["Column: ", api.columnApi.getFriendlyNameForColumnId(data.ColumnId)] })] }));
+import { Card } from '../../../components/Card';
+export const renderCustomSortColumn = (data, api) => {
+    return (_jsxs(Box, { className: "twa:text-2 twa:py-2 twa:pr-2", children: [_jsxs(Tag, { className: "twa:mr-2", children: ["Name: ", data.Name] }), _jsxs(ColumnTag, { children: ["Column: ", api.columnApi.getFriendlyNameForColumnId(data.ColumnId)] })] }));
 };
 export const isValidCustomSortColumn = (data, allCustomSorts) => {
     if (!data.Name) {
@@ -28,16 +26,12 @@ export const CustomSortColumnWizardSection = (props) => {
     const { data, api } = 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;
@@ -50,18 +44,17 @@ export const CustomSortColumnWizardSection = (props) => {
             });
         });
     }, []);
-    const [columnsSearchText, setColumnsSearchText] = React.useState('');
     const onNameChange = (event) => {
         props.onChange({
             ...data,
             Name: event.target.value,
         });
     };
-    return (_jsxs(Flex, { flexDirection: "column", style: { height: '100%' }, children: [_jsxs(Tabs, { className: "twa:mb-3", children: [_jsx(Tabs.Tab, { children: "Settings" }), _jsx(Tabs.Content, { children: _jsx(Flex, { flexDirection: "row", children: _jsx(FormLayout, { className: "twa:max-w-[300px] twa:w-full", children: _jsx(FormRow, { label: "Name", children: _jsx(Input, { className: "twa:w-full", "data-name": "custom-sort-name", onChange: onNameChange, value: data?.Name ?? '' }) }) }) }) })] }), _jsxs(Tabs, { style: { flex: 1, minHeight: 0 }, children: [_jsx(Tabs.Tab, { children: "Column" }), _jsxs(Tabs.Content, { children: [_jsxs(Flex, { flexDirection: "row", alignItems: "center", className: "twa:p-2", children: [_jsx(Box, { className: "twa:text-2", children: "Columns" }), _jsx(Box, { className: "twa:flex-3" }), _jsx(AdaptableFormControlTextClear, { value: columnsSearchText, OnTextChange: setColumnsSearchText, placeholder: "Type to search columns", style: { flex: 1 } })] }), _jsx(NewColumnSelector, { columnFilterText: columnsSearchText, availableColumns: sortableCols, selected: data.ColumnId ? [data.ColumnId] : [], singleSelect: true, onChange: (ids) => {
-                                    props.onChange({
-                                        ...data,
-                                        SortedValues: [],
-                                        ColumnId: ids[0],
-                                    });
-                                }, allowReorder: false })] })] })] }));
+    return (_jsxs(Flex, { flexDirection: "column", className: "twa:h-full twa:min-h-0", children: [_jsx(Flex, { flexDirection: "column", className: "twa:gap-3 twa:p-3 twa:shrink-0", 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 Custom Sort" })] }), _jsx(Card.Body, { className: "twa:p-1", children: _jsx(Input, { className: "twa:max-w-[300px] twa:w-full", "data-name": "custom-sort-name", onChange: onNameChange, value: data?.Name ?? '' }) })] }) }), _jsxs(Flex, { flexDirection: "column", className: "twa:flex-1 twa:min-h-0 twa:overflow-hidden", children: [_jsxs(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: [_jsx(Box, { className: "twa:text-5 twa:font-medium", children: "Column" }), _jsx(Box, { className: "twa:text-xs twa:opacity-70 twa:max-w-[520px]", children: "Select the column to apply the Custom Sort to" })] }), _jsx(Box, { className: "twa:flex-1 twa:min-h-0 twa:overflow-hidden twa:px-2 twa:pb-2 twa:flex twa:flex-col", children: _jsx(NewColumnSelector, { compactColumnList: true, className: "twa:h-full", optionClassName: 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 }) })] })] }));
 };

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

@@ -2,7 +2,6 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
 import { useMemo, useEffect, useState } from 'react';
 import { Loader } from '../../../components/Loader';
-import { Tabs } from '../../../components/Tabs';
 import join from '../../../components/utils/join';
 import { runIfNotResolvedIn } from '../../../Utilities/runIfNotResolvedIn';
 import { ValueSelector } from '../../Components/ValueSelector';
@@ -10,6 +9,8 @@ import { useOnePageAdaptableWizardContext } from '../../Wizard/OnePageAdaptableW
 import ArrayExtensions from '../../.././Utilities/Extensions/ArrayExtensions';
 import { parseToISO } from '../../../Utilities/Helpers/DateHelper';
 import { TagList } from '../../../components/Tag';
+import { Box, Flex } from '../../../components/Flex';
+import { Card } from '../../../components/Card';
 export const isValidCustomSortOrder = (data) => {
     if (!data.SortedValues || !data.SortedValues.length) {
         return 'At least one value is required for the Custom Sort order.';
@@ -27,7 +28,6 @@ export const CustomSortValuesWizardSection = (props) => {
     useEffect(() => {
         let isMounted = true;
         (async () => {
-            // for sync and very fast resolving promises does not make sense to show a loader
             setDistinctValues([]);
             const newValues = (await runIfNotResolvedIn(api.gridApi.internalApi.getDistinctValuesForColumn(data.ColumnId), () => isMounted && setIsDistinctValuesLoading(true))) ?? [];
             if (!isMounted) {
@@ -70,10 +70,10 @@ export const CustomSortValuesWizardSection = (props) => {
     }, [allowReorder, distinctValues, data.SortedValues]);
     const baseClassName = 'ab-CustomSortWizard__SortOrder';
     const className = join(baseClassName, isDistinctValuesLoading && `${baseClassName}--loading`);
-    return (_jsxs(Tabs, { style: { height: '100%' }, className: className, children: [_jsx(Tabs.Tab, { children: "Sort Order" }), _jsxs(Tabs.Content, { children: [isDistinctValuesLoading && _jsx(Loader, { children: "Loading" }), _jsx(ValueSelector, { toIdentifier: toIdentifier, toLabel: toLabel, options: options, value: data.SortedValues, allowReorder: allowReorder, onChange: (SortedValues) => {
-                            props.onChange({
-                                ...data,
-                                SortedValues,
-                            });
-                        } })] })] }));
+    return (_jsx(Flex, { flexDirection: "column", className: "twa:h-full twa:p-3", children: _jsxs(Card, { shadow: false, className: join('twa:flex-1 twa:min-h-0', className), children: [_jsxs(Card.Title, { children: [_jsx(Box, { className: "twa:font-medium", children: "Sort Order" }), _jsx(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" })] }), _jsxs(Card.Body, { className: "twa:flex-1 twa:min-h-0", children: [isDistinctValuesLoading && _jsx(Loader, { children: "Loading" }), _jsx(ValueSelector, { toIdentifier: toIdentifier, toLabel: toLabel, options: options, value: data.SortedValues, allowReorder: allowReorder, onChange: (SortedValues) => {
+                                props.onChange({
+                                    ...data,
+                                    SortedValues,
+                                });
+                            } })] })] }) }));
 };

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

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

package/src/View/Dashboard/CustomDashboardButton.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import kebabCase from '../../Utilities/utils/kebabCase';
+import { kebabCase } from '../../Utilities/Extensions/StringExtensions';
 import { ADAPTABLE_BUTTON_SURFACE_DEFAULTS, AdaptableButtonView, } from '../Components/AdaptableButton';
 export const CustomDashboardButton = (props) => {
     const { button } = props;

package/src/View/Dashboard/Dashboard.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
-import kebabCase from '../../Utilities/utils/kebabCase';
+import { kebabCase } from '../../Utilities/Extensions/StringExtensions';
 import { ACCESS_LEVEL_FULL, ACCESS_LEVEL_HIDDEN, ACCESS_LEVEL_READ_ONLY, } from '../../Utilities/Constants/GeneralConstants';
 import { connect } from 'react-redux';
 import { Dashboard as DashboardUI, DashboardTab as DashboardTabUI, } from '../../components/Dashboard';

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;

package/src/View/Dashboard/DashboardPopup.js

@@ -1,80 +1,16 @@
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
 import { connect } from 'react-redux';
 import * as DashboardRedux from '../../Redux/ActionsReducers/DashboardRedux';
 import { PopupPanel } from '../Components/Popups/AdaptablePopup/PopupPanel';
-import DashboardManagerUI from '../../components/Dashboard/DashboardManager';
 import { ACCESS_LEVEL_FULL, ACCESS_LEVEL_READ_ONLY, } from '../../Utilities/Constants/GeneralConstants';
-import { ModuleValueSelector } from '../Components/ModuleValueSelector';
-import { PinnedToolbarsSelector } from './PinnedToolbarsSelector';
-import { Flex } from '../../components/Flex';
-import { ToggleButton } from '../../components/ToggleButton';
-import { Tabs } from '../../components/Tabs';
-import { Card } from '../../components/Card';
-export var DashboardConfigView;
-(function (DashboardConfigView) {
-    DashboardConfigView["Toolbars"] = "Toolbars";
-    DashboardConfigView["Buttons"] = "Buttons";
-    DashboardConfigView["PinnedToolbars"] = "PinnedToolbars";
-})(DashboardConfigView || (DashboardConfigView = {}));
+import { DashboardPopupSections } from './DashboardPopupSections';
 class DashboardPopupComponent extends React.Component {
-    constructor(props) {
-        super(props);
-        this.state = {
-            DashboardConfigView: DashboardConfigView.Toolbars,
-        };
-    }
     render() {
-        const systemToolbars = this.props.api.dashboardApi.internalApi
-            .getModuleToolbars()
-            .map((toolbar) => ({
-            Id: toolbar.id,
-            Title: toolbar.friendlyName,
-        }));
-        const customToolbars = this.props.api.dashboardApi.getCustomToolbars().map((ct) => ({
-            Id: ct.name,
-            Title: ct.title ? ct.title : ct.name,
-        }));
-        const tabs = this.props.DashboardState.Tabs.map((tab) => {
-            const Toolbars = tab.Toolbars.filter((vt) => {
-                let customToolbar = this.props.api.dashboardApi
-                    .getCustomToolbars()
-                    .find((ct) => ct.name === vt);
-                return customToolbar
-                    ? true
-                    : this.props.api.internalApi
-                        .getModuleService()
-                        .isAdapTableModulePresent(vt);
-            });
-            return { ...tab, Toolbars };
-        });
-        let selectedModuleButtons = [];
-        this.props.DashboardState.ModuleButtons.forEach((x) => {
-            let menuItem = this.props.InternalState.SettingsPanelModuleEntries.find((m) => m.category == x);
-            if (menuItem?.isVisible) {
-                selectedModuleButtons.push(x);
-            }
-        });
-        const allModuleButtons = this.props.InternalState.SettingsPanelModuleEntries.map((x) => x.category);
-        const baseClassName = 'ab-Dashboard-Popup';
         const dashboardAccessLevel = this.props.api.entitlementApi.getEntitlementAccessLevelForModule('Dashboard');
         const areDashboardSettingsVisible = dashboardAccessLevel == ACCESS_LEVEL_FULL || dashboardAccessLevel == ACCESS_LEVEL_READ_ONLY;
         const isDashboardDisabled = dashboardAccessLevel === ACCESS_LEVEL_READ_ONLY;
-        const isModuleCheckboxDisabled = (module) => {
-            if (module === 'SettingsPanel') {
-                return this.props.api.optionsApi.getSettingsPanelOptions().alwaysShowInDashboard;
-            }
-            return false;
-        };
-        const contentCls = '';
-        return (_jsx(PopupPanel, { headerText: this.props.moduleInfo.FriendlyName, glyphicon: this.props.moduleInfo.Glyph, infoLink: this.props.moduleInfo.HelpPage, infoLinkDisabled: !this.props.api.internalApi.isDocumentationLinksDisplayed(), children: _jsxs(Flex, { flexDirection: "column", className: "twa:h-full twa:gap-4", children: [areDashboardSettingsVisible && (_jsx(_Fragment, { children: _jsxs(Card, { children: [_jsx(Card.Title, { gap: 8, children: "Display Settings" }), _jsx(Card.Body, { gap: 2, className: "twa:p-2", children: _jsxs("div", { className: "twa:flex twa:flex-row twa:items-center twa:justify-start twa:gap-3", children: [_jsx(ToggleButton, { className: "twa:w-24", onChange: (visible) => this.props.onSetDashboardHidden(!visible), checked: !this.props.IsHidden, "data-name": "dashboard-visibility", children: this.props.IsHidden ? 'Hidden' : 'Visible' }), this.props.DashboardState.Tabs?.length > 0 ? (_jsx(ToggleButton, { disabled: this.props.IsFloating, className: "twa:w-24", onChange: (expanded) => this.props.onSetDashboardCollapsed(!expanded), checked: !this.props.IsCollapsed, "data-name": "expand-state", children: this.props.IsCollapsed ? 'Collapsed' : 'Expanded' })) : null, this.props.api.optionsApi.getDashboardOptions().canFloat ? (_jsx(ToggleButton, { className: "twa:w-24", onChange: (pinned) => this.props.onSetDashboardFloating(!pinned), checked: !this.props.IsFloating, "data-name": "floating", children: this.props.IsFloating ? 'Floating' : 'Pinned' })) : null] }) })] }) })), _jsxs(Card, { className: "twa:flex-1 twa:overflow-hidden", gap: 0, children: [_jsx(Card.Title, { children: "Contents" }), _jsx(Card.Body, { className: "twa:p-2", children: _jsxs(Tabs, { className: "twa:flex-1 twa:min-h-0", children: [_jsx(Tabs.Tab, { value: "pinned-toolbars", children: "Pinned Toolbars" }), _jsx(Tabs.Tab, { value: "tabbed-toolbars", children: "Tabs & Toolbars" }), _jsx(Tabs.Tab, { value: "buttons", children: "Buttons" }), _jsx(Tabs.Content, { value: "pinned-toolbars", className: contentCls, children: _jsx(PinnedToolbarsSelector, {}) }), _jsx(Tabs.Content, { value: "tabbed-toolbars", className: contentCls, children: _jsx(DashboardManagerUI, { disabled: isDashboardDisabled, availableToolbars: [...systemToolbars, ...customToolbars], tabs: tabs, onTabsChange: this.props.onDashboardSetTabs, api: this.props.api }) }), _jsx(Tabs.Content, { value: "buttons", className: contentCls, children: _jsx(ModuleValueSelector, { disabled: isDashboardDisabled, options: allModuleButtons, value: selectedModuleButtons, isOptionDisabled: isModuleCheckboxDisabled, onChange: (selectedValues) => this.props.onDashboardSetModuleButtons(selectedValues) }) })] }) })] })] }) }));
-    }
-    onDashboardConfigViewChanged(event) {
-        let e = event.target;
-        let dashboardConfigView = e.value;
-        this.setState({
-            DashboardConfigView: dashboardConfigView,
-        });
+        return (_jsx(PopupPanel, { headerText: this.props.moduleInfo.FriendlyName, glyphicon: this.props.moduleInfo.Glyph, infoLink: this.props.moduleInfo.HelpPage, infoLinkDisabled: !this.props.api.internalApi.isDocumentationLinksDisplayed(), bodyClassName: "twa:gap-3 twa:flex twa:flex-col", children: _jsx(DashboardPopupSections, { DashboardState: this.props.DashboardState, InternalState: this.props.InternalState, IsCollapsed: this.props.IsCollapsed, IsHidden: this.props.IsHidden, IsFloating: this.props.IsFloating, isDashboardDisabled: isDashboardDisabled, areDashboardSettingsVisible: areDashboardSettingsVisible, canFloat: this.props.api.optionsApi.getDashboardOptions().canFloat ?? false, onDashboardSetModuleButtons: this.props.onDashboardSetModuleButtons, onDashboardSetTabs: this.props.onDashboardSetTabs, onSetDashboardCollapsed: this.props.onSetDashboardCollapsed, onSetDashboardHidden: this.props.onSetDashboardHidden, onSetDashboardFloating: this.props.onSetDashboardFloating }) }));
     }
 }
 function mapStateToProps(state, ownProps) {

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

@@ -0,0 +1,20 @@
+import * as React from 'react';
+import { InternalState } from '../../AdaptableState/InternalState';
+import { DashboardState, DashboardTab } from '../../AdaptableState/DashboardState';
+import { AdaptableModuleButtons } from '../../AdaptableState/Common/Types';
+export interface DashboardPopupSectionsProps {
+    DashboardState: DashboardState;
+    InternalState: InternalState;
+    IsCollapsed: boolean;
+    IsHidden: boolean;
+    IsFloating: boolean;
+    isDashboardDisabled: boolean;
+    areDashboardSettingsVisible: boolean;
+    canFloat: boolean;
+    onDashboardSetModuleButtons: (moduleButtons: AdaptableModuleButtons) => void;
+    onDashboardSetTabs: (tabs: DashboardTab[]) => void;
+    onSetDashboardCollapsed: (isCollapsed: boolean) => void;
+    onSetDashboardHidden: (isHidden: boolean) => void;
+    onSetDashboardFloating: (isFloating: boolean) => void;
+}
+export declare const DashboardPopupSections: React.FunctionComponent<DashboardPopupSectionsProps>;