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

package/src/Utilities/Services/Interface/IAlertService.d.ts

@@ -20,5 +20,5 @@ export interface IAlertService extends IAdaptableService {
     getReactiveActiveAlerts(): AlertDefinition[];
     isReactiveAlertActive(alertDefinition: AlertDefinition): boolean;
 }
-export declare const isRowDataChangedInfo: (value: CellDataChangedInfo | RowDataChangedInfo) => value is RowDataChangedInfo<any>;
-export declare const isCellDataChangedInfo: (value: CellDataChangedInfo | RowDataChangedInfo) => value is CellDataChangedInfo<any>;
+export declare const isRowDataChangedInfo: (value: CellDataChangedInfo | RowDataChangedInfo) => value is RowDataChangedInfo;
+export declare const isCellDataChangedInfo: (value: CellDataChangedInfo | RowDataChangedInfo) => value is CellDataChangedInfo;

package/src/Utilities/createAgStatusPanelComponent.d.ts

@@ -9,7 +9,7 @@ export interface StatusPanelProps {
         Key: string;
     };
 }
-export declare const createAgStatusPanelComponent: (component: React.FunctionComponent<StatusPanelProps>, adaptable: IAdaptable, context: StatusPanelProps['context']) => ((props: IStatusPanelParams) => React.JSX.Element) | {
+export declare const createAgStatusPanelComponent: (component: React.FunctionComponent<StatusPanelProps>, adaptable: IAdaptable, context: StatusPanelProps["context"]) => ((props: IStatusPanelParams) => React.JSX.Element) | {
     new (): {
         params: IStatusPanelParams;
         eGui: HTMLElement;

package/src/Utilities/getObjectTagsViewItems.js

@@ -29,7 +29,7 @@ export const getObjectTagsViewItems = (object, api) => {
                 const editAction = viewOptions.getEditAction(newObject);
                 dispatch(editAction);
             }, [hasCurrentLayoutAsTag, props.data]);
-            return (React.createElement(SimpleButton, { onClick: handleToggleTag, mt: 1, icon: hasCurrentLayoutAsTag ? 'minus' : 'plus' }, hasCurrentLayoutAsTag ? 'Remove from Layout' : 'Add to Layout'));
+            return (React.createElement(SimpleButton, { onClick: handleToggleTag, className: "twa:mt-1", icon: hasCurrentLayoutAsTag ? 'minus' : 'plus' }, hasCurrentLayoutAsTag ? 'Remove from Layout' : 'Add to Layout'));
         },
     };
 };

package/src/Utilities/runIfNotResolvedIn.d.ts

@@ -5,4 +5,4 @@
  * @param callback Called if promise does not resolve in the time defined by 'delay'
  * @param delay Time after which if the promise was not resolved the callback (fn) is called.
  */
-export declare const runIfNotResolvedIn: <T>(promise: Promise<T>, callback: () => void, delay?: number) => Promise<T>;
+export declare const runIfNotResolvedIn: <T>(promise: Promise<T>, callback: () => void, delay?: number) => typeof promise;

package/src/View/AdaptableComputedCSSVarsContext.js

@@ -1,5 +1,7 @@
 import * as React from 'react';
 import { CSSNumericVariableWatch } from '../components/Select/CSSNumericVariableWatch';
+import debounce from 'lodash/debounce';
+import { useMemo } from 'react';
 const computedCSSVarNames = [
     '--ab-cmp-select-menu__max-width',
     '--ab-cmp-select-menu__min-width',
@@ -8,7 +10,10 @@ const computedCSSVarNames = [
 const defaultValues = Object.fromEntries(computedCSSVarNames.map((varName) => [varName, 0]));
 export const AdaptableComputedCSSVarsContext = React.createContext(defaultValues);
 export const WithAdaptableComputedCSSVars = ({ children }) => {
-    const [computedCSSVars, setComputedCSSVars] = React.useState(defaultValues);
+    const [computedCSSVars, doSetComputedCSSVars] = React.useState(defaultValues);
+    const setComputedCSSVars = useMemo(() => {
+        return debounce(doSetComputedCSSVars, 300, { leading: false, trailing: true });
+    }, [doSetComputedCSSVars]);
     return (React.createElement(AdaptableComputedCSSVarsContext.Provider, { value: computedCSSVars },
         children,
         computedCSSVarNames.map((varName) => (React.createElement(CSSNumericVariableWatch, { key: varName, varName: varName, onChange: (value) => {

package/src/View/AdaptablePopover/index.d.ts

@@ -14,7 +14,7 @@ export interface AdaptablePopoverProps extends React.ClassAttributes<React.Props
     tooltipText?: string;
     popoverMinWidth?: number;
     popoverMaxWidth?: number;
-    popupPadding?: number;
+    popupPadding?: 0 | 2;
     alignPosition?: OverlayShowParams['alignPosition'];
     visible?: boolean;
 }

package/src/View/AdaptablePopover/index.js

@@ -4,7 +4,7 @@ import { UIHelper } from '../UIHelper';
 import { ButtonInfo } from '../Components/Buttons/ButtonInfo';
 import { Icon } from '../../components/icons';
 import OverlayTrigger from '../../components/OverlayTrigger';
-import { Flex, Box, Text } from 'rebass';
+import { Box, Flex } from '../../components/Flex';
 export class AdaptablePopover extends React.Component {
     render() {
         let messageType = this.props.MessageType != null ? this.props.MessageType : 'Info';
@@ -20,8 +20,8 @@ export class AdaptablePopover extends React.Component {
                 minWidth: popoverMinWidth,
                 maxWidth: this.props.popoverMaxWidth ?? 300,
             } },
-            title ? (React.createElement(Text, { fontSize: 4, padding: 2 }, title)) : null,
-            React.createElement(Box, { className: "ab-Popover__body", padding: this.props.popupPadding ?? 2 }, this.props.bodyText.map((textOrHTML, index) => (React.createElement("span", { key: index }, textOrHTML))))));
+            title ? React.createElement(Box, { className: "twa:text-4 twa:p-2" }, title) : null,
+            React.createElement(Box, { className: `ab-Popover__body ${(this.props.popupPadding ?? 2) === 0 ? 'twa:p-0' : 'twa:p-2'}` }, this.props.bodyText.map((textOrHTML, index) => (React.createElement("span", { key: index }, textOrHTML))))));
         const icon = 'info'; // - think this is wrong - UIHelper.getGlyphByMessageType(messageType);
         const color = UIHelper.getColorByMessageType(messageType);
         const iconStyle = {

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/AdaptableOptionsForm.js

@@ -1,5 +1,4 @@
 import * as React from 'react';
-import { Box, Flex } from 'rebass';
 import { CheckBox } from '../../../components/CheckBox';
 import DropdownButton from '../../../components/DropdownButton';
 import HelpBlock from '../../../components/HelpBlock';
@@ -7,13 +6,13 @@ import Input from '../../../components/Input';
 import StringExtensions from '../../../Utilities/Extensions/StringExtensions';
 import { MetamodelService } from '../../../Utilities/Services/MetamodelService';
 import { AdaptablePopover } from '../../AdaptablePopover';
-const LABEL_WIDTH = 250;
+import { Box, Flex } from '../../../components/Flex';
 const SUPPORTED_PRIMITEVE_TYPES = ['s', 'n', 'b'];
 const OptionInput = (props) => {
     const { name, defaultValue, value, description, uiLabel } = props.option;
     const label = uiLabel ?? StringExtensions.Humanize(name);
     let input = React.createElement(React.Fragment, null);
-    const info = (React.createElement(Box, { ml: 2 },
+    const info = (React.createElement(Box, { className: "twa:ml-2" },
         React.createElement(AdaptablePopover, { headerText: null, bodyText: [description] })));
     const handleInputChange = (event) => props.onChange({ ...props.option, value: event.currentTarget.value });
     const handleCheckboxChange = (checked) => props.onChange({ ...props.option, value: checked });
@@ -62,7 +61,7 @@ const OptionInput = (props) => {
         }
     }
     let content = (React.createElement(React.Fragment, null,
-        React.createElement(Flex, { minWidth: LABEL_WIDTH, alignItems: "center" },
+        React.createElement(Flex, { alignItems: "center", className: "twa:min-w-[250px]" },
             label,
             " ",
             info),
@@ -73,14 +72,14 @@ const OptionInput = (props) => {
             " ",
             info));
     }
-    return (React.createElement(Flex, { mb: 2, pl: 1 }, content));
+    return React.createElement(Flex, { className: "twa:mb-2 twa:pl-1" }, content);
 };
 const OptionsSection = (props) => {
     if (!props.options.length) {
         return React.createElement(React.Fragment, null);
     }
-    return (React.createElement(Box, { mb: 2 },
-        React.createElement(HelpBlock, { mb: 2 }, props.name ?? props.id),
+    return (React.createElement(Box, { className: "twa:mb-2" },
+        React.createElement(HelpBlock, { className: "twa:mb-2" }, props.name ?? props.id),
         props.options.map((option, index) => (React.createElement(OptionInput, { key: index, option: option, onChange: props.onChange })))));
 };
 export const AdaptableOptionsForm = (props) => {
@@ -104,7 +103,7 @@ export const AdaptableOptionsForm = (props) => {
         }
         props.onChangedAdaptableOptions(adaptableOptions);
     };
-    return (React.createElement(Box, { p: 2 }, nocodeOptions.map(([sectionName, { containerLabel, items }]) => {
+    return (React.createElement(Box, { className: "twa:p-2" }, nocodeOptions.map(([sectionName, { containerLabel, items }]) => {
         return (React.createElement(OptionsSection, { onChange: handleOptionChange(sectionName), key: sectionName, id: sectionName, name: containerLabel, options: items }));
     })));
 };

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/ColumnsList.js

@@ -7,8 +7,9 @@ import Input from '../../../components/Input';
 import { useRef, useState } from 'react';
 import StringExtensions from '../../../Utilities/Extensions/StringExtensions';
 import { DataSource, InfiniteTableGrid, } from '../../../components/InfiniteTable';
-import { Box, Flex } from 'rebass';
+import { Box, Flex } from '../../../components/Flex';
 import throttle from 'lodash/throttle';
+import { twMerge } from '../../../twMerge';
 const dataTypes = [
     {
         value: 'text',
@@ -165,12 +166,12 @@ const ColumnsList = ({ columns: cols, handle, onValidityChange, onChange, onSele
                 whiteSpace: 'normal',
             }, justifyContent: "center", alignItems: "center" }, props.children));
     };
-    const HeaderCellWrapper = (props) => (React.createElement(CellWrapper, { ...props, fontSize: 3, style: { fontWeight: 600 } }));
+    const HeaderCellWrapper = (props) => (React.createElement(CellWrapper, { ...props, className: twMerge('twa:text-3 twa:font-bold', props.className) }));
     const HeaderWithCheckbox = (props) => {
         const { label, onChange, checked, ...flexProps } = props;
         return (React.createElement(HeaderCellWrapper, { ...flexProps, flexDirection: "column" },
             React.createElement(Box, null, label),
-            React.createElement(Box, { style: { textAlign: 'center' } },
+            React.createElement(Box, { className: "twa:text-center twa:ml-1" },
                 React.createElement(CheckBox, { checked: checked, onChange: onChange }))));
     };
     const columnsMap = {
@@ -223,7 +224,7 @@ const ColumnsList = ({ columns: cols, handle, onValidityChange, onChange, onSele
             render: (params) => {
                 const column = params.data;
                 const humanized = StringExtensions.Humanize(column.field);
-                return (React.createElement(Box, { p: 2 },
+                return (React.createElement(Box, { className: "twa:p-2" },
                     React.createElement(ThrottledInput, { key: column.field, style: inputStyle, value: column.caption != undefined ? column.caption : humanized, placeholder: humanized, onChange: (value) => {
                             setColumnCaption(value, column.field);
                         } })));
@@ -235,7 +236,7 @@ const ColumnsList = ({ columns: cols, handle, onValidityChange, onChange, onSele
             renderMenuIcon: false,
             render: (params) => {
                 const column = params.data;
-                return (React.createElement(CellWrapper, { paddingLeft: 1, paddingRight: 1 },
+                return (React.createElement(CellWrapper, { className: "twa:px-1" },
                     React.createElement(Dropdown, { style: inputStyle, showClearButton: false, options: dataTypes, value: column?.type ?? '', onChange: onColumnTypeChange.bind(null, column) })));
             },
         },
@@ -329,7 +330,7 @@ const ColumnsList = ({ columns: cols, handle, onValidityChange, onChange, onSele
             },
         },
     };
-    return (React.createElement(Box, { p: 2, style: { height: '100%' }, className: theme },
+    return (React.createElement(Box, { className: twMerge('twa:p-2 twa:h-full', theme) },
         React.createElement(DataSource, { data: data, primaryKey: "colId" },
             React.createElement(InfiniteTableGrid, { columnTypes: {
                     default: {

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/Components/FormBox.d.ts

@@ -1,3 +1,5 @@
 import * as React from 'react';
-import { BoxProps } from 'rebass';
-export declare const NocodeWizardFormBox: React.FunctionComponent<React.PropsWithChildren<BoxProps>>;
+import { BoxProps } from '../../../../components/Flex';
+export declare const NocodeWizardFormBox: React.FunctionComponent<React.PropsWithChildren<BoxProps & {
+    className?: string;
+}>>;

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/Components/FormBox.js

@@ -1,4 +1,4 @@
 import * as React from 'react';
-import { Box } from 'rebass';
-import join from '../../../../components/utils/join';
-export const NocodeWizardFormBox = (props) => (React.createElement(Box, { ...props, padding: 2, mb: 2, className: join('ab-NocodeWizardFormBox', props.className) }));
+import { Box } from '../../../../components/Flex';
+import { twMerge } from '../../../../twMerge';
+export const NocodeWizardFormBox = (props) => (React.createElement(Box, { ...props, className: twMerge('ab-NocodeWizardFormBox twa:p-2 twa:mb-2', props.className) }));

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/EntitlementsForm.js

@@ -1,11 +1,11 @@
 import * as React from 'react';
 import HelpBlock from '../../../components/HelpBlock';
 import { ALL_MODULES } from '../../../AdaptableState/Common/Types';
-import { Box, Flex } from 'rebass';
 import Radio from '../../../components/Radio';
 import FormLayout, { FormRow } from '../../../components/FormLayout';
 import { ADAPTABLE_MODULE_MAP } from '../../../Utilities/Constants/ModuleConstants';
 import { DataSource, InfiniteTableGrid, } from '../../../components/InfiniteTable';
+import { Box, Flex } from '../../../components/Flex';
 const ALL_ENTITLEMENTS_MODULES = ALL_MODULES;
 const tableDOMProps = {
     style: {
@@ -28,7 +28,7 @@ const EntitlementsListForm = (props) => {
     let abOptions = props.adaptableOptions;
     const entitlements = abOptions?.entitlementOptions?.moduleEntitlements ?? [];
     if (typeof entitlements === 'function') {
-        return (React.createElement(HelpBlock, { mt: 2 }, "Entitlements cannot be customized, they are handled by a custom function."));
+        return (React.createElement(HelpBlock, { className: "twa:mt-2" }, "Entitlements cannot be customized, they are handled by a custom function."));
     }
     const entitlementsMap = React.useMemo(() => {
         return entitlements.reduce((acc, entitlement) => {
@@ -63,7 +63,7 @@ const EntitlementsListForm = (props) => {
         });
     }, [abOptions?.entitlementOptions]);
     if (typeof entitlements === 'function') {
-        return (React.createElement(HelpBlock, { mb: 2 }, "Entitlements cannot be customized, they are handled by a custom function."));
+        return (React.createElement(HelpBlock, { className: "twa:mb-2" }, "Entitlements cannot be customized, they are handled by a custom function."));
     }
     const columnsMap = {
         name: {
@@ -104,7 +104,7 @@ const EntitlementsListForm = (props) => {
         props.adaptableOptions.initialState.Theme?.CurrentTheme) {
         theme = props.adaptableOptions.initialState.Theme.CurrentTheme;
     }
-    return (React.createElement(Box, { flex: 1, height: "100%", className: theme },
+    return (React.createElement(Box, { className: `${theme} twa:flex-1 twa:h-full` },
         React.createElement(DataSource, { data: data, primaryKey: "name" },
             React.createElement(InfiniteTableGrid, { columnTypes: columnTypes, headerOptions: headerOptions, domProps: tableDOMProps, columns: columnsMap }))));
 };
@@ -113,7 +113,7 @@ const DefaultEntitlementForm = (props) => {
     const entitlementOptions = props.adaptableOptions?.entitlementOptions;
     const defaultEntitlement = entitlementOptions?.defaultAccessLevel;
     if (typeof defaultEntitlement === 'function') {
-        return React.createElement(HelpBlock, { mb: 2 }, "Default Entitlement is controlled by a custom function");
+        return (React.createElement(HelpBlock, { className: "twa:mb-2" }, "Default Entitlement is controlled by a custom function"));
     }
     const handleDefaultEntitlementChange = React.useCallback((accessLevel) => {
         props.onChangedAptableOptions({
@@ -124,15 +124,15 @@ const DefaultEntitlementForm = (props) => {
             },
         });
     }, [abOptions?.entitlementOptions?.defaultAccessLevel]);
-    return (React.createElement(FormLayout, { mb: 2 },
+    return (React.createElement(FormLayout, { className: "twa:mb-2" },
         React.createElement(FormRow, { label: "Default Entitlement:" },
-            React.createElement(Radio, { onClick: () => handleDefaultEntitlementChange('Full'), checked: defaultEntitlement === 'Full', mr: 3 }, "Visible"),
-            React.createElement(Radio, { onClick: () => handleDefaultEntitlementChange('ReadOnly'), checked: defaultEntitlement === 'ReadOnly', mr: 3 }, "Read Only"),
+            React.createElement(Radio, { onClick: () => handleDefaultEntitlementChange('Full'), checked: defaultEntitlement === 'Full', className: "twa:mr-3" }, "Visible"),
+            React.createElement(Radio, { onClick: () => handleDefaultEntitlementChange('ReadOnly'), checked: defaultEntitlement === 'ReadOnly', className: "twa:mr-3" }, "Read Only"),
             React.createElement(Radio, { onClick: () => handleDefaultEntitlementChange('Hidden'), checked: defaultEntitlement === 'Hidden' }, "Hidden"))));
 };
 const EntitlementsForm = (props) => {
     let abOptions = props.adaptableOptions;
-    return (React.createElement(Flex, { height: "100%", flexDirection: "column", p: 2 },
+    return (React.createElement(Flex, { flexDirection: "column", className: "twa:p-2 twa:h-full" },
         React.createElement(DefaultEntitlementForm, { ...props }),
         React.createElement(EntitlementsListForm, { ...props })));
 };

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/GridOptionsForm.js

@@ -2,12 +2,12 @@ import * as React from 'react';
 import FormLayout, { FormRow } from '../../../components/FormLayout';
 import { CheckBox } from '../../../components/CheckBox';
 import HelpBlock from '../../../components/HelpBlock';
-import { Box } from 'rebass';
+import { Box } from '../../../components/Flex';
 const GridOptionsForm = (props) => {
     let { gridOptions } = props;
-    return (React.createElement(Box, { p: 2 },
+    return (React.createElement(Box, { className: "twa:p-2" },
         React.createElement(HelpBlock, null, "Grid Options"),
-        React.createElement(FormLayout, { margin: 2, columns: [{ name: 'children' }, { name: 'label', style: { textAlign: 'start' } }] },
+        React.createElement(FormLayout, { className: "twa:m-2", columns: [{ name: 'children' }, { name: 'label', style: { textAlign: 'start' } }] },
             React.createElement(FormRow, { label: "Enable Cell Selection" },
                 React.createElement(CheckBox, { checked: !!gridOptions.cellSelection, onChange: (enableCellSelection) => {
                         gridOptions = { ...gridOptions, cellSelection: enableCellSelection };

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