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

package/src/components/NewSelect/index.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { Select, SelectContent, SelectGroup, SelectItem, SelectLabel, SelectSeparator, SelectTrigger, SelectValue, } from '~/components/ui/select';
-import { Tooltip, TooltipContent, TooltipTrigger } from '~/components/ui/tooltip';
+import { Select, SelectContent, SelectGroup, SelectItem, SelectLabel, SelectSeparator, SelectTrigger, SelectValue, } from '../ui/select';
+import { Tooltip, TooltipContent, TooltipTrigger } from '../ui/tooltip';
 import { cn } from '../../lib/utils';
 import React from 'react';
 const getItemTitle = (label, value) => {
@@ -30,9 +30,13 @@ const NewSelect = (props) => {
         ];
         allItems = props.items;
     }
-    const maxLabelLength = allItems.reduce((max, item) => Math.max(max, typeof item.label === 'string' ? item.label.length : 0), 0);
+    const maxLabelLength = allItems.reduce((max, item) => Math.max(max, typeof item.label === 'string'
+        ? item.label.length
+        : typeof item.tooltip === 'string'
+            ? item.tooltip.length
+            : 0), 0);
     const contentStyle = {
-        width: `max(${maxLabelLength + 3}ch, calc(var(--ab-base-space) * 20), var(--anchor-width))`,
+        width: `max(${maxLabelLength + (props.extraWidthChars ?? 3)}ch, calc(var(--ab-base-space) * 20), var(--anchor-width))`,
     };
     const renderValueProp = props.renderValue;
     const renderValueChild = renderValueProp
@@ -48,13 +52,22 @@ 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'], children: _jsx(SelectValue, { placeholder: props.placeholder, className: 'twa:truncate twa:block!', children: renderValueChild }) }), _jsx(SelectContent, { 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 tooltipText = props.showItemTooltip
-                                            ? getItemTitle(item.label, item.value)
-                                            : undefined;
+                                        const itemTitle = getItemTitle(item.label, item.value);
+                                        const tooltipText = props.showItemTooltip ? itemTitle : undefined;
                                         const itemContent = item.label;
-                                        const itemElement = (_jsx(SelectItem, { value: item.value, className: 'ab-Select-Row', disabled: item.disabled, children: itemContent }, item.value));
+                                        const itemElement = (_jsx(SelectItem, { value: item.value, "aria-label": itemTitle || undefined, className: 'ab-Select-Row', disabled: item.disabled, children: itemContent }, item.value));
                                         if (tooltipText != null) {
                                             return (_jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { render: itemElement, children: itemContent }), _jsx(TooltipContent, { side: "right", children: tooltipText })] }, item.value));
                                         }

package/src/components/NewTooltip/index.js

@@ -1,5 +1,5 @@
 import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { Tooltip, TooltipTrigger, TooltipContent } from '~/components/ui/tooltip';
+import { Tooltip, TooltipTrigger, TooltipContent } from '../ui/tooltip';
 export function NewTooltip({ label, children, side, align }) {
     if (!label) {
         return _jsx(_Fragment, { children: children });

package/src/components/OverlayTrigger/index.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
 import { useRef, useEffect } from 'react';
-import debounce from '../../Utilities/utils/debounce';
+import { debounce } from '../../Utilities/Helpers/TimingHelper';
 import batchUpdate from '../utils/batchUpdate';
 import selectParent from '../utils/selectParent';
 import useProperty from '../utils/useProperty';

package/src/components/Panel/index.js

@@ -1,10 +1,10 @@
 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';
-const DEFAULT_BODY_CLS = 'twa:relative twa:flex-1 twa:p-2 twa:bg-defaultbackground twa:text-foreground';
+const DEFAULT_BODY_CLS = 'twa:relative twa:flex-1 twa:p-2 twa:bg-background twa:text-foreground';
 const Header = ({ children, variant = 'default', className, style, onClick, ...flexProps }) => {
     if (!children) {
         return null;
@@ -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, {
-        'twa:bg-primarylight twa:text-text-on-primary twa:border-0': variant === 'modern',
+    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',
     }),
 };

package/src/components/SimpleButton/index.js

@@ -1,10 +1,10 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
+import { cn } from '../../lib/utils';
 import { allIcons } from '../icons';
 import { ACCESS_LEVEL_HIDDEN, ACCESS_LEVEL_READ_ONLY, } from '../../Utilities/Constants/GeneralConstants';
 import { IconComponent, isAdaptableElementIcon, isAdaptableCustomIcon, isAdaptableSystemIcon, } from '../Icon';
 import { Box } from '../Flex';
-import clsx from 'clsx';
 import { NewTooltip } from '../NewTooltip';
 export const baseClassName = 'ab-SimpleButton';
 const SimpleButton = React.forwardRef((givenProps, theRef) => {
@@ -73,36 +73,36 @@ const SimpleButton = React.forwardRef((givenProps, theRef) => {
     if (ariaLabel != null && ariaLabel !== '') {
         extraButtonProps['aria-label'] = ariaLabel;
     }
-    const btn = (_jsx(Box, { ...buttonProps, ...extraButtonProps, as: buttonProps.as || 'button', disabled: disabled, className: clsx(baseClassName, 'twa:p-1', 'twa:rounded-button', 'twa:inline-flex twa:flex-row twa:flex-none twa:items-center', 'twa:fill-current', 'twa:overflow-hidden twa:relative twa:align-middle', 
+    const btn = (_jsx(Box, { ...buttonProps, ...extraButtonProps, as: buttonProps.as || 'button', disabled: disabled, className: cn(baseClassName, 'twa:p-1', 'twa:rounded-button', 'twa:inline-flex twa:flex-row twa:flex-none twa:items-center', 'twa:fill-current', 'twa:overflow-hidden twa:relative twa:align-middle', 
         // direct children should be above the before pseudo element
         'twa:*:z-1', 
         // all svgs inside should be aligned middle
         'twa:[&_svg]:align-middle', 
-        // 'twa:text-text-on-primary',
+        // 'twa:text-primary-foreground',
         // the text variant has the background applied on the before pseudo element
         // so let's configure the before pseudo element for all buttons here
         'twa:before:content-[""] twa:before:absolute twa:before:inset-0 twa:before:block', 'twa:before:z-0 twa:before:pointer-events-none twa:before:rounded-[inherit]', 'twa:outline-none twa:focus-visible:border-ring twa:focus-visible:ring-3 twa:focus-visible:ring-ring/50', disabled ? `${baseClassName}--disabled` : '', `${baseClassName}--variant-${variant}`, `${baseClassName}--tone-${tone}`, 'twa:transition-opacity twa:duration-200', {
-            'twa:text-text-on-primary': tone == 'neutral',
+            'twa:text-primary-foreground': tone == 'neutral',
             'twa:text-inherit': tone === 'none',
             'twa:text-success': tone === 'success',
             'twa:text-accent': tone === 'accent',
-            'twa:text-error': tone === 'error',
+            'twa:text-destructive': tone === 'error',
             'twa:text-warn': tone === 'warning',
             'twa:text-info': tone === 'info',
         }, variant === 'text' ? 'twa:bg-transparent' : '', variant === 'ghost'
             ? 'twa:hover:bg-muted twa:hover:text-foreground twa:aria-expanded:bg-muted twa:aria-expanded:text-foreground twa:dark:hover:bg-muted/50'
             : '', variant === 'outlined'
-            ? 'twa:bg-defaultbackground twa:border-input-border twa:border'
+            ? 'twa:bg-background twa:border-input-border twa:border'
             : '', variant === 'raised'
             ? {
-                'twa:text-text-on-primary twa:shadow-(--ab-cmp-simple-button__box-shadow) twa:hover:not-disabled:shadow-(--ab-cmp-simple-button__hover-box-shadow) twa:transition-(--ab-cmp-simple-button__transition) twa:duration-200 twa:focus:shadow-(--ab-focus__box-shadow)': true,
-                'twa:bg-success twa:text-text-on-success': tone == 'success',
+                'twa:text-primary-foreground twa:shadow-(--ab-cmp-simple-button__box-shadow) twa:hover:not-disabled:shadow-(--ab-cmp-simple-button__hover-box-shadow) twa:transition-(--ab-cmp-simple-button__transition) twa:duration-200 twa:focus:shadow-(--ab-focus__box-shadow)': true,
+                'twa:bg-success twa:text-success-foreground': tone == 'success',
                 'twa:bg-accent twa:text-accent-foreground': tone == 'accent',
                 'twa:bg-transparent': tone == 'none',
-                'twa:bg-primary twa:text-text-on-primary': tone == 'neutral',
-                'twa:bg-error twa:text-text-on-error': tone == 'error',
-                'twa:bg-warn twa:text-text-on-warn': tone == 'warning',
-                'twa:bg-info twa:text-text-on-info': tone == 'info',
+                'twa:bg-primary twa:text-primary-foreground': tone == 'neutral',
+                'twa:bg-destructive twa:text-destructive-foreground': tone == 'error',
+                'twa:bg-warn twa:text-warn-foreground': tone == 'warning',
+                'twa:bg-info twa:text-info-foreground': tone == 'info',
             }
             : '', 
         // opacity transitioning for the background applied on the before pseudo element

package/src/components/StylePreview.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { toStyle } from '../Utilities/Helpers/StyleHelper';
+import { cn } from '../lib/utils';
 import { twMerge } from '../twMerge';
 import { Box } from './Flex';
-import clsx from 'clsx';
-export const StylePreview = (props) => (_jsx(Box, { ...props, className: clsx(twMerge('ab-StylePreview twa:p-2 twa:mt-2', props.className), props.styleObject.ClassName), style: { ...toStyle(props.styleObject), ...props.style }, children: props.children ?? 'Preview result' }));
+export const StylePreview = (props) => (_jsx(Box, { ...props, className: cn(twMerge('ab-StylePreview twa:p-2 twa:mt-2', props.className), props.styleObject.ClassName), style: { ...toStyle(props.styleObject), ...props.style }, children: props.children ?? 'Preview result' }));

package/src/components/Tabs/index.js

@@ -5,7 +5,7 @@ import join from '../utils/join';
 import useProperty from '../utils/useProperty';
 import { Box, Flex } from '../Flex';
 import { twMerge } from '../../twMerge';
-import clsx from 'clsx';
+import { cn } from '../../lib/utils';
 const TabContext = React.createContext({
     selectedIndex: 0,
     tabCount: 0,
@@ -61,12 +61,12 @@ export const Tabs = (props) => {
     };
     const currentContent = contents[selectedIndex];
     const { value, ...contentProps } = (currentContent?.props || {});
-    const fillerClassName = clsx('ab-Tabs__Filler', 'twa:bg-(--ab-cmp-tabs-strip__background)');
+    const fillerClassName = cn('ab-Tabs__Filler', 'twa:bg-(--ab-cmp-tabs-strip__background)');
     return (_jsx(TabContext.Provider, { value: {
             selectedIndex,
             tabCount: tabs.length,
             setSelectedIndex,
-        }, children: _jsxs(Box, { ...boxProps, className: join(boxProps.className, 'ab-Tabs twa:flex twa:flex-col'), "data-selected-index": selectedIndex, children: [_jsxs(Flex, { flexDirection: "row", className: clsx('ab-Tabs__Strip', 'twa:bg-(--ab-cmp-tabs-strip__background)'), children: [_jsx(Box, { className: fillerClassName }), tabs, _jsx(Flex, { className: clsx(fillerClassName, 'twa:flex-1') })] }), _jsx(Box, { ...contentProps, className: `ab-Tabs__Body twa:p-2 twa:flex-1 ${contentProps.className || ''} `, children: currentContent })] }) }));
+        }, children: _jsxs(Box, { ...boxProps, className: join(boxProps.className, 'ab-Tabs twa:flex twa:flex-col'), "data-selected-index": selectedIndex, children: [_jsxs(Flex, { flexDirection: "row", className: cn('ab-Tabs__Strip', 'twa:bg-(--ab-cmp-tabs-strip__background)', 'twa:pt-0.5'), children: [_jsx(Box, { className: fillerClassName }), tabs, _jsx(Flex, { className: cn(fillerClassName, 'twa:flex-1') })] }), _jsx(Box, { ...contentProps, className: `ab-Tabs__Body twa:p-2 twa:flex-1 ${contentProps.className || ''} `, children: currentContent })] }) }));
 };
 export const Tab = (props) => {
     const { index, autoFocus, keyboardNavigation = true, className: propsClassName, ...boxProps } = props;
@@ -74,7 +74,7 @@ export const Tab = (props) => {
     const baseClassName = 'ab-Tabs__Tab';
     const active = context.selectedIndex === props.index;
     const beforeActive = context.selectedIndex === props.index + 1;
-    const className = clsx(baseClassName, active ? `${baseClassName}--active` : '', beforeActive ? `${baseClassName}--before-active` : '', 'twa:cursor-pointer twa:p-2', propsClassName);
+    const className = cn(baseClassName, active ? `${baseClassName}--active` : '', beforeActive ? `${baseClassName}--before-active` : '', 'twa:cursor-pointer twa:p-2', propsClassName);
     const ref = useRef(null);
     React.useEffect(() => {
         if (active && autoFocus && keyboardNavigation) {

package/src/components/Tag/Tag.d.ts

@@ -1,10 +1,21 @@
 import * as React from 'react';
 import { FlexProps } from '../Flex';
+export type TagVariant = 'default' | 'column';
 export declare const Tag: React.FunctionComponent<React.PropsWithChildren<FlexProps & {
     className?: string;
     style?: React.CSSProperties;
     onClick?: React.MouseEventHandler<HTMLDivElement>;
+    variant?: TagVariant;
 }> & React.RefAttributes<HTMLDivElement>>;
+/** Tag styled for column names — accent tint and left stripe for quick recognition. */
+export declare const ColumnTag: React.ForwardRefExoticComponent<Omit<FlexProps & {
+    className?: string;
+    style?: React.CSSProperties;
+    onClick?: React.MouseEventHandler<HTMLDivElement>;
+    variant?: TagVariant;
+} & {
+    children?: React.ReactNode | undefined;
+} & React.RefAttributes<HTMLDivElement>, "ref"> & React.RefAttributes<HTMLDivElement>>;
 export declare const TagBox: (props: {
     children: React.ReactNode;
     className?: string;
@@ -12,4 +23,9 @@ export declare const TagBox: (props: {
 export declare const TagList: (props: {
     tags: (React.ReactNode | string)[];
     className?: string;
+    variant?: TagVariant;
 }) => React.JSX.Element;
+export declare function renderColumnTags(columnIds: string[], getFriendlyName: (columnId: string) => string, options?: {
+    className?: string;
+    tagClassName?: string;
+}): React.ReactNode;

package/src/components/Tag/Tag.js

@@ -1,12 +1,22 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
+import { cn } from '../../lib/utils';
 import { twMerge } from '../../twMerge';
 import { Box, Flex } from '../Flex';
-import clsx from 'clsx';
-export const Tag = React.forwardRef((props, ref) => (_jsx(Flex, { ...props, ref: ref, className: twMerge(`ab-Tag twa:bg-primary twa:text-2 twa:py-2 twa:px-2 twa:inline-flex twa:rounded-standard`, props.className), style: props.style })));
+const COLUMN_TAG_CLASS = 'ab-Tag--column';
+export const Tag = React.forwardRef(({ variant = 'default', className, ...props }, ref) => (_jsx(Flex, { ...props, ref: ref, className: twMerge(`ab-Tag twa:text-2 twa:py-2 twa:px-2 twa:inline-flex twa:w-fit twa:rounded-standard`, variant === 'column' ? COLUMN_TAG_CLASS : 'twa:bg-primary', className), style: props.style })));
+/** Tag styled for column names — accent tint and left stripe for quick recognition. */
+export const ColumnTag = React.forwardRef((props, ref) => _jsx(Tag, { ...props, ref: ref, variant: "column" }));
 export const TagBox = (props) => {
-    return (_jsx(Box, { className: clsx('twa:flex twa:flex-wrap twa:flex-row twa:gap-1', props.className), children: props.children }));
+    return (_jsx(Box, { className: cn('twa:flex twa:flex-wrap twa:flex-row twa:gap-1', props.className), children: props.children }));
 };
 export const TagList = (props) => {
-    return (_jsx(TagBox, { className: props.className, children: props.tags.map((tag, index) => (_jsx(Tag, { children: tag }, index))) }));
+    const TagComponent = props.variant === 'column' ? ColumnTag : Tag;
+    return (_jsx(TagBox, { className: props.className, children: props.tags.map((tag, index) => (_jsx(TagComponent, { children: tag }, index))) }));
 };
+export function renderColumnTags(columnIds, getFriendlyName, options) {
+    if (!columnIds.length) {
+        return null;
+    }
+    return (_jsx(Flex, { flexWrap: "wrap", className: cn('twa:gap-1', options?.className), children: columnIds.map((columnId) => (_jsx(ColumnTag, { className: options?.tagClassName, children: getFriendlyName(columnId) }, columnId))) }));
+}

package/src/components/Tag/columnScopeTagHelpers.d.ts

@@ -0,0 +1,8 @@
+import type { Report } from '../../types';
+import type { ColumnScope } from '../../AdaptableState/Common/ColumnScope';
+import type { TagVariant } from './Tag';
+/** True when a tag label is a scope placeholder (e.g. `[All Columns]`), not a column name. */
+export declare const isBracketedScopeTagLabel: (value: string) => boolean;
+/** True when export column tags are actual column friendly names. */
+export declare const reportColumnTagsUseColumnVariant: (report: Report) => boolean;
+export declare const getScopeViewItemsTagVariant: (scope: ColumnScope) => TagVariant | undefined;

package/src/components/Tag/columnScopeTagHelpers.js

@@ -0,0 +1,6 @@
+const BRACKETED_SCOPE_LABEL = /^\[[^\]]+\]$/;
+/** True when a tag label is a scope placeholder (e.g. `[All Columns]`), not a column name. */
+export const isBracketedScopeTagLabel = (value) => BRACKETED_SCOPE_LABEL.test(value.trim());
+/** True when export column tags are actual column friendly names. */
+export const reportColumnTagsUseColumnVariant = (report) => report.ReportColumnScope === 'ScopeColumns' && 'ColumnIds' in (report.Scope ?? {});
+export const getScopeViewItemsTagVariant = (scope) => 'ColumnIds' in scope && Array.isArray(scope.ColumnIds) ? 'column' : undefined;

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

@@ -1 +1 @@
-export { Tag, TagBox, TagList } from './Tag';
+export { Tag, TagBox, TagList, ColumnTag, renderColumnTags, type TagVariant } from './Tag';

package/src/components/Tag/index.js

@@ -1 +1 @@
-export { Tag, TagBox, TagList } from './Tag';
+export { Tag, TagBox, TagList, ColumnTag, renderColumnTags } from './Tag';

package/src/components/Textarea/index.js

@@ -1,8 +1,7 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
+import { cn } from '../../lib/utils';
 import { Box } from '../Flex';
-import clsx from 'clsx';
-import { twMerge } from '../../twMerge';
 export const baseClassName = 'ab-Textarea';
 const Textarea = React.forwardRef((props, ref) => {
     const internalRef = React.useRef(null);
@@ -59,6 +58,6 @@ const Textarea = React.forwardRef((props, ref) => {
         }, onChange: (e) => {
             expandToFitContent();
             props.onChange && props.onChange(e);
-        }, as: "textarea", type: type, disabled: disabled, className: twMerge(clsx(baseClassName, disabled ? `${baseClassName}--disabled` : ''), className), spellCheck: false }));
+        }, as: "textarea", type: type, disabled: disabled, className: cn(baseClassName, disabled ? `${baseClassName}--disabled` : '', className), spellCheck: false }));
 });
 export default Textarea;

package/src/components/Toggle/Toggle.d.ts

@@ -4,5 +4,7 @@ export type ToggleProps = {
     onPressedChange: (pressed: boolean) => void;
     pressed?: boolean;
     icon?: AdaptableSystemIconName;
+    /** Render as an individual button (not inside a {@link ToggleGroup}). */
+    standalone?: boolean;
 };
 export declare const Toggle: React.FunctionComponent<React.PropsWithChildren<ToggleProps>>;

package/src/components/Toggle/Toggle.js

@@ -1,11 +1,10 @@
 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 { IconComponent } from '../Icon';
-import { twMerge } from '../../twMerge';
 import { ToggleGroupContext } from './ToggleGroup';
 const baseClassName = 'ab-Toggle';
-export const Toggle = ({ onPressedChange, pressed, icon, children, ...rest }) => {
+export const Toggle = ({ onPressedChange, pressed, icon, standalone = false, children, ...rest }) => {
     const onPressedChangeRef = React.useRef(onPressedChange);
     React.useLayoutEffect(() => {
         onPressedChangeRef.current = onPressedChange;
@@ -20,7 +19,10 @@ export const Toggle = ({ onPressedChange, pressed, icon, children, ...rest }) =>
     const isActive = toggleContext.activeIndex === currentIndex;
     const ref = React.useRef(null);
     React.useEffect(() => {
-        if (!toggleContext || !toggleContext.toggleButtons) {
+        if (standalone) {
+            return;
+        }
+        if (!toggleContext?.toggleButtons) {
             return;
         }
         const thisButton = {
@@ -36,18 +38,23 @@ export const Toggle = ({ onPressedChange, pressed, icon, children, ...rest }) =>
             }
         };
     }, [toggleContext]);
-    return (_jsxs("button", { ...rest, ref: ref, tabIndex: -1, className: twMerge(clsx('twa:border-0', 'twa:cursor-pointer twa:fill-current', 'twa:outline-0', 'twa:min-h-input twa:relative twa:py-1 twa:px-2', 'twa:not-first:after:content-[""] twa:not-first:after:border-l-2 twa:not-first:after:border-accent-foreground twa:not-first:after:h-[10px] twa:not-first:after:absolute twa:not-first:after:-left-px twa:not-first:after:top-1/2 twa:not-first:after:-translate-y-1/2', 
+    return (_jsxs("button", { ...rest, ref: ref, tabIndex: standalone ? 0 : -1, className: cn('twa:border-0', 'twa:cursor-pointer twa:fill-current', 'twa:outline-0', 'twa:min-h-input twa:relative twa:py-1 twa:px-2', !standalone &&
+            'twa:not-first:after:content-[""] twa:not-first:after:border-l-2 twa:not-first:after:border-accent-foreground twa:not-first:after:h-[10px] twa:not-first:after:absolute twa:not-first:after:-left-px twa:not-first:after:top-1/2 twa:not-first:after:-translate-y-1/2', standalone && [
+            'ab-Toggle--standalone',
+            'twa:shadow-sm twa:rounded-standard twa:bg-primary twa:text-primary-foreground',
+        ], 
         // backgrounds
         {
             'twa:text-inherit twa:bg-transparent': !pressed,
-            'twa:hover:bg-primarylight twa:hover:text-text-on-primary': !pressed,
+            'twa:hover:bg-primarylight twa:hover:text-primary-foreground': !pressed,
             [`${baseClassName}--pressed`]: pressed,
             'twa:bg-accent twa:hover:bg-accent/90 twa:text-accent-foreground': pressed,
-        }, {
+        }, !standalone && {
             'twa:before:rounded-standard twa:before:content-[""] twa:before:absolute twa:before:inset-1 twa:before:z-20 twa:before:pointer-events-none': true,
             // let's display a shadow on the before pseudo element
             // when the toggle is active
             'twa:before:shadow-(--ab-focus-light__box-shadow)': isActive && pressed,
             'twa:before:shadow-(--ab-focus__box-shadow)': isActive && !pressed,
-        }, baseClassName)), onClick: toggle, children: [icon && _jsx(IconComponent, { icon: { name: icon } }), children] }));
+        }, standalone &&
+            'twa:focus-visible:ring-2 twa:focus-visible:ring-ring twa:focus-visible:ring-offset-1', baseClassName), onClick: toggle, children: [icon && _jsx(IconComponent, { icon: { name: icon } }), children] }));
 };

package/src/components/Toggle/ToggleGroup.js

@@ -1,9 +1,9 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
 import { Flex } from '../Flex';
-import clsx from 'clsx';
 import { useRef } from 'react';
 import contains from '../utils/contains';
+import { cn } from '../../lib/utils';
 export const ToggleGroupContext = React.createContext({
     toggleButtons: [],
     activeIndex: -1,
@@ -20,7 +20,7 @@ export const ToggleGroup = (props) => {
             activeIndex: index,
         }));
     }, []);
-    return (_jsx(ToggleGroupContext.Provider, { value: context, children: _jsx(Flex, { ref: ref, tabIndex: 0, className: clsx('ab-Toggle-Group twa:shadow-sm', 'twa:bg-primary twa:text-text-on-primary', 'twa:rounded-standard twa:overflow-hidden', 'twa:inline-flex twa:w-fit', 'twa:focus:outline-0', 
+    return (_jsx(ToggleGroupContext.Provider, { value: context, children: _jsx(Flex, { ref: ref, tabIndex: 0, className: cn('ab-Toggle-Group twa:shadow-sm', 'twa:bg-primary twa:text-primary-foreground', 'twa:rounded-standard twa:overflow-hidden', 'twa:inline-flex twa:w-fit', 'twa:focus:outline-0', 
             // make the shadow of child Toggle buttons invisible when the group is not focused
             'twa:not-focus-within:[--ab-focus-light__box-shadow:none]', 'twa:not-focus-within:[--ab-focus__box-shadow:none]'), onMouseDown: (event) => {
                 const index = context.toggleButtons.findIndex((btn) => contains(btn.node, event.target));

package/src/components/ToggleButton/index.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import clsx from 'clsx';
 import { Flex } from '../Flex';
 import { twMerge } from '../../twMerge';
+import { cn } from '../../lib/utils';
 export const ToggleButton = ({ checked, onChange, disabled, className, children, style = {}, 'data-name': dataName, }) => {
     const isChecked = Boolean(checked);
     const handleChange = (event) => {
@@ -11,12 +11,12 @@ export const ToggleButton = ({ checked, onChange, disabled, className, children,
         onChange(Boolean(event.target.checked));
     };
     const baseClassName = 'ab-ToggleButton';
-    const preparedClassName = clsx(baseClassName, 'twa:group twa:outline-0', 'twa:select-none twa:relative twa:inline-block', 'twa:min-w-[40px]', 'twa:min-h-input', 'twa:w-[77px]', {
+    const preparedClassName = cn(baseClassName, 'twa:group twa:outline-0', 'twa:select-none twa:relative twa:inline-block', 'twa:min-w-[40px]', 'twa:min-h-input', 'twa:w-[77px]', {
         [`${baseClassName}--checked`]: isChecked,
         [`${baseClassName}--disabled`]: disabled,
         'twa:hover:cursor-pointer twa:hover:opacity-85': !disabled,
     }, className);
-    return (_jsxs("label", { "data-checked": isChecked, "data-name": dataName, style: style, className: twMerge(preparedClassName), children: [_jsx("input", { type: "checkbox", disabled: disabled, checked: isChecked, className: clsx(`${baseClassName}__input`, 'twa:opacity-0 twa:size-0'), onChange: handleChange }), _jsx(Flex, { alignItems: "center", "data-checked": isChecked, className: clsx(`${baseClassName}__slider`, 'twa:group:focus-within:ring-1 twa:group-focus-within:shadow-(--ab-focus__box-shadow)', 'twa:absolute twa:inset-0 twa:rounded-standard', {
+    return (_jsxs("label", { "data-checked": isChecked, "data-name": dataName, style: style, className: twMerge(preparedClassName), children: [_jsx("input", { type: "checkbox", disabled: disabled, checked: isChecked, className: cn(`${baseClassName}__input`, 'twa:opacity-0 twa:size-0'), onChange: handleChange }), _jsx(Flex, { alignItems: "center", "data-checked": isChecked, className: cn(`${baseClassName}__slider`, 'twa:group:focus-within:ring-1 twa:group-focus-within:shadow-(--ab-focus__box-shadow)', 'twa:absolute twa:inset-0 twa:rounded-standard', {
                     'twa:bg-(--ab-cmp-toggle-button__background)': !isChecked,
                     'twa:bg-accent': isChecked,
                     'twa:justify-start': isChecked,
@@ -24,7 +24,7 @@ export const ToggleButton = ({ checked, onChange, disabled, className, children,
                     'twa:opacity-50': disabled,
                 }, 
                 // the :before pseudo element
-                'twa:before:absolute twa:before:content-[""] twa:before:size-[24px]', 'twa:before:rounded-standard twa:before:bg-white'), children: _jsx("div", { className: clsx(`${baseClassName}__text`, 'twa:font-semibold', 'twa:pr-2', 'twa:text-1', {
+                'twa:before:absolute twa:before:content-[""] twa:before:size-[24px]', 'twa:before:rounded-standard twa:before:bg-white'), children: _jsx("div", { className: cn(`${baseClassName}__text`, 'twa:font-semibold', 'twa:pr-2', 'twa:text-1', {
                         'twa:text-(--ab-cmp-toggle-button__color)': !isChecked,
                         'twa:text-(--ab-cmp-toggle-button--checked__color)': isChecked,
                         'twa:pl-2': isChecked,

package/src/components/Tree/TreeDropdown/index.js

@@ -1,9 +1,8 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import { useCallback, useMemo, useState } from 'react';
-import clsx from 'clsx';
 import { ChevronRightIcon, ChevronDownIcon, ChevronsDownUpIcon, ChevronsUpDownIcon, } from 'lucide-react';
 import { TreeExpandState, TreeSelectionState } from '../../InfiniteTable';
-import { MultiCombobox } from '../../Combobox';
+import { GRID_FILTER_COMBBOX_ADJUSTMENTS_CLASSNAME, MultiCombobox, } from '../../Combobox';
 import { ComboboxChip } from '../../ui/combobox';
 import { toDisplayValueDefault, toDisplayValueFromOptionTree } from '../treeUtils';
 import { cn } from '../../../lib/utils';
@@ -57,15 +56,9 @@ function TreeItemLabel(props) {
     // that base-ui's boolean indicator can't.
     const indent = node.depth > 0 ? `calc(${node.depth} * var(--ab-tree-indent-size))` : 0;
     const iconProps = {
-        style: {
-            // override this explicitly since the parent ComboboxItem
-            // sets this on highlighted items, but the color is not appropriate
-            //@ts-ignore ignore
-            '--ab-color-accent-foreground': 'var(--ab-color-accent)',
-        },
         className: 'twa:size-4',
     };
-    return (_jsxs(_Fragment, { children: [node.hasChildren ? (_jsx("button", { type: "button", tabIndex: -1, "aria-label": isExpanded ? 'Collapse' : 'Expand', "data-name": "expand-collapse-icon", onMouseDown: handleChevronMouseDown, onClick: handleChevronClick, style: { order: -1, marginLeft: indent }, className: cn('twa:inline-flex twa:shrink-0 twa:items-center twa:justify-center twa:rounded', 'twa:cursor-pointer'), children: isExpanded ? _jsx(ChevronDownIcon, { ...iconProps }) : _jsx(ChevronRightIcon, { ...iconProps }) })) : reserveExpandSpace ? (_jsx("span", { "aria-hidden": "true", style: { order: -1, marginLeft: indent }, className: "twa:inline-block twa:size-4 twa:shrink-0" })) : null, _jsx(CheckBox, { checked: selected, checkSquareClassName: clsx(selected === true && 'twa:ring-1 twa:ring-accent-foreground') }), _jsx("span", { className: "twa:truncate twa:min-w-0 twa:flex-1", children: node.label })] }));
+    return (_jsxs(_Fragment, { children: [node.hasChildren ? (_jsx("button", { type: "button", tabIndex: -1, "aria-label": isExpanded ? 'Collapse' : 'Expand', "data-name": "expand-collapse-icon", onMouseDown: handleChevronMouseDown, onClick: handleChevronClick, style: { order: -1, marginLeft: indent }, className: cn('twa:bg-transparent twa:text-foreground', 'twa:inline-flex twa:shrink-0 twa:items-center twa:justify-center twa:rounded', 'twa:cursor-pointer'), children: isExpanded ? _jsx(ChevronDownIcon, { ...iconProps }) : _jsx(ChevronRightIcon, { ...iconProps }) })) : reserveExpandSpace ? (_jsx("span", { "aria-hidden": "true", style: { order: -1, marginLeft: indent }, className: "twa:inline-block twa:size-4 twa:shrink-0" })) : null, _jsx(CheckBox, { checked: selected, checkSquareClassName: cn(selected === true && 'twa:ring-1 twa:ring-accent-foreground') }), _jsx("span", { className: "twa:truncate twa:min-w-0 twa:flex-1", children: node.label })] }));
 }
 export function TreeDropdown(props) {
     const { isLoading = false } = props;
@@ -454,7 +447,7 @@ export function TreeDropdown(props) {
             }, onClick: (e) => {
                 e.preventDefault();
                 toggleExpandAll();
-            }, className: cn('ab-NewTreeDropdown-expand-all', 'twa:inline-flex twa:shrink-0 twa:items-center twa:justify-center', 'twa:bg-defaultbackground', 'twa:size-6 twa:rounded-md twa:text-muted-foreground', 'twa:hover:text-foreground twa:hover:bg-ring/50 twa:cursor-pointer'
+            }, className: cn('ab-NewTreeDropdown-expand-all', 'twa:inline-flex twa:shrink-0 twa:items-center twa:justify-center', 'twa:bg-background', 'twa:size-6 twa:rounded-md twa:text-muted-foreground', 'twa:hover:text-foreground twa:hover:bg-ring/50 twa:cursor-pointer'
             // 'twa:-mr-1'
             ), children: anyBranchExpanded ? (_jsx(ChevronsDownUpIcon, { className: "twa:size-4" })) : (_jsx(ChevronsUpDownIcon, { className: "twa:size-4" })) }));
     }, [branchNodes.length, anyBranchExpanded, toggleExpandAll]);
@@ -479,6 +472,8 @@ export function TreeDropdown(props) {
         resizable: props.resizable,
         placeholder: props.placeholder,
         showClear: showRemoveChip,
+        //@ts-ignore ignore
+        'data-name': props['data-name'] ?? 'Select Values',
         renderItemLabel: (defaultLabel) => {
             return defaultLabel;
         },
@@ -496,11 +491,11 @@ export function TreeDropdown(props) {
         },
         renderInputValues,
         renderSearchInputTrailing,
-        className: clsx('ab-NewTreeDropdown', props.className),
+        className: cn('ab-NewTreeDropdown', props.className),
     };
     return (
         // <div
-        //   className={clsx('ab-NewTreeDropdown-wrap', 'twa:w-full')}
+        //   className={cn('ab-NewTreeDropdown-wrap', 'twa:w-full')}
         //   style={{ ...props.fieldStyle, ...props.style }}
         //   onMouseDown={props.onMouseDown}
         // >
@@ -520,10 +515,6 @@ export function GridFilterTreeDropdown(props) {
         }
         return (_jsxs("div", { className: "twa:text-ellipsis twa:overflow-hidden twa:whitespace-nowrap twa:flex-1000", "data-slot": "combobox-selected-values", children: [showSelectedCount && selectedLeafPaths.length > 0 && (_jsxs("span", { "data-name": "multiple-values-count", className: "twa:mr-0.5", children: ["(", selectedLeafPaths.length, ")"] })), children] }));
     }, [placeholder, showSelectedCount]);
-    const mergedClassName = cn(
-    // Match the restyling GridFilterCombobox uses: remove the field border,
-    // flatten the shadow and absolutely position so the component fits the
-    // grid's floating-filter input box.
-    'twa:[.ab-FloatingFilter_&]:border-none twa:[.ab-FloatingFilter_&]:inset-y-0.5 twa:[.ab-FloatingFilter_&]:inset-x-0 twa:[.ab-FloatingFilter_&]:absolute twa:[.ab-FloatingFilter_&]:shadow-none twa:[.ab-FloatingFilter_&]:min-h-auto!', className);
+    const mergedClassName = cn(GRID_FILTER_COMBBOX_ADJUSTMENTS_CLASSNAME, className);
     return (_jsx(TreeDropdown, { ...rest, placeholder: placeholder, className: mergedClassName, showClear: rest.showClear ?? false, resizable: rest.resizable ?? true, renderSelectedValues: renderSelectedValues }));
 }