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

package/src/View/Components/AdaptableObjectList/AdaptableObjectCompactList.js

@@ -1,9 +1,9 @@
 import * as React from 'react';
 import { useDispatch } from 'react-redux';
-import { Box, Flex } from 'rebass';
 import SimpleButton from '../../../components/SimpleButton';
 import { useAdaptable } from '../../AdaptableContext';
-import { ValueOptionsTags } from '../ValueSelector';
+import { Box, Flex } from '../../../components/Flex';
+import { TagList } from '../../../components/Tag/Tag';
 const baseClassName = 'ab-Adaptable-Object-Compact-List';
 const ICON_SIZE = 20;
 export const AdaptableObjectCompactListItem = (props) => {
@@ -37,17 +37,17 @@ export const AdaptableObjectCompactListItem = (props) => {
     }
     labelEl = labelEl ?? objectView.item.name;
     return (React.createElement(Flex, { className: `${baseClassName}__Item`, alignItems: "center" },
-        labelEl && (React.createElement(Flex, { flex: '1 1 auto', className: `${baseClassName}__Item__Name` }, labelEl)),
-        React.createElement(Box, { flex: '2 1 auto' },
+        labelEl && (React.createElement(Flex, { className: `${baseClassName}__Item__Name twa:flex-[1_1_auto]` }, labelEl)),
+        React.createElement(Box, { className: "twa:flex-[2_1_auto]" },
             typeof objectView.item.view === 'function'
                 ? React.createElement(objectView.item.view, {
                     data: props.abObject,
                 })
                 : objectView.item.view,
-            Boolean(objectView.item?.values && objectView.item?.values?.length) && (React.createElement(Box, { mb: 2, className: `${baseClassName}__Item__Values` },
-                React.createElement(ValueOptionsTags, { style: { marginRight: 0 }, readOnly: true, options: objectView.item.values, value: objectView.item.values, allowWrap: true, toIdentifier: (c) => c, toLabel: (c) => React.createElement(React.Fragment, null, c) })))),
+            Boolean(objectView.item?.values && objectView.item?.values?.length) && (React.createElement(Box, { className: `${baseClassName}__Item__Values` },
+                React.createElement(TagList, { tags: objectView.item.values.map(String) })))),
         suspendAction && unSuspendAction && (React.createElement(SimpleButton, { onMouseDown: handleSuspendUnSuspend, tone: isSuspended ? 'neutral' : 'success', variant: "text", icon: isSuspended ? 'resume' : 'pause' })),
-        React.createElement(Flex, { ml: 1, flex: '0 0 auto' }, deleteAction && (React.createElement(SimpleButton, { iconSize: ICON_SIZE, icon: "delete", variant: "text", onMouseDown: handleDelete, accessLevel: moduleAccessLevel })))));
+        React.createElement(Flex, { className: "twa:ml-1 twa:flex-[0_0_auto]" }, deleteAction && (React.createElement(SimpleButton, { iconSize: ICON_SIZE, icon: "delete", variant: "text", onMouseDown: handleDelete, accessLevel: moduleAccessLevel })))));
 };
 export const AdaptableObjectCompactList = (props) => {
     const adaptable = useAdaptable();
@@ -71,10 +71,10 @@ export const AdaptableObjectCompactList = (props) => {
         }
     }, [isAtLeastOneAbObjectActive]);
     return (React.createElement(Flex, { flexDirection: "column", className: baseClassName },
-        React.createElement(Flex, { className: `${baseClassName}__Header`, fontSize: 3 },
+        React.createElement(Flex, { className: `${baseClassName}__Header twa:text-3` },
             React.createElement(Flex, { className: `${baseClassName}__Title`, alignItems: 'center' }, props.module.moduleInfo.FriendlyName),
-            React.createElement(Box, { flex: 1 }),
-            suspendAllAction && unSuspendAllAction && (React.createElement(SimpleButton, { mr: 2, onMouseDown: handleSuspendUnsuspendAll, tone: isAtLeastOneAbObjectActive ? 'neutral' : 'success', variant: "raised", icon: isAtLeastOneAbObjectActive ? 'pause' : 'resume', accessLevel: accessLevel }, isAtLeastOneAbObjectActive ? 'Suspend All' : 'Unsuspend All')),
+            React.createElement(Box, { className: "twa:flex-1" }),
+            suspendAllAction && unSuspendAllAction && (React.createElement(SimpleButton, { className: "twa:mr-2", onMouseDown: handleSuspendUnsuspendAll, tone: isAtLeastOneAbObjectActive ? 'neutral' : 'success', variant: "raised", icon: isAtLeastOneAbObjectActive ? 'pause' : 'resume', accessLevel: accessLevel }, isAtLeastOneAbObjectActive ? 'Suspend All' : 'Unsuspend All')),
             deleteAllAction && (React.createElement(SimpleButton, { onMouseDown: () => dispatch(deleteAllAction), variant: "raised", tone: "neutral", accessLevel: accessLevel }, "Clear All"))),
         React.createElement(Box, { className: `${baseClassName}__Body` }, props.abObjects.map((abObject) => {
             return (React.createElement(AdaptableObjectCompactListItem, { key: abObject.Uuid, abObject: abObject, module: props.module }));

package/src/View/Components/AdaptableObjectList/AdaptableObjectList.d.ts

@@ -43,12 +43,14 @@ interface AdaptableObjectListItemProps {
      */
     deleteDisabled?: boolean;
     deleteTooltip?: string;
+    className?: string;
 }
 export declare const AdaptableObjectListItem: React.FunctionComponent<AdaptableObjectListItemProps>;
 interface AdaptableObjectListProps {
     items: AdaptableObjectView[];
     module: IModule;
     itemProps?: Partial<AdaptableObjectListItemProps>;
+    className?: string;
 }
 export declare const AdaptableObjectList: React.FunctionComponent<AdaptableObjectListProps>;
 export {};

package/src/View/Components/AdaptableObjectList/AdaptableObjectList.js

@@ -1,16 +1,17 @@
 import * as React from 'react';
 import { useDispatch, useSelector } from 'react-redux';
-import { Box, Flex } from 'rebass';
 import * as InternalRedux from '../../../Redux/ActionsReducers/InternalRedux';
 import SimpleButton from '../../../components/SimpleButton';
-import join from '../../../components/utils/join';
 import AdaptableHelper from '../../../Utilities/Helpers/AdaptableHelper';
 import { useAdaptable } from '../../AdaptableContext';
 import { ButtonDelete } from '../Buttons/ButtonDelete';
 import { ButtonEdit } from '../Buttons/ButtonEdit';
 import { ButtonShare } from '../Buttons/ButtonShare';
 import { SuspendToggleButton } from '../Buttons/SuspendToggleButton/SuspendToggleButton';
-import { ValueOptionsTags } from '../ValueSelector';
+import { Box, Flex } from '../../../components/Flex';
+import { twMerge } from '../../../twMerge';
+import clsx from 'clsx';
+import { TagList } from '../../../components/Tag/Tag';
 const ICON_SIZE = 26;
 const LIST_BASE_CLASS_NAME = 'ab-Adaptable-Object-List';
 const ITEM_BASE_CLASS_NAME = `${LIST_BASE_CLASS_NAME}__Item`;
@@ -33,25 +34,25 @@ export const AdaptableObjectListItemView = (props) => {
         };
     }
     const deleteActionButton = React.createElement(ButtonDelete, { ...deleteActionProps });
-    return (React.createElement(Flex, { "data-name": "adaptable-object-list-item", "data-value": props.abObject.Uuid, as: "li", mb: 3, className: join(props.className, baseClassName), style: props.style },
-        React.createElement(Box, { flex: 1, className: `${baseClassName}__rows` }, props.items.filter?.(Boolean)?.map((tag, index) => {
+    return (React.createElement(Flex, { "data-name": "adaptable-object-list-item", "data-value": props.abObject.Uuid, as: "li", className: twMerge(baseClassName, 'twa:rounded-standard', props.className), style: props.style },
+        React.createElement(Box, { className: `twa:flex-1 ${baseClassName}__rows twa:gap-2 twa:flex twa:flex-col` }, props.items.filter?.(Boolean)?.map((tag, index) => {
             const labelElement = typeof tag.label === 'function'
                 ? React.createElement(tag.label, { key: index, data: props.abObject })
                 : tag.label ?? tag.name;
-            return (React.createElement(Flex, { "data-name": tag.name, key: `${index}-${tag.name}`, mb: 2, className: `${baseClassName}__row` },
-                !tag.isLabelInline && (React.createElement(Box, { className: `${baseClassName}__label`, mr: 3 },
+            return (React.createElement(Flex, { "data-name": tag.name, key: `${index}-${tag.name}`, className: `${baseClassName}__row twa:gap-3` },
+                !tag.isLabelInline && (React.createElement(Box, { className: `${baseClassName}__label twa:flex twa:items-center twa:flex-row twa:text-nowrap` },
                     labelElement,
-                    props.showEditButton && (React.createElement(SimpleButton, { "data-name": `${tag.name}-edit-button`, accessLevel: props.accessLevel, className: `${baseClassName}__edit-property`, ml: 1, icon: "edit", tooltip: "edit", iconSize: 18, variant: "text", onClick: () => {
+                    props.showEditButton && (React.createElement(SimpleButton, { "data-name": `${tag.name}-edit-button`, accessLevel: props.accessLevel, className: `${baseClassName}__edit-property twa:ml-1`, icon: "edit", tooltip: "edit", iconSize: 18, variant: "text", onClick: () => {
                             props.handleOnEdit(tag.name);
                         } })))),
-                React.createElement(Box, { flex: 1, className: `${baseClassName}__values` },
+                React.createElement(Box, { className: `twa:flex-1 ${baseClassName}__values` },
                     typeof tag.view === 'function'
                         ? React.createElement(tag.view, {
                             data: props.abObject,
                             module: props.module,
                         })
                         : tag.view,
-                    Boolean(tag?.values && tag?.values?.length) && (React.createElement(ValueOptionsTags, { style: { marginRight: 0 }, readOnly: true, options: tag.values, value: tag.values, allowWrap: true, toIdentifier: (c) => c, toLabel: (c) => React.createElement(React.Fragment, null, c) })),
+                    Boolean(tag?.values && tag?.values?.length) ? (React.createElement(TagList, { tags: tag.values.map(String) })) : null,
                     typeof tag.viewAfter === 'function'
                         ? React.createElement(tag.viewAfter, {
                             data: props.abObject,
@@ -59,16 +60,17 @@ export const AdaptableObjectListItemView = (props) => {
                         })
                         : tag.viewAfter)));
         })),
-        props.showActions && (React.createElement(Flex, { flexDirection: "column", className: `${baseClassName}__buttons` },
-            React.createElement(Flex, { justifyContent: "end" },
+        props.showActions && (React.createElement(Flex, { flexDirection: "column", className: `${baseClassName}__buttons twa:ml-3 twa:pl-3 twa:text-right twa:min-w-[80px]` },
+            React.createElement(Flex, { className: "twa:justify-end" },
                 props.actions,
                 props.teamSharingActivated && (React.createElement(ButtonShare, { iconSize: ICON_SIZE, Header: `TeamSharing ${props.entityType}`, accessLevel: props.accessLevel, onShare: props.onShare })),
                 props.onDelete && (React.createElement(SimpleButton, { "data-name": "delete", disabled: props.deleteDisabled, iconSize: ICON_SIZE, tooltip: props.deleteTooltip, icon: "delete", onClick: props.onDelete, variant: "text" })),
-                props.deleteAction && deleteActionButton,
+                props.deleteAction ? deleteActionButton : null,
                 props.showEditButton && (React.createElement(ButtonEdit, { iconSize: ICON_SIZE, disabled: props.editDisabled, accessLevel: props.accessLevel, onClick: () => props.handleOnEdit() }))),
-            React.createElement(Box, { flex: 1 }),
-            props.suspendedEnabled && (React.createElement(Flex, { justifyContent: "end" },
-                React.createElement(SuspendToggleButton, { onSuspend: props.onSuspend, onUnSuspend: props.onUnSuspend, suspendableObject: props.abObject, accessLevel: props.accessLevel })))))));
+            props.suspendedEnabled && (React.createElement(React.Fragment, null,
+                React.createElement(Box, { className: "twa:flex-1 twa:min-h-[20px]" }),
+                React.createElement(Flex, { className: "twa:justify-end" },
+                    React.createElement(SuspendToggleButton, { onSuspend: props.onSuspend, onUnSuspend: props.onUnSuspend, suspendableObject: props.abObject, accessLevel: props.accessLevel }))))))));
 };
 export const AdaptableObjectListItem = (props) => {
     const adaptable = useAdaptable();
@@ -85,7 +87,7 @@ export const AdaptableObjectListItem = (props) => {
     const entityType = props.module.moduleInfo.FriendlyName;
     const moduleAccessLevel = adaptable.api.entitlementApi.getEntitlementAccessLevelForModule(props.module.moduleInfo.ModuleName);
     const accessLevel = AdaptableHelper.getAccessLevelForObject(props.data.abObject, moduleAccessLevel);
-    const itemClassName = join(props.data.className, ITEM_BASE_CLASS_NAME, props.data.abObject.IsSuspended &&
+    const itemClassName = clsx(props.className, props.data.className, ITEM_BASE_CLASS_NAME, props.data.abObject.IsSuspended &&
         `${ITEM_BASE_CLASS_NAME}--is-suspended`);
     const handleCloseWizard = React.useCallback(() => {
         setIsEditWizardVisible(false);
@@ -120,5 +122,5 @@ export const AdaptableObjectListItem = (props) => {
         isEditWizardVisible && EditWizard && (React.createElement(EditWizard, { defaultCurrentSectionName: wizardStepName, moduleInfo: props.module.moduleInfo, data: props.data.abObject, configEntities: null, onCloseWizard: handleCloseWizard, onFinishWizard: handleCloseWizard }))));
 };
 export const AdaptableObjectList = (props) => {
-    return (React.createElement("ul", { className: LIST_BASE_CLASS_NAME }, props?.items?.map((item, index) => (React.createElement(AdaptableObjectListItem, { key: item.abObject.Uuid ?? index, data: item, module: props.module, ...props.itemProps })))));
+    return (React.createElement("ul", { className: twMerge(clsx(LIST_BASE_CLASS_NAME, 'twa:list-none twa:p-0 twa:gap-3 twa:flex twa:flex-col', props.className)) }, props?.items?.map((item, index) => (React.createElement(AdaptableObjectListItem, { key: item.abObject.Uuid ?? index, data: item, module: props.module, ...props.itemProps })))));
 };

package/src/View/Components/AdaptableObjectRow/index.d.ts

@@ -5,6 +5,7 @@ export interface AdaptableObjectRowProps extends React.ClassAttributes<Adaptable
     fontSize?: string;
     onClick?: (e: React.SyntheticEvent) => void;
     style?: React.CSSProperties;
+    className?: string;
     isSuspended?: boolean;
 }
 export declare class AdaptableObjectRow extends React.Component<AdaptableObjectRowProps, {}> {

package/src/View/Components/AdaptableObjectRow/index.js

@@ -1,11 +1,10 @@
 import * as React from 'react';
-/// <reference path="../../typings/.d.ts" />
-import { Flex, Text } from 'rebass';
-import join from '../../../components/utils/join';
+import { Flex, Box } from '../../../components/Flex';
+import clsx from 'clsx';
 export class AdaptableObjectRow extends React.Component {
     render() {
-        const colItems = this.props.colItems.map((colItem, index) => (React.createElement(Text, { className: "ab-AdaptableObjectRow__cell", "data-name": "list-group-cell", key: index, title: typeof colItem.Content === 'string' ? colItem.Content : undefined, flex: colItem.Size, paddingLeft: 1, paddingRight: 1 }, colItem.Content)));
-        const className = join('ab-AdaptableObjectRow', this.props.isSuspended && 'ab-AdaptableObjectRow--is-suspended');
+        const colItems = this.props.colItems.map((colItem, index) => (React.createElement(Box, { className: `ab-AdaptableObjectRow__cell twa:px-1`, style: { flex: colItem.Size }, "data-name": "list-group-cell", key: index, title: typeof colItem.Content === 'string' ? colItem.Content : undefined }, colItem.Content)));
+        const className = clsx('ab-AdaptableObjectRow', 'twa:p-3', 'twa:m-0', this.props.isSuspended && 'ab-AdaptableObjectRow--is-suspended', this.props.className);
         return (React.createElement(Flex, { className: className, onClick: this.props.onClick, style: this.props.style }, colItems));
     }
 }

package/src/View/Components/Buttons/ButtonBase/index.d.ts

@@ -1,7 +1,6 @@
 import * as React from 'react';
-import { ButtonProps as BtnProps } from 'rebass';
 import { AccessLevel } from '../../../../AdaptableState/Common/Entitlement';
-export interface ButtonBaseProps extends BtnProps {
+export interface ButtonBaseProps extends React.HTMLProps<HTMLButtonElement | HTMLDivElement> {
     overrideDisableButton?: boolean;
     transformGlyph?: boolean;
     className?: string;

package/src/View/Components/Buttons/ButtonBase/index.js

@@ -1,10 +1,11 @@
 import * as React from 'react';
-import { Button } from 'rebass';
-import join from '../../../../components/utils/join';
+import { Box } from '../../../../components/Flex';
+import clsx from 'clsx';
+import { twMerge } from '../../../../twMerge';
 const Glyphicon = ({ glyph, style }) => {
     return React.createElement("span", { style: style, className: `glyphicon glyphicon-${glyph}` });
 };
-const baseClassName = 'ab-Button';
+const baseClassName = 'ab-Button twa:text-current';
 export class ButtonBase extends React.Component {
     render() {
         let isDisabled;
@@ -53,7 +54,7 @@ export class ButtonBase extends React.Component {
                 ' ',
                 this.props.iconPosition !== 'end' ? text : null));
         }
-        let button = (React.createElement(Button, { ...this.props, style: { color: 'currentColor', ...this.props.style }, className: join(baseClassName, `${baseClassName}--size-${'normal'}`, `${baseClassName}--style-${'normal'}`, isDisabled ? `${baseClassName}--disabled` : `${baseClassName}--enabled`), disabled: isDisabled, onClick: this.props.onClick, onMouseDown: this.props.onMouseDown || ((e) => e.preventDefault()) }, content));
+        let button = (React.createElement(Box, { ...this.props, as: "button", style: this.props.style, className: twMerge(clsx(baseClassName, `${baseClassName}--size-normal`, `${baseClassName}--style-normal`, isDisabled ? `${baseClassName}--disabled` : `${baseClassName}--enabled`), this.props.className), disabled: isDisabled, onClick: this.props.onClick, onMouseDown: this.props.onMouseDown || ((e) => e.preventDefault()) }, content));
         let buttonwithtooltip = React.createElement("div", null, button);
         return hideToolTip ? button : buttonwithtooltip;
     }

package/src/View/Components/Buttons/ButtonClear.js

@@ -2,6 +2,7 @@ import * as React from 'react';
 import SimpleButton from '../../../components/SimpleButton';
 export class ButtonClear extends React.Component {
     render() {
-        return (React.createElement(SimpleButton, { "data-name": "clear", tooltip: "Clear", iconSize: 20, icon: this.props.showIcon == false ? '' : 'close', ...this.props, variant: "text" }, this.props.showText ? 'Clear' : ''));
+        const { showText, showIcon, ...innerProps } = this.props;
+        return (React.createElement(SimpleButton, { "data-name": "clear", tooltip: "Clear", iconSize: 20, icon: showIcon == false ? '' : 'close', ...innerProps, variant: "text" }, showText ? 'Clear' : ''));
     }
 }

package/src/View/Components/Buttons/ButtonFunction.js

@@ -1,7 +1,8 @@
 import * as React from 'react';
 import SimpleButton from '../../../components/SimpleButton';
+import { twMerge } from '../../../twMerge';
 export class ButtonFunction extends React.Component {
     render() {
-        return (React.createElement(SimpleButton, { "data-name": "function", tooltip: "Module", iconSize: 20, icon: "function", mr: 1, ...this.props }));
+        return (React.createElement(SimpleButton, { "data-name": "function", tooltip: "Module", iconSize: 20, icon: "function", ...this.props, className: twMerge('twa:mr-1', this.props.className) }));
     }
 }

package/src/View/Components/Buttons/ButtonNew.d.ts

@@ -1,3 +1,13 @@
 import * as React from 'react';
 import { SimpleButtonProps } from '../../../components/SimpleButton';
-export declare const ButtonNew: (props: SimpleButtonProps) => React.JSX.Element;
+type ButtonNewProps = {
+    variant?: SimpleButtonProps['variant'];
+    className?: string;
+    tone?: SimpleButtonProps['tone'];
+    tooltip?: SimpleButtonProps['tooltip'];
+    accessLevel?: SimpleButtonProps['accessLevel'];
+    children?: React.ReactNode;
+    onClick?: () => void;
+};
+export declare const ButtonNew: (props: ButtonNewProps) => React.JSX.Element;
+export {};

package/src/View/Components/Buttons/ButtonNew.js

@@ -1,5 +1,6 @@
 import * as React from 'react';
 import SimpleButton from '../../../components/SimpleButton';
+import { twMerge } from '../../../twMerge';
 export const ButtonNew = (props) => {
-    return (React.createElement(SimpleButton, { "data-name": "new", tooltip: "New", tone: "accent", icon: "plus", variant: "raised", ...props }, props.children === undefined ? 'New' : props.children));
+    return (React.createElement(SimpleButton, { "data-name": "new", tone: props.tone || 'accent', icon: "plus", variant: props.variant || 'raised', tooltip: props.tooltip || 'New', accessLevel: props.accessLevel, onClick: props.onClick, className: twMerge(`twa:flex twa:flex-row twa:items-center`, props.className) }, props.children === undefined ? 'New' : props.children));
 };

package/src/View/Components/Buttons/EntityListActionButtons.d.ts

@@ -25,7 +25,7 @@ export interface EntityListActionButtonsProps extends React.ClassAttributes<Enti
     overrideTooltipShare?: string;
     confirmDeleteAction: Redux.Action;
     entityType: string;
-    justifyContent?: string;
+    justifyContent?: 'start' | 'center' | 'end';
     accessLevel: AccessLevel;
     cloneAccessLevel?: AccessLevel;
     editSize: any;

package/src/View/Components/Buttons/EntityListActionButtons.js

@@ -2,56 +2,27 @@ import * as React from 'react';
 import { ButtonEdit } from './ButtonEdit';
 import { ButtonClone } from './ButtonClone';
 import { ButtonDelete } from './ButtonDelete';
-import { Flex } from 'rebass';
 import { ButtonShare } from './ButtonShare';
 import { SuspendToggleButton } from './SuspendToggleButton/SuspendToggleButton';
+import { Flex } from '../../../components/Flex';
+import clsx from 'clsx';
 const stopPropagation = (e) => {
     e.stopPropagation();
 };
 export class EntityListActionButtons extends React.Component {
     render() {
-        return (React.createElement(Flex, { justifyContent: this.props.justifyContent || 'center', margin: 0, padding: 0, onClick: stopPropagation },
-            this.props.showEdit && (React.createElement(ButtonEdit, { onClick: () => (this.props.editClick ? this.props.editClick() : null), style: {
-                    marginLeft: '0px',
-                    marginTop: '2px',
-                    marginBottom: '2px',
-                    marginRight: '2px',
-                    color: 'var(--ab-color-text-on-edit)',
-                    fill: 'var(--ab-color-text-on-edit)',
-                    background: 'var(--ab-color-action-edit)',
-                }, disabled: this.props.overrideDisableEdit || this.props.accessLevel == 'ReadOnly', tooltip: this.props.overrideTooltipEdit, accessLevel: this.props.accessLevel })),
-            this.props.showClone && (React.createElement(ButtonClone, { onClick: () => (this.props.cloneClick ? this.props.cloneClick() : null), style: {
-                    marginLeft: '0px',
-                    marginTop: '2px',
-                    marginBottom: '2px',
-                    marginRight: '2px',
-                    color: 'var(--ab-color-text-on-clone)',
-                    fill: 'var(--ab-color-text-on-clone)',
-                    background: 'var(--ab-color-action-clone)',
-                }, children: null, disabled: this.props.overrideDisableClone || this.props.cloneAccessLevel == 'ReadOnly', tooltip: this.props.overrideTooltipClone, accessLevel: this.props.cloneAccessLevel })),
-            this.props.showDelete && (React.createElement(ButtonDelete, { "data-name": "delete", style: {
-                    marginLeft: '1px',
-                    marginTop: '2px',
-                    marginBottom: '2px',
-                    marginRight: '1px',
-                    //TODO move those styles in ButtonDelete
-                    color: 'var(--ab-color-text-on-delete)',
-                    fill: 'var(--ab-color-text-on-delete)',
-                    background: 'var(--ab-color-action-delete)',
-                }, disabled: this.props.overrideDisableDelete || this.props.accessLevel == 'ReadOnly', tooltip: this.props.overrideTooltipDelete, ConfirmAction: this.props.confirmDeleteAction, ConfirmationMsg: 'Are you sure you want to delete this ' + this.props.entityType + '?', ConfirmationTitle: 'Delete ' + this.props.entityType, accessLevel: this.props.accessLevel })),
-            this.props.showShare && (React.createElement(ButtonShare, { style: {
-                    marginLeft: '1px',
-                    marginTop: '2px',
-                    marginBottom: '2px',
-                    marginRight: '1px',
-                    color: 'var(--ab-color-text-on-share)',
-                    fill: 'var(--ab-color-text-on-share)',
-                    background: 'var(--ab-color-action-share)',
-                }, onShare: (config) => this.props.shareClick ? this.props.shareClick(config) : null, Header: `TeamSharing ${this.props.entityType}`, disabled: this.props.overrideDisableShare || this.props.accessLevel == 'ReadOnly', tooltip: this.props.overrideTooltipShare, accessLevel: this.props.accessLevel })),
-            this.props.showSuspend && this.props.suspendableObject && (React.createElement(SuspendToggleButton, { style: {
-                    marginLeft: 2,
-                    alignSelf: 'center',
-                }, onSuspend: this.props.onSuspend, onUnSuspend: this.props.onUnSuspend, suspendableObject: this.props.suspendableObject, disabled: this.props.accessLevel == 'ReadOnly' }))));
+        const { justifyContent } = this.props;
+        const justifyContentClassName = clsx({
+            'twa:justify-start': justifyContent === 'start',
+            'twa:justify-center': justifyContent === 'center',
+            'twa:justify-end': justifyContent === 'end',
+        }) || 'twa:justify-center';
+        return (React.createElement(Flex, { className: `${justifyContentClassName} twa:m-0 twa:p-0`, onClick: stopPropagation },
+            this.props.showEdit && (React.createElement(ButtonEdit, { onClick: () => (this.props.editClick ? this.props.editClick() : null), className: `twa:ml-0 twa:mr-[2px] twa:my-[2px] twa:text-text-on-edit twa:bg-action-edit twa:fill-text-on-edit`, disabled: this.props.overrideDisableEdit || this.props.accessLevel == 'ReadOnly', tooltip: this.props.overrideTooltipEdit, accessLevel: this.props.accessLevel })),
+            this.props.showClone && (React.createElement(ButtonClone, { onClick: () => (this.props.cloneClick ? this.props.cloneClick() : null), className: `twa:ml-0 twa:mr-[2px] twa:my-[2px] twa:text-text-on-clone twa:bg-action-clone twa:fill-text-on-clone`, children: null, disabled: this.props.overrideDisableClone || this.props.cloneAccessLevel == 'ReadOnly', tooltip: this.props.overrideTooltipClone, accessLevel: this.props.cloneAccessLevel })),
+            this.props.showDelete && (React.createElement(ButtonDelete, { "data-name": "delete", className: `twa:mx-[px] twa:my-[2px] twa:text-text-on-delete twa:bg-action-delete twa:fill-text-on-delete`, disabled: this.props.overrideDisableDelete || this.props.accessLevel == 'ReadOnly', tooltip: this.props.overrideTooltipDelete, ConfirmAction: this.props.confirmDeleteAction, ConfirmationMsg: 'Are you sure you want to delete this ' + this.props.entityType + '?', ConfirmationTitle: 'Delete ' + this.props.entityType, accessLevel: this.props.accessLevel })),
+            this.props.showShare && (React.createElement(ButtonShare, { className: `twa:mx-[1px] twa:my-[2px] twa:text-text-on-share twa:bg-action-share twa:fill-text-on-share`, onShare: (config) => this.props.shareClick ? this.props.shareClick(config) : null, Header: `TeamSharing ${this.props.entityType}`, disabled: this.props.overrideDisableShare || this.props.accessLevel == 'ReadOnly', tooltip: this.props.overrideTooltipShare, accessLevel: this.props.accessLevel })),
+            this.props.showSuspend && this.props.suspendableObject && (React.createElement(SuspendToggleButton, { className: `twa:ml-[2px] twa:align-self-center`, onSuspend: this.props.onSuspend, onUnSuspend: this.props.onUnSuspend, suspendableObject: this.props.suspendableObject, disabled: this.props.accessLevel == 'ReadOnly' }))));
     }
 }
 EntityListActionButtons.defaultProps = {

package/src/View/Components/Buttons/SuspendToggleButton/SuspendToggleButton.d.ts

@@ -9,6 +9,7 @@ interface EntityListSuspendButtonProps {
     style?: React.CSSProperties;
     disabled?: boolean;
     accessLevel?: AccessLevel;
+    className?: string;
 }
 export declare const SuspendToggleButton: React.FunctionComponent<EntityListSuspendButtonProps>;
 export {};

package/src/View/Components/Buttons/SuspendToggleButton/SuspendToggleButton.js

@@ -1,6 +1,7 @@
 import * as React from 'react';
 import { ToggleButton } from '../../../../components/ToggleButton';
-export const SuspendToggleButton = React.memo(({ suspendableObject, onUnSuspend, onSuspend, style, disabled, accessLevel }) => {
+import clsx from 'clsx';
+export const SuspendToggleButton = React.memo(({ suspendableObject, onUnSuspend, onSuspend, style, disabled, accessLevel, className }) => {
     const handleOnChange = React.useCallback((checked) => {
         if (checked) {
             onUnSuspend(suspendableObject);
@@ -11,5 +12,5 @@ export const SuspendToggleButton = React.memo(({ suspendableObject, onUnSuspend,
     }, [onUnSuspend, onSuspend]);
     const preparedDisabled = (accessLevel && accessLevel === 'ReadOnly') || disabled;
     const isSuspended = suspendableObject.IsSuspended;
-    return (React.createElement(ToggleButton, { className: "ab-SuspendButton", "data-name": suspendableObject.IsSuspended ? 'un-suspend' : 'suspend', disabled: preparedDisabled, style: style, onChange: handleOnChange, checked: !isSuspended }, isSuspended ? 'inactive' : 'active'));
+    return (React.createElement(ToggleButton, { className: clsx(`ab-SuspendButton`, className), "data-name": suspendableObject.IsSuspended ? 'un-suspend' : 'suspend', disabled: preparedDisabled, style: style, onChange: handleOnChange, checked: !isSuspended }, isSuspended ? 'inactive' : 'active'));
 });

package/src/View/Components/CellPopup/index.d.ts

@@ -9,5 +9,5 @@ export type CellPopupHandle = {
     refreshContent: () => void;
 };
 export declare const CellPopup: React.ForwardRefExoticComponent<CellPopupProps & {
-    children?: React.ReactNode;
+    children?: React.ReactNode | undefined;
 } & React.RefAttributes<CellPopupHandle>>;

package/src/View/Components/ColumnFilter/AdaptableColumnFilter.d.ts

@@ -1,10 +1,11 @@
 import * as React from 'react';
-import { BoxProps } from 'rebass';
 export interface AdaptableColumnFilterProps {
     location: 'columnMenu' | 'filterForm';
     columnId: string;
-    padding?: BoxProps['p'];
-    wrapperProps?: BoxProps;
+    wrapperProps?: {
+        className?: string;
+        style?: React.CSSProperties;
+    };
 }
 /**
  * This wrapper knows about predicates.

package/src/View/Components/ColumnFilter/ColumnFilter.d.ts

@@ -1,5 +1,4 @@
 import * as React from 'react';
-import { BoxProps } from 'rebass';
 import { QlPredicate, QlPredicateDef } from '../../../parser/src/predicate';
 interface ColumnFilterComponentProps {
     location: 'columnMenu' | 'filterForm';
@@ -9,7 +8,10 @@ interface ColumnFilterComponentProps {
     predicate?: QlPredicate;
     predicateDefs: QlPredicateDef[];
     onPredicateChange: (predicate: QlPredicate | null) => void;
-    wrapperProps?: BoxProps;
+    wrapperProps?: {
+        className?: string;
+        style?: React.CSSProperties;
+    };
 }
 export declare const ColumnFilterComponent: React.FunctionComponent<ColumnFilterComponentProps>;
 export {};

package/src/View/Components/ColumnFilter/ColumnFilter.js

@@ -1,5 +1,4 @@
 import * as React from 'react';
-import { Box, Flex } from 'rebass';
 import SimpleButton from '../../../components/SimpleButton';
 import { ColumnFilterInputList } from './components/ColumnFilterInputList';
 import { usePredicateDef } from './hooks';
@@ -7,28 +6,26 @@ import Radio from '../../../components/Radio';
 import { useAdaptable } from '../../AdaptableContext';
 import { Select } from '../../../components/Select';
 import { mapQlPredicateToAdaptablePredicate } from './utils';
+import { Box, Flex } from '../../../components/Flex';
+import clsx from 'clsx';
+import { twMerge } from '../../../twMerge';
 const ColumnFilterPredicateDropdown = (props) => {
     const predicateDef = usePredicateDef(props.predicate?.operator, props.predicateDefs);
     const options = props.predicateDefs.map((predicateDef) => {
         return {
-            label: (React.createElement(Box, { display: 'flex', alignItems: "center" },
-                React.createElement(SimpleButton, { variant: "raised", mr: 2, tone: "accent" }, predicateDef.icon),
+            label: (React.createElement(Box, { className: "twa:flex twa:items-center" },
+                React.createElement(SimpleButton, { variant: "raised", className: "twa:mr-2", tone: "accent" }, predicateDef.icon),
                 predicateDef.label)),
             value: predicateDef.operator,
         };
     });
     const operator = props.predicate?.operator;
     const isAndOr = operator === 'AND' || operator === 'OR';
-    return (React.createElement(Box, { display: 'flex', alignItems: "center", className: "ab-ColumnFilterPredicateDropdown", style: {
+    return (React.createElement(Box, { className: "twa:flex twa:items-center ab-ColumnFilterPredicateDropdown", style: {
             //@ts-ignore ignore
             '--ab-cmp-input__background': 'var(--ab-color-primary)',
         } },
-        React.createElement(Select, { style: predicateDef
-                ? {
-                    minWidth: '10rem',
-                }
-                : null // for AND and OR don't apply a min width
-            , onChange: (value) => {
+        React.createElement(Select, { className: predicateDef ? `twa:min-w-[10rem]` : null, onChange: (value) => {
                 props.onPredicateChange({
                     operator: value,
                     args: [],
@@ -36,10 +33,10 @@ const ColumnFilterPredicateDropdown = (props) => {
             }, options: options, value: isAndOr ? 'Add Condition' : props.predicate?.operator })));
 };
 const ColumnFilterEditor = (props) => {
-    return (React.createElement(Box, { mb: 3 },
-        React.createElement(Flex, { mb: 2 },
+    return (React.createElement(Box, { className: "twa:mb-3" },
+        React.createElement(Flex, { className: "twa:mb-2" },
             React.createElement(ColumnFilterPredicateDropdown, { columnId: props.columnId, disabled: props.disabled, predicate: props.predicate, predicateDefs: props.predicateDefs, onPredicateChange: props.onPredicateChange }),
-            React.createElement(Flex, { alignItems: "center", ml: 2 },
+            React.createElement(Flex, { alignItems: "center", className: "twa:ml-2" },
                 React.createElement(SimpleButton, { disabled: props.deleteDisabled, onClick: props.onDelete, variant: "text", icon: "delete" }))),
         React.createElement(ColumnFilterInputList, { columnId: props.columnId, disabled: props.disabled, predicate: props.predicate, onPredicateChange: props.onPredicateChange, predicateDefs: props.predicateDefs })));
 };
@@ -55,9 +52,9 @@ const AndOrInput = (props) => {
         // />
         (React.createElement(
             Flex,
-            { flex: 1 },
-            React.createElement(Radio, { mr: 2, onClick: () => props.onChange('AND'), checked: props.operator === 'AND' }, "AND"),
-            React.createElement(Radio, { mr: 2, onClick: () => props.onChange('OR'), checked: props.operator === 'OR' }, "OR")
+            { className: "twa:flex-1" },
+            React.createElement(Radio, { className: "twa:mr-2", onClick: () => props.onChange('AND'), checked: props.operator === 'AND' }, "AND"),
+            React.createElement(Radio, { className: "twa:mr-2", onClick: () => props.onChange('OR'), checked: props.operator === 'OR' }, "OR")
         ))
     );
 };
@@ -125,22 +122,28 @@ export const ColumnFilterComponent = (props) => {
             .some((adaptablePredicate) => adaptable.api.predicateApi.isValidPredicate(adaptablePredicate));
     };
     return (React.createElement(React.Fragment, null,
-        React.createElement(Flex, { flexDirection: "column", backgroundColor: "primarylight", pb: !props.hideActionButtons ? 2 : undefined, mb: props.location === 'filterForm' ? 2 : undefined, mt: props.location === 'columnMenu' ? 2 : undefined, ml: props.location === 'columnMenu' ? 2 : undefined, mr: props.location === 'columnMenu' ? 2 : undefined, style: { borderRadius: 'var(--ab__border-radius)' } },
-            React.createElement(Flex, { m: 2 },
+        React.createElement(Flex, { flexDirection: "column", className: clsx({
+                'twa:bg-primarylight': true,
+                'twa:pb-2': !props.hideActionButtons,
+                'twa:mb-2': props.location === 'filterForm',
+                'twa:mt-2 twa:ml-2 twa:mr-2': props.location === 'columnMenu',
+                'twa:rounded-standard': true,
+            }) },
+            React.createElement(Flex, { className: "twa:m-2" },
                 React.createElement(AndOrInput, { onChange: onCombineChange, operator: currentPredicate.operator })),
-            !props.hideActionButtons && (React.createElement(Flex, { ml: 2, mr: 2, className: "ab-ColumnFilter-actions", justifyContent: "space-between" },
+            !props.hideActionButtons && (React.createElement(Flex, { className: "ab-ColumnFilter-actions twa:ml-2 twa:mr-2", justifyContent: "space-between" },
                 React.createElement(Box, { className: "ab-ColumnFilter-action-clearall" },
                     React.createElement(SimpleButton, { "aria-label": 'Clear All Filters', onClick: () => clearAllFilters() }, "Clear All")),
                 manuallyApplyColumnFilter ? (React.createElement(React.Fragment, null,
-                    React.createElement(Box, { flex: 1, "data-name": "spacer" }),
-                    React.createElement(Box, { className: "ab-ColumnFilter-action-reset", mr: 2 },
+                    React.createElement(Box, { className: "twa:flex-1", "data-name": "spacer" }),
+                    React.createElement(Box, { className: "ab-ColumnFilter-action-reset twa:mr-2" },
                         React.createElement(SimpleButton, { "aria-label": 'Reset All', tone: "neutral", variant: "raised", onClick: () => {
                                 setPredicateNotYetApplied(props.predicate);
                             } }, "Reset")),
                     React.createElement(Box, { className: "ab-ColumnFilter-action-apply" },
                         React.createElement(SimpleButton, { "aria-label": 'Apply Filter', tone: "accent", variant: "raised", onClick: applyFilter, disabled: !isAtLeastOneColumnFilterValid(predicateNotYetApplied?.args) && !isAtLeastOneColumnFilterValid(currentPredicate.args) }, "Apply")))) : null))),
-        React.createElement(Flex, { flexDirection: "column", className: "ab-ColumnFilter", flex: 1, minHeight: 0, ...props.wrapperProps },
-            React.createElement(Box, { style: { overflow: 'auto' } },
+        React.createElement(Flex, { flexDirection: "column", style: props.wrapperProps?.style, className: twMerge(`ab-ColumnFilter twa:flex-1 twa:min-h-0`, props.wrapperProps?.className) },
+            React.createElement(Box, { className: "ab-ColumnFilter-content twa:overflow-auto" },
                 currentPredicate.args.map((predicate, index) => {
                     return (React.createElement(ColumnFilterEditor, { deleteDisabled: currentPredicate.args.length < 2, onDelete: () => {
                             const currentPredicate = currentPredicateRef.current;

package/src/View/Components/ColumnFilter/ColumnFilterWindow.js

@@ -1,10 +1,10 @@
 import * as React from 'react';
-import { Box, Flex } from 'rebass';
 import FormLayout, { FormRow } from '../../../components/FormLayout';
 import { ColumnSelector } from '../Selectors/ColumnSelector';
 import { AdaptableColumnFilter } from './AdaptableColumnFilter';
 import { useAdaptable } from '../../AdaptableContext';
 import { AdaptableIconComponent } from '../AdaptableIconComponent';
+import { Box, Flex } from '../../../components/Flex';
 export const ColumnFilterWindow = (props) => {
     const { api } = useAdaptable();
     const { value: initialColumnId } = props?.popupProps;
@@ -12,19 +12,19 @@ export const ColumnFilterWindow = (props) => {
     React.useEffect(() => {
         setColumnId(initialColumnId);
     }, [props.popupProps.value]);
-    const onChange = props.popupProps.onChange;
-    return (React.createElement(Flex, { flex: 1, minHeight: 0, height: "100%", flexDirection: "column", p: 2, className: "ab-ColumnFilterWindow" },
-        React.createElement(Box, { mb: 2 },
+    // const onChange = props.popupProps.onChange;
+    return (React.createElement(Flex, { flexDirection: "column", className: "ab-ColumnFilterWindow twa:flex-1 twa:min-h-0 twa:p-2 twa:h-full" },
+        React.createElement(Box, { className: "twa:mb-2" },
             React.createElement(FormLayout, null,
                 React.createElement(FormRow, { label: "Column" },
                     React.createElement(ColumnSelector, { renderOption: (column) => {
                             const columnFilter = api.filterApi.columnFilterApi.getColumnFilterForColumn(column.columnId);
-                            let label = column.friendlyName ?? column.columnId;
+                            const label = column.friendlyName ?? column.columnId;
                             if (columnFilter &&
                                 api.filterApi.columnFilterApi.isColumnFilterActive(columnFilter)) {
                                 return (React.createElement(Flex, null,
                                     label,
-                                    React.createElement(Box, { flex: 1 }),
+                                    React.createElement(Box, { className: "twa:flex-1" }),
                                     React.createElement(AdaptableIconComponent, { icon: { name: 'filter' } })));
                             }
                             return label;