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

package/src/components/Select/Select.js

@@ -3,15 +3,15 @@ import * as React from 'react';
 import ReactSelect, { components, } from 'react-select';
 import CreatableSelect from 'react-select/creatable';
 import { Icon } from '../icons';
-import { Box, Flex } from 'rebass';
 import { DataSource, InfiniteTable, } from '@infinite-table/infinite-react';
 import { useCallback, useMemo, useState } from 'react';
-import join from '../utils/join';
 import { Resizable } from 're-resizable';
 import Tooltip from '../Tooltip';
 import { ensurePortalElement } from '../OverlayTrigger';
 import { CheckBox } from '../CheckBox';
 import { useAdaptableComputedCSSVars } from '../../View/AdaptableComputedCSSVarsContext';
+import { Box, Flex } from '../Flex';
+import clsx from 'clsx';
 const resizableDirections = {
     right: true,
     bottom: true,
@@ -53,7 +53,7 @@ const INFINITE_COLUMNS_WITH_CHECKBOX = {
         renderSelectionCheckBox: (params) => {
             // disable reacting to onChange
             // as we handle selection change in the onCellClick
-            return React.createElement(CheckBox, { mx: 1, checked: params.rowInfo?.rowSelected ?? false });
+            return React.createElement(CheckBox, { className: "twa:mx-1", checked: params.rowInfo?.rowSelected ?? false });
         },
         renderHeaderSelectionCheckBox: true,
         className: 'ab-Select-CheckboxColumn',
@@ -66,7 +66,7 @@ const INFINITE_COLUMNS_WITH_CHECKBOX = {
                     : false;
             const { api } = headerParams;
             return (React.createElement(React.Fragment, null,
-                React.createElement(CheckBox, { mx: 1, checked: selected, onChange: (selected) => {
+                React.createElement(CheckBox, { className: "twa:mx-1", checked: selected, onChange: (selected) => {
                         if (selected) {
                             api.rowSelectionApi.selectAll();
                         }
@@ -231,7 +231,7 @@ export const Select = function (props) {
                 placeholder: props.placeholder,
             });
             const title = typeof customRenderValue === 'string' ? customRenderValue : '';
-            children = customRenderValue ? (React.createElement(Box, { display: 'flex', flexDirection: 'row', flex: 1, flexWrap: 'nowrap', alignItems: 'center', overflow: 'hidden', height: '100%' },
+            children = customRenderValue ? (React.createElement(Box, { className: "twa:flex twa:flex-row twa:flex-1 twa:flex-nowrap twa:items-center twa:overflow-hidden twa:h-full" },
                 React.createElement("span", { title: title, "data-name": "multi-value-text", style: {
                         flex: '0 1 auto',
                         appearance: 'none',
@@ -473,7 +473,7 @@ export const Select = function (props) {
                 data: filteredOptions, primaryKey: "value", selectionMode: isMulti ? 'multi-row' : 'single-row', 
                 // @ts-ignore
                 onRowSelectionChange: isLoading ? null : isMulti ? onRowSelectionChange : onSingleRowSelectionChange, rowSelection: rowSelection, isRowDisabled: isRowDisabled },
-                searchableInMenulist && (React.createElement(Flex, { p: 1, className: "ab-Select-MenulistSearchContainer" },
+                searchableInMenulist && (React.createElement(Flex, { className: "twa:p-1 ab-Select-MenulistSearchContainer" },
                     React.createElement("input", { ref: menulistInputRef, "data-name": "menulist-search-input", style: {
                             width: '100%',
                         }, className: 'ab-Select-MenulistSearch ab-Input ab-Input--type-text', autoCorrect: "off", autoComplete: "off", spellCheck: "false", type: "text", value: inputValue, onChange: (e) => {
@@ -521,8 +521,32 @@ export const Select = function (props) {
         setInputValue(value);
         props.onInputChange?.(value);
     }, [props.onInputChange, isMulti]);
+    const SingleValue = React.useCallback((singleValueProps) => {
+        return (React.createElement(components.SingleValue, { ...singleValueProps }, props.renderSingleValue
+            ? props.renderSingleValue(selectedOption)
+            : singleValueProps.children));
+    }, [selectedOption]);
+    const selectComponents = useMemo(() => {
+        return {
+            SelectContainer,
+            ValueContainer,
+            Menu: MenuComponent,
+            SingleValue,
+            ClearIndicator,
+            DropdownIndicator,
+            MenuList,
+        };
+    }, [
+        SelectContainer,
+        ValueContainer,
+        MenuComponent,
+        SingleValue,
+        ClearIndicator,
+        DropdownIndicator,
+        MenuList,
+    ]);
     return (React.createElement(React.Fragment, null,
-        React.createElement(SelectComponent, { ref: ref, openMenuOnClick: searchableInMenulist ? false : undefined, openMenuOnFocus: searchableInMenulist ? false : undefined, menuIsOpen: searchableInMenulist ? isSelectMenuOpen : undefined, isSearchable: searchableInline, "aria-label": props['aria-label'], onKeyDown: props.onKeyDown, inputValue: inputValue, onInputChange: onInputChange, onFocus: onFocus, onBlur: onBlur, onMenuOpen: props.onMenuOpen, isLoading: props.isLoading, options: props.options, className: join(props.className, 'ab-Select'), isDisabled: disabled, menuPlacement: props.menuPlacement ?? 'auto', hideSelectedOptions: false, isMulti: isMulti, value: selectedOption, blurInputOnSelect: false, menuPosition: props.menuPosition ?? 'absolute', 
+        React.createElement(SelectComponent, { ref: ref, openMenuOnClick: searchableInMenulist ? false : undefined, openMenuOnFocus: searchableInMenulist ? false : undefined, menuIsOpen: searchableInMenulist ? isSelectMenuOpen : undefined, isSearchable: searchableInline, "aria-label": props['aria-label'], onKeyDown: props.onKeyDown, inputValue: inputValue, onInputChange: onInputChange, onFocus: onFocus, onBlur: onBlur, onMenuOpen: props.onMenuOpen, isLoading: props.isLoading, options: props.options, className: clsx(props.className, 'ab-Select'), isDisabled: disabled, menuPlacement: props.menuPlacement ?? 'auto', hideSelectedOptions: false, isMulti: isMulti, value: selectedOption, blurInputOnSelect: false, menuPosition: props.menuPosition ?? 'absolute', 
             // This needed so the menu is not clipped by overflow: hidden
             menuPortalTarget: ensurePortalElement(), isClearable: props.isClearable, closeMenuOnSelect: props.closeMenuOnSelect, onChange: (option) => {
                 if (isMulti) {
@@ -541,19 +565,7 @@ export const Select = function (props) {
             }, placeholder: props.placeholder, createOptionPosition: 'first', 
             // formatCreateLabel={(inputValue) => inputValue} // can we make this auto??
             // we use this:  https://react-select.com/creatable
-            components: {
-                SelectContainer,
-                ValueContainer,
-                Menu: MenuComponent,
-                SingleValue: React.useCallback((singleValueProps) => {
-                    return (React.createElement(components.SingleValue, { ...singleValueProps }, props.renderSingleValue
-                        ? props.renderSingleValue(selectedOption)
-                        : singleValueProps.children));
-                }, [selectedOption]),
-                ClearIndicator,
-                DropdownIndicator,
-                MenuList,
-            }, 
+            components: selectComponents, 
             /**
              * Using styles is the preferred way to style react-select.
              * https://react-select.com/styles#the-styles-prop
@@ -640,7 +652,7 @@ export const Select = function (props) {
                     return {
                         ...baseStyle,
                         ...commonStyles(state), // height: 30,
-                        minHeight: props.size === 'small' ? 0 : '100%',
+                        minHeight: props.size === 'small' ? 0 : 'var(--ab-input-height)',
                         boxShadow: state.isFocused ? 'var(--ab-cmp-select-focused__box-shadow)' : 'none',
                         outline: state.isFocused ? 'var(--ab-cmp-select-focused__outline)' : 'none',
                         border: 'var(--ab-cmp-select__border)',

package/src/components/SelectList.js

@@ -1,5 +1,5 @@
 import * as React from 'react';
 import SimpleButton from './SimpleButton';
 export const SelectList = (props) => {
-    return (React.createElement(React.Fragment, null, props.options.map((option) => (React.createElement(SimpleButton, { p: 2, width: '100%', variant: "text", onClick: () => props.onChange(option), key: option.label }, option.label)))));
+    return (React.createElement(React.Fragment, null, props.options.map((option) => (React.createElement(SimpleButton, { className: "twa:p-2 twa:w-full", variant: "text", onClick: () => props.onChange(option), key: option.label }, option.label)))));
 };

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

@@ -11,5 +11,5 @@ interface SelectableListProps {
     toggleOnSimpleClick?: boolean;
     getItemId: (index: number) => string | number;
 }
-declare const SelectableList: (props: HTMLProps<HTMLElement> & SelectableListProps) => React.JSX.Element;
+declare const SelectableList: (props: HTMLProps<HTMLDivElement> & SelectableListProps) => React.JSX.Element;
 export default SelectableList;

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

@@ -1,10 +1,10 @@
 import * as React from 'react';
-import { ButtonProps } from 'rebass';
-import { ReactNode } from 'react';
+import { HTMLProps, ReactNode } from 'react';
 import { AccessLevel } from '../../AdaptableState/Common/Entitlement';
 import { AdaptableIcon } from '../../AdaptableState/Common/AdaptableIcon';
+import { BoxProps } from '../Flex';
 export declare const baseClassName = "ab-SimpleButton";
-export interface SimpleButtonProps extends Omit<ButtonProps, 'ref'> {
+export interface SimpleButtonProps extends Omit<BoxProps, 'ref'>, HTMLProps<HTMLButtonElement> {
     tooltip?: string;
     variant?: 'text' | 'outlined' | 'raised';
     tone?: 'success' | 'error' | 'neutral' | 'none' | 'warning' | 'info' | 'accent';
@@ -14,7 +14,5 @@ export interface SimpleButtonProps extends Omit<ButtonProps, 'ref'> {
     disabled?: boolean;
     accessLevel?: AccessLevel;
 }
-declare const SimpleButton: React.ForwardRefExoticComponent<SimpleButtonProps & {
-    children?: React.ReactNode;
-} & React.RefAttributes<unknown>>;
+declare const SimpleButton: React.ForwardRefExoticComponent<Omit<React.PropsWithChildren<SimpleButtonProps>, "ref"> & React.RefAttributes<unknown>>;
 export default SimpleButton;

package/src/components/SimpleButton/index.js

@@ -1,21 +1,13 @@
 import * as React from 'react';
-import { Button } from 'rebass';
-import join from '../utils/join';
 import { allIcons } from '../icons';
 import Tooltip from '../Tooltip';
-import theme from '../../theme';
 import { IconComponent, isAdaptableElementIcon, isAdaptableCustomIcon, isAdaptableSystemIcon, } from '../Icon';
+import { Box } from '../Flex';
+import clsx from 'clsx';
+import { targetOwn } from '../twUtils';
 export const baseClassName = 'ab-SimpleButton';
-const defaultProps = {
-    px: null,
-    py: null,
-    fontWeight: 'normal',
-    m: null,
-    //@ts-ignore
-    borderRadius: null,
-};
 const SimpleButton = React.forwardRef((givenProps, theRef) => {
-    const props = { ...defaultProps, ...givenProps };
+    const props = { ...givenProps };
     let { children, disabled, variant = 'outlined', tone = 'neutral', iconPosition = 'start', iconSize, className, icon, tooltip, accessLevel: accessLevel, type, ...buttonProps } = props;
     let adaptableSystemIcon;
     if (isAdaptableSystemIcon(icon)) {
@@ -75,17 +67,57 @@ const SimpleButton = React.forwardRef((givenProps, theRef) => {
     if (accessLevel === 'ReadOnly') {
         disabled = true;
     }
-    // for whatever reason, even if fontWeight is present in buttonProps
-    // and sent to rebass, styled-components/rebass does not honour it
-    // so we had to send it via css
-    const fontWeight = buttonProps.fontWeight
-        ? theme[buttonProps.fontWeight] ?? buttonProps.fontWeight ?? 'normal'
-        : 'normal';
-    const btn = (React.createElement(Button, { ...buttonProps, "aria-label": buttonProps['aria-label'] ||
-            buttonProps.label ||
-            tooltip ||
-            buttonProps.title ||
-            `${buttonProps.key}`, disabled: disabled, className: join(className, baseClassName, disabled ? `${baseClassName}--disabled` : '', fontWeight ? `${baseClassName}--font-weight=${fontWeight}` : '', `${baseClassName}--variant-${variant}`, `${baseClassName}--tone-${tone}`), ref: theRef }, children));
+    const ariaLabel = buttonProps['aria-label'] ||
+        buttonProps.label ||
+        tooltip ||
+        buttonProps.title ||
+        `${buttonProps.key}`;
+    const extraButtonProps = {};
+    if (ariaLabel != null && ariaLabel !== '') {
+        extraButtonProps['aria-label'] = ariaLabel;
+    }
+    const btn = (React.createElement(Box, { ...buttonProps, ...extraButtonProps, as: buttonProps.as || 'button', disabled: disabled, className: clsx(baseClassName, 'twa:p-1', 'twa:rounded-standard', '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',
+        // 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]', 
+        // focus shadow
+        targetOwn.focusOutline, disabled ? `${baseClassName}--disabled` : '', `${baseClassName}--variant-${variant}`, `${baseClassName}--tone-${tone}`, 'twa:transition-opacity twa:duration-200', {
+            'twa:text-text-on-primary': tone == 'neutral',
+            'twa:text-inherit': tone === 'none',
+            'twa:text-success': tone === 'success',
+            'twa:text-accent': tone === 'accent',
+            'twa:text-error': tone === 'error',
+            'twa:text-warn': tone === 'warning',
+            'twa:text-info': tone === 'info',
+        }, variant === 'text' ? 'twa:bg-transparent' : '', variant === 'outlined'
+            ? 'twa:bg-defaultbackground twa:border-inputborder 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: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',
+            }
+            : '', 
+        // opacity transitioning for the background applied on the before pseudo element
+        variant === 'outlined' || variant === 'text'
+            ? {
+                'twa:before:opacity-0 twa:before:transition-opacity twa:before:duration-200': true,
+                'twa:hover:before:opacity-15 twa:hover:before:bg-current': !disabled,
+            }
+            : null, {
+            'twa:cursor-pointer': !disabled,
+            'twa:opacity-50': disabled,
+        }, className), ref: theRef }, children));
     return tooltip ? React.createElement(Tooltip, { label: tooltip }, btn) : btn;
 });
 export default SimpleButton;

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

@@ -1,7 +1,9 @@
 import * as React from 'react';
-import { BoxProps } from 'rebass';
 import { ReactNode } from 'react';
+import { BoxProps } from '../Flex';
 interface SizedContainerProps extends Omit<BoxProps, 'children' | 'onResize'> {
+    style?: React.CSSProperties;
+    className?: string;
     children: (size: {
         width: number;
         height: number;

package/src/components/SizedContainer/index.js

@@ -1,6 +1,6 @@
 import * as React from 'react';
-import { Box } from 'rebass';
 import NotifyResize from '../NotifyResize';
+import { Box } from '../Flex';
 const SizedContainer = (props) => {
     const { onResize: onResizeFromProps, ...domProps } = props;
     const [size, onResize] = React.useState(null);

package/src/components/StylePreview.d.ts

@@ -1,8 +1,10 @@
 import * as React from 'react';
-import { BoxProps } from 'rebass';
 import { AdaptableStyle } from '../types';
+import { BoxProps } from './Flex';
 interface StylePreviewProps extends BoxProps {
     styleObject: AdaptableStyle;
+    className?: string;
+    style?: React.CSSProperties;
 }
 export declare const StylePreview: React.FunctionComponent<React.PropsWithChildren<StylePreviewProps>>;
 export {};

package/src/components/StylePreview.js

@@ -1,5 +1,6 @@
 import * as React from 'react';
-import { Box } from 'rebass';
 import { toStyle } from '../Utilities/Helpers/StyleHelper';
-import join from './utils/join';
-export const StylePreview = (props) => (React.createElement(Box, { ...props, className: join('ab-StylePreview', props.className), padding: props.padding ?? 2, mt: props.mt ?? 2, style: { ...toStyle(props.styleObject), ...props.style } }, props.children ?? 'Preview result'));
+import { twMerge } from '../twMerge';
+import { Box } from './Flex';
+import clsx from 'clsx';
+export const StylePreview = (props) => (React.createElement(Box, { ...props, className: clsx(twMerge('ab-StylePreview twa:p-2 twa:mt-2', props.className), props.styleObject.ClassName), style: { ...toStyle(props.styleObject), ...props.style } }, props.children ?? 'Preview result'));

package/src/components/Tabs/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 type TabsProps<VALUE_TYPE> = HTMLProps<HTMLElement> & {
     value?: VALUE_TYPE;
     defaultValue?: VALUE_TYPE;
@@ -10,7 +10,7 @@ export type TabsProps<VALUE_TYPE> = HTMLProps<HTMLElement> & {
     defaultSelectedIndex?: number;
     onSelectedIndexChange?: (index: number) => void;
     keyboardNavigation?: boolean;
-} & BoxProps;
+} & BoxProps & React.HTMLProps<HTMLDivElement>;
 export declare const Tabs: {
     <VALUE_TYPE extends string | number>(props: TabsProps<VALUE_TYPE>): React.JSX.Element;
     Tab: (props: TabProps) => React.JSX.Element;
@@ -24,7 +24,7 @@ export declare const Tab: (props: TabProps) => React.JSX.Element;
 export declare const SupportedTabMenuComps: Set<unknown>;
 type ContentProps = {
     value?: string | number;
-} & BoxProps;
+} & BoxProps & React.HTMLProps<HTMLDivElement>;
 export declare const Content: (props: ContentProps) => React.JSX.Element;
 export declare const SupportedTabContentComps: Set<unknown>;
 export {};

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)));
 };