@adaptabletools/adaptable 21.2.2-canary.0 → 22.0.0-canary.1

package/src/components/Tabs/index.js

@@ -1,8 +1,10 @@
 import * as React from 'react';
-import { Box, Flex } from 'rebass';
 import { useRef } from 'react';
 import join from '../utils/join';
 import useProperty from '../utils/useProperty';
+import { Box, Flex } from '../Flex';
+import { twMerge } from '../../twMerge';
+import clsx from 'clsx';
 const TabContext = React.createContext({
     selectedIndex: 0,
     tabCount: 0,
@@ -15,7 +17,7 @@ const isTabContent = (c) => {
     return c.type === Content || SupportedTabContentComps.has(c.type);
 };
 export const Tabs = (props) => {
-    const { autoFocus = true, children, onValueChange: _onValueChange, defaultValue: _defaultValue, value: _value, keyboardNavigation = true, selectedIndex: _selectedIndex, defaultSelectedIndex: _defaultSelectedIndex, onSelectedIndexChange: _onSelectedIndexChange, ...boxProps } = props;
+    const { autoFocus, children, onValueChange: _onValueChange, defaultValue: _defaultValue, value: _value, keyboardNavigation = true, selectedIndex: _selectedIndex, defaultSelectedIndex: _defaultSelectedIndex, onSelectedIndexChange: _onSelectedIndexChange, ...boxProps } = props;
     let [selectedIndex, doSetSelectedIndex] = useProperty(props, 'selectedIndex', 0);
     const [selectedValue, setSelectedValue] = useProperty(props, 'value', 0);
     const allChildren = React.Children.toArray(children);
@@ -58,17 +60,18 @@ 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)');
     return (React.createElement(TabContext.Provider, { value: {
             selectedIndex,
             tabCount: tabs.length,
             setSelectedIndex,
         } },
-        React.createElement(Box, { ...boxProps, className: join(boxProps.className, 'ab-Tabs'), "data-selected-index": selectedIndex },
-            React.createElement(Flex, { flexDirection: "row", className: "ab-Tabs__Strip" },
-                React.createElement(Box, { className: "ab-Tabs__Filler" }),
+        React.createElement(Box, { ...boxProps, className: join(boxProps.className, 'ab-Tabs twa:flex twa:flex-col'), "data-selected-index": selectedIndex },
+            React.createElement(Flex, { flexDirection: "row", className: clsx('ab-Tabs__Strip', 'twa:bg-(--ab-cmp-tabs-strip__background)') },
+                React.createElement(Box, { className: fillerClassName }),
                 tabs,
-                React.createElement(Flex, { flex: 1, className: "ab-Tabs__Filler" })),
-            React.createElement(Box, { padding: 2, ...contentProps, className: `${contentProps.className || ''} ab-Tabs__Body` }, currentContent))));
+                React.createElement(Flex, { className: clsx(fillerClassName, 'twa:flex-1') })),
+            React.createElement(Box, { ...contentProps, className: `ab-Tabs__Body twa:p-2 twa:flex-1 ${contentProps.className || ''} ` }, currentContent))));
 };
 export const Tab = (props) => {
     const { index, autoFocus, keyboardNavigation = true, className: propsClassName, ...boxProps } = props;
@@ -76,14 +79,28 @@ export const Tab = (props) => {
     const baseClassName = 'ab-Tabs__Tab';
     const active = context.selectedIndex === props.index;
     const beforeActive = context.selectedIndex === props.index + 1;
-    const className = join(propsClassName, baseClassName, active ? `${baseClassName}--active` : '', beforeActive ? `${baseClassName}--before-active` : '');
+    const className = clsx(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) {
             ref.current?.focus();
         }
     }, [active, autoFocus]);
-    return (React.createElement(Box, { ref: ref, padding: 2, tabIndex: active ? 0 : -1, ...boxProps, className: className, onClick: (event) => {
+    const mountedRef = React.useRef(false);
+    React.useEffect(() => {
+        // don't focus initially,
+        // so we don't steal focus, if autoFocus is false
+        if (!mountedRef.current) {
+            return;
+        }
+        if (active && keyboardNavigation) {
+            ref.current?.focus();
+        }
+    }, [active, keyboardNavigation]);
+    React.useEffect(() => {
+        mountedRef.current = true;
+    }, []);
+    return (React.createElement(Box, { ref: ref, tabIndex: active ? 0 : -1, ...boxProps, className: twMerge('twa:p-2', className), onClick: (event) => {
             context.setSelectedIndex(props.index);
             props.onClick?.(event);
         }, onKeyDown: (event) => {

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

@@ -1,3 +1,15 @@
 import * as React from 'react';
-import { FlexProps } from 'rebass';
-export declare const Tag: React.FunctionComponent<React.PropsWithChildren<FlexProps>>;
+import { FlexProps } from '../Flex';
+export declare const Tag: React.FunctionComponent<React.PropsWithChildren<FlexProps & {
+    className?: string;
+    style?: React.CSSProperties;
+    onClick?: React.MouseEventHandler<HTMLDivElement>;
+}> & React.RefAttributes<HTMLDivElement>>;
+export declare const TagBox: (props: {
+    children: React.ReactNode;
+    className?: string;
+}) => React.JSX.Element;
+export declare const TagList: (props: {
+    tags: (React.ReactNode | string)[];
+    className?: string;
+}) => React.JSX.Element;

package/src/components/Tag/Tag.js

@@ -1,4 +1,11 @@
 import * as React from 'react';
-import { Box } from 'rebass';
-import join from '../utils/join';
-export const Tag = React.forwardRef((props, ref) => (React.createElement(Box, { ...props, ref: ref, className: join('ab-Tag', props.className), backgroundColor: "primary", paddingTop: props.paddingTop ?? 1, paddingBottom: props.paddingBottom ?? 1, paddingLeft: props.paddingLeft ?? 2, paddingRight: props.paddingRight ?? 2, style: { borderRadius: 'var(--ab__border-radius)', ...props.style } })));
+import { twMerge } from '../../twMerge';
+import { Box, Flex } from '../Flex';
+import clsx from 'clsx';
+export const Tag = React.forwardRef((props, ref) => (React.createElement(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 })));
+export const TagBox = (props) => {
+    return (React.createElement(Box, { className: clsx('twa:flex twa:flex-wrap twa:flex-row twa:gap-1', props.className) }, props.children));
+};
+export const TagList = (props) => {
+    return (React.createElement(TagBox, { className: props.className }, props.tags.map((tag, index) => (React.createElement(Tag, { key: index }, tag)))));
+};

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

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

package/src/components/Tag/index.js

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

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

@@ -1,6 +1,6 @@
 import * as React from 'react';
-import { BoxProps } from 'rebass';
 import { HTMLProps } from 'react';
+import { BoxProps } from '../Flex';
 export declare const baseClassName = "ab-Textarea";
 /**
  * Autoheight strategy:
@@ -15,6 +15,8 @@ export type TextareaProps = Omit<HTMLProps<HTMLTextAreaElement>, 'ref'> & {
     disabled?: boolean;
     value?: string;
     autoResizeOnFocus?: boolean;
+    className?: string;
+    style?: React.CSSProperties;
 } & Omit<BoxProps, 'ref'>;
 declare const Textarea: React.ForwardRefExoticComponent<Omit<React.HTMLProps<HTMLTextAreaElement>, "ref"> & {
     placeholder?: string;
@@ -22,5 +24,7 @@ declare const Textarea: React.ForwardRefExoticComponent<Omit<React.HTMLProps<HTM
     disabled?: boolean;
     value?: string;
     autoResizeOnFocus?: boolean;
+    className?: string;
+    style?: React.CSSProperties;
 } & Omit<BoxProps, "ref"> & React.RefAttributes<HTMLDivElement | HTMLTextAreaElement | HTMLInputElement>>;
 export default Textarea;

package/src/components/Textarea/index.js

@@ -1,6 +1,7 @@
 import * as React from 'react';
-import { Box } from 'rebass';
-import join from '../utils/join';
+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);
@@ -57,6 +58,6 @@ const Textarea = React.forwardRef((props, ref) => {
         }, onChange: (e) => {
             expandToFitContent();
             props.onChange && props.onChange(e);
-        }, as: "textarea", type: type, disabled: disabled, className: join(className, baseClassName, disabled ? `${baseClassName}--disabled` : ''), spellCheck: false }));
+        }, as: "textarea", type: type, disabled: disabled, className: twMerge(clsx(baseClassName, disabled ? `${baseClassName}--disabled` : ''), className), spellCheck: false }));
 });
 export default Textarea;

package/src/components/Toggle/Toggle.js

@@ -1,9 +1,54 @@
 import * as React from 'react';
+import clsx from 'clsx';
 import { IconComponent } from '../Icon';
-import join from '../utils/join';
+import { twMerge } from '../../twMerge';
+import { ToggleGroupContext } from './ToggleGroup';
+const baseClassName = 'ab-Toggle';
 export const Toggle = ({ onPressedChange, pressed, icon, children, ...rest }) => {
-    const baseClassName = 'ab-Toggle';
-    return (React.createElement("button", { ...rest, className: join(baseClassName, pressed && `${baseClassName}--pressed`), onClick: () => onPressedChange(!pressed) },
+    const onPressedChangeRef = React.useRef(onPressedChange);
+    React.useLayoutEffect(() => {
+        onPressedChangeRef.current = onPressedChange;
+    }, [onPressedChange]);
+    const pressedRef = React.useRef(pressed);
+    React.useLayoutEffect(() => {
+        pressedRef.current = pressed;
+    }, [pressed]);
+    const toggle = React.useCallback(() => onPressedChangeRef.current(!pressedRef.current), []);
+    const toggleContext = React.useContext(ToggleGroupContext);
+    const [currentIndex, setCurrentIndex] = React.useState(-1);
+    const isActive = toggleContext.activeIndex === currentIndex;
+    const ref = React.useRef(null);
+    React.useEffect(() => {
+        if (!toggleContext || !toggleContext.toggleButtons) {
+            return;
+        }
+        const thisButton = {
+            node: ref.current,
+            toggle,
+        };
+        toggleContext.toggleButtons.push(thisButton);
+        setCurrentIndex(toggleContext.toggleButtons.length - 1);
+        return () => {
+            const index = toggleContext.toggleButtons.indexOf(thisButton);
+            if (index !== -1) {
+                toggleContext.toggleButtons.splice(index, 1);
+            }
+        };
+    }, [toggleContext]);
+    return (React.createElement("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', 
+        // backgrounds
+        {
+            'twa:text-inherit twa:bg-transparent': !pressed,
+            'twa:hover:bg-primarylight twa:hover:text-text-on-primary': !pressed,
+            [`${baseClassName}--pressed`]: pressed,
+            'twa:bg-accent twa:hover:bg-accent/90 twa:text-accent-foreground': pressed,
+        }, {
+            '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 },
         icon && React.createElement(IconComponent, { icon: { name: icon } }),
         children));
 };

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

@@ -1,2 +1,9 @@
 import * as React from 'react';
+export declare const ToggleGroupContext: React.Context<{
+    toggleButtons: {
+        node: HTMLButtonElement;
+        toggle: VoidFunction;
+    }[];
+    activeIndex: number;
+}>;
 export declare const ToggleGroup: React.FunctionComponent<React.PropsWithChildren<unknown>>;

package/src/components/Toggle/ToggleGroup.js

@@ -1,5 +1,60 @@
 import * as React from 'react';
-import { Flex } from 'rebass';
+import { Flex } from '../Flex';
+import clsx from 'clsx';
+import { useRef } from 'react';
+import contains from '../utils/contains';
+export const ToggleGroupContext = React.createContext({
+    toggleButtons: [],
+    activeIndex: -1,
+});
 export const ToggleGroup = (props) => {
-    return React.createElement(Flex, { className: "ab-Toggle-Group" }, props.children);
+    const ref = useRef(null);
+    const [context, setContext] = React.useState({
+        toggleButtons: [],
+        activeIndex: 0,
+    });
+    const setActiveIndex = React.useCallback((index) => {
+        setContext((prev) => ({
+            ...prev,
+            activeIndex: index,
+        }));
+    }, []);
+    return (React.createElement(ToggleGroupContext.Provider, { value: context },
+        React.createElement(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', 
+            // 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));
+                if (index !== -1) {
+                    setActiveIndex(index);
+                }
+            }, onKeyDown: (event) => {
+                const { toggleButtons, activeIndex } = context;
+                if (event.key === ' ') {
+                    event.preventDefault();
+                    event.stopPropagation();
+                    const activeButton = toggleButtons[activeIndex];
+                    if (!activeButton) {
+                        return;
+                    }
+                    activeButton.toggle();
+                    return;
+                }
+                if (event.key === 'ArrowLeft' || event.key === 'ArrowRight') {
+                    event.preventDefault();
+                    event.stopPropagation();
+                    const node = ref.current;
+                    if (!node) {
+                        return;
+                    }
+                    const dir = event.key === 'ArrowLeft' ? -1 : 1;
+                    let nextIndex = activeIndex + dir;
+                    if (nextIndex < 0) {
+                        nextIndex = toggleButtons.length - 1;
+                    }
+                    else if (nextIndex > toggleButtons.length - 1) {
+                        nextIndex = 0;
+                    }
+                    setActiveIndex(nextIndex);
+                }
+            } }, props.children)));
 };

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

@@ -1,11 +1,11 @@
 import * as React from 'react';
 interface ToggleButtonProps {
     checked?: boolean;
-    className: string;
+    className?: string;
     disabled?: boolean;
     onChange: (on: boolean) => void;
     style?: React.CSSProperties;
-    'data-name': string;
+    'data-name'?: string;
 }
 export declare const ToggleButton: React.FunctionComponent<React.PropsWithChildren<ToggleButtonProps>>;
 export {};

package/src/components/ToggleButton/index.js

@@ -1,7 +1,9 @@
 import * as React from 'react';
-import { Flex } from 'rebass';
-import join from '../utils/join';
+import clsx from 'clsx';
+import { Flex } from '../Flex';
+import { twMerge } from '../../twMerge';
 export const ToggleButton = ({ checked, onChange, disabled, className, children, style = {}, 'data-name': dataName, }) => {
+    const isChecked = Boolean(checked);
     const handleChange = (event) => {
         if (disabled) {
             return;
@@ -9,9 +11,25 @@ export const ToggleButton = ({ checked, onChange, disabled, className, children,
         onChange(Boolean(event.target.checked));
     };
     const baseClassName = 'ab-ToggleButton';
-    const preparedClassName = join(className, baseClassName, checked && `${baseClassName}--checked`, disabled && `${baseClassName}--disabled`);
-    return (React.createElement("label", { "data-name": dataName, style: style, className: preparedClassName },
-        React.createElement("input", { type: "checkbox", disabled: disabled, checked: Boolean(checked), className: `${baseClassName}__input`, onChange: handleChange }),
-        React.createElement(Flex, { alignItems: "center", justifyContent: checked ? 'start' : 'end', className: `${baseClassName}__slider` },
-            React.createElement("div", { className: `${baseClassName}__text` }, children))));
+    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]', {
+        [`${baseClassName}--checked`]: isChecked,
+        [`${baseClassName}--disabled`]: disabled,
+        'twa:hover:cursor-pointer twa:hover:opacity-85': !disabled,
+    }, className);
+    return (React.createElement("label", { "data-checked": isChecked, "data-name": dataName, style: style, className: twMerge(preparedClassName) },
+        React.createElement("input", { type: "checkbox", disabled: disabled, checked: isChecked, className: clsx(`${baseClassName}__input`, 'twa:opacity-0 twa:size-0'), onChange: handleChange }),
+        React.createElement(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', {
+                'twa:bg-(--ab-cmp-toggle-button__background)': !isChecked,
+                'twa:bg-accent': isChecked,
+                'twa:justify-start': isChecked,
+                'twa:justify-end': !isChecked,
+                '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') },
+            React.createElement("div", { className: clsx(`${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,
+                }) }, children))));
 };

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

@@ -3,7 +3,6 @@ import FieldWrap from '../../FieldWrap';
 import { TreeList } from '../TreeList';
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import OverlayTrigger from '../../OverlayTrigger';
-import { Box, Flex } from 'rebass';
 import NotifyResize from '../../NotifyResize';
 import Input from '../../Input';
 import { TreeSelectionState, withSelectedLeafNodesOnly, } from '../../InfiniteTable';
@@ -12,6 +11,7 @@ import { CheckBox } from '../../CheckBox';
 import { useLatest } from '../../utils/useLatest';
 import { Resizable } from 're-resizable';
 import { useAdaptableComputedCSSVars } from '../../../View/AdaptableComputedCSSVarsContext';
+import { Box, Flex } from '../../Flex';
 const resizableDirections = {
     right: true,
     bottom: true,
@@ -34,7 +34,7 @@ const getLabelColumn = (field, { includeExpandCollapseButton }) => {
             if (!rowInfo.isTreeNode) {
                 return null;
             }
-            return (React.createElement(CheckBox, { mx: 1, checked: rowInfo?.rowSelected, onChange: (checked) => {
+            return (React.createElement(CheckBox, { className: "twa:mx-1", checked: rowInfo?.rowSelected, onChange: (checked) => {
                     dataSourceApi.treeApi.setNodeSelection(rowInfo.nodePath, checked);
                     api.focus();
                 } }));
@@ -44,11 +44,11 @@ const getLabelColumn = (field, { includeExpandCollapseButton }) => {
             const allFirstLevelCollapsed = dataSourceApi
                 .getOriginalDataArray()
                 .every((item) => !treeApi.isNodeExpanded([item.id]));
-            return (React.createElement(Flex, { flexDirection: 'row', alignItems: 'center', width: '100%', onMouseDown: (e) => {
+            return (React.createElement(Flex, { flexDirection: 'row', alignItems: 'center', className: "twa:w-full", onMouseDown: (e) => {
                     // so we can keep the focus on the Grid
                     e.preventDefault();
                 } },
-                React.createElement(CheckBox, { checked: someRowsSelected && !allRowsSelected ? null : allRowsSelected, mr: 2, onChange: () => {
+                React.createElement(CheckBox, { checked: someRowsSelected && !allRowsSelected ? null : allRowsSelected, className: "twa:mr-2", onChange: () => {
                         if (allRowsSelected) {
                             dataSourceApi.treeApi.deselectAll();
                         }
@@ -57,7 +57,7 @@ const getLabelColumn = (field, { includeExpandCollapseButton }) => {
                         }
                         api.focus();
                     } }, allRowsSelected ? '(Deselect All)' : '(Select All)'),
-                React.createElement(Flex, { flex: 1 }),
+                React.createElement(Flex, { className: "twa:flex-1" }),
                 includeExpandCollapseButton ? (React.createElement(SimpleButton, { label: "toggle-expand-collapse", icon: allFirstLevelCollapsed ? 'expand-all' : 'collapse-all', onMouseDown: () => {
                         if (allFirstLevelCollapsed) {
                             dataSourceApi.treeApi.expandAll();
@@ -179,10 +179,7 @@ export function TreeDropdown(props) {
         }
         return filterTreeNode(data);
     }, [nodeMatches]);
-    return (React.createElement(Flex, { flexDirection: 'row', className: "ab-TreeDropdown", style: {
-            width: '100%',
-            ...props.style,
-        }, onMouseDown: props.onMouseDown, onBlur: (e) => {
+    return (React.createElement(Flex, { flexDirection: 'row', className: "ab-TreeDropdown twa:w-full", style: props.style, onMouseDown: props.onMouseDown, onBlur: (e) => {
             const { relatedTarget } = e;
             const overlayDOMNode = overlayDOMRef.current;
             if ((overlayDOMNode && relatedTarget == overlayDOMNode) ||
@@ -230,8 +227,8 @@ export function TreeDropdown(props) {
                         setTreeListApi(api);
                         api.focus();
                     }, defaultTreeExpandState: treeExpandState, onTreeExpandStateChange: setTreeExpandState, columns: columns, options: props.options, treeSelection: treeSelection, onTreeSelectionChange: withSelectedLeafNodesOnly(onChange), style: treeListStyle }));
-                let children = (React.createElement(Flex, { flexDirection: 'column', height: '100%' },
-                    React.createElement(Flex, { backgroundColor: 'defaultbackground', p: 1, alignItems: 'center', justifyContent: 'stretch', justifyItems: 'stretch' },
+                let children = (React.createElement(Flex, { flexDirection: 'column', className: "twa:h-full" },
+                    React.createElement(Flex, { className: "twa:bg-defaultbackground twa:p-1 twa:items-center twa:justify-stretch twa:justify-items-stretch" },
                         React.createElement(Input, { "data-name": "menulist-search-input", placeholder: "Search...", style: { width: '100%' }, value: searchValue, onChange: (e) => setSearchValue(e.target.value) })),
                     treeList));
                 if (resizable) {
@@ -251,10 +248,8 @@ export function TreeDropdown(props) {
                         fontSize: 'var(--ab-cmp-select__font-size)',
                     } }, children));
             } },
-            React.createElement(FieldWrap, { style: { width: '100%', ...props.fieldStyle } },
-                React.createElement(Input, { type: "text", readOnly: true, "data-name": "Select Values", placeholder: props.placeholder ?? 'Select a value', style: {
-                        width: '100%',
-                    }, pr: props.clearable ? 0 : undefined, value: props.toDisplayValue ? props.toDisplayValue(value) : toDisplayValueDefault(value), onFocus: () => {
+            React.createElement(FieldWrap, { style: props.fieldStyle, className: "twa:w-full" },
+                React.createElement(Input, { type: "text", readOnly: true, "data-name": "Select Values", placeholder: props.placeholder ?? 'Select a value', className: `twa:w-full ${props.clearable ? 'twa:pr-0' : ''}`, value: props.toDisplayValue ? props.toDisplayValue(value) : toDisplayValueDefault(value), onFocus: () => {
                         if (!visible) {
                             setVisible(true);
                         }

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

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { TreeDataSource, TreeGrid, } from '../../InfiniteTable';
-import { Flex } from 'rebass';
-import join from '../../utils/join';
+import { Flex } from '../../Flex';
+import clsx from 'clsx';
 const columns = {
     label: {
         field: 'label',
@@ -13,23 +13,19 @@ const columns = {
     },
 };
 const domProps = {
-    style: {
-        height: '100%',
-        flex: 1,
-    },
-    className: 'ab-TreeList',
+    className: 'ab-TreeList twa:flex-1 twa:h-full',
 };
 const DEFAULT_TREE_EXPAND_STATE = {
     expandedPaths: [],
     defaultExpanded: false,
 };
 export function TreeList(props) {
-    return (React.createElement(Flex, { flex: 1, flexDirection: 'column', className: "ab-TreeList", style: props.style },
+    return (React.createElement(Flex, { flexDirection: 'column', className: "ab-TreeList twa:flex-1", style: props.style },
         React.createElement(TreeDataSource, { data: props.options, primaryKey: props.primaryKey ?? 'id', defaultTreeSelection: props.defaultTreeSelection, treeSelection: props.treeSelection, onTreeSelectionChange: props.onTreeSelectionChange, treeFilterFunction: props.treeFilterFunction, onTreeExpandStateChange: props.onTreeExpandStateChange, defaultTreeExpandState: props.defaultTreeExpandState ?? DEFAULT_TREE_EXPAND_STATE },
             React.createElement(TreeGrid, { defaultActiveRowIndex: 0, onReady: props.onReady, debugId: props.debugId, keyboardSelection: true, rowHeight: props.rowHeight ?? '--ab-grid-row-height', keyboardNavigation: "row", columnHeaderHeight: props.columnHeaderHeight, domProps: {
                     ...domProps,
                     ...props.domProps,
-                    className: join(domProps.className, props.domProps?.className),
+                    className: clsx(domProps.className, props.domProps?.className),
                     style: { ...domProps.style, ...props.domProps?.style },
                 }, columns: props.columns ?? columns, showZebraRows: false }))));
 }

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

@@ -1,4 +1,8 @@
 import * as React from 'react';
-import { BoxProps } from 'rebass';
+import { BoxProps } from '../Flex';
 export declare const baseClassName = "ab-WarningBox";
-export declare const WarningBox: (props: BoxProps) => React.JSX.Element;
+export declare const WarningBox: (props: BoxProps & {
+    className?: string;
+    children?: React.ReactNode;
+    style?: React.CSSProperties;
+}) => React.JSX.Element;

package/src/components/WarningBox/index.js

@@ -1,7 +1,7 @@
 import * as React from 'react';
-import { Box } from 'rebass';
-import join from '../utils/join';
+import { Box } from '../Flex';
+import clsx from 'clsx';
 export const baseClassName = 'ab-WarningBox';
 export const WarningBox = (props) => {
-    return React.createElement(Box, { ...props, className: join(props.className, baseClassName) });
+    return (React.createElement(Box, { ...props, className: clsx('twa:p-3 twa:rounded-standard twa:bg-warn twa:text-text-on-warn', baseClassName, props.className) }));
 };

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

@@ -1,4 +1,9 @@
 import * as React from 'react';
 import { PanelProps } from '../Panel';
-declare const WizardPanel: (props: PanelProps) => React.JSX.Element;
+declare const WizardPanel: (props: {
+    bodyProps?: PanelProps["bodyProps"];
+    className?: string;
+    "data-name"?: string;
+    children?: React.ReactNode;
+}) => React.JSX.Element;
 export default WizardPanel;

package/src/components/WizardPanel/index.js

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import Panel from '../Panel';
-import join from '../utils/join';
+import { twMerge } from '../../twMerge';
 const WizardPanel = (props) => {
-    return (React.createElement(Panel, { border: "none", borderRadius: "none", variant: "primary", bodyScroll: true, ...props, className: join(props.className, 'ab-WizardPanel'), style: { height: '100%', ...props.style } }));
+    return (React.createElement(Panel, { bodyScroll: true, bodyProps: props.bodyProps, "data-name": props['data-name'], className: twMerge('ab-WizardPanel', 'twa:border-none twa:rounded-none twa:h-full', props.className) }, props.children));
 };
 export default WizardPanel;

package/src/components/icons/DefaultIcon.d.ts

@@ -7,6 +7,7 @@ export type IconProps = {
     tabIndex?: number;
     style?: React.CSSProperties;
     color?: string;
+    fill?: string;
 };
 declare const _default: ({ children, size, name, tabIndex, color, ...props }: IconProps) => React.JSX.Element;
 export default _default;

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

@@ -12,6 +12,6 @@ type IconProps = {
     props?: React.SVGProps<SVGElement>;
 };
 export declare const Icon: ({ name, style, className, tabIndex, ...props }: IconProps) => React.JSX.Element;
-export declare const NaturallySizedIcon: (props: Omit<IconProps, 'size'>) => React.JSX.Element;
+export declare const NaturallySizedIcon: (props: Omit<IconProps, "size">) => React.JSX.Element;
 export declare const iconToString: (icon: AdaptableSystemIcon | AdaptableCustomIcon, style?: CSSProperties) => string;
 export {};

package/src/components/icons/index.js

@@ -73,6 +73,7 @@ import PlusMinus from './plus-minus';
 import QuickSearch from './quick-search';
 import Reminder from './reminder';
 import Schedule from './schedule';
+import Inspector from './inspector';
 import Shortcut from './shortcut';
 import UpdatedRow from './updated-row';
 import logout from './logout';
@@ -264,6 +265,7 @@ export const allIcons = {
     logout: logout,
     'import-export': ImportExport,
     import: Import,
+    inspector: Inspector,
     paperclip: AttachFile,
     info: Info,
     'cloud-upload': CloudUpload,

package/src/components/icons/inspector.d.ts

@@ -0,0 +1,3 @@
+import * as React from 'react';
+declare const _default: (props: any) => React.JSX.Element;
+export default _default;

package/src/components/icons/inspector.js

@@ -0,0 +1,5 @@
+import * as React from 'react';
+import DefaultIcon from './DefaultIcon';
+export default (props) => (React.createElement(DefaultIcon, { ...props },
+    React.createElement("path", { d: "M12.034 12.681a.498.498 0 0 1 .647-.647l9 3.5a.5.5 0 0 1-.033.943l-3.444 1.068a1 1 0 0 0-.66.66l-1.067 3.443a.5.5 0 0 1-.943.033z" }),
+    React.createElement("path", { d: "M21 11V5a2 2 0 0 0-2-2H5a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h6" })));

package/src/components/twUtils.d.ts

@@ -0,0 +1,7 @@
+export declare const targetOwn: {
+    focusOutline: string;
+    focusWithinOutline: string;
+};
+export declare const targetChildren: {
+    focusWithinOutline: string;
+};

package/src/components/twUtils.js

@@ -0,0 +1,13 @@
+export const targetOwn = {
+    focusOutline: 
+    // 'twa:outline-0 twa:focus:outline-2 twa:focus:outline-offset-1 twa:focus:outline-accent',
+    'twa:outline-0 twa:focus:shadow-(--ab-focus__box-shadow)',
+    focusWithinOutline: 
+    // 'twa:outline-0 twa:focus-within:outline-2 twa:focus-within:outline-offset-1 twa:focus-within:outline-accent',
+    'twa:outline-0 twa:focus-within:shadow-(--ab-focus__box-shadow)',
+};
+export const targetChildren = {
+    focusWithinOutline: 
+    // 'twa:*:outline-0 twa:*:focus-within:outline-2 twa:*:focus-within:outline-offset-1 twa:*:focus-within:outline-accent',
+    'twa:*:outline-0 twa:*:focus-within:shadow-(--ab-focus__box-shadow)',
+};

package/src/components/utils/useDraggable.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export default function useDraggable({ onMove, onDrop, getBoundingRect, handleSelector, }: {
     onMove?: (event: MouseEvent) => void;
     onDrop?: (dx: number, dy: number) => void;