@adaptabletools/adaptable 23.0.0-canary.6 → 23.0.0-canary.8

package/src/components/DropdownButton/index.js

@@ -1,162 +1,28 @@
-import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
-import { cloneElement, useRef } from 'react';
-import join from '../utils/join';
+import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuSeparator, DropdownMenuTrigger, } from '../ui/dropdown-menu';
+import { NewTooltip } from '../NewTooltip';
+import { cn } from '../../lib/utils';
+import { ChevronDownIcon } from 'lucide-react';
 import SimpleButton from '../SimpleButton';
-import useExpanded from './useExpanded';
-import renderItem from './renderItem';
-import OverlayTrigger from '../OverlayTrigger';
-import clsx from 'clsx';
-export const DROPDOWN_ICON = (_jsx("svg", { width: "20", height: "20", viewBox: "0 0 24 24", children: _jsx("path", { d: "M7 10l5 5 5-5H7z" }) }));
-const spacer = _jsx("div", { className: "twa:flex-1" });
-const baseClassName = 'ab-DropdownButton';
-const defaultListItemStyle = {
-    padding: 'var(--ab-cmp-dropdownbutton-list-item__padding)',
-};
-const DropdownButton = React.forwardRef((props, theRef) => {
-    let { columns, overlayProps, listOffset = 10, collapseOnItemClick = true, focusOnClear = true, idProperty = 'id', isItemDisabled, items, children, listMinWidth = 100, listStyle, listItemStyle, listItemClassName, constrainTo, showClearButton = false, onClear, clearButtonProps, onExpand, onCollapse, showToggleIcon = true, ...domProps } = props;
-    isItemDisabled = isItemDisabled || ((item) => item.disabled);
-    if (!columns) {
-        columns = ['icon', 'label'];
-    }
-    let content;
-    if (Array.isArray(items)) {
-        content = items.map((item, index) => {
-            if (item.separator) {
-                return (_jsx("tr", { className: `${baseClassName}__separator`, children: _jsx("td", { colSpan: 2 }) }, index));
-            }
-            if (typeof listItemStyle === 'function') {
-                listItemStyle = listItemStyle(item, index);
-            }
-            const disabled = isItemDisabled(item);
-            const itemStyle = { ...defaultListItemStyle, ...listItemStyle };
-            const itemClassName = join(`${baseClassName}__list-item`, item.clickable === false || disabled
-                ? `${baseClassName}__list-item--not-clickable`
-                : `${baseClassName}__list-item--clickable`, disabled ? `${baseClassName}__list-item--disabled` : '', listItemClassName);
-            const getItemHandler = (eventName) => {
-                return (e) => {
-                    if (!disabled) {
-                        if (item[eventName]) {
-                            item[eventName](e, item);
-                        }
+export const NewDropdownButton = React.forwardRef((props, ref) => {
+    const { items, children, className, disabled, tooltip, variant = 'text', accessLevel, side = 'bottom', align = 'start', 'data-name': dataName, tone = 'neutral', showDivider = true, id, 'data-id': dataId, 'data-value': dataValue, 'aria-label': ariaLabel, onMouseDown, } = props;
+    const isHidden = accessLevel === 'Hidden';
+    const isReadOnly = accessLevel === 'ReadOnly';
+    const isDisabled = disabled || isHidden || isReadOnly;
+    const trigger = (_jsxs(DropdownMenuTrigger, { render: _jsx(SimpleButton, { ref: ref, tone: tone, variant: variant, disabled: isDisabled, className: cn(className, 'twa:pr-1 twa:active:translate-y-0 twa:flex-row twa:flex-none', variant !== 'text' ? 'twa:gap-1' : 'twa:gap-0.5'), "data-name": dataName, id: id, "data-id": dataId, "data-value": dataValue, "aria-label": ariaLabel, onMouseDown: onMouseDown }), children: [children, showDivider && (_jsx("div", { className: cn('twa:h-full twa:my-1', variant !== 'text' ? 'twa:border-l twa:border-border' : '') })), _jsx(ChevronDownIcon, { className: "twa:size-3.5 twa:opacity-60 twa:transition-transform twa:duration-200 twa:[[data-popup-open]_&]:rotate-180" })] }));
+    const maxLabelLength = items.reduce((max, item) => Math.max(max, typeof item.label === 'string'
+        ? item.label.length
+        : typeof item.tooltip === 'string'
+            ? item.tooltip.length
+            : 0), 0);
+    return (_jsxs(DropdownMenu, { children: [tooltip ? _jsx(NewTooltip, { label: tooltip, children: trigger }) : trigger, _jsx(DropdownMenuContent, { side: side, align: align, style: {
+                    // minWidth: `min(max(${maxLabelLength + 5}ch, calc(var(--ab-base-space) * 32)),80vw)`,
+                    width: `max(${maxLabelLength + (props.extraWidthChars ?? 3)}ch, calc(var(--ab-base-space) * 20), var(--anchor-width))`,
+                }, children: items.map((item, index) => {
+                    if (item.separator) {
+                        return _jsx(DropdownMenuSeparator, {}, index);
                     }
-                    if (collapseOnItemClick) {
-                        if (!disabled) {
-                            setExpanded(false);
-                        }
-                        buttonRef.current?.focus();
-                    }
-                    else {
-                        e.nativeEvent.preventCollapse = true;
-                    }
-                };
-            };
-            const domProps = {};
-            if (item.onChange) {
-                domProps.onChange = getItemHandler('onChange');
-            }
-            const itemDataName = item['dataName'] || (typeof item['label'] === 'string' ? item['label'] : undefined);
-            if (itemDataName) {
-                domProps['data-name'] = itemDataName;
-            }
-            return renderItem({
-                index,
-                idProperty,
-                onItemClick: getItemHandler('onClick'),
-                domProps,
-                className: itemClassName,
-                style: itemStyle,
-                item,
-                columns: columns,
-            });
-        });
-        content = (_jsx("table", { className: `${baseClassName}__content`, children: _jsx("tbody", { children: content }) }));
-    }
-    const dropdownButtonClassName = props.className;
-    const className = join(props.className, baseClassName);
-    const positionerRef = useRef(null);
-    const { expanded, toggle, setExpanded, positionInfo } = useExpanded(props, positionerRef);
-    const { maxHeight: maxListHeight, maxWidth: maxListWidth } = positionInfo;
-    listStyle = {
-        minWidth: typeof maxListWidth === 'number' ? Math.min(listMinWidth, maxListWidth) : listMinWidth,
-        maxHeight: maxListHeight,
-        maxWidth: maxListWidth,
-        ...listStyle,
-    };
-    let icon = expanded
-        ? cloneElement(DROPDOWN_ICON, {
-            style: {
-                ...DROPDOWN_ICON.props.style,
-                transform: 'rotate(180deg) translate3d(0px, -2px, 0px)',
-            },
-        })
-        : DROPDOWN_ICON;
-    const hasClearButton = onClear || showClearButton;
-    const clearButton = hasClearButton ? (_jsx(SimpleButton, { disabled: domProps.disabled, as: "div", onClick: (event) => {
-            event.stopPropagation();
-            if (onClear) {
-                onClear();
-            }
-            buttonRef.current?.focus();
-        }, className: "twa:ml-2 twa:p-0", variant: 'text', icon: "close", ...clearButtonProps, style: {
-            ...clearButtonProps?.style,
-            visibility: showClearButton ? 'visible' : 'hidden',
-        } })) : null;
-    icon = (_jsxs(_Fragment, { children: [spacer, hasClearButton ? clearButton : null, icon] }));
-    const buttonRef = useRef(null);
-    return (_jsx(OverlayTrigger, { visible: expanded, targetOffset: listOffset, render: () => {
-            return (_jsx("div", { "data-name": `${dropdownButtonClassName || 'dropdown-button-list'}`, style: listStyle, className: `${baseClassName}__list`, onMouseDownCapture: (e) => {
-                    /**
-                     * This stops popups register clicks inside the dropdown
-                     * This is needed for column filter dropdows when redenred
-                     * inside ag-grid column filter
-                     */
-                    if (props.stopPropagationOnOverlay) {
-                        e.stopPropagation();
-                    }
-                }, children: content }));
-        }, ...overlayProps, children: _jsxs(SimpleButton, { iconPosition: "end", ...(showToggleIcon && { icon }), ...domProps, ref: (btn) => {
-                buttonRef.current = btn;
-                if (!theRef) {
-                    return;
-                }
-                if (typeof theRef === 'function') {
-                    theRef(btn);
-                }
-                else {
-                    theRef.current = btn;
-                }
-            }, style: domProps.style, className: clsx(className, {
-                'twa:pr-0': showToggleIcon,
-            }), onClick: (e) => {
-                if (domProps.onClick) {
-                    domProps.onClick(e);
-                }
-                if (e.nativeEvent.preventCollapse && expanded) {
-                    return;
-                }
-                toggle();
-            }, onKeyDown: (e) => {
-                if (domProps.onKeyDown) {
-                    domProps.onKeyDown(e);
-                }
-                if (expanded && e.key === 'Escape') {
-                    toggle();
-                }
-            }, onBlur: (e) => {
-                if (domProps.onBlur) {
-                    domProps.onBlur(e);
-                }
-                setExpanded(false);
-            }, children: [_jsx("div", { ref: positionerRef, tabIndex: -1, style: {
-                        position: 'absolute',
-                        height: '100%',
-                        width: '100%',
-                        zIndex: -1,
-                        pointerEvents: 'none',
-                        opacity: 0,
-                        top: 0,
-                        left: 0,
-                    } }), children] }) }));
+                    return (_jsxs(DropdownMenuItem, { disabled: item.disabled, "data-name": item.dataName, closeOnClick: item.closeOnClick, onClick: (e) => item.onClick?.(e), children: [item.icon, item.label] }, item.dataName ?? index));
+                }) })] }));
 });
-export default DropdownButton;

package/src/components/EmptyContent/index.js

@@ -1,11 +1,11 @@
 import { jsx as _jsx } from "react/jsx-runtime";
+import { cn } from '../../lib/utils';
 import { Box, Flex } from '../Flex';
-import clsx from 'clsx';
 const baseClassName = 'ab-EmptyContent';
 const EmptyContent = ({ children, className, style, ...flexProps }) => {
     if (typeof children === 'string') {
         children = _jsx("p", { children: children });
     }
-    return (_jsx(Box, { className: `${baseClassName}__wrapper twa:flex-1 twa:relative twa:size-full`, children: _jsx(Flex, { alignItems: "center", justifyContent: "center", flexDirection: "column", ...flexProps, className: clsx('twa:absolute twa:inset-0 twa:text-3 twa:text-center twa:p-4', 'twa:[&_p]:text-primary-foreground', baseClassName, className), style: style, children: children }) }));
+    return (_jsx(Box, { className: `${baseClassName}__wrapper twa:flex-1 twa:relative twa:size-full`, children: _jsx(Flex, { alignItems: "center", justifyContent: "center", flexDirection: "column", ...flexProps, className: cn('twa:absolute twa:inset-0 twa:text-3 twa:text-center twa:p-4', 'twa:[&_p]:text-primary-foreground', baseClassName, className), style: style, children: children }) }));
 };
 export default EmptyContent;

package/src/components/ErrorBox/index.js

@@ -1,8 +1,8 @@
 import { jsx as _jsx } from "react/jsx-runtime";
+import { cn } from '../../lib/utils';
 import { Box } from '../Flex';
-import clsx from 'clsx';
 export const baseClassName = 'ab-ErrorBox';
 const ErrorBox = (props) => {
-    return (_jsx(Box, { ...props, className: clsx('twa:p-3 twa:rounded-standard twa:bg-error twa:text-text-on-error', props.className, baseClassName) }));
+    return (_jsx(Box, { ...props, className: cn('twa:p-3 twa:rounded-standard twa:bg-destructive twa:text-destructive-foreground', props.className, baseClassName) }));
 };
 export default ErrorBox;

package/src/components/ExpressionEditor/BaseEditorInput.js

@@ -1,5 +1,6 @@
 import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as parser from '../../parser/src';
+import { cn } from '../../lib/utils';
 import * as React from 'react';
 import ErrorBox from '../ErrorBox';
 import { useSelectionRange } from '../utils/useSelectionRange';
@@ -21,7 +22,6 @@ import StringExtensions from '../../Utilities/Extensions/StringExtensions';
 import Radio from '../Radio';
 import { Box, Flex } from '../Flex';
 import { AdaptableFormControlTextClear } from '../../View/Components/Forms/AdaptableFormControlTextClear';
-import clsx from 'clsx';
 const filterableCategories = [
     'dates',
     'logical',
@@ -151,8 +151,8 @@ const FunctionsDropdown = ({ expressionFunctions, baseClassName }) => {
                                             return (_jsx(Box, { onMouseEnter: () => setOverFunction(functionName), onClick: () => hidePopup(), children: functionName === 'VAR' ? (_jsx(VarEditorButton, { className: buttonClassName }, functionName)) : (_jsx(EditorButton, { data: getEditorButtonData(functionName), className: buttonClassName, children: functionName }, functionName)) }, functionName));
                                         })
                                             .filter(Boolean);
-                                        return (_jsxs(Box, { className: clsx('twa:mb-2 twa:mx-1', fns.length === 0 ? 'twa:hidden' : ''), children: [_jsx(Tag, { className: "twa:mb-1 twa:bg-primarylight twa:text-primary-foreground twa:w-full", children: StringExtensions.Humanize(groupName) }), fns] }, groupName));
-                                    }) })] }), _jsx(Box, { className: clsx(`${baseClassName}__dropdown-functions-description `, `twa:flex-1 twa:p-2 twa:w-[600px] twa:max-w-[60vw]`, `twa:rounded-standard twa:shadow-sm twa:overflow-auto twa:h-auto`, 'twa:bg-primarylight twa:text-primary-foreground'), children: overFunction ? (_jsxs(_Fragment, { children: [_jsx(Tag, { className: "twa:bg-accent twa:text-accent-foreground", children: overFunction }), _jsx(ExpressionFunctionDocumentation, { expressionFunction: expressionFunctions[overFunction] })] })) : (_jsx(Flex, { className: "twa:size-full twa:items-center twa:justify-center twa:text-2 twa:italic", children: _jsxs("ul", { children: [_jsxs("li", { children: ["Hover over a Function to learn more", _jsx("br", {}), _jsx("br", {})] }), _jsx("li", { children: "Click a Function to add it to the Expression in the Editor" })] }) })) })] })] })), children: _jsx(SimpleButton, { "data-name": "expression-dropdown", icon: "arrow-down", iconPosition: 'end', className: "twa:mr-1", children: _jsx(Flex, { className: "twa:mr-1 twa:text-2", children: _jsx(Icon, { name: "equation" }) }) }) }));
+                                        return (_jsxs(Box, { className: cn('twa:mb-2 twa:mx-1', fns.length === 0 ? 'twa:hidden' : ''), children: [_jsx(Tag, { className: "twa:mb-1 twa:bg-primarylight twa:text-primary-foreground twa:w-full", children: StringExtensions.Humanize(groupName) }), fns] }, groupName));
+                                    }) })] }), _jsx(Box, { className: cn(`${baseClassName}__dropdown-functions-description `, `twa:flex-1 twa:p-2 twa:w-[600px] twa:max-w-[60vw]`, `twa:rounded-standard twa:shadow-sm twa:overflow-auto twa:h-auto`, 'twa:bg-primarylight twa:text-primary-foreground'), children: overFunction ? (_jsxs(_Fragment, { children: [_jsx(Tag, { className: "twa:bg-accent twa:text-accent-foreground", children: overFunction }), _jsx(ExpressionFunctionDocumentation, { expressionFunction: expressionFunctions[overFunction] })] })) : (_jsx(Flex, { className: "twa:size-full twa:items-center twa:justify-center twa:text-2 twa:italic", children: _jsxs("ul", { children: [_jsxs("li", { children: ["Hover over a Function to learn more", _jsx("br", {}), _jsx("br", {})] }), _jsx("li", { children: "Click a Function to add it to the Expression in the Editor" })] }) })) })] })] })), children: _jsx(SimpleButton, { "data-name": "expression-dropdown", icon: "arrow-down", iconPosition: 'end', className: "twa:mr-1", children: _jsx(Flex, { className: "twa:mr-1 twa:text-2", children: _jsx(Icon, { name: "equation" }) }) }) }));
 };
 export function BaseEditorInput(props) {
     const { expressionFunctions, testData, style, type } = props;

package/src/components/ExpressionEditor/QueryBuilder/QueryBuilderInputs.js

@@ -8,7 +8,7 @@ import { ColumnSelector } from '../../../View/Components/Selectors/ColumnSelecto
 import { FieldSelector } from '../../../View/Components/Selectors/FieldSelector';
 import { PermittedValuesSelector } from '../../../View/Components/Selectors/PermittedValuesSelector';
 import { CheckBox } from '../../CheckBox';
-import DropdownButton from '../../DropdownButton';
+import { NewDropdownButton } from '../../DropdownButton';
 import { Icon } from '../../icons';
 import { InputGroup } from '../../InputGroup';
 import { useQueryBuilderContext } from './QueryBuilder';
@@ -178,7 +178,7 @@ const SymbolToIcon = (props) => {
 export const ExpressionSelector = (props) => {
     const { getExpressions } = useQueryBuilderContext();
     const expressions = props.dataType ? getExpressions(props.dataType) : [];
-    return (_jsx(DropdownButton, { "data-id": "expression-selector", "data-value": props.value, variant: "raised", tone: 'accent', columns: ['label'], items: expressions.map((expression) => ({
+    return (_jsx(NewDropdownButton, { "data-id": "expression-selector", className: "twa:min-h-input", "data-value": props.value, variant: "raised", tone: 'accent', items: expressions.map((expression) => ({
             label: _jsx(SymbolToIcon, { symbol: getQlPredicateSymbol(expression) }),
             onClick: () => {
                 if (expression !== props.value) {
@@ -188,7 +188,7 @@ export const ExpressionSelector = (props) => {
         })), children: _jsx(SymbolToIcon, { symbol: getQlPredicateSymbol(props.value) ?? 'Select Operator' }) }));
 };
 export const CombinatorSelector = (props) => {
-    return (_jsx(DropdownButton, { "data-id": "combinator-selector", "data-value": props.value, columns: ['label'], variant: "raised", tone: "accent", items: [
+    return (_jsx(NewDropdownButton, { className: "twa:min-h-input", "data-id": "combinator-selector", "data-value": props.value, variant: "raised", tone: "accent", items: [
             { label: 'AND', onClick: () => props.onChange('AND') },
             { label: 'OR', onClick: () => props.onChange('OR') },
         ], children: props.value }));

package/src/components/ExpressionEditor/QueryBuilder/QueryPredicateBuilder.js

@@ -1,23 +1,23 @@
 import { createElement as _createElement } from "react";
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import { defaultDragProxyMove, DragList } from '../../dnd';
+import { cn } from '../../../lib/utils';
 import { isArgumentColumnOrField, isQlLogicalOperator, } from '../../../parser/src/predicate';
 import { mapColumnDataTypeToExpressionFunctionType } from '../../../Utilities/adaptableQlUtils';
 import { booleanExpressionFunctions } from '../../../Utilities/ExpressionFunctions/booleanExpressionFunctions';
 import { useAdaptable } from '../../../View/AdaptableContext';
-import DropdownButton from '../../DropdownButton';
+import { NewDropdownButton } from '../../DropdownButton';
 import ErrorBox from '../../ErrorBox';
 import { Icon } from '../../icons';
 import SimpleButton from '../../SimpleButton';
 import { CombinatorSelector, ExpressionSelector, PrimitiveValueInput, PrimitiveColumnOrFieldSelector, PrimitiveMultiValueInput, } from './QueryBuilderInputs';
 import { getOperatorMatchingInputs as getFunctionMatchingInputTypes, mapExpressionToFieldValue, } from './utils';
 import { Box, Flex } from '../../Flex';
-import clsx from 'clsx';
 const ITEM_HEIGHT = 36;
 const BASE_CLASS_NAME = 'ab-QueryBuilder-predicate-editor';
 const Handle = (props) => (_jsx(Flex, { className: `${BASE_CLASS_NAME}__handle twa:mr-1`, style: { height: ITEM_HEIGHT }, alignItems: "center", ...props, children: _jsx(Icon, { name: "drag" }) }));
 const QueryPredicateButtons = (props) => {
-    return (_jsxs(_Fragment, { children: [!props.hideAdd && (_jsx(DropdownButton, { listMinWidth: 150, columns: ['label'], items: [
+    return (_jsxs(_Fragment, { children: [!props.hideAdd && (_jsx(NewDropdownButton, { items: [
                     { label: 'Condition', onClick: () => props.onNewPredicate('filter') },
                     { label: 'AND / OR Group', onClick: () => props.onNewPredicate('group') },
                 ], variant: "text", children: _jsx(Icon, { name: "plus" }) })), !props.hideDelete && (_jsx(SimpleButton, { icon: "delete", variant: "text", onClick: () => {
@@ -38,7 +38,7 @@ const LogicalFunctionEditor = (props) => {
         props.onChange({ ...props.predicate, args: newArgs });
     };
     const getCombinatorEl = (handleProps) => (_jsx(DragList, { dragListId: props.id, orientation: "vertical", onDrop: handleDrop, onDragProxyMove: defaultDragProxyMove, children: (listDomProps) => {
-            return (_jsxs("div", { ...listDomProps, className: clsx(listDomProps.className), children: [_jsxs(Flex, { children: [props.isRoot ? null : _jsx(Handle, { ...handleProps }), _jsxs(Flex, { className: "twa:flex-1 twa:mb-2", alignItems: "center", height: ITEM_HEIGHT, children: [_jsx(CombinatorSelector, { value: props.predicate.operator, onChange: (combinator) => {
+            return (_jsxs("div", { ...listDomProps, className: cn(listDomProps.className), children: [_jsxs(Flex, { children: [props.isRoot ? null : _jsx(Handle, { ...handleProps }), _jsxs(Flex, { className: "twa:flex-1 twa:mb-2", alignItems: "center", height: ITEM_HEIGHT, children: [_jsx(CombinatorSelector, { value: props.predicate.operator, onChange: (combinator) => {
                                             props.onChange({
                                                 ...props.predicate,
                                                 operator: combinator,
@@ -94,7 +94,7 @@ const LogicalFunctionEditor = (props) => {
     }
     return (_jsx(DragList.DraggableItem, { id: props.id, children: (itemDomProps) => {
             const { onPointerDown, ...restDomProps } = itemDomProps;
-            return (_jsx("div", { ...restDomProps, className: clsx(className, restDomProps.className), children: getCombinatorEl({ onPointerDown }) }));
+            return (_jsx("div", { ...restDomProps, className: cn(className, restDomProps.className), children: getCombinatorEl({ onPointerDown }) }));
         } }));
 };
 const PrimitiveFunctionEditor = (props) => {
@@ -129,7 +129,7 @@ const PrimitiveFunctionEditor = (props) => {
     const level = props.id.split('/').length - 1;
     return (_jsx(DragList.DraggableItem, { id: props.id, children: (itemDomProps) => {
             const { onPointerDown, ...restDomProps } = itemDomProps;
-            return (_jsxs(Flex, { ...restDomProps, className: clsx(`twa:pb-2 ${BASE_CLASS_NAME} ${BASE_CLASS_NAME}-level-${level} ${BASE_CLASS_NAME}-primitive ${props.lastChild ? `${BASE_CLASS_NAME}--last-child` : ''}`, restDomProps.className), style: { minHeight: ITEM_HEIGHT }, children: [_jsx(Handle, { onPointerDown: onPointerDown }), _jsxs(Flex, { alignItems: "center", style: { height: ITEM_HEIGHT }, className: "twa:gap-0.5 twa:w-full", children: [_jsx(Box, { children: _jsx(PrimitiveColumnOrFieldSelector, { onChange: (colOrField) => {
+            return (_jsxs(Flex, { ...restDomProps, className: cn(`twa:pb-2 ${BASE_CLASS_NAME} ${BASE_CLASS_NAME}-level-${level} ${BASE_CLASS_NAME}-primitive ${props.lastChild ? `${BASE_CLASS_NAME}--last-child` : ''}`, restDomProps.className), style: { minHeight: ITEM_HEIGHT }, children: [_jsx(Handle, { onPointerDown: onPointerDown }), _jsxs(Flex, { alignItems: "center", style: { height: ITEM_HEIGHT }, className: "twa:gap-0.5 twa:w-full", children: [_jsx(Box, { children: _jsx(PrimitiveColumnOrFieldSelector, { onChange: (colOrField) => {
                                         props.onChange({
                                             ...props.predicate,
                                             args: [colOrField],

package/src/components/FieldWrap/index.js

@@ -1,8 +1,8 @@
 import { jsx as _jsx } from "react/jsx-runtime";
+import { cn } from '../../lib/utils';
 import { Flex } from '../Flex';
-import clsx from 'clsx';
 import { targetOwn } from '../twUtils';
 const FieldWrap = (props) => {
-    return (_jsx(Flex, { flexDirection: "row", alignItems: "center", ...props, className: clsx('ab-FieldWrap', targetOwn.focusWithinOutline, props.className) }));
+    return (_jsx(Flex, { flexDirection: "row", alignItems: "center", ...props, className: cn('ab-FieldWrap', targetOwn.focusWithinOutline, props.className) }));
 };
 export default FieldWrap;

package/src/components/Flex.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
-import clsx from 'clsx';
 import { twMerge } from '../twMerge';
+import { cn } from '../lib/utils';
 const ALIGN_ITEMS_MAP = {
     center: 'twa:items-center',
     'flex-start': 'twa:items-start',
@@ -30,7 +30,7 @@ const FLEX_WRAP_MAP = {
 };
 export const Flex = React.forwardRef((props, ref) => {
     const { className: _, flexDirection, alignItems, justifyContent, flexWrap, as, ...domProps } = props;
-    const className = clsx('twa:flex', 'twa:box-border', FLEX_DIRECTION_MAP[flexDirection], ALIGN_ITEMS_MAP[alignItems], JUSTIFY_CONTENT_MAP[justifyContent], FLEX_WRAP_MAP[flexWrap]);
+    const className = cn('twa:flex', 'twa:box-border', FLEX_DIRECTION_MAP[flexDirection], ALIGN_ITEMS_MAP[alignItems], JUSTIFY_CONTENT_MAP[justifyContent], FLEX_WRAP_MAP[flexWrap]);
     const Cmp = (as || 'div');
     return (_jsx(Cmp, { ref: ref, ...domProps, className: twMerge(className, props.className) }));
 });

package/src/components/FormLayout/index.d.ts

@@ -13,7 +13,7 @@ type TypeFormLayout = {
     defaultComponent?: React.ComponentType<any>;
     columns?: (string | number | FormColumn)[];
     placeholder?: ReactNode;
-    sizes?: (string | number)[];
+    sizes?: readonly (string | number)[];
     style?: React.CSSProperties;
     gridRowGap?: string | number;
     gridColumnGap?: string | number;

package/src/components/HelpBlock/index.js

@@ -1,9 +1,9 @@
 import { jsx as _jsx } from "react/jsx-runtime";
+import { cn } from '../../lib/utils';
 import { Box } from '../Flex';
-import clsx from 'clsx';
 export const baseClassName = 'ab-HelpBlock';
-export const HelpBlockClassName = clsx('twa:text-2/relaxed twa:p-2 twa:rounded-standard', 'twa:bg-primarylight twa:text-primary-foreground', baseClassName);
+export const HelpBlockClassName = cn('twa:text-2/relaxed twa:p-2 twa:rounded-standard', 'twa:bg-primarylight twa:text-primary-foreground', baseClassName);
 const HelpBlock = (props) => {
-    return _jsx(Box, { ...props, className: clsx(HelpBlockClassName, props.className) });
+    return _jsx(Box, { ...props, className: cn(HelpBlockClassName, props.className) });
 };
 export default HelpBlock;

package/src/components/IconSelector/IconSelector.d.ts

@@ -1,5 +1,13 @@
 import { FunctionComponent } from 'react';
 import { CustomIcon } from '../../types';
+export interface IconSelectorPanelProps {
+    customIcons?: CustomIcon[];
+    value?: string;
+    onChange: (iconName: string) => void;
+    className?: string;
+    showTitle?: boolean;
+}
+export declare const IconSelectorPanel: FunctionComponent<IconSelectorPanelProps>;
 export interface IconSelectorProps {
     customIcons?: CustomIcon[];
     value?: string;

package/src/components/IconSelector/IconSelector.js

@@ -1,15 +1,18 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React from 'react';
+import { cn } from '../../lib/utils';
 import AdaptableInput from '../../View/Components/AdaptableInput';
 import { IconComponent } from '../Icon';
 import { allIcons, Icon } from '../icons';
 import OverlayTrigger from '../OverlayTrigger';
 import SimpleButton from '../SimpleButton';
 import { Box, Flex } from '../Flex';
+import { wizardSelectionButtonClassName } from '../../Utilities/wizardSelection';
+const ICON_GRID_BUTTON_CLASS = 'twa:!min-w-[36px] twa:!w-9 twa:!h-9 twa:!p-0 twa:justify-center twa:items-center';
 const IconButton = (props) => {
-    return (_jsx(SimpleButton, { onClick: () => props.onClick(), className: "twa:p-2", variant: props.active ? 'raised' : 'text', tone: props.active ? 'accent' : 'none', icon: props.icon, children: props.children }));
+    return (_jsx(SimpleButton, { onClick: () => props.onClick(), className: wizardSelectionButtonClassName(props.active, ICON_GRID_BUTTON_CLASS), variant: props.active ? 'outlined' : 'text', tone: "none", icon: props.icon, children: props.children }));
 };
-export const IconSelector = (props) => {
+export const IconSelectorPanel = (props) => {
     const [query, setQuery] = React.useState('');
     const allIconsNames = Object.keys(allIcons);
     const filteredIcons = query
@@ -17,13 +20,14 @@ export const IconSelector = (props) => {
             return iconName.toLowerCase().includes(query.toLowerCase());
         })
         : allIconsNames;
-    const iconsElements = filteredIcons.map((iconName) => {
-        return (_jsx(Flex, { children: _jsx(IconButton, { onClick: () => props.onChange(iconName), active: iconName === props.value, icon: iconName }) }, iconName));
-    });
+    const iconsElements = filteredIcons.map((iconName) => (_jsx(IconButton, { onClick: () => props.onChange(iconName), active: iconName === props.value, icon: iconName }, iconName)));
     const customIconsElements = props.customIcons?.map((def) => {
-        return (_jsx(IconButton, { active: false, onClick: () => props.onChange(def.name), children: _jsx(IconComponent, { icon: def.icon }, def.name) }, def.name));
+        return (_jsx(IconButton, { active: def.name === props.value, onClick: () => props.onChange(def.name), children: _jsx(IconComponent, { icon: def.icon }, def.name) }, def.name));
     });
-    const popup = (_jsxs(Box, { className: "ab-IconSelector__Popup", children: [_jsxs(Box, { className: "twa:mb-2", children: [_jsx(Box, { className: "twa:mb-2 twa:text-4", children: "Select an Icon" }), _jsx(AdaptableInput, { value: query, onChange: (event) => setQuery(event.target.value ?? ''), className: "twa:w-full" })] }), _jsxs(Flex, { className: "twa:p-2 twa:w-[300px] twa:max-h-[300px] twa:overflow-auto twa:flex-wrap", children: [iconsElements, " ", customIconsElements] })] }));
+    return (_jsxs(Box, { className: cn('ab-IconSelector__Popup', props.className), children: [_jsxs(Box, { className: "twa:mb-2", children: [props.showTitle ? (_jsx(Box, { className: "twa:mb-2 twa:text-4", children: "Select an Icon" })) : null, _jsx(AdaptableInput, { value: query, onChange: (event) => setQuery(event.target.value ?? ''), className: "twa:w-full", placeholder: "Search Icons" })] }), _jsxs(Flex, { flexDirection: "row", flexWrap: "wrap", className: "twa:p-2 twa:w-[300px] twa:max-w-full twa:max-h-[300px] twa:overflow-auto twa:gap-0.5", children: [iconsElements, customIconsElements] })] }));
+};
+export const IconSelector = (props) => {
+    const popup = (_jsx(IconSelectorPanel, { customIcons: props.customIcons, value: props.value, onChange: props.onChange, showTitle: true }));
     let value = 'No Icon Selected';
     if (props.value in allIcons) {
         value = (_jsx(Icon, { style: { display: 'inline-block' }, name: props.value }));

package/src/components/IconSelector/index.d.ts

@@ -1 +1,2 @@
 export * from './IconSelector';
+export { IconSelectorPanel } from './IconSelector';

package/src/components/IconSelector/index.js

@@ -1 +1,2 @@
 export * from './IconSelector';
+export { IconSelectorPanel } from './IconSelector';

package/src/components/Modal/index.js

@@ -2,12 +2,12 @@ import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-run
 import { createPortal } from 'react-dom';
 import { useMemo } from 'react';
 import { RemoveScroll } from 'react-remove-scroll';
+import { cn } from '../../lib/utils';
 import { baseClassName, default as Backdrop } from './Backdrop';
 import { createUuid } from '../utils/uuid';
 import { isBrowserDocumentAvailable } from '../../View/UIHelper';
 import { useStacking } from '../WindowModal/useStacking';
 import { Flex } from '../Flex';
-import clsx from 'clsx';
 let portalElement;
 let loadingScreenPortalElement;
 export const ensurePortalElement = () => {
@@ -42,5 +42,5 @@ export const Modal = (props) => {
     const backdropZIndexOffset = 1;
     const stacking = useStacking();
     const zIndex = stacking.zIndex;
-    return createPortal(isOpen ? (_jsxs(_Fragment, { children: [_jsx(Backdrop, { timestamp: openTimestamp, uuid: uuid, zIndex: zIndex - backdropZIndexOffset, onBringToFront: onBringToFront }), _jsx(RemoveScroll, { children: _jsx(Flex, { alignItems: "center", justifyContent: "center", flexDirection: "column", ...boxProps, style: { zIndex, ...style }, className: clsx('twa:fixed twa:inset-0 twa:z-1000 twa:font-(family-name:--ab__font-family)', baseClassName, className), children: children }) })] })) : null, portalElement);
+    return createPortal(isOpen ? (_jsxs(_Fragment, { children: [_jsx(Backdrop, { timestamp: openTimestamp, uuid: uuid, zIndex: zIndex - backdropZIndexOffset, onBringToFront: onBringToFront }), _jsx(RemoveScroll, { children: _jsx(Flex, { alignItems: "center", justifyContent: "center", flexDirection: "column", ...boxProps, style: { zIndex, ...style }, className: cn('twa:fixed twa:inset-0 twa:z-1000 twa:font-(family-name:--ab__font-family)', baseClassName, className), children: children }) })] })) : null, portalElement);
 };

package/src/components/NewSelect/index.js

@@ -52,7 +52,17 @@ const NewSelect = (props) => {
             return item !== undefined ? renderValueProp(item) : undefined;
         }
         : undefined;
-    return (_jsxs(Select, { multiple: props.multiple, open: props.open, onOpenChange: props.onOpenChange, isItemEqualToValue: isItemEqualToValue, items: allItems, disabled: props.disabled, value: props.value, onValueChange: props.onValueChange, "aria-label": props.ariaLabel, defaultValue: props.defaultValue, children: [_jsx(SelectTrigger, { size: props.size === 'small' ? 'sm' : 'default', className: cn('twa:max-w-80 ab-Select', props.className), "aria-invalid": isInvalid, "aria-label": props.ariaLabel, "data-name": props['data-name'], icon: props.chevronIcon, children: _jsx(SelectValue, { placeholder: props.placeholder, className: 'twa:truncate twa:block!', children: renderValueChild }) }), _jsx(SelectContent, { "aria-label": props.ariaLabel ? `${props.ariaLabel} content` : undefined, alignItemWithTrigger: false, container: props.container, stopMouseDownPropagation: props.stopMouseDownPropagation, style: contentStyle, children: groups.map((group, index) => {
+    return (_jsxs(Select, { multiple: props.multiple, open: props.open, onOpenChange: props.onOpenChange, isItemEqualToValue: isItemEqualToValue, items: allItems, disabled: props.disabled, value: props.value, onValueChange: props.onValueChange, "aria-label": props.ariaLabel, defaultValue: props.defaultValue, children: [_jsx(SelectTrigger, { size: props.size === 'small' ? 'sm' : 'default', className: cn('twa:max-w-80 ab-Select', props.className), "aria-invalid": isInvalid, "aria-label": props.ariaLabel, "data-name": props['data-name'], icon: props.chevronIcon, onMouseDown: props.stopMouseDownPropagation
+                    ? (e) => {
+                        e.stopPropagation();
+                        e.nativeEvent?.stopPropagation?.();
+                    }
+                    : undefined, onClick: props.stopMouseDownPropagation
+                    ? (e) => {
+                        e.stopPropagation();
+                        e.nativeEvent?.stopPropagation?.();
+                    }
+                    : undefined, children: _jsx(SelectValue, { placeholder: props.placeholder, className: 'twa:truncate twa:block!', children: renderValueChild }) }), _jsx(SelectContent, { "aria-label": props.ariaLabel ? `${props.ariaLabel} content` : undefined, alignItemWithTrigger: false, container: props.container, stopMouseDownPropagation: props.stopMouseDownPropagation, style: contentStyle, children: groups.map((group, index) => {
                     return (_jsxs(React.Fragment, { children: [_jsxs(SelectGroup, { children: [group.label && _jsx(SelectLabel, { children: group.label }), group.items.map((item) => {
                                         const itemTitle = getItemTitle(item.label, item.value);
                                         const tooltipText = props.showItemTooltip ? itemTitle : undefined;

package/src/components/Panel/index.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
-import clsx from 'clsx';
+import { cn } from '../../lib/utils';
 import { Box, Flex } from '../Flex';
 import { twMerge } from '../../twMerge';
 export const baseClassName = 'ab-Panel';
@@ -18,16 +18,16 @@ const Body = ({ children, bodyScroll, variant, className, style, }) => {
     if (bodyScroll === true) {
         bodyScroll = 'auto';
     }
-    const bodyCls = clsx(DEFAULT_BODY_CLS, `${baseClassName}__body`, variant && `${baseClassName}__body--variant-${variant}`, bodyScroll ? `twa:overflow-auto` : null, {
+    const bodyCls = cn(DEFAULT_BODY_CLS, `${baseClassName}__body`, variant && `${baseClassName}__body--variant-${variant}`, bodyScroll ? `twa:overflow-auto` : null, {
         'twa:bg-primarylight twa:text-primary-foreground twa:border-0': variant === 'modern',
     }, className);
     return (_jsx(Box, { style: style, className: bodyCls, children: children }));
 };
 const PlainHeader = ({ children, className }) => {
-    return (_jsx(Box, { className: clsx(`${baseClassName}__header`, `${baseClassName}__header--variant-plain`, className), children: children }));
+    return (_jsx(Box, { className: cn(`${baseClassName}__header`, `${baseClassName}__header--variant-plain`, className), children: children }));
 };
 const FlexBody = ({ children, className }) => {
-    return (_jsx(Box, { className: clsx(DEFAULT_BODY_CLS, `${baseClassName}__body`, `${baseClassName}__body--variant-flex`, 'twa:overflow-auto twa:min-h-0', 'twa:flex-1 twa:flex twa:flex-col', className), children: children }));
+    return (_jsx(Box, { className: cn(DEFAULT_BODY_CLS, `${baseClassName}__body`, `${baseClassName}__body--variant-flex`, 'twa:overflow-auto twa:min-h-0', 'twa:flex-1 twa:flex twa:flex-col', className), children: children }));
 };
 const Panel = (props) => {
     const { border, className, header, children, headerProps, bodyProps, bodyScroll, variant = 'default', ...boxProps } = props;
@@ -40,7 +40,7 @@ const Panel = (props) => {
         border,
         ...(bodyProps ? bodyProps.style : null),
     };
-    const cls = twMerge(clsx(baseClassName, `${baseClassName}--variant-${variant}`, !header ? `${baseClassName}--no-header` : `${baseClassName}--with-header`, 'twa:rounded-standard', 'twa:flex twa:flex-col'), className);
+    const cls = cn(baseClassName, `${baseClassName}--variant-${variant}`, !header ? `${baseClassName}--no-header` : `${baseClassName}--with-header`, 'twa:rounded-standard', 'twa:flex twa:flex-col', className);
     let headerCls = headerProps?.className;
     if (cls.includes('twa:rounded-none')) {
         headerCls = twMerge(headerCls, 'twa:rounded-none');
@@ -65,10 +65,10 @@ const Panel = (props) => {
     });
     if (theHeader) {
         childrenArr = childrenArr.filter((child) => child !== theHeader);
-        theHeader = (_jsx(PlainHeader, { ...theHeader.props, className: clsx(headerCls, theHeader.props.className ?? '') }));
+        theHeader = (_jsx(PlainHeader, { ...theHeader.props, className: cn(headerCls, theHeader.props.className ?? '') }));
     }
     if (theBody) {
-        theBody = (_jsx(FlexBody, { ...theBody.props, className: clsx(bodyCls, theBody.props.className ?? '') }));
+        theBody = (_jsx(FlexBody, { ...theBody.props, className: cn(bodyCls, theBody.props.className ?? '') }));
     }
     return (_jsxs(Box, { ...boxProps, style: { ...style, ...boxProps.style }, className: cls, children: [theHeader ?? (_jsx(Header, { ...headerProps, style: headerStyle, variant: variant, className: headerCls, children: header })), theBody ??
                 (childrenArr.length > 0 ? (_jsx(Body, { ...bodyProps, style: bodyStyle, bodyScroll: bodyScroll, variant: variant, className: twMerge(bodyCls), children: childrenArr })) : null)] }));

package/src/components/Radio/index.d.ts

@@ -9,7 +9,7 @@ type TypeProps = {
     value?: any;
     onChange?: (checked: boolean, event?: SyntheticEvent | any) => void;
     children?: ReactNode | React.JSX.Element;
-    gapDistance?: number;
+    gapDistance?: number | string;
     childrenPosition?: 'start' | 'end';
     variant?: Variant;
 };

package/src/components/Radio/index.js

@@ -4,8 +4,8 @@ import { useState } from 'react';
 import useProperty from '../utils/useProperty';
 import { Box, Flex } from '../Flex';
 import { twMerge } from '../../twMerge';
-import clsx from 'clsx';
 import { targetChildren, targetOwn } from '../twUtils';
+import { cn } from '../../lib/utils';
 const RadioContext = React.createContext({
     value: null,
     name: '',
@@ -15,7 +15,7 @@ const RadioContext = React.createContext({
 export const useRadioContext = () => {
     return React.useContext(RadioContext);
 };
-const Radio = ({ children, checked, onChange, value, name, gapDistance = 10, childrenPosition = 'end', as = 'label', id, tabIndex, disabled, ...props }) => {
+const Radio = ({ children, checked, onChange, value, name, gapDistance = 'var(--ab-radio-gap)', childrenPosition = 'end', as = 'label', id, tabIndex, disabled, ...props }) => {
     const context = useRadioContext();
     const { value: contextValue, onChange: contextOnChange, name: contextName, variant } = context;
     const [stateChecked, setStateChecked] = useState(false);
@@ -41,7 +41,7 @@ const Radio = ({ children, checked, onChange, value, name, gapDistance = 10, chi
     const beforeGap = childrenPosition === 'start' ? gap : null;
     const after = childrenPosition === 'end' ? children : null;
     const afterGap = childrenPosition === 'end' ? gap : null;
-    return (_jsxs(Box, { ...props, className: twMerge(`ab-Radio twa:my-2 twa:inline-flex twa:flex-row twa:items-center twa:cursor-pointer twa:relative`, props.className), "data-checked": computedChecked, as: as, children: [before, beforeGap, _jsx("input", { disabled: disabled, className: clsx('ab-Radio-input', targetOwn.focusOutline, 'twa:align-middle', 'twa:m-0', 'twa:rounded-full', 'twa:cursor-pointer', 'twa:position-relative', 'twa:w-[1rem]', 'twa:h-[1rem]', 'twa:min-w-[1rem]', 'twa:min-h-[1rem]', variant === 'default' && 'ab-Radio-input--default', variant === 'text-only' && 'ab-Radio-input--text-only twa:size-0 twa:opacity-0'), id: id, checked: computedChecked, type: "radio", name: name ?? contextName, value: value, tabIndex: tabIndex, onChange: onInputChange }), afterGap, after] }));
+    return (_jsxs(Box, { ...props, className: twMerge(`ab-Radio twa:my-2 twa:inline-flex twa:flex-row twa:items-center twa:cursor-pointer twa:relative`, props.className), "data-checked": computedChecked, as: as, children: [before, beforeGap, _jsx("input", { disabled: disabled, className: cn('ab-Radio-input', targetOwn.focusOutline, 'twa:align-middle', 'twa:m-0', 'twa:rounded-full', 'twa:cursor-pointer', 'twa:position-relative', 'twa:w-[1rem]', 'twa:h-[1rem]', 'twa:min-w-[1rem]', 'twa:min-h-[1rem]', variant === 'default' && 'ab-Radio-input--default', variant === 'text-only' && 'ab-Radio-input--text-only twa:size-0 twa:opacity-0'), id: id, checked: computedChecked, type: "radio", name: name ?? contextName, value: value, tabIndex: tabIndex, onChange: onInputChange }), afterGap, after] }));
 };
 export const RadioGroup = (props) => {
     const { orientation, value: _value, name, onRadioChange, children, variant = 'default' } = props;
@@ -50,12 +50,14 @@ export const RadioGroup = (props) => {
             onRadioChange(value);
         },
     });
-    return (_jsx(RadioContext.Provider, { value: { value, onChange: setValue, name, variant }, children: _jsx(Flex, { className: clsx('ab-RadioGroup', props.className), flexDirection: orientation == 'horizontal' ? 'row' : 'column', alignItems: orientation == 'horizontal' ? 'center' : 'flex-start', children: children }) }));
+    return (_jsx(RadioContext.Provider, { value: { value, onChange: setValue, name, variant }, children: _jsx(Flex, { className: cn('ab-RadioGroup', props.className), flexDirection: orientation == 'horizontal' ? 'row' : 'column', alignItems: orientation == 'horizontal' ? 'center' : 'flex-start', children: children }) }));
 };
 export const radioGroupStyling = {
-    horizontalTextOnly: clsx('twa:bg-primarylight twa:rounded-standard twa:p-1 twa:gap-5', {
-        'twa:*:flex-1 twa:*:rounded-standard twa:*:p-1 twa:*:m-0': 'default styles for all the radio buttons',
+    horizontalTextOnly: cn('twa:bg-primarylight twa:rounded-standard twa:p-1 twa:gap-5', {
+        'twa:*:flex-1 twa:*:shrink-0 twa:*:min-w-fit twa:*:rounded-standard twa:*:p-1 twa:*:m-0 twa:*:px-4': 'default styles for all the radio buttons',
         'twa:*:data-[checked=true]:bg-accent twa:*:data-[checked=true]:text-accent-foreground': 'style the checked state',
+        'twa:[--ab-radio-gap:0]': 'remove the gap between the radio input and its label',
+        'twa:[&_input]:size-0 twa:[&_input]:min-w-0 twa:[&_input]:min-h-0 twa:[&_input]:border-0 twa:[&_input]:p-0': 'collapse any nested radio inputs to zero size (overriding their fixed min-w/min-h)',
         [targetChildren.focusWithinOutline]: 'styles for when a radio is currently focused - show a ring, so people know they can do keyboard nav with left/right arrow keys',
     }),
 };