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

package/src/components/Panel/index.js

@@ -1,30 +1,36 @@
 import * as React from 'react';
-import { Box, Flex } from 'rebass';
-import join from '../utils/join';
+import clsx from 'clsx';
+import { Box, Flex } from '../Flex';
+import { twMerge } from '../../twMerge';
 export const baseClassName = 'ab-Panel';
-const Header = ({ children, variant = 'default', ...headerProps }) => {
+const DEFAULT_BODY_CLS = 'twa:relative twa:flex-1 twa:p-2 twa:bg-defaultbackground twa:text-text-on-defaultbackground';
+const Header = ({ children, variant = 'default', className, style, onClick, ...flexProps }) => {
     if (!children) {
         return null;
     }
-    const style = {};
-    return (React.createElement(Flex, { flexDirection: "row", alignItems: "center", ...headerProps, style: { ...style, ...headerProps.style }, className: join(`${baseClassName}__header`, `${baseClassName}__header--variant-${variant}`) }, children));
+    return (React.createElement(Flex, { flexDirection: "row", alignItems: "center", style: { ...style }, onClick: onClick, className: twMerge(`${baseClassName}__header ${baseClassName}__header--variant-${variant}`, className), ...flexProps }, children));
 };
-const Body = ({ children, bodyScroll, variant, ...bodyProps }) => {
+const Body = ({ children, bodyScroll, variant, className, style, }) => {
     if (!children) {
         return null;
     }
     if (bodyScroll === true) {
         bodyScroll = 'auto';
     }
-    return (React.createElement(Box, { ...bodyProps, className: join(`${baseClassName}__body`, variant && `${baseClassName}__body--variant-${variant}`, bodyScroll ? `${baseClassName}__body--scroll-${bodyScroll}` : null) }, children));
+    const bodyCls = clsx(DEFAULT_BODY_CLS, `${baseClassName}__body`, variant && `${baseClassName}__body--variant-${variant}`, bodyScroll ? `twa:overflow-auto` : null, {
+        'twa:bg-primarylight twa:text-text-on-primary twa:border-0': variant === 'modern',
+    }, className);
+    return (React.createElement(Box, { style: style, className: bodyCls }, children));
+};
+const PlainHeader = ({ children, className }) => {
+    return (React.createElement(Box, { className: clsx(`${baseClassName}__header`, `${baseClassName}__header--variant-plain`, className) }, children));
+};
+const FlexBody = ({ children, className }) => {
+    return (React.createElement(Box, { className: clsx(DEFAULT_BODY_CLS, `${baseClassName}__body`, `${baseClassName}__body--variant-flex`, 'twa:overflow-auto twa:min-h-0', 'twa:flex-1 twa:flex twa:flex-col', className) }, children));
 };
 const Panel = (props) => {
-    const { borderRadius, border, className, header, children, headerProps, bodyProps, bodyScroll, variant = 'default', ...boxProps } = props;
+    const { border, className, header, children, headerProps, bodyProps, bodyScroll, variant = 'default', ...boxProps } = props;
     const style = {};
-    if (borderRadius !== undefined) {
-        style['--ab-cmp-panel__border-radius'] =
-            typeof borderRadius == 'number' ? `var(--ab-space-${borderRadius})` : borderRadius;
-    }
     const headerStyle = {
         border,
         ...(headerProps ? headerProps.style : null),
@@ -33,8 +39,41 @@ const Panel = (props) => {
         border,
         ...(bodyProps ? bodyProps.style : null),
     };
-    return (React.createElement(Box, { ...boxProps, style: { ...style, ...boxProps.style }, className: join(className, baseClassName, `${baseClassName}--variant-${variant}`, !header ? `${baseClassName}--no-header` : `${baseClassName}--with-header`) },
-        React.createElement(Header, { ...headerProps, style: headerStyle, variant: variant }, header),
-        React.createElement(Body, { ...bodyProps, style: bodyStyle, bodyScroll: bodyScroll, variant: variant }, children)));
+    const cls = twMerge(clsx(baseClassName, `${baseClassName}--variant-${variant}`, !header ? `${baseClassName}--no-header` : `${baseClassName}--with-header`, 'twa:rounded-standard', 'twa:flex twa:flex-col'), className);
+    let headerCls = headerProps?.className;
+    if (cls.includes('twa:rounded-none')) {
+        headerCls = twMerge(headerCls, 'twa:rounded-none');
+    }
+    let bodyCls = bodyProps?.className;
+    if (cls.includes('twa:rounded-none')) {
+        bodyCls = twMerge(bodyCls, 'twa:rounded-none');
+    }
+    if (cls.includes('twa:border-none')) {
+        bodyCls = twMerge(bodyCls, 'twa:border-none');
+    }
+    let childrenArr = React.Children.toArray(children);
+    let theBody;
+    let theHeader;
+    childrenArr.forEach((child) => {
+        if (React.isValidElement(child) && child.type === FlexBody) {
+            theBody = child;
+        }
+        else if (React.isValidElement(child) && child.type === PlainHeader) {
+            theHeader = child;
+        }
+    });
+    if (theHeader) {
+        childrenArr = childrenArr.filter((child) => child !== theHeader);
+        theHeader = (React.createElement(PlainHeader, { ...theHeader.props, className: clsx(headerCls, theHeader.props.className ?? '') }));
+    }
+    if (theBody) {
+        theBody = (React.createElement(FlexBody, { ...theBody.props, className: clsx(bodyCls, theBody.props.className ?? '') }));
+    }
+    return (React.createElement(Box, { ...boxProps, style: { ...style, ...boxProps.style }, className: cls },
+        theHeader ?? (React.createElement(Header, { ...headerProps, style: headerStyle, variant: variant, className: headerCls }, header)),
+        theBody ??
+            (childrenArr.length > 0 ? (React.createElement(Body, { ...bodyProps, style: bodyStyle, bodyScroll: bodyScroll, variant: variant, className: twMerge(bodyCls) }, childrenArr)) : null)));
 };
+Panel.PlainHeader = PlainHeader;
+Panel.FlexBody = FlexBody;
 export default Panel;

package/src/components/PopupWithFooter.js

@@ -1,12 +1,11 @@
 import * as React from 'react';
 import Dialog from './Dialog';
 import FlexWithFooter from './FlexWithFooter';
+import { twMerge } from '../twMerge';
 export const PopupWithFooter = React.forwardRef((props, ref) => {
     const { showModal, onHide, footer, maxWidth, style, ...dialogProps } = props;
-    return (React.createElement(Dialog, { ...dialogProps, ref: ref, isOpen: showModal, onDismiss: onHide, showCloseButton: false, padding: 0 },
+    return (React.createElement(Dialog, { ...dialogProps, ref: ref, isOpen: showModal, onDismiss: onHide, showCloseButton: false, className: twMerge('twa:p-0', dialogProps.className) },
         React.createElement(FlexWithFooter, { flexDirection: "column", style: style, footer: footer, footerProps: {
-                padding: 2,
-                backgroundColor: 'primary',
-                className: 'ab-Popup__footer',
+                className: 'ab-Popup__footer twa:p-2 twa:bg-primary',
             }, children: props.children })));
 });

package/src/components/ProgressIndicator/ProgressIndicator.js

@@ -5,7 +5,7 @@ import { LoaderSpinner } from '../Loader';
 import { useAdaptable } from '../../View/AdaptableContext';
 import { ExternalRenderer } from '../../View/Components/ExternalRenderer';
 import Dialog from '../Dialog';
-import { Box, Flex } from 'rebass';
+import { Box, Flex } from '../Flex';
 export const ProgressIndicator = () => {
     const adaptable = useAdaptable();
     const { active, text, render, frameworkComponent, renderMode } = useSelector((state) => state.Popup.ProgressIndicator);
@@ -62,9 +62,9 @@ export const ProgressIndicator = () => {
         // Otherwise use the default Flex layout
         (React.createElement(
             Flex,
-            { alignItems: "center", flexDirection: "column", p: 3, className: "ab-ProgressIndicator-body" },
+            { alignItems: "center", flexDirection: "column", className: "ab-ProgressIndicator-body twa:p-3" },
             React.createElement(LoaderSpinner, null),
-            React.createElement(Box, { mt: 3 },
+            React.createElement(Box, { className: "twa:mt-3" },
                 text && React.createElement(Box, null, text),
                 customEl)
         )))))

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,18 +1,22 @@
 import * as React from 'react';
 import { useState } from 'react';
-import { Box, Flex } from 'rebass';
 import useProperty from '../utils/useProperty';
+import { Box, Flex } from '../Flex';
+import { twMerge } from '../../twMerge';
+import clsx from 'clsx';
+import { targetChildren } from '../twUtils';
 const RadioContext = React.createContext({
     value: null,
     name: '',
     onChange: (v) => { },
+    variant: 'default',
 });
 export const useRadioContext = () => {
     return React.useContext(RadioContext);
 };
 const Radio = ({ children, checked, onChange, value, name, gapDistance = 10, childrenPosition = 'end', as = 'label', id, tabIndex, disabled, ...props }) => {
     const context = useRadioContext();
-    const { value: contextValue, onChange: contextOnChange, name: contextName } = context;
+    const { value: contextValue, onChange: contextOnChange, name: contextName, variant } = context;
     const [stateChecked, setStateChecked] = useState(false);
     const computedChecked = checked !== undefined
         ? checked
@@ -36,34 +40,28 @@ 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(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(Box, { ...props, className: twMerge(`ab-Radio twa:my-2 twa:inline-flex twa:flex-row twa:items-center twa:cursor-pointer twa:relative`, props.className), "data-checked": computedChecked, as: as },
         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: clsx('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));
 };
 export const RadioGroup = (props) => {
-    const { orientation, value: _value, name, onRadioChange, ...flexProps } = props;
+    const { orientation, value: _value, name, onRadioChange, children, variant = 'default' } = props;
     const [value, setValue] = useProperty(props, 'value', undefined, {
         onChange: (value) => {
             onRadioChange(value);
         },
     });
-    return (React.createElement(RadioContext.Provider, { value: { value, onChange: setValue, name } },
-        React.createElement(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, { className: clsx('ab-RadioGroup', props.className), flexDirection: orientation == 'horizontal' ? 'row' : 'column', alignItems: orientation == 'horizontal' ? 'center' : 'flex-start' }, children)));
+};
+export const radioGroupStyling = {
+    horizontalTextOnly: clsx('twa:bg-primarylight twa:rounded-standard twa:p-1 twa:gap-5', {
+        'twa:*:flex-1 twa:*:rounded-standard twa:*:p-1 twa:*:m-0': 'default styles for all the radio buttons',
+        'twa:*:data-[checked=true]:bg-accent twa:*:data-[checked=true]:text-accent-foreground': 'style the checked state',
+        [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',
+    }),
 };
 export default Radio;

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