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

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/UIOptions/UIOptionsSidebarForm.js

@@ -1,10 +1,10 @@
 import * as React from 'react';
-import { Box, Flex } from 'rebass';
 import { CheckBox } from '../../../../components/CheckBox';
 import DropdownButton from '../../../../components/DropdownButton';
 import FormLayout, { FormRow } from '../../../../components/FormLayout';
 import HelpBlock from '../../../../components/HelpBlock';
 import StringExtensions from '../../../../Utilities/Extensions/StringExtensions';
+import { Box, Flex } from '../../../../components/Flex';
 const ALL_SIDEBAR_OPTIONS = ['columns', 'filters', 'adaptable'];
 const prepareSidebarDef = (sideBar) => {
     sideBar = sideBar;
@@ -35,7 +35,7 @@ export const UIOptionsSidebarForm = (props) => {
     const { gridOptions, onChange } = props;
     const sideBar = prepareSidebarDef(gridOptions.sideBar);
     const renderSidebarCheckbox = (sidebarName) => {
-        return (React.createElement(CheckBox, { mr: 3, key: sidebarName, checked: isSidebarChecked(sideBar, sidebarName), onChange: (check) => handleToolpanelsChange(sidebarName, check) }, StringExtensions.Humanize(sidebarName)));
+        return (React.createElement(CheckBox, { className: "twa:mr-3", key: sidebarName, checked: isSidebarChecked(sideBar, sidebarName), onChange: (check) => handleToolpanelsChange(sidebarName, check) }, StringExtensions.Humanize(sidebarName)));
     };
     const handleToolpanelsChange = (panelName, check) => {
         let newPanels = sideBar?.toolPanels ?? [];
@@ -75,8 +75,8 @@ export const UIOptionsSidebarForm = (props) => {
     };
     return (React.createElement(Box, null,
         React.createElement(HelpBlock, null, "Tool Panels"),
-        React.createElement(Box, { m: 2 },
-            React.createElement(Flex, { mb: 2 }, ALL_SIDEBAR_OPTIONS.map(renderSidebarCheckbox)),
+        React.createElement(Box, { className: "twa:m-2" },
+            React.createElement(Flex, { className: "twa:mb-2" }, ALL_SIDEBAR_OPTIONS.map(renderSidebarCheckbox)),
             React.createElement(FormLayout, { columns: [{ name: 'label' }, { name: 'children' }] },
                 React.createElement(FormRow, { label: "Position" },
                     React.createElement(DropdownButton, { columns: ['label'], items: [

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/UIOptions/UIOptionsStatusbarForm.js

@@ -1,5 +1,4 @@
 import * as React from 'react';
-import { Box } from 'rebass';
 import { ModuleManager } from '../../../../components/DragAndDropContext/ModuleManager';
 import HelpBlock from '../../../../components/HelpBlock';
 import FormLayout, { FormRow } from '../../../../components/FormLayout';
@@ -7,6 +6,7 @@ import Input from '../../../../components/Input';
 import SimpleButton from '../../../../components/SimpleButton';
 import DropdownButton from '../../../../components/DropdownButton';
 import { NocodeWizardFormBox } from '../Components/FormBox';
+import { Box } from '../../../../components/Flex';
 export const UIOptionsStatusbarForm = (props) => {
     const allPanels = props.gridOptions?.statusBar?.statusPanels ?? [];
     const panelIdtoPanel = (panelsIds, align) => panelsIds.map((panelId) => {
@@ -92,17 +92,17 @@ export const UIOptionsStatusbarForm = (props) => {
     };
     return (React.createElement(Box, null,
         React.createElement(HelpBlock, null, "Status Bar"),
-        React.createElement(Box, { p: 2 },
+        React.createElement(Box, { className: "twa:p-2" },
             React.createElement(NocodeWizardFormBox, null,
                 React.createElement(Box, { as: "b" }, "Create Adaptable Statusbar Panel"),
-                React.createElement(FormLayout, { mt: 2 },
+                React.createElement(FormLayout, { className: "twa:mt-2" },
                     React.createElement(FormRow, { label: "Panel Name" },
                         React.createElement(Input, { value: adaptablePanelTitle, placeholder: 'Adaptable Panel Name', onChange: (event) => setAdaptablePanelTitle(event.target.value) })),
                     React.createElement(FormRow, { label: "Align" },
                         React.createElement(DropdownButton, { columns: ['label'], items: alignOptions }, alignOptions.find((option) => option.value === adaptablePanelAlign)?.label)),
                     React.createElement(FormRow, { label: "" },
                         React.createElement(SimpleButton, { disabled: !isAdaptablePanelTitleAvailable, onClick: handleNewAdaptablePanel, icon: "plus", variant: "raised" }, "Add"),
-                        !isAdaptablePanelTitleAvailable && (React.createElement(Box, { mt: 2, color: "var(--ab-color-error)" }, "Adaptable panel name must be unique."))))),
+                        !isAdaptablePanelTitleAvailable && (React.createElement(Box, { className: "twa:mt-2 twa:text-error" }, "Adaptable panel name must be unique."))))),
             React.createElement(ModuleManager, { permittedActions: {
                     createTab: false,
                     dragAndDropTab: false,

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/UIOptions/UiOptionsForm.js

@@ -1,10 +1,10 @@
 import * as React from 'react';
-import { Box } from 'rebass';
 import { Tabs } from '../../../../components/Tabs';
 import { UIOptionsSidebarForm } from './UIOptionsSidebarForm';
 import { UIOptionsStatusbarForm } from './UIOptionsStatusbarForm';
+import { Box } from '../../../../components/Flex';
 export const UIElementsForm = (props) => {
-    return (React.createElement(Box, { p: 2 },
+    return (React.createElement(Box, { className: "twa:p-2" },
         React.createElement(Tabs, null,
             React.createElement(Tabs.Tab, null, "Tool Panel"),
             React.createElement(Tabs.Tab, null, "Status Bar"),

package/src/View/AdaptableWizardView/Wizard.js

@@ -1,10 +1,10 @@
 import * as React from 'react';
 import { useReducer, useState, useEffect } from 'react';
 import { prepareDataSource, prepareGridOptions } from './helper';
-import { Flex } from 'rebass';
 import ConfigurationDialog from './AdaptableConfigurationDialog';
 import FileDroppable from '../../components/FileDroppable';
 import { validDataSource } from './Utils';
+import { Flex } from '../../components/Flex';
 export const initialState = {
     dropped: false,
 };

package/src/View/AdaptableWizardView/index.js

@@ -1,7 +1,4 @@
 import * as React from 'react';
-import { ThemeProvider } from 'styled-components';
-import theme from '../../theme';
 import { Wizard } from './Wizard';
-const AdaptableWizardView = (props) => (React.createElement(ThemeProvider, { theme: theme },
-    React.createElement(Wizard, { ...props })));
+const AdaptableWizardView = (props) => React.createElement(Wizard, { ...props });
 export default AdaptableWizardView;

package/src/View/Alert/ActiveAlertsPanelItemLabel.js

@@ -1,7 +1,7 @@
 import * as React from 'react';
-import { Box, Text } from 'rebass';
 import { allIcons } from '../../components/icons';
 import UIHelper from '../UIHelper';
+import { Box } from '../../components/Flex';
 export const ActiveAlertsPanelItemLabel = (props) => {
     const iconColor = UIHelper.getColorByMessageType(props.data.alertDefinition.MessageType);
     const iconStyle = {
@@ -12,6 +12,6 @@ export const ActiveAlertsPanelItemLabel = (props) => {
     const IconCmp = allIcons[iconName];
     const icon = IconCmp ? React.createElement(IconCmp, null) : null;
     return (React.createElement(Box, null,
-        React.createElement(Text, { style: { float: 'left', ...iconStyle } }, icon),
+        React.createElement(Box, { className: "twa:float-left", style: iconStyle }, icon),
         props.data.header));
 };

package/src/View/Alert/AlertStatusSubPanel.js

@@ -46,5 +46,5 @@ export const AlertStatusPanel = () => {
         }, statusbarHighlightDuration);
     }, [alerts]);
     let alertsPanel = React.createElement(ActiveAlertsPanel, null);
-    return (React.createElement(StatusBarPanel, { tooltip: module.moduleInfo.ModuleName, "data-name": module.moduleInfo.ModuleName, color: style.color, backgroundColor: style.background, onAction: handleAction, icon: module.moduleInfo.Glyph, popover: alerts.length ? alertsPanel : null, content: text }));
+    return (React.createElement(StatusBarPanel, { tooltip: module.moduleInfo.ModuleName, "data-name": module.moduleInfo.ModuleName, style: { backgroundColor: style.background, color: style.color }, onAction: handleAction, icon: module.moduleInfo.Glyph, popover: alerts.length ? alertsPanel : null, content: text }));
 };

package/src/View/Alert/AlertViewPanel.js

@@ -2,10 +2,10 @@ import * as React from 'react';
 import { connect } from 'react-redux';
 import * as InternalRedux from '../../Redux/ActionsReducers/InternalRedux';
 import { AdaptablePopover } from '../AdaptablePopover';
-import { Flex } from 'rebass';
 import UIHelper from '../UIHelper';
 import { getAlertButtonStyle } from './Utilities/getAlertButtonStyle';
 import { ActiveAlertsPanel } from './ActiveAlertsPanel';
+import { Flex } from '../../components/Flex';
 class AlertViewPanelComponent extends React.Component {
     constructor(props) {
         super(props);
@@ -30,7 +30,7 @@ class AlertViewPanelComponent extends React.Component {
         const alertsPanel = React.createElement(ActiveAlertsPanel, null);
         const elementType = this.props.viewType === 'Toolbar' ? 'DashboardToolbar' : 'ToolPanel';
         return (React.createElement(Flex, { alignItems: "stretch", className: `ab-${elementType}__Alert__wrap` },
-            React.createElement(Flex, { style: { borderRadius: 'var(--ab__border-radius)' }, className: `ab-${elementType}__Alert__text`, marginRight: 2, padding: 2, color: buttonTextColor, backgroundColor: buttonBackground, fontSize: 'var( --ab-font-size-2)', alignItems: "center" }, collapsedText),
+            React.createElement(Flex, { className: `ab-${elementType}__Alert__text twa:rounded-standard twa:mr-2 twa:p-2 text-2`, style: { color: buttonTextColor, backgroundColor: buttonBackground }, alignItems: "center" }, collapsedText),
             this.props.AdaptableAlerts.length > 0 && (React.createElement(Flex, { alignItems: "center" },
                 React.createElement(AdaptablePopover, { className: `ab-${elementType}__Alert__info`, headerText: "", 
                     // tooltipText="Alerts"

package/src/View/Alert/Utilities/getDefaultAlertDefinition.d.ts

@@ -7,24 +7,7 @@ import { AlertType } from './getAlertType';
 export declare const getDefaultAlertDefinition: (alertDefinition: AlertDefinition, type: AlertType) => {
     Uuid: string;
     Scope: import("../../../types").ColumnScope;
-    Rule: ({
-        Predicates?: never;
-    } & (({
-        BooleanExpression?: never;
-    } & (({
-        ObservableExpression?: never;
-    } & import("../../../types").AdaptableAggregatedBooleanQuery) | ({
-        AggregatedBooleanExpression?: never;
-    } & import("../../../types").AdaptableObservableQuery))) | ({
-        AggregatedBooleanExpression?: never;
-        ObservableExpression?: never;
-    } & import("../../../types").AdaptableBooleanQuery))) | ({
-        AggregatedBooleanExpression?: never;
-        ObservableExpression?: never;
-        BooleanExpression?: never;
-    } & {
-        Predicates: import("../../../types").AlertDefinitionPredicate[];
-    });
+    Rule: import("../../../types").AlertRule;
     MessageType: import("../../../types").AdaptableMessageType;
     MessageHeader?: string;
     MessageText?: string;
@@ -32,8 +15,8 @@ export declare const getDefaultAlertDefinition: (alertDefinition: AlertDefinitio
     AlertForm?: string | import("../../../types").AlertButtonForm;
     IsSuspended?: boolean;
     Source?: "InitialState" | "User";
-    AdaptableVersion?: `${string}.${string}.${string}`;
+    AdaptableVersion?: import("../../../types").AdaptableVersion;
     IsReadOnly?: boolean;
-    Tags?: string[];
+    Tags?: import("../../../types").AdaptableObjectTag[];
     Metadata?: any;
 };

package/src/View/Alert/Wizard/AlertBehaviourWizardSection.js

@@ -3,14 +3,14 @@ import { Tabs } from '../../../components/Tabs';
 import { useOnePageAdaptableWizardContext } from '../../Wizard/OnePageAdaptableWizard';
 import { CheckBox } from '../../../components/CheckBox';
 import { CodeBlock } from '../../../components/CodeBlock';
-import { Box, Flex, Text } from 'rebass';
-import { ValueOptionsTags } from '../../Components/ValueSelector';
 import { StyleComponent } from '../../Components/StyleComponent';
 import ObjectFactory from '../../../Utilities/ObjectFactory';
 import { useAdaptable } from '../../AdaptableContext';
 import { StylePreview } from '../../../components/StylePreview';
 import Panel from '../../../components/Panel';
 import { Select } from '../../../components/Select';
+import { Box, Flex } from '../../../components/Flex';
+import { Tag, TagBox } from '../../../components/Tag/Tag';
 const HighlightStyle = (props) => {
     const adaptable = useAdaptable();
     const options = [
@@ -40,7 +40,7 @@ const HighlightStyle = (props) => {
     ];
     return (React.createElement(Box, { "data-name": props.dataName },
         React.createElement(Flex, null,
-            React.createElement(CheckBox, { mr: 2, style: { alignItems: 'flex-start' }, checked: Boolean(props.highlight), onChange: (checked) => {
+            React.createElement(CheckBox, { className: "twa:mr-2 twa:items-start", checked: Boolean(props.highlight), onChange: (checked) => {
                     props.onChange(checked);
                 } }, props.label),
             Boolean(props.highlight) && (React.createElement(Select, { options: options2, value: typeof props.highlight === 'boolean' ? 'system' : 'custom', onChange: (value) => {
@@ -52,8 +52,8 @@ const HighlightStyle = (props) => {
                         props.onChange(initialStyle);
                     }
                 } }))),
-        typeof props.highlight === 'object' && (React.createElement(Panel, { margin: 2 },
-            React.createElement(Box, { paddingLeft: 3 },
+        typeof props.highlight === 'object' && (React.createElement(Panel, { className: "twa:m-2" },
+            React.createElement(Box, { className: "twa:pl-3" },
                 React.createElement(StyleComponent, { headless: true, api: adaptable.api, Style: props.highlight, UpdateStyle: (style) => {
                         props.onChange(style);
                     } }))))));
@@ -74,7 +74,7 @@ export const renderAlertBehaviourSummary = (alert, api, allowWrap = false) => {
             ? {
                 label: (React.createElement(React.Fragment, null,
                     "Show in ",
-                    React.createElement(CodeBlock, { ml: 1, p: 0 }, `<div />`))),
+                    React.createElement(CodeBlock, { className: "twa:p-0 twa:ml-1" }, `<div />`))),
                 id: 'showInDiv',
             }
             : null,
@@ -86,15 +86,17 @@ export const renderAlertBehaviourSummary = (alert, api, allowWrap = false) => {
             id: 'none',
         });
     }
-    return (React.createElement(ValueOptionsTags, { allowWrap: allowWrap, options: values, value: values.map((v) => v.id), readOnly: true, toIdentifier: (x) => x.id, toLabel: (x) => {
+    return (React.createElement(React.Fragment, null,
+        React.createElement(TagBox, null, values.map((x) => {
+            let label = React.createElement(Box, { className: "twa:flex twa:items-center" }, x.label);
             if (x.id === 'highlightCell' && typeof AlertProperties.HighlightCell === 'object') {
-                return (React.createElement(StylePreview, { padding: 0, mt: 0, styleObject: AlertProperties.HighlightCell }, "Highlight Cell"));
+                label = (React.createElement(StylePreview, { styleObject: AlertProperties.HighlightCell, className: "twa:mt-0 twa:p-0" }, "Highlight Cell"));
             }
             if (x.id === 'highlightRow' && typeof AlertProperties.HighlightRow === 'object') {
-                return (React.createElement(StylePreview, { padding: 0, mt: 0, styleObject: AlertProperties.HighlightRow }, "Highlight Row"));
+                label = (React.createElement(StylePreview, { styleObject: AlertProperties.HighlightRow, className: "twa:mt-0 twa:p-0" }, "Highlight Row"));
             }
-            return React.createElement(React.Fragment, null, x.label);
-        } }));
+            return React.createElement(Tag, { key: x.id }, label);
+        }))));
 };
 export const AlertBehaviourWizardSection = (props) => {
     const { data, api } = useOnePageAdaptableWizardContext();
@@ -125,10 +127,10 @@ export const AlertBehaviourWizardSection = (props) => {
     };
     return (React.createElement(Tabs, null,
         React.createElement(Tabs.Tab, null, api.internalApi.getCorrectEnglishVariant('Behaviour')),
-        React.createElement(Tabs.Content, null,
+        React.createElement(Tabs.Content, { className: "twa:flex twa:flex-col twa:gap-1" },
             hasPreventCellEdit && (React.createElement(CheckBox, { "data-name": "prevent-cell-edit", style: { alignItems: 'flex-start' }, checked: AlertProperties.PreventEdit, disabled: true },
                 "Prevent Cell Edit",
-                React.createElement(Text, { fontSize: 2, mt: 1 }, "(automatically undo data change which triggered Alert)"))),
+                React.createElement(Box, { className: "twa:text-2 twa:mt-1" }, "(automatically undo data change which triggered Alert)"))),
             hasHighlightCell && (React.createElement(HighlightStyle, { dataName: "highlight-cell", highlight: AlertProperties.HighlightCell, label: "Highlight Cell", onChange: (HighlightCell) => {
                     onChange({ HighlightCell });
                 } })),

package/src/View/Alert/Wizard/AlertButtonsEditor.js

@@ -1,4 +1,3 @@
-import { Flex, Box, Text } from 'rebass';
 import * as React from 'react';
 import SimpleButton from '../../../components/SimpleButton';
 import Input from '../../../components/Input';
@@ -8,6 +7,8 @@ import { cloneObject } from '../../../Utilities/Helpers/Helper';
 import StringExtensions from '../../../Utilities/Extensions/StringExtensions';
 import { AdaptableIconSelector } from '../../Components/AdaptableIconSelector';
 import { Select } from '../../../components/Select';
+import { Box, Flex } from '../../../components/Flex';
+import { sentenceCase } from 'sentence-case';
 function renderCommand(command) {
     switch (command) {
         case 'highlight-cell':
@@ -42,13 +43,7 @@ const TONE_OPTIONS = [
 ];
 function renderTone(option) {
     return (React.createElement(Flex, { flexDirection: "row", alignItems: "center" },
-        React.createElement(SimpleButton, { mr: 2, style: {
-                width: 10,
-                height: 10,
-                lineHeight: 0,
-                borderRadius: '100%',
-                background: 'currentColor',
-            }, tone: option.value, variant: "text" }),
+        React.createElement(SimpleButton, { className: "twa:mr-2 twa:w-[10px] twa:h-[10px] twa:line-height-0 twa:rounded-[100%] twa:bg-current", tone: option.value, variant: "text" }),
         option.label));
 }
 export const AlertButtonsEditor = (props) => {
@@ -100,7 +95,7 @@ export const AlertButtonsEditor = (props) => {
     }
     return (React.createElement(React.Fragment, null,
         React.createElement(Flex, { flexDirection: "row", alignItems: "center", justifyContent: "space-between" },
-            React.createElement(Text, { fontSize: 2, mt: 3, mb: 2 }, "Add Buttons to the Alert Notification, and set Actions to perform when the Button is clicked"),
+            React.createElement(Box, { className: "twa:text-2 twa:mt-3 twa:mb-2" }, "Add Buttons to the Alert Notification, and set Actions to perform when the Button is clicked"),
             React.createElement(SimpleButton, { icon: "plus", onClick: () => {
                     onChange([
                         ...(AlertButtons || []),
@@ -123,7 +118,7 @@ export const AlertButtonsEditor = (props) => {
                 btnCommands = button.Command;
             }
             // filter out the adaptable standard commands
-            // const btnUserFunctions = btnCommands.filter((command) => !buttonCommands.includes(command));
+            const btnUserFunctions = btnCommands.filter((command) => !buttonCommands.includes(command));
             const setVariant = (variant) => {
                 onChange(AlertButtons.map((btn, i) => {
                     if (i === index) {
@@ -190,13 +185,13 @@ export const AlertButtonsEditor = (props) => {
                         }));
                     } }));
             }
-            return (React.createElement(Box, { key: index, marginLeft: 3, style: {
+            return (React.createElement(Box, { key: index, className: "twa:ml-3", style: {
                     borderTop: index ? '1px dashed var(--ab-color-inputborder)' : '',
                 } },
-                React.createElement(FormLayout, { marginBottom: 2, paddingTop: 2 },
-                    React.createElement(FormRow, { label: React.createElement(Text, { fontSize: 2, style: { whiteSpace: 'nowrap' } }, "Button Text") },
+                React.createElement(FormLayout, { className: "twa:mb-2 twa:pt-2" },
+                    React.createElement(FormRow, { label: React.createElement(Box, { className: "twa:text-2 twa:whitespace-nowrap" }, "Button Text") },
                         React.createElement(Flex, { flexDirection: "row" },
-                            React.createElement(Input, { value: buttonLabel, mr: 2, style: { width: 80 }, onChange: (e) => {
+                            React.createElement(Input, { value: buttonLabel, className: "twa:mr-2 twa:w-[80px]", onChange: (e) => {
                                     onChange(AlertButtons.map((btn, i) => {
                                         if (i === index) {
                                             return { ...btn, Label: e.target.value };
@@ -212,22 +207,30 @@ export const AlertButtonsEditor = (props) => {
                                 }), renderSingleValue: (option) => `Variant: ${option.label}`, value: buttonStyle?.variant, onChange: (value) => {
                                     setVariant(value);
                                 } }),
-                            React.createElement(Select, { style: { marginLeft: 'var(--ab-space-2)' }, options: TONE_OPTIONS, onChange: (value) => {
+                            React.createElement(Select, { className: "twa:ml-2", options: TONE_OPTIONS, onChange: (value) => {
                                     if (value === 'text') {
                                         setTone(null);
                                         return;
                                     }
                                     setTone(value);
                                 }, value: buttonStyle?.tone ?? 'text' }),
-                            React.createElement(SimpleButton, { icon: "close", tone: "error", disabled: AlertButtons.length <= 1, marginLeft: 1, variant: "text", tooltip: AlertButtons.length <= 1 ? 'Cannot remove last button' : 'Remove button', onClick: () => {
+                            React.createElement(SimpleButton, { icon: "close", tone: "error", disabled: AlertButtons.length <= 1, className: "twa:ml-1", variant: "text", tooltip: AlertButtons.length <= 1 ? 'Cannot remove last button' : 'Remove button', onClick: () => {
                                     onChange(AlertButtons.filter((btn) => btn !== button));
                                 } }))),
-                    React.createElement(FormRow, { label: React.createElement(Text, { fontSize: 2 }, "Actions") }, buttonCommands.map((commandName) => {
-                        return (React.createElement(CheckBox, { key: commandName, marginRight: 3, onChange: (checked) => handleCommandChange(checked, commandName), checked: button.Command === commandName ||
-                                (Array.isArray(button.Command) && button.Command.includes(commandName)) },
-                            React.createElement(Text, { fontSize: 2 }, renderCommand(commandName))));
-                    })),
-                    iconSelector && (React.createElement(FormRow, { label: React.createElement(Text, { fontSize: 2 }, "Icon") },
+                    React.createElement(FormRow, { label: React.createElement(Box, { className: "twa:text-2" }, "Actions") },
+                        buttonCommands.map((commandName) => {
+                            return (React.createElement(CheckBox, { key: commandName, className: "twa:mr-3", onChange: (checked) => handleCommandChange(checked, commandName), checked: button.Command === commandName ||
+                                    (Array.isArray(button.Command) && button.Command.includes(commandName)) },
+                                React.createElement(Box, { className: "twa:text-2" }, sentenceCase(commandName))));
+                        }),
+                        btnUserFunctions.length ? (React.createElement(CheckBox, { checked: true, disabled: true },
+                            React.createElement(Box, { className: "twa:text-2" },
+                                "User function",
+                                btnUserFunctions.length > 1 ? 's' : '',
+                                ":",
+                                ' ',
+                                btnUserFunctions.join(', ')))) : null),
+                    iconSelector && (React.createElement(FormRow, { label: React.createElement(Box, { className: "twa:text-2" }, "Icon") },
                         React.createElement(Box, null, iconSelector))))));
         })));
 };

package/src/View/Alert/Wizard/AlertMessageWizardSection.js

@@ -2,16 +2,16 @@ import * as React from 'react';
 import { Tabs } from '../../../components/Tabs';
 import Radio, { RadioGroup } from '../../../components/Radio';
 import { useOnePageAdaptableWizardContext } from '../../Wizard/OnePageAdaptableWizard';
-import { Text } from 'rebass';
 import { CodeBlock } from '../../../components/CodeBlock';
 import FormLayout, { FormRow } from '../../../components/FormLayout';
 import { ButtonInfo } from '../../Components/Buttons/ButtonInfo';
 import { AlertMessageDocsLink } from '../../../Utilities/Constants/DocumentationLinkConstants';
 import Textarea from '../../../components/Textarea';
 import HelpBlock from '../../../components/HelpBlock';
+import { Box } from '../../../components/Flex';
 export const renderAlertMessageSummary = () => {
     const { data } = useOnePageAdaptableWizardContext();
-    return (React.createElement(Text, { fontSize: 2 },
+    return (React.createElement(Box, { className: "twa:text-2" },
         "Message Type ",
         React.createElement(CodeBlock, null, data.MessageType)));
 };
@@ -45,26 +45,22 @@ export const AlertMessageWizardSection = (props) => {
                             MessageType,
                         });
                     } },
-                    React.createElement(Radio, { marginLeft: 1, value: "Info" }, "Info"),
-                    React.createElement(Radio, { marginLeft: 4, value: "Success" }, "Success"),
-                    React.createElement(Radio, { marginLeft: 4, value: "Warning" }, "Warning"),
-                    React.createElement(Radio, { marginLeft: 4, value: "Error" }, "Error")))),
-        React.createElement(Tabs, { "data-name": "message-text", mt: 2, mb: 3, autoFocus: false },
+                    React.createElement(Radio, { className: "twa:ml-1", value: "Info" }, "Info"),
+                    React.createElement(Radio, { className: "twa:ml-4", value: "Success" }, "Success"),
+                    React.createElement(Radio, { className: "twa:ml-4", value: "Warning" }, "Warning"),
+                    React.createElement(Radio, { className: "twa:ml-4", value: "Error" }, "Error")))),
+        React.createElement(Tabs, { "data-name": "message-text", className: "twa:mt-2 twa:mb-3", autoFocus: false },
             React.createElement(Tabs.Tab, null, "Message Text"),
             React.createElement(Tabs.Content, null,
-                React.createElement(Text, { fontSize: 2, mt: 3, mb: 2 }, "Text to display as the Alert Message (leave blank to show automated Message based on Alert Type)"),
-                ' ',
+                React.createElement(Box, { className: "twa:text-2 twa:mt-3 twa:mb-2" }, "Text to display as the Alert Message (leave blank to show automated Message based on Alert Type)"),
                 React.createElement(FormLayout, null,
                     React.createElement(FormRow, { label: "Header" },
-                        React.createElement(Textarea, { minWidth: 300, rows: 3, placeholder: "(Use Default Header Message)", marginTop: 2, type: 'text', autoFocus: false, value: messageHeader ?? '', 
+                        React.createElement(Textarea, { className: "twa:min-w-[300px] twa:mt-2", rows: 3, placeholder: "(Use Default Header Message)", type: 'text', autoFocus: false, value: messageHeader ?? '', 
                             // placeholder="defaults to column name"
                             onChange: (e) => onMessageHeaderChange(e) })),
                     React.createElement(FormRow, { label: "Message" },
-                        React.createElement(Textarea, { minWidth: 300, rows: 3, marginTop: 2, type: 'text', autoFocus: false, value: messageText ?? '', onChange: (e) => onMessageTextChange(e) }))),
-                showDocumentationLinks && (React.createElement(HelpBlock, { "data-name": "alert-message-documentation", mt: 3, mb: 2, style: {
-                        fontSize: 'var(--ab-font-size-3)',
-                        padding: 0,
-                    } },
-                    React.createElement(ButtonInfo, { mr: 2, onClick: () => window.open(AlertMessageDocsLink, '_blank') }),
+                        React.createElement(Textarea, { className: "twa:min-w-[300px] twa:mt-2", rows: 3, type: 'text', autoFocus: false, value: messageText ?? '', onChange: (e) => onMessageTextChange(e) }))),
+                showDocumentationLinks && (React.createElement(HelpBlock, { "data-name": "alert-message-documentation", className: "twa:mt-3 twa:mb-2 twa:p-0 twa:text-3" },
+                    React.createElement(ButtonInfo, { className: "twa:mr-2", onClick: () => window.open(AlertMessageDocsLink, '_blank') }),
                     "See how to create dynamic Alert Messages using placeholders"))))));
 };

package/src/View/Alert/Wizard/AlertNotificationWizardSection.d.ts

@@ -1,10 +1,12 @@
 import * as React from 'react';
 import { AlertDefinition } from '../../../AdaptableState/AlertState';
 import { AdaptableApi } from '../../../types';
-import { BoxProps } from 'rebass';
 import { AlertType } from '../Utilities/getAlertType';
+import { BoxProps } from '../../../components/Flex';
 export declare const renderAlertNotificationSummary: () => React.JSX.Element;
 interface AlertPreviewProps extends BoxProps {
+    className?: string;
+    style?: React.CSSProperties;
     api: AdaptableApi;
     alertDefinition: AlertDefinition;
     focusFirstButton?: boolean;

package/src/View/Alert/Wizard/AlertNotificationWizardSection.js

@@ -2,14 +2,14 @@ import * as React from 'react';
 import { Tabs } from '../../../components/Tabs';
 import { useOnePageAdaptableWizardContext } from '../../Wizard/OnePageAdaptableWizard';
 import { CheckBox } from '../../../components/CheckBox';
-import { Box, Text } from 'rebass';
 import { AdaptablePopupAlert } from '../../Components/Popups/AdaptablePopupAlert';
 import { AlertButtonsEditor } from './AlertButtonsEditor';
-import join from '../../../components/utils/join';
+import { Box } from '../../../components/Flex';
+import clsx from 'clsx';
 export const renderAlertNotificationSummary = () => {
     const { data, api } = useOnePageAdaptableWizardContext();
     if (!data.AlertProperties?.DisplayNotification) {
-        return React.createElement(Text, { fontSize: 2 }, "No Alert Notification will be displayed");
+        return React.createElement(Box, { className: "twa:text-2" }, "No Alert Notification will be displayed");
     }
     return React.createElement(AlertPreview, { api: api, alertDefinition: data });
 };
@@ -43,7 +43,7 @@ export const AlertPreview = ({ alertDefinition, api, focusFirstButton, ...boxPro
         };
         return result;
     }, [alertDefinition]);
-    return (React.createElement(Box, { ...boxProps, className: join(boxProps.className, 'ab-AlertPreview'), style: {
+    return (React.createElement(Box, { ...boxProps, className: clsx('ab-AlertPreview', boxProps.className), style: {
             border: '1px solid var(--ab-color-inputborder)',
             ...boxProps.style,
         } },
@@ -61,7 +61,7 @@ export const AlertNotificationWizardSection = (props) => {
         data.AlertForm = api.alertApi.internalApi.getDefaultAlertNotificationForm();
     }
     return (React.createElement(React.Fragment, null,
-        React.createElement(Tabs, { "data-name": "display-options", mt: 2, mb: 3, autoFocus: false },
+        React.createElement(Tabs, { "data-name": "display-options", className: "twa:mt-2 twa:mb-3", autoFocus: false },
             React.createElement(Tabs.Tab, null, "Notification Options"),
             React.createElement(Tabs.Content, null,
                 React.createElement("div", null,
@@ -90,7 +90,7 @@ export const AlertNotificationWizardSection = (props) => {
                             }
                             props.onChange(newAlertDefinition);
                         } }, "Display a Notification when Alert is triggered (with action buttons)")),
-                data.AlertProperties?.DisplayNotification ? (typeof data.AlertForm === 'string' ? (React.createElement(Text, { fontSize: 2 }, "Alert buttons cannot be customized because form is dynamically driven")) : (React.createElement(AlertButtonsEditor, { alertType: props.alertType, AlertButtons: data.AlertForm?.Buttons, api: api, adaptableAlert: adaptableAlert, onChange: (buttons) => {
+                data.AlertProperties?.DisplayNotification ? (typeof data.AlertForm === 'string' ? (React.createElement(Box, { className: "twa:text-2" }, "Alert buttons cannot be customized because form is dynamically driven")) : (React.createElement(AlertButtonsEditor, { alertType: props.alertType, AlertButtons: data.AlertForm?.Buttons, api: api, adaptableAlert: adaptableAlert, onChange: (buttons) => {
                         props.onChange({
                             ...data,
                             AlertForm: {
@@ -101,5 +101,5 @@ export const AlertNotificationWizardSection = (props) => {
                     } }))) : null)),
         data.AlertProperties?.DisplayNotification ? (React.createElement(Tabs, { "data-name": "alert-preview", autoFocus: false },
             React.createElement(Tabs.Tab, null, "Alert Preview"),
-            React.createElement(Tabs.Content, null, typeof data.AlertForm === 'string' ? (React.createElement(Text, { fontSize: 2 }, "Preview not available because form is dynamically driven")) : (React.createElement(AlertPreview, { alertDefinition: data, api: api }))))) : null));
+            React.createElement(Tabs.Content, null, typeof data.AlertForm === 'string' ? (React.createElement(Box, { className: "twa:text-2" }, "Preview not available because form is dynamically driven")) : (React.createElement(AlertPreview, { alertDefinition: data, api: api }))))) : null));
 };

package/src/View/Alert/Wizard/AlertRulesWizardSection.js

@@ -5,8 +5,8 @@ import { useOnePageAdaptableWizardContext } from '../../Wizard/OnePageAdaptableW
 import { getAvailablePredicateDefinitions } from '../Utilities/getAvailablePredicates';
 import { Tabs } from '../../../components/Tabs';
 import Radio from '../../../components/Radio';
-import { Box } from 'rebass';
 import { OBSERVABLE_EXPRESSION_ROW_ADDED, OBSERVABLE_EXPRESSION_ROW_REMOVED, } from './../../../Utilities/Constants/GeneralConstants';
+import { Box } from '../../../components/Flex';
 export const getRuleStepDescription = (alertType) => {
     switch (alertType) {
         case 'DataChange':
@@ -54,7 +54,7 @@ const RowChangeEditor = (props) => {
             },
         });
     };
-    return (React.createElement(Box, { p: 2 },
+    return (React.createElement(Box, { className: "twa:p-2" },
         React.createElement(Tabs, null,
             React.createElement(Tabs.Tab, null, "Row Change"),
             React.createElement(Tabs.Content, null,

package/src/View/Alert/Wizard/AlertScopeWizardSection.js

@@ -1,7 +1,7 @@
 import * as React from 'react';
-import { Flex } from 'rebass';
 import { NewScopeComponent } from '../../Components/NewScopeComponent';
 import { useOnePageAdaptableWizardContext } from '../../Wizard/OnePageAdaptableWizard';
+import { Flex } from '../../../components/Flex';
 export const AlertScopeWizardSection = (props) => {
     const { data, api } = useOnePageAdaptableWizardContext();
     let disableDataTypes = true;
@@ -10,7 +10,7 @@ export const AlertScopeWizardSection = (props) => {
         disableDataTypes = false;
         disableColumns = false;
     }
-    return (React.createElement(Flex, { flexDirection: "column", style: { height: '100%' }, padding: 2 },
+    return (React.createElement(Flex, { flexDirection: "column", className: "twa:p-2 twa:h-full" },
         React.createElement(NewScopeComponent, { disableColumns: disableColumns, disableDataTypes: disableDataTypes, descriptions: {
                 rowScope: 'Changes in any Column in the row will trigger an Alert',
                 columnScope: 'Changes in selected Columns will trigger an Alert',

package/src/View/Alert/Wizard/AlertTypeWizardSection.js

@@ -1,9 +1,9 @@
 import * as React from 'react';
 import { Tabs } from '../../../components/Tabs';
 import { AlertType, getAlertTypeText } from '../Utilities/getAlertType';
-import { Box, Flex } from 'rebass';
 import { TypeRadio } from '../../Wizard/TypeRadio';
 import { Tag } from '../../../components/Tag';
+import { Box, Flex } from '../../../components/Flex';
 export const renderAlertTypeSummary = (alertType) => {
     const text = getAlertTypeText(alertType);
     return (React.createElement(Box, null,