@adaptabletools/adaptable 23.0.0-canary.5 → 23.0.0-canary.7

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,7 +73,7 @@ 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
@@ -86,7 +86,7 @@ const SimpleButton = React.forwardRef((givenProps, theRef) => {
             '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'
@@ -96,13 +96,13 @@ const SimpleButton = React.forwardRef((givenProps, theRef) => {
             : '', variant === 'raised'
             ? {
                 '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-text-on-success': tone == 'success',
+                '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-primary-foreground': 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-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)', 'twa:pt-0.5'), 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-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-primary-foreground', '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,6 +1,5 @@
 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 { GRID_FILTER_COMBBOX_ADJUSTMENTS_CLASSNAME, MultiCombobox, } from '../../Combobox';
@@ -59,7 +58,7 @@ function TreeItemLabel(props) {
     const iconProps = {
         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: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: 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;
@@ -492,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}
         // >

package/src/components/WarningBox/index.js

@@ -1,7 +1,7 @@
 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-WarningBox';
 export const WarningBox = (props) => {
-    return (_jsx(Box, { ...props, className: clsx('twa:p-3 twa:rounded-standard twa:bg-warn twa:text-text-on-warn', baseClassName, props.className) }));
+    return (_jsx(Box, { ...props, className: cn('twa:p-3 twa:rounded-standard twa:bg-warn twa:text-warn-foreground', baseClassName, props.className) }));
 };

package/src/components/icons/sort-asc.js

@@ -1,3 +1,3 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import DefaultIcon from './DefaultIcon';
-export default (props) => (_jsx(DefaultIcon, { ...props, children: _jsxs("g", { transform: "scale(0.021 0.021)", children: [_jsx("path", { d: "M320 768v-768h-128v768h-160l224 224 224-224h-160z" }), _jsx("path", { d: "M928 1024h-256c-11.8 0-22.644-6.496-28.214-16.9-5.566-10.404-4.958-23.030 1.59-32.85l222.832-334.25h-196.208c-17.672 0-32-14.328-32-32s14.328-32 32-32h256c11.8 0 22.644 6.496 28.214 16.9 5.566 10.404 4.958 23.030-1.59 32.85l-222.83 334.25h196.206c17.672 0 32 14.328 32 32s-14.328 32-32 32z" }), _jsx("path", { d: "M1020.622 401.686l-192.002-384c-5.42-10.842-16.502-17.69-28.622-17.69-12.122 0-23.202 6.848-28.624 17.69l-191.996 384c-7.904 15.806-1.496 35.030 14.31 42.932 4.594 2.296 9.476 3.386 14.288 3.386 11.736 0 23.040-6.484 28.644-17.698l55.156-110.31h216.446l55.156 110.31c7.902 15.806 27.124 22.21 42.932 14.31 15.808-7.902 22.216-27.124 14.312-42.93zM723.778 255.996l76.22-152.446 76.224 152.446h-152.444z" })] }) }));
+export default (props) => (_jsx(DefaultIcon, { ...props, children: _jsxs("g", { transform: "scale(0.021 0.021)", children: [_jsx("path", { transform: "translate(0, 1024) scale(1, -1)", d: "M320 768v-768h-128v768h-160l224 224 224-224h-160z" }), _jsx("path", { d: "M928 1024h-256c-11.8 0-22.644-6.496-28.214-16.9-5.566-10.404-4.958-23.030 1.59-32.85l222.832-334.25h-196.208c-17.672 0-32-14.328-32-32s14.328-32 32-32h256c11.8 0 22.644 6.496 28.214 16.9 5.566 10.404 4.958 23.030-1.59 32.85l-222.83 334.25h196.206c17.672 0 32 14.328 32 32s-14.328 32-32 32z" }), _jsx("path", { d: "M1020.622 401.686l-192.002-384c-5.42-10.842-16.502-17.69-28.622-17.69-12.122 0-23.202 6.848-28.624 17.69l-191.996 384c-7.904 15.806-1.496 35.030 14.31 42.932 4.594 2.296 9.476 3.386 14.288 3.386 11.736 0 23.040-6.484 28.644-17.698l55.156-110.31h216.446l55.156 110.31c7.902 15.806 27.124 22.21 42.932 14.31 15.808-7.902 22.216-27.124 14.312-42.93zM723.778 255.996l76.22-152.446 76.224 152.446h-152.444z" })] }) }));

package/src/components/ui/button.d.ts

@@ -2,10 +2,10 @@ import * as React from 'react';
 import { type VariantProps } from 'class-variance-authority';
 declare const buttonVariants: (props?: {
     variant?: "link" | "secondary" | "default" | "ghost" | "outline" | "destructive";
-    size?: "default" | "icon" | "xs" | "sm" | "lg" | "icon-xs" | "icon-sm" | "icon-lg";
+    size?: "default" | "xs" | "sm" | "lg" | "icon" | "icon-xs" | "icon-sm" | "icon-lg";
 } & import("class-variance-authority/dist/types").ClassProp) => string;
 declare const Button: React.ForwardRefExoticComponent<Omit<import("@base-ui/react/button").ButtonProps & VariantProps<(props?: {
     variant?: "link" | "secondary" | "default" | "ghost" | "outline" | "destructive";
-    size?: "default" | "icon" | "xs" | "sm" | "lg" | "icon-xs" | "icon-sm" | "icon-lg";
+    size?: "default" | "xs" | "sm" | "lg" | "icon" | "icon-xs" | "icon-sm" | "icon-lg";
 } & import("class-variance-authority/dist/types").ClassProp) => string>, "ref"> & React.RefAttributes<HTMLButtonElement>>;
 export { Button, buttonVariants };

package/src/components/ui/combobox.d.ts

@@ -6,7 +6,9 @@ declare const Combobox: typeof ComboboxPrimitive.Root;
 declare const RESIZABLE_VIRTUALIZED_LIST_CLASS = "twa:group-data-resizable/combobox-content:max-h-none twa:group-data-resizable/combobox-content:flex-1 twa:group-data-resizable/combobox-content:min-h-0 twa:group-data-resizable/combobox-content:flex twa:group-data-resizable/combobox-content:flex-col";
 declare const RESIZABLE_VIRTUALIZED_SCROLL_CLASS = "twa:group-data-resizable/combobox-content:h-auto twa:group-data-resizable/combobox-content:max-h-none twa:group-data-resizable/combobox-content:flex-1 twa:group-data-resizable/combobox-content:min-h-0";
 declare function ComboboxValue({ ...props }: ComboboxPrimitive.Value.Props): React.JSX.Element;
-declare const ComboboxTrigger: React.ForwardRefExoticComponent<Omit<import("@base-ui/react").ComboboxTriggerProps, "ref"> & React.RefAttributes<HTMLButtonElement>>;
+declare const ComboboxTrigger: React.ForwardRefExoticComponent<Omit<import("@base-ui/react").ComboboxTriggerProps & {
+    icon?: React.ReactNode;
+}, "ref"> & React.RefAttributes<HTMLButtonElement>>;
 export declare const ComboboxClear: React.ForwardRefExoticComponent<Omit<import("@base-ui/react").AutocompleteClearProps, "ref"> & React.RefAttributes<HTMLButtonElement>>;
 declare const ComboboxInput: React.ForwardRefExoticComponent<Omit<import("@base-ui/react").AutocompleteInputProps & {
     isLoading?: boolean;

package/src/components/ui/combobox.js

@@ -15,8 +15,8 @@ const RESIZABLE_VIRTUALIZED_SCROLL_CLASS = 'twa:group-data-resizable/combobox-co
 function ComboboxValue({ ...props }) {
     return _jsx(ComboboxPrimitive.Value, { "data-slot": "combobox-value", ...props });
 }
-const ComboboxTrigger = React.forwardRef(function ComboboxTrigger({ className, children, ...props }, ref) {
-    return (_jsxs(ComboboxPrimitive.Trigger, { "data-slot": "combobox-trigger", className: cn('twa:[&_svg:not([class*=size-])]:size-4', className), ref: ref, ...props, children: [children, _jsx(ChevronDownIcon, { className: "twa:pointer-events-none twa:size-4 twa:text-muted-foreground" })] }));
+const ComboboxTrigger = React.forwardRef(function ComboboxTrigger({ className, children, icon, ...props }, ref) {
+    return (_jsxs(ComboboxPrimitive.Trigger, { "data-slot": "combobox-trigger", className: cn('twa:[&_svg:not([class*=size-])]:size-4', className), ref: ref, ...props, children: [children, icon !== undefined ? (icon) : (_jsx(ChevronDownIcon, { className: "twa:pointer-events-none twa:size-4 twa:text-muted-foreground" }))] }));
 });
 export const ComboboxClear = React.forwardRef(function ComboboxClear({ className, ...props }, ref) {
     return (_jsx(ComboboxPrimitive.Clear, { "data-slot": "combobox-clear", render: _jsx(InputGroupButton, { variant: "ghost", size: "icon-xs", className: "twa:min-h-auto!" }), className: className, ref: ref, ...props, children: _jsx(XIcon, { className: "twa:pointer-events-none", strokeWidth: 1 }) }));

package/src/components/ui/input-group.d.ts

@@ -7,7 +7,7 @@ declare const inputGroupAddonVariants: (props?: {
 declare function InputGroupAddon({ className, align, ...props }: React.ComponentProps<'div'> & VariantProps<typeof inputGroupAddonVariants>): React.JSX.Element;
 declare const InputGroupButton: React.ForwardRefExoticComponent<Omit<Omit<Omit<import("@base-ui/react").ButtonProps & VariantProps<(props?: {
     variant?: "link" | "secondary" | "default" | "ghost" | "outline" | "destructive";
-    size?: "default" | "icon" | "xs" | "sm" | "lg" | "icon-xs" | "icon-sm" | "icon-lg";
+    size?: "default" | "xs" | "sm" | "lg" | "icon" | "icon-xs" | "icon-sm" | "icon-lg";
 } & import("class-variance-authority/dist/types").ClassProp) => string>, "ref"> & React.RefAttributes<HTMLButtonElement>, "type" | "size"> & VariantProps<(props?: {
     size?: "xs" | "sm" | "icon-xs" | "icon-sm";
 } & import("class-variance-authority/dist/types").ClassProp) => string> & {

package/src/components/ui/select.js

@@ -14,12 +14,13 @@ const SelectTrigger = React.forwardRef(function SelectTrigger({ className, size
     return (_jsxs(SelectPrimitive.Trigger, { ref: ref, "data-slot": "select-trigger", "data-size": size, className: cn('twa:flex twa:w-fit twa:items-center twa:justify-between twa:gap-1.5 twa:rounded-input twa:border twa:border-input twa:py-1.5 twa:pr-2 twa:pl-2.5 twa:text-sm twa:whitespace-nowrap twa:shadow-xs twa:transition-[color,box-shadow] twa:outline-none twa:focus-visible:border-ring twa:focus-visible:ring-3 twa:focus-visible:ring-ring/50 twa:disabled:cursor-not-allowed twa:disabled:opacity-50 twa:aria-invalid:border-destructive twa:aria-invalid:ring-3 twa:aria-invalid:ring-destructive/20 twa:data-placeholder:text-muted-foreground twa:data-[size=default]:min-h-input twa:data-[size=sm]:h-7 twa:data-[size=sm]:min-h-auto twa:*:data-[slot=select-value]:line-clamp-1 twa:*:data-[slot=select-value]:flex twa:*:data-[slot=select-value]:items-center twa:*:data-[slot=select-value]:gap-1.5 twa:bg-input-background twa:hover:bg-input-background/80 twa:dark:aria-invalid:border-destructive/50 twa:dark:aria-invalid:ring-destructive/40 twa:[&_svg]:pointer-events-none twa:[&_svg]:shrink-0 twa:[&_svg:not([class*=size-])]:size-4', className), ...props, "data-name": props['data-name'], children: [children, icon !== undefined ? (icon) : (_jsx(SelectPrimitive.Icon, { render: _jsx(ChevronDownIcon, { className: "twa:pointer-events-none twa:size-4 twa:text-muted-foreground" }) }))] }));
 });
 function SelectContent({ className, children, side = 'bottom', sideOffset = 4, align = 'center', alignOffset = 0, alignItemWithTrigger = true, container, stopMouseDownPropagation = false, ...props }) {
-    const onMouseDown = stopMouseDownPropagation
+    const stopEventPropagation = stopMouseDownPropagation
         ? (e) => {
+            e.stopPropagation();
             e.nativeEvent?.stopPropagation?.();
         }
         : undefined;
-    return (_jsx(SelectPrimitive.Portal, { container: container, children: _jsx(SelectPrimitive.Positioner, { side: side, sideOffset: sideOffset, align: align, alignOffset: alignOffset, alignItemWithTrigger: alignItemWithTrigger, className: `twa:isolate ${POPUP_Z_INDEX}`, children: _jsxs(SelectPrimitive.Popup, { "data-slot": "select-content", "data-align-trigger": alignItemWithTrigger, onMouseDown: onMouseDown, className: cn('twa:relative twa:isolate twa:z-50 twa:max-h-(--available-height) twa:min-w-36 twa:origin-(--transform-origin) twa:overflow-x-hidden twa:overflow-y-auto twa:rounded-input twa:bg-popover twa:text-popover-foreground twa:shadow-md twa:ring-1 twa:ring-foreground/10 twa:duration-100 twa:data-[align-trigger=true]:animate-none twa:data-[side=bottom]:slide-in-from-top-2 twa:data-[side=inline-end]:slide-in-from-left-2 twa:data-[side=inline-start]:slide-in-from-right-2 twa:data-[side=left]:slide-in-from-right-2 twa:data-[side=right]:slide-in-from-left-2 twa:data-[side=top]:slide-in-from-bottom-2 twa:data-open:animate-in twa:data-open:fade-in-0 twa:data-open:zoom-in-95 twa:data-closed:animate-out twa:data-closed:fade-out-0 twa:data-closed:zoom-out-95', 'twa:w-(--anchor-width)', 'twa:max-w-[min(var(--available-width),80vw)]', className), ...props, children: [_jsx(SelectScrollUpButton, {}), _jsx(SelectPrimitive.List, { children: children }), _jsx(SelectScrollDownButton, {})] }) }) }));
+    return (_jsx(SelectPrimitive.Portal, { container: container, children: _jsx(SelectPrimitive.Positioner, { side: side, sideOffset: sideOffset, align: align, alignOffset: alignOffset, alignItemWithTrigger: alignItemWithTrigger, className: `twa:isolate ${POPUP_Z_INDEX}`, children: _jsxs(SelectPrimitive.Popup, { "data-slot": "select-content", "data-align-trigger": alignItemWithTrigger, onMouseDown: stopEventPropagation, onClick: stopEventPropagation, className: cn('twa:relative twa:isolate twa:z-50 twa:max-h-(--available-height) twa:min-w-36 twa:origin-(--transform-origin) twa:overflow-x-hidden twa:overflow-y-auto twa:rounded-input twa:bg-popover twa:text-popover-foreground twa:shadow-md twa:ring-1 twa:ring-foreground/10 twa:duration-100 twa:data-[align-trigger=true]:animate-none twa:data-[side=bottom]:slide-in-from-top-2 twa:data-[side=inline-end]:slide-in-from-left-2 twa:data-[side=inline-start]:slide-in-from-right-2 twa:data-[side=left]:slide-in-from-right-2 twa:data-[side=right]:slide-in-from-left-2 twa:data-[side=top]:slide-in-from-bottom-2 twa:data-open:animate-in twa:data-open:fade-in-0 twa:data-open:zoom-in-95 twa:data-closed:animate-out twa:data-closed:fade-out-0 twa:data-closed:zoom-out-95', 'twa:w-(--anchor-width)', 'twa:max-w-[min(var(--available-width),80vw)]', className), ...props, children: [_jsx(SelectScrollUpButton, {}), _jsx(SelectPrimitive.List, { children: children }), _jsx(SelectScrollDownButton, {})] }) }) }));
 }
 const SelectLabel = React.forwardRef(function SelectLabel({ className, ...props }, ref) {
     return (_jsx(SelectPrimitive.GroupLabel, { "data-slot": "select-label", className: cn('twa:px-2 twa:py-1.5 twa:text-xs twa:text-muted-foreground', className), ref: ref, ...props }));

package/src/components/ui/textarea.js

@@ -2,6 +2,6 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
 import { cn } from '../../lib/utils';
 const Textarea = React.forwardRef(function Textarea({ className, ...props }, ref) {
-    return (_jsx("textarea", { "data-slot": "textarea", className: cn('twa:flex twa:field-sizing-content twa:min-h-16 twa:w-full twa:rounded-md twa:border twa:border-input twa:bg-transparent twa:px-2.5 twa:py-2 twa:text-base twa:shadow-xs twa:transition-[color,box-shadow] twa:outline-none twa:placeholder:text-muted-foreground twa:focus-visible:border-ring twa:focus-visible:ring-3 twa:focus-visible:ring-ring/50 twa:disabled:cursor-not-allowed twa:disabled:opacity-50 twa:aria-invalid:border-destructive twa:aria-invalid:ring-3 twa:aria-invalid:ring-destructive/20 twa:md:text-sm twa:dark:aria-invalid:border-destructive/50 twa:dark:aria-invalid:ring-destructive/40', className), ref: ref, ...props }));
+    return (_jsx("textarea", { "data-slot": "textarea", className: cn('twa:text-input-foreground twa:flex twa:field-sizing-content twa:min-h-16 twa:w-full twa:rounded-md twa:border twa:border-input twa:bg-transparent twa:px-2.5 twa:py-2 twa:text-base twa:shadow-xs twa:transition-[color,box-shadow] twa:outline-none twa:placeholder:text-muted-foreground twa:focus-visible:border-ring twa:focus-visible:ring-3 twa:focus-visible:ring-ring/50 twa:disabled:cursor-not-allowed twa:disabled:opacity-50 twa:aria-invalid:border-destructive twa:aria-invalid:ring-3 twa:aria-invalid:ring-destructive/20 twa:md:text-sm twa:dark:aria-invalid:border-destructive/50 twa:dark:aria-invalid:ring-destructive/40', className), ref: ref, ...props }));
 });
 export { Textarea };

package/src/env.js

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

package/src/layout-manager/src/index.js

@@ -490,9 +490,13 @@ export class LayoutManager extends LMEmitter {
             // if it's different from the initial default column width
             else if (colState.width && initialWidth != colState.width) {
                 const colSizing = { ...ColumnSizing[colId] };
-                delete colSizing.Flex;
-                colSizing.Width = colState.width;
-                ColumnSizing[colId] = colSizing;
+                // Flex columns often report a computed width without flex in column state —
+                // keep explicit Flex sizing from the layout instead of replacing it with pixels.
+                if (colSizing.Flex == null) {
+                    delete colSizing.Flex;
+                    colSizing.Width = colState.width;
+                    ColumnSizing[colId] = colSizing;
+                }
             }
             if (colState.hide) {
                 acc[colId] = false;