@adaptabletools/adaptable-cjs 21.2.1 → 22.0.0-canary.0

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

@@ -1,6 +1,7 @@
 import * as React from 'react';
 import { ReactNode, SyntheticEvent } from 'react';
-import { BoxProps, FlexProps } from 'rebass';
+import { BoxProps } from '../Flex';
+type Variant = 'default' | 'text-only';
 type TypeProps = {
     checked?: boolean;
     as?: any;
@@ -10,20 +11,41 @@ type TypeProps = {
     children?: ReactNode | React.JSX.Element;
     gapDistance?: number;
     childrenPosition?: 'start' | 'end';
+    variant?: Variant;
 };
 export interface RadioProps extends TypeProps, Omit<BoxProps, keyof TypeProps> {
+    tabIndex?: number;
+    id?: string;
+    disabled?: boolean;
+    className?: string;
+    style?: React.CSSProperties;
+    onClick?: React.MouseEventHandler<HTMLDivElement>;
+    onFocus?: React.FocusEventHandler<HTMLDivElement>;
 }
 export declare const useRadioContext: <T extends unknown>() => {
     value: T;
     onChange: (value: T) => void;
     name: string;
+    variant: Variant;
 };
 declare const Radio: ({ children, checked, onChange, value, name, gapDistance, childrenPosition, as, id, tabIndex, disabled, ...props }: RadioProps) => React.JSX.Element;
-export declare const RadioGroup: <T extends unknown>(props: FlexProps & {
-    orientation: 'horizontal' | 'vertical';
+export declare const RadioGroup: <T extends unknown>(props: {
+    orientation: "horizontal" | "vertical";
     value?: T;
     name?: string;
     defaultValue?: T;
     onRadioChange?: (value: T) => void;
+    className?: string;
+    children: React.ReactNode;
+    /**
+     * The variant of the radio group.
+     * @default 'default' - will show the radio button and the text
+     *
+     * 'text-only' - will show the text only and hide the radio button
+     */
+    variant?: Variant;
 }) => React.JSX.Element;
+export declare const radioGroupStyling: {
+    horizontalTextOnly: string;
+};
 export default Radio;

package/src/components/Radio/index.js

@@ -1,15 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RadioGroup = exports.useRadioContext = void 0;
+exports.radioGroupStyling = exports.RadioGroup = exports.useRadioContext = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const react_1 = require("react");
-const rebass_1 = require("rebass");
 const useProperty_1 = tslib_1.__importDefault(require("../utils/useProperty"));
+const Flex_1 = require("../Flex");
+const twMerge_1 = require("../../twMerge");
+const clsx_1 = tslib_1.__importDefault(require("clsx"));
+const twUtils_1 = require("../twUtils");
 const RadioContext = React.createContext({
     value: null,
     name: '',
     onChange: (v) => { },
+    variant: 'default',
 });
 const useRadioContext = () => {
     return React.useContext(RadioContext);
@@ -17,7 +21,7 @@ const useRadioContext = () => {
 exports.useRadioContext = useRadioContext;
 const Radio = ({ children, checked, onChange, value, name, gapDistance = 10, childrenPosition = 'end', as = 'label', id, tabIndex, disabled, ...props }) => {
     const context = (0, exports.useRadioContext)();
-    const { value: contextValue, onChange: contextOnChange, name: contextName } = context;
+    const { value: contextValue, onChange: contextOnChange, name: contextName, variant } = context;
     const [stateChecked, setStateChecked] = (0, react_1.useState)(false);
     const computedChecked = checked !== undefined
         ? checked
@@ -41,35 +45,29 @@ const Radio = ({ children, checked, onChange, value, name, gapDistance = 10, chi
     const beforeGap = childrenPosition === 'start' ? gap : null;
     const after = childrenPosition === 'end' ? children : null;
     const afterGap = childrenPosition === 'end' ? gap : null;
-    return (React.createElement(rebass_1.Box, { className: "ab-Radio", my: 2, ...props, style: {
-            display: 'inline-flex',
-            flexFlow: 'row',
-            alignItems: 'center',
-            cursor: 'pointer',
-            position: 'relative',
-            ...props.style,
-        }, as: as },
+    return (React.createElement(Flex_1.Box, { ...props, className: (0, twMerge_1.twMerge)(`ab-Radio twa:my-2 twa:inline-flex twa:flex-row twa:items-center twa:cursor-pointer twa:relative`, props.className), "data-checked": computedChecked, as: as },
         before,
         beforeGap,
-        React.createElement("input", { disabled: disabled, className: "ab-Radio-input", id: id, checked: computedChecked, type: "radio", name: name ?? contextName, value: value, tabIndex: tabIndex, style: {
-                verticalAlign: 'middle',
-                margin: '0px',
-                borderRadius: '50%',
-                cursor: 'pointer',
-                position: 'relative',
-            }, onChange: onInputChange }),
+        React.createElement("input", { disabled: disabled, className: (0, clsx_1.default)('ab-Radio-input', 'twa:align-middle', 'twa:m-0', 'twa:rounded-full', 'twa:cursor-pointer', 'twa:position-relative', 'twa:w-[1rem]', 'twa:h-[1rem]', 'twa:min-w-[1rem]', 'twa:min-h-[1rem]', variant === 'default' && 'ab-Radio-input--default', variant === 'text-only' && 'ab-Radio-input--text-only twa:size-0 twa:opacity-0'), id: id, checked: computedChecked, type: "radio", name: name ?? contextName, value: value, tabIndex: tabIndex, onChange: onInputChange }),
         afterGap,
         after));
 };
 const RadioGroup = (props) => {
-    const { orientation, value: _value, name, onRadioChange, ...flexProps } = props;
+    const { orientation, value: _value, name, onRadioChange, children, variant = 'default' } = props;
     const [value, setValue] = (0, useProperty_1.default)(props, 'value', undefined, {
         onChange: (value) => {
             onRadioChange(value);
         },
     });
-    return (React.createElement(RadioContext.Provider, { value: { value, onChange: setValue, name } },
-        React.createElement(rebass_1.Flex, { className: "ab-RadioGroup", flexDirection: orientation == 'horizontal' ? 'row' : 'column', alignItems: orientation == 'horizontal' ? 'center' : 'flex=start', ...flexProps })));
+    return (React.createElement(RadioContext.Provider, { value: { value, onChange: setValue, name, variant } },
+        React.createElement(Flex_1.Flex, { className: (0, clsx_1.default)('ab-RadioGroup', props.className), flexDirection: orientation == 'horizontal' ? 'row' : 'column', alignItems: orientation == 'horizontal' ? 'center' : 'flex-start' }, children)));
 };
 exports.RadioGroup = RadioGroup;
+exports.radioGroupStyling = {
+    horizontalTextOnly: (0, clsx_1.default)('twa:bg-primarylight twa:rounded-standard twa:p-1 twa:gap-5', {
+        'twa:*:flex-1 twa:*:rounded-standard twa:*:p-1 twa:*:m-0': 'default styles for all the radio buttons',
+        'twa:*:data-[checked=true]:bg-accent twa:*:data-[checked=true]:text-accent-foreground': 'style the checked state',
+        [twUtils_1.targetChildren.focusWithinOutline]: 'styles for when a radio is currently focused - show a ring, so people know they can do keyboard nav with left/right arrow keys',
+    }),
+};
 exports.default = Radio;

package/src/components/Select/Select.js

@@ -7,15 +7,15 @@ const React = tslib_1.__importStar(require("react"));
 const react_select_1 = tslib_1.__importStar(require("react-select"));
 const creatable_1 = tslib_1.__importDefault(require("react-select/creatable"));
 const icons_1 = require("../icons");
-const rebass_1 = require("rebass");
 const infinite_react_1 = require("@infinite-table/infinite-react");
 const react_1 = require("react");
-const join_1 = tslib_1.__importDefault(require("../utils/join"));
 const re_resizable_1 = require("re-resizable");
 const Tooltip_1 = tslib_1.__importDefault(require("../Tooltip"));
 const OverlayTrigger_1 = require("../OverlayTrigger");
 const CheckBox_1 = require("../CheckBox");
 const AdaptableComputedCSSVarsContext_1 = require("../../View/AdaptableComputedCSSVarsContext");
+const Flex_1 = require("../Flex");
+const clsx_1 = tslib_1.__importDefault(require("clsx"));
 const resizableDirections = {
     right: true,
     bottom: true,
@@ -57,7 +57,7 @@ const INFINITE_COLUMNS_WITH_CHECKBOX = {
         renderSelectionCheckBox: (params) => {
             // disable reacting to onChange
             // as we handle selection change in the onCellClick
-            return React.createElement(CheckBox_1.CheckBox, { mx: 1, checked: params.rowInfo?.rowSelected ?? false });
+            return React.createElement(CheckBox_1.CheckBox, { className: "twa:mx-1", checked: params.rowInfo?.rowSelected ?? false });
         },
         renderHeaderSelectionCheckBox: true,
         className: 'ab-Select-CheckboxColumn',
@@ -70,7 +70,7 @@ const INFINITE_COLUMNS_WITH_CHECKBOX = {
                     : false;
             const { api } = headerParams;
             return (React.createElement(React.Fragment, null,
-                React.createElement(CheckBox_1.CheckBox, { mx: 1, checked: selected, onChange: (selected) => {
+                React.createElement(CheckBox_1.CheckBox, { className: "twa:mx-1", checked: selected, onChange: (selected) => {
                         if (selected) {
                             api.rowSelectionApi.selectAll();
                         }
@@ -235,7 +235,7 @@ const Select = function (props) {
                 placeholder: props.placeholder,
             });
             const title = typeof customRenderValue === 'string' ? customRenderValue : '';
-            children = customRenderValue ? (React.createElement(rebass_1.Box, { display: 'flex', flexDirection: 'row', flex: 1, flexWrap: 'nowrap', alignItems: 'center', overflow: 'hidden', height: '100%' },
+            children = customRenderValue ? (React.createElement(Flex_1.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',
@@ -477,7 +477,7 @@ 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(rebass_1.Flex, { p: 1, className: "ab-Select-MenulistSearchContainer" },
+                searchableInMenulist && (React.createElement(Flex_1.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) => {
@@ -525,8 +525,32 @@ const Select = function (props) {
         setInputValue(value);
         props.onInputChange?.(value);
     }, [props.onInputChange, isMulti]);
+    const SingleValue = React.useCallback((singleValueProps) => {
+        return (React.createElement(react_select_1.components.SingleValue, { ...singleValueProps }, props.renderSingleValue
+            ? props.renderSingleValue(selectedOption)
+            : singleValueProps.children));
+    }, [selectedOption]);
+    const selectComponents = (0, react_1.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: (0, join_1.default)(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: (0, clsx_1.default)(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: (0, OverlayTrigger_1.ensurePortalElement)(), isClearable: props.isClearable, closeMenuOnSelect: props.closeMenuOnSelect, onChange: (option) => {
                 if (isMulti) {
@@ -545,19 +569,7 @@ 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(react_select_1.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
@@ -644,7 +656,7 @@ 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

@@ -5,6 +5,6 @@ const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const SimpleButton_1 = tslib_1.__importDefault(require("./SimpleButton"));
 const SelectList = (props) => {
-    return (React.createElement(React.Fragment, null, props.options.map((option) => (React.createElement(SimpleButton_1.default, { 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_1.default, { className: "twa:p-2 twa:w-full", variant: "text", onClick: () => props.onChange(option), key: option.label }, option.label)))));
 };
 exports.SelectList = SelectList;

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

@@ -3,23 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.baseClassName = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
-const rebass_1 = require("rebass");
-const join_1 = tslib_1.__importDefault(require("../utils/join"));
 const icons_1 = require("../icons");
 const Tooltip_1 = tslib_1.__importDefault(require("../Tooltip"));
-const theme_1 = tslib_1.__importDefault(require("../../theme"));
 const Icon_1 = require("../Icon");
+const Flex_1 = require("../Flex");
+const clsx_1 = tslib_1.__importDefault(require("clsx"));
+const twUtils_1 = require("../twUtils");
 exports.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 ((0, Icon_1.isAdaptableSystemIcon)(icon)) {
@@ -79,17 +71,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_1.default[buttonProps.fontWeight] ?? buttonProps.fontWeight ?? 'normal'
-        : 'normal';
-    const btn = (React.createElement(rebass_1.Button, { ...buttonProps, "aria-label": buttonProps['aria-label'] ||
-            buttonProps.label ||
-            tooltip ||
-            buttonProps.title ||
-            `${buttonProps.key}`, disabled: disabled, className: (0, join_1.default)(className, exports.baseClassName, disabled ? `${exports.baseClassName}--disabled` : '', fontWeight ? `${exports.baseClassName}--font-weight=${fontWeight}` : '', `${exports.baseClassName}--variant-${variant}`, `${exports.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(Flex_1.Box, { ...buttonProps, ...extraButtonProps, as: buttonProps.as || 'button', disabled: disabled, className: (0, clsx_1.default)(exports.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
+        twUtils_1.targetOwn.focusOutline, disabled ? `${exports.baseClassName}--disabled` : '', `${exports.baseClassName}--variant-${variant}`, `${exports.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_1.default, { label: tooltip }, btn) : btn;
 });
 exports.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

@@ -2,14 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
-const rebass_1 = require("rebass");
 const NotifyResize_1 = tslib_1.__importDefault(require("../NotifyResize"));
+const Flex_1 = require("../Flex");
 const SizedContainer = (props) => {
     const { onResize: onResizeFromProps, ...domProps } = props;
     const [size, onResize] = React.useState(null);
     const sizeFn = props.children;
-    return (React.createElement(rebass_1.Box, { ...domProps, style: { flex: 1, ...domProps.style, position: 'relative' } },
-        React.createElement(rebass_1.Box, { style: {
+    return (React.createElement(Flex_1.Box, { ...domProps, style: { flex: 1, ...domProps.style, position: 'relative' } },
+        React.createElement(Flex_1.Box, { style: {
                 position: 'absolute',
                 left: 0,
                 top: 0,

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

@@ -3,8 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.StylePreview = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
-const rebass_1 = require("rebass");
 const StyleHelper_1 = require("../Utilities/Helpers/StyleHelper");
-const join_1 = tslib_1.__importDefault(require("./utils/join"));
-const StylePreview = (props) => (React.createElement(rebass_1.Box, { ...props, className: (0, join_1.default)('ab-StylePreview', props.className), padding: props.padding ?? 2, mt: props.mt ?? 2, style: { ...(0, StyleHelper_1.toStyle)(props.styleObject), ...props.style } }, props.children ?? 'Preview result'));
+const twMerge_1 = require("../twMerge");
+const Flex_1 = require("./Flex");
+const clsx_1 = tslib_1.__importDefault(require("clsx"));
+const StylePreview = (props) => (React.createElement(Flex_1.Box, { ...props, className: (0, clsx_1.default)((0, twMerge_1.twMerge)('ab-StylePreview twa:p-2 twa:mt-2', props.className), props.styleObject.ClassName), style: { ...(0, StyleHelper_1.toStyle)(props.styleObject), ...props.style } }, props.children ?? 'Preview result'));
 exports.StylePreview = StylePreview;

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

@@ -3,10 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SupportedTabContentComps = exports.Content = exports.SupportedTabMenuComps = exports.Tab = exports.Tabs = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
-const rebass_1 = require("rebass");
 const react_1 = require("react");
 const join_1 = tslib_1.__importDefault(require("../utils/join"));
 const useProperty_1 = tslib_1.__importDefault(require("../utils/useProperty"));
+const Flex_1 = require("../Flex");
+const twMerge_1 = require("../../twMerge");
+const clsx_1 = tslib_1.__importDefault(require("clsx"));
 const TabContext = React.createContext({
     selectedIndex: 0,
     tabCount: 0,
@@ -19,7 +21,7 @@ const isTabContent = (c) => {
     return c.type === exports.Content || exports.SupportedTabContentComps.has(c.type);
 };
 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] = (0, useProperty_1.default)(props, 'selectedIndex', 0);
     const [selectedValue, setSelectedValue] = (0, useProperty_1.default)(props, 'value', 0);
     const allChildren = React.Children.toArray(children);
@@ -62,17 +64,18 @@ const Tabs = (props) => {
     };
     const currentContent = contents[selectedIndex];
     const { value, ...contentProps } = (currentContent?.props || {});
+    const fillerClassName = (0, clsx_1.default)('ab-Tabs__Filler', 'twa:bg-(--ab-cmp-tabs-strip__background)');
     return (React.createElement(TabContext.Provider, { value: {
             selectedIndex,
             tabCount: tabs.length,
             setSelectedIndex,
         } },
-        React.createElement(rebass_1.Box, { ...boxProps, className: (0, join_1.default)(boxProps.className, 'ab-Tabs'), "data-selected-index": selectedIndex },
-            React.createElement(rebass_1.Flex, { flexDirection: "row", className: "ab-Tabs__Strip" },
-                React.createElement(rebass_1.Box, { className: "ab-Tabs__Filler" }),
+        React.createElement(Flex_1.Box, { ...boxProps, className: (0, join_1.default)(boxProps.className, 'ab-Tabs twa:flex twa:flex-col'), "data-selected-index": selectedIndex },
+            React.createElement(Flex_1.Flex, { flexDirection: "row", className: (0, clsx_1.default)('ab-Tabs__Strip', 'twa:bg-(--ab-cmp-tabs-strip__background)') },
+                React.createElement(Flex_1.Box, { className: fillerClassName }),
                 tabs,
-                React.createElement(rebass_1.Flex, { flex: 1, className: "ab-Tabs__Filler" })),
-            React.createElement(rebass_1.Box, { padding: 2, ...contentProps, className: `${contentProps.className || ''} ab-Tabs__Body` }, currentContent))));
+                React.createElement(Flex_1.Flex, { className: (0, clsx_1.default)(fillerClassName, 'twa:flex-1') })),
+            React.createElement(Flex_1.Box, { ...contentProps, className: `ab-Tabs__Body twa:p-2 twa:flex-1 ${contentProps.className || ''} ` }, currentContent))));
 };
 exports.Tabs = Tabs;
 const Tab = (props) => {
@@ -81,14 +84,28 @@ const Tab = (props) => {
     const baseClassName = 'ab-Tabs__Tab';
     const active = context.selectedIndex === props.index;
     const beforeActive = context.selectedIndex === props.index + 1;
-    const className = (0, join_1.default)(propsClassName, baseClassName, active ? `${baseClassName}--active` : '', beforeActive ? `${baseClassName}--before-active` : '');
+    const className = (0, clsx_1.default)(baseClassName, active ? `${baseClassName}--active` : '', beforeActive ? `${baseClassName}--before-active` : '', 'twa:cursor-pointer twa:p-2', propsClassName);
     const ref = (0, react_1.useRef)(null);
     React.useEffect(() => {
         if (active && autoFocus && keyboardNavigation) {
             ref.current?.focus();
         }
     }, [active, autoFocus]);
-    return (React.createElement(rebass_1.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(Flex_1.Box, { ref: ref, tabIndex: active ? 0 : -1, ...boxProps, className: (0, twMerge_1.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,8 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Tag = void 0;
+exports.TagList = exports.TagBox = exports.Tag = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
-const rebass_1 = require("rebass");
-const join_1 = tslib_1.__importDefault(require("../utils/join"));
-exports.Tag = React.forwardRef((props, ref) => (React.createElement(rebass_1.Box, { ...props, ref: ref, className: (0, join_1.default)('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 } })));
+const twMerge_1 = require("../../twMerge");
+const Flex_1 = require("../Flex");
+const clsx_1 = tslib_1.__importDefault(require("clsx"));
+exports.Tag = React.forwardRef((props, ref) => (React.createElement(Flex_1.Flex, { ...props, ref: ref, className: (0, twMerge_1.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 TagBox = (props) => {
+    return (React.createElement(Flex_1.Box, { className: (0, clsx_1.default)('twa:flex twa:flex-wrap twa:flex-row twa:gap-1', props.className) }, props.children));
+};
+exports.TagBox = TagBox;
+const TagList = (props) => {
+    return (React.createElement(exports.TagBox, { className: props.className }, props.tags.map((tag, index) => (React.createElement(exports.Tag, { key: index }, tag)))));
+};
+exports.TagList = TagList;

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,5 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Tag = void 0;
+exports.TagList = exports.TagBox = exports.Tag = void 0;
 var Tag_1 = require("./Tag");
 Object.defineProperty(exports, "Tag", { enumerable: true, get: function () { return Tag_1.Tag; } });
+Object.defineProperty(exports, "TagBox", { enumerable: true, get: function () { return Tag_1.TagBox; } });
+Object.defineProperty(exports, "TagList", { enumerable: true, get: function () { return Tag_1.TagList; } });