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

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

@@ -1,19 +1,20 @@
 import * as React from 'react';
 import { useMemo } from 'react';
-import { Flex, Text } from 'rebass';
 import { SupportedTabMenuComps, Tabs } from '../../../components/Tabs';
 import Radio from '../../../components/Radio';
 import { ExpressionEditor } from '../../../components/ExpressionEditor';
 import { useAdaptable } from '../../AdaptableContext';
 import { EntityRulePredicatesEditor } from './EntityRulePredicatesEditor';
 import Panel from '../../../components/Panel';
+import { Box, Flex } from '../../../components/Flex';
+import { twMerge } from '../../../twMerge';
 const QueryTab = (props) => {
     const { type, label, disabled = false, ...tabProps } = props;
     const text = (React.createElement(Flex, { flexDirection: "column" },
         label,
         " ",
-        React.createElement(Text, { fontSize: 2 }, "query")));
-    return (React.createElement(Tabs.Tab, { style: { flex: 1 }, ...tabProps }, !disabled && props.showRadio ? (React.createElement(Radio, { tabIndex: -1, margin: 0, checked: type === props.value, style: { alignItems: 'baseline' } }, text)) : (text)));
+        React.createElement(Box, { className: "twa:text-2" }, "query")));
+    return (React.createElement(Tabs.Tab, { style: { flex: 1 }, ...tabProps }, !disabled && props.showRadio ? (React.createElement(Radio, { tabIndex: -1, className: "twa:m-0 twa:align-baseline", checked: type === props.value }, text)) : (text)));
 };
 // needed here to be considered a child Tab component, inside the Tabs component
 SupportedTabMenuComps.add(QueryTab);
@@ -24,11 +25,11 @@ export const EntityRulesSummary = (props) => {
         !data?.Rule?.BooleanExpression &&
         !data?.Rule?.ObservableExpression &&
         !data?.Rule?.AggregatedBooleanExpression) {
-        return React.createElement(Text, { fontSize: 2 }, "No Rule defined");
+        return React.createElement(Box, { className: "twa:text-2" }, "No Rule defined");
     }
     return (React.createElement(
-        Text,
-        { fontSize: 2 },
+        Box,
+        { className: "twa:text-2" },
         data.Rule.Predicates ? (React.createElement(React.Fragment, null, data.Rule?.Predicates?.map?.((predicate, index) => (
         // predicate id is not unique
         (React.createElement(
@@ -39,7 +40,7 @@ export const EntityRulesSummary = (props) => {
     ));
 };
 const RuleTabTitle = (props) => {
-    return props.showRadio ? (React.createElement(Radio, { tabIndex: -1, margin: 0, checked: props.checked }, props.children)) : (React.createElement(React.Fragment, null, "props.children"));
+    return props.showRadio ? (React.createElement(Radio, { className: "twa:m-0", tabIndex: -1, checked: props.checked }, props.children)) : (React.createElement(React.Fragment, null, "props.children"));
 };
 export const EntityRulesEditor = (props) => {
     const { data, children, descriptions, predicateDefs, showNoRule = false, showPredicate = true, showObservable = true, showBoolean = true, showAggregation = true, flexProps, module, } = props;
@@ -133,13 +134,13 @@ export const EntityRulesEditor = (props) => {
     };
     const initialData = useMemo(() => api.internalApi.getQueryPreviewData(), []);
     const baseClassName = 'ab-EntityRulesEditor';
-    return (React.createElement(Flex, { className: baseClassName, flexDirection: "column", padding: 2, pt: 0, pl: 0, ...flexProps, style: { height: '100%', ...flexProps?.style } },
+    return (React.createElement(Flex, { ...flexProps, className: twMerge(baseClassName, 'twa:p-2 twa:pt-0 twa:pl-0 twa:h-full', flexProps?.className), flexDirection: "column", style: flexProps?.style },
         children,
-        React.createElement(Tabs, { onValueChange: setType, value: selectedTab, pt: 2, pl: 2, style: { flex: 1, overflow: 'auto' } },
+        React.createElement(Tabs, { onValueChange: setType, value: selectedTab, className: "twa:pt-2 twa:pl-2 twa:flex-1 twa:overflow-auto" },
             showNoRule ? (React.createElement(Tabs.Tab, { value: 'NoRule', style: { flex: 1 } },
                 React.createElement(RuleTabTitle, { showRadio: showRadioButtons, checked: type === 'NoRule' }, "No Condition"))) : null,
             showNoRule ? (React.createElement(Tabs.Content, { value: 'NoRule' },
-                React.createElement(Text, { fontSize: 2, mb: 2 }, 'Format Column is always applied'))) : null,
+                React.createElement(Box, { className: "twa:text-2 twa:mb-2" }, 'Format Column is always applied'))) : null,
             showPredicate ? (React.createElement(Tabs.Tab, { value: 'Predicate', style: { flex: 1 } },
                 React.createElement(RuleTabTitle, { showRadio: showRadioButtons, checked: type === 'Predicate' }, "Predicate"))) : null,
             showPredicate ? (React.createElement(Tabs.Content, { "data-name": "Predicate", value: "Predicate" },

package/src/View/Components/ExpressionWizard.js

@@ -1,11 +1,11 @@
 import * as React from 'react';
-import { Flex } from 'rebass';
 import { CheckBox } from '../../components/CheckBox';
 import { ExpressionEditor } from '../../components/ExpressionEditor';
 import Input from '../../components/Input';
 import { StringExtensions } from '../../Utilities/Extensions/StringExtensions';
 import { NamedQueryModuleId } from '../../Utilities/Constants/ModuleConstants';
 import { useMemo } from 'react';
+import { Flex } from '../../components/Flex';
 export class ExpressionWizard extends React.Component {
     constructor(props) {
         super(props);
@@ -29,11 +29,11 @@ export class ExpressionWizard extends React.Component {
         return (React.createElement(React.Fragment, null,
             React.createElement(ExpressionEditor, { type: 'boolean', module: NamedQueryModuleId, value: this.state.expression, onChange: this.handleCustomExpressionChange, initialData: initialData, columns: this.props.api.columnApi.internalApi.getQueryableColumnsForUIEditor(), fields: this.props.api.expressionApi.internalApi.getAvailableFields(), namedQueries: this.props.api.namedQueryApi.getNamedQueries(), api: this.props.api }),
             ' ',
-            React.createElement(Flex, { flexDirection: "row", padding: 1, marginBottom: 2, marginLeft: 1, alignItems: "center", "data-name": "expression-wizard-save-option" },
-                React.createElement(CheckBox, { marginLeft: 2, disabled: !this.isValidExpression(), marginBottom: 2, checked: this.state.saveToNamedQueries, onChange: (checked) => this.setState({
+            React.createElement(Flex, { flexDirection: "row", className: "twa:p-1 twa:mb-2 twa:ml-1", alignItems: "center", "data-name": "expression-wizard-save-option" },
+                React.createElement(CheckBox, { className: "twa:ml-2 twa:mb-2", disabled: !this.isValidExpression(), checked: this.state.saveToNamedQueries, onChange: (checked) => this.setState({
                         saveToNamedQueries: checked,
                     }, () => this.props.updateGoBackState()) }, "Save as new Named Query"),
-                this.state.saveToNamedQueries && (React.createElement(Input, { marginLeft: 2, style: { minWidth: '20rem' }, value: this.state.newNamedQuery, onChange: (e) => this.setState({
+                this.state.saveToNamedQueries && (React.createElement(Input, { className: "twa:ml-2 twa:min-w-[20rem]", value: this.state.newNamedQuery, onChange: (e) => this.setState({
                         newNamedQuery: e.target.value,
                     }, () => this.props.updateGoBackState()) })))));
     }

package/src/View/Components/FilterForm/Waiting.d.ts

@@ -1,8 +1,10 @@
 import * as React from 'react';
-import { FlexProps } from 'rebass';
 export type WaitingProps = React.ClassAttributes<Waiting> & {
     WaitingMessage: string;
-} & FlexProps;
+} & FlexProps & {
+    className?: string;
+};
+import { FlexProps } from '../../../components/Flex';
 export declare class Waiting extends React.Component<WaitingProps, {}> {
     render(): any;
 }

package/src/View/Components/FilterForm/Waiting.js

@@ -1,10 +1,11 @@
 import * as React from 'react';
-import { Flex } from 'rebass';
 import IconRefresh from '../../../components/icons/refresh';
+import { Flex } from '../../../components/Flex';
+import { twMerge } from '../../../twMerge';
 export class Waiting extends React.Component {
     render() {
         const { WaitingMessage, ...props } = this.props;
-        return (React.createElement(Flex, { flexDirection: "column", marginTop: 2, marginBottom: 2, ...props },
+        return (React.createElement(Flex, { flexDirection: "column", ...props, className: twMerge(`twa:my-2`, props.className) },
             React.createElement(Flex, { flexDirection: "row", justifyContent: "center" },
                 React.createElement(IconRefresh, null)),
             React.createElement(Flex, { flexDirection: "row", justifyContent: "center" },

package/src/View/Components/Forms/AdaptableFormControlTextClear.d.ts

@@ -6,6 +6,7 @@ export type AdaptableFormControlTextClearProps = {
     focusOnClear?: boolean;
     autoFocus?: boolean;
     inputStyle?: CSSProperties;
+    inputClassName?: string;
     actionTools?: React.ReactNode;
 } & InputProps;
 export declare const AdaptableFormControlTextClear: React.ForwardRefExoticComponent<Omit<AdaptableFormControlTextClearProps, "ref"> & React.RefAttributes<HTMLInputElement>>;

package/src/View/Components/Forms/AdaptableFormControlTextClear.js

@@ -3,17 +3,13 @@ import { StringExtensions } from '../../../Utilities/Extensions/StringExtensions
 import FieldWrap from '../../../components/FieldWrap';
 import SimpleButton from '../../../components/SimpleButton';
 import Input from '../../../components/Input';
+import { twMerge } from '../../../twMerge';
 export const AdaptableFormControlTextClear = React.forwardRef((props, ref) => {
     let closeButtonTooltip = props.value ? 'Clear' : null;
     const inputRef = React.useRef(null);
     const { focusOnClear = true } = props;
-    return (React.createElement(FieldWrap, { onClick: props.onClick, className: props.className, style: {
-            background: 'var(--ab-color-defaultbackground)',
-            overflow: 'visible',
-            width: '100%',
-            ...props.style,
-        } },
-        React.createElement(Input, { "aria-label": props['aria-label'], autoFocus: props.autoFocus, style: props.inputStyle, ref: (r) => {
+    return (React.createElement(FieldWrap, { onClick: props.onClick, className: twMerge('twa:bg-defaultbackground twa:overflow-visible twa:w-full', props.className), style: props.style },
+        React.createElement(Input, { "aria-label": props['aria-label'], autoFocus: props.autoFocus, style: props.inputStyle, className: props.inputClassName, ref: (r) => {
                 inputRef.current = r;
                 if (!ref) {
                     return;
@@ -26,7 +22,7 @@ export const AdaptableFormControlTextClear = React.forwardRef((props, ref) => {
                 }
             }, type: "text", placeholder: props.placeholder, value: props.value, onChange: (x) => props.OnTextChange(x.target.value) }),
         props.actionTools,
-        React.createElement(SimpleButton, { variant: "text", icon: "close", tooltip: closeButtonTooltip, px: 0, py: 0, marginRight: 1, onClick: () => {
+        React.createElement(SimpleButton, { variant: "text", icon: "close", tooltip: closeButtonTooltip, className: "twa:mr-1 twa:p-0", onClick: () => {
                 props.OnTextChange('');
                 const input = inputRef.current;
                 if (!focusOnClear) {

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

@@ -4,7 +4,7 @@ import { useAdaptable } from '../../AdaptableContext';
 import { useMemo, useCallback } from 'react';
 import ArrayExtensions from '../../../Utilities/Extensions/ArrayExtensions';
 export const ModuleValueSelector = (props) => {
-    const { options, value, onChange, selectionBoxPosition = 'top', ...valueSelectorProps } = props;
+    const { options, value, onChange, ...valueSelectorProps } = props;
     const adaptable = useAdaptable();
     const selectedModulesMap = useMemo(() => {
         if (!value || !value.length) {
@@ -26,5 +26,5 @@ export const ModuleValueSelector = (props) => {
     const sortedOptions = useMemo(() => {
         return ArrayExtensions.sortArrayWithOrder(options, value, { sortUnorderedItems: true });
     }, [allowReorder, options, value]);
-    return (React.createElement(ValueSelector, { ...valueSelectorProps, options: sortedOptions, value: value, onChange: onChange, allowReorder: allowReorder, toIdentifier: (module) => module, toLabel: (module) => moduleLabelMap.get(module), selectionBoxPosition: selectionBoxPosition, isOptionDisabled: props.isOptionDisabled, disabled: props.disabled }));
+    return (React.createElement(ValueSelector, { ...valueSelectorProps, options: sortedOptions, value: value, onChange: onChange, allowReorder: allowReorder, toIdentifier: (module) => module, toLabel: (module) => moduleLabelMap.get(module), isOptionDisabled: props.isOptionDisabled, disabled: props.disabled }));
 };

package/src/View/Components/NewScopeComponent.js

@@ -1,6 +1,5 @@
 import * as React from 'react';
 import { useState } from 'react';
-import { Box, Flex, Text } from 'rebass';
 import Radio from '../../components/Radio';
 import { CheckBox } from '../../components/CheckBox';
 import { Tabs } from '../../components/Tabs';
@@ -8,9 +7,10 @@ import { SummaryText } from '../Wizard/OnePageAdaptableWizard';
 import { NewColumnSelector } from './ColumnSelector';
 import { AdaptableFormControlTextClear } from './Forms/AdaptableFormControlTextClear';
 import { useAdaptable } from '../AdaptableContext';
-import { ValueOptionsTags } from './ValueSelector';
 import { getColumnTypeFriendlyName } from '../../AdaptableState/Common/AdaptableColumn';
 import StringExtensions from '../../Utilities/Extensions/StringExtensions';
+import { Box, Flex } from '../../components/Flex';
+import { TagList } from '../../components/Tag/Tag';
 export const isScopeValid = ({ Scope }) => {
     const result = [];
     if (!Scope) {
@@ -51,13 +51,13 @@ export const renderScopeSummary = (scope, labels) => {
     const columnsInScope = scopeApi.getColumnsInScope(scope);
     return (React.createElement(React.Fragment, null,
         React.createElement(Box, null,
-            React.createElement(SummaryText, { mb: 0 }, scopeApi.scopeIsAll(scope) ? labels.scopeWholeRow : null)),
-        React.createElement(Box, { style: { overflow: 'hidden' } }, 'ColumnIds' in scope ? (React.createElement(React.Fragment, null,
-            React.createElement(SummaryText, { mb: columnsInScope.length ? 2 : 0 }, labels.scopeColumns),
-            columnsInScope.length ? (React.createElement(ValueOptionsTags, { options: columnsInScope, value: columnsInScope.map((c) => c.columnId), toLabel: (c) => c.friendlyName, allowWrap: true, readOnly: true, renderLabel: (c) => React.createElement(SummaryText, { mb: 0 }, c), toIdentifier: (c) => c.columnId })) : null)) : null),
+            React.createElement(SummaryText, { className: "twa:mb-0" }, scopeApi.scopeIsAll(scope) ? labels.scopeWholeRow : null)),
+        React.createElement(Box, { className: "twa:overflow-hidden" }, 'ColumnIds' in scope ? (React.createElement(React.Fragment, null,
+            React.createElement(SummaryText, { className: columnsInScope.length ? 'twa:mb-2' : '' }, labels.scopeColumns),
+            columnsInScope.length ? (React.createElement(TagList, { tags: columnsInScope.map((c) => c.friendlyName) })) : null)) : null),
         React.createElement(Box, null, 'DataTypes' in scope ? (React.createElement(React.Fragment, null,
-            React.createElement(Text, { fontSize: 2, mb: 2 }, labels.scopeDataTypes),
-            React.createElement(ValueOptionsTags, { readOnly: true, options: scope.DataTypes, value: scope.DataTypes, toLabel: (c) => c, allowWrap: true, renderLabel: (c) => React.createElement(Text, { fontSize: 2 }, renderDataTypeLabel(c)), toIdentifier: (c) => c }))) : null)));
+            React.createElement(Box, { className: "twa:text-2 twa:mb-2" }, labels.scopeDataTypes),
+            React.createElement(TagList, { tags: scope.DataTypes.map((dataType) => renderDataTypeLabel(dataType)) }))) : null)));
 };
 const DATA_TYPES_OPTIONS = Object.values(DATA_TYPES_MAP);
 export const NewScopeComponent = (props) => {
@@ -146,27 +146,27 @@ export const NewScopeComponent = (props) => {
     }, []);
     return (React.createElement(Tabs, { "data-name": 'scope-component', className: "ab-ScopeComponent", value: scopeChoice, style: { height: '100%', ...props.style }, onValueChange: onScopeSelectChanged },
         props.hideWholeRow ? null : (React.createElement(Tabs.Tab, { value: "Row" },
-            React.createElement(Radio, { margin: 0, checked: scopeChoice == 'All', tabIndex: -1 }, "All Columns"))),
+            React.createElement(Radio, { className: "twa:m-0", checked: scopeChoice == 'All', tabIndex: -1 }, "All Columns"))),
         !props.disableColumns && (React.createElement(Tabs.Tab, { value: "Column" },
-            React.createElement(Radio, { margin: 0, value: "Column", checked: scopeChoice == 'Column', tabIndex: -1 }, "Selected Columns"))),
+            React.createElement(Radio, { className: "twa:m-0", value: "Column", checked: scopeChoice == 'Column', tabIndex: -1 }, "Selected Columns"))),
         !props.disableDataTypes && (React.createElement(Tabs.Tab, { value: "DataType" },
-            React.createElement(Radio, { margin: 0, value: "DataType", checked: scopeChoice == 'DataType', tabIndex: -1 }, "Data Types"))),
+            React.createElement(Radio, { className: "twa:m-0", value: "DataType", checked: scopeChoice == 'DataType', tabIndex: -1 }, "Data Types"))),
         hasColumnTypes && (React.createElement(Tabs.Tab, { value: "ColumnType" },
-            React.createElement(Radio, { margin: 0, value: "ColumnType", checked: scopeChoice == 'ColumnType', tabIndex: -1 }, "Column Types"))),
+            React.createElement(Radio, { className: "twa:m-0", value: "ColumnType", checked: scopeChoice == 'ColumnType', tabIndex: -1 }, "Column Types"))),
         props.hideWholeRow ? null : (React.createElement(Tabs.Content, { value: "Row", style: { flex: 'none' }, "data-name": "row-scope" },
-            React.createElement(Text, { padding: 2, pl: 0, fontSize: 2 }, props.descriptions.rowScope))),
-        !props.disableColumns && (React.createElement(Tabs.Content, { value: "Column", style: { flex: 1, overflow: 'auto' }, "data-name": "column-scope", padding: 0 },
-            React.createElement(Flex, { flexDirection: "row", alignItems: "center", padding: 2 },
-                React.createElement(Text, { fontSize: 2 }, props.descriptions.columnScope),
-                React.createElement(Flex, { flex: 3 }),
+            React.createElement(Box, { className: "twa:p-2 twa:pl-0 twa:text-2" }, props.descriptions.rowScope))),
+        !props.disableColumns && (React.createElement(Tabs.Content, { value: "Column", "data-name": "column-scope", className: "twa:p-0 twa:flex-1 twa:overflow-auto" },
+            React.createElement(Flex, { flexDirection: "row", alignItems: "center", className: "twa:p-2" },
+                React.createElement(Box, { className: "twa:text-2" }, props.descriptions.columnScope),
+                React.createElement(Box, { className: "twa:flex-3" }),
                 React.createElement(AdaptableFormControlTextClear, { value: columnsSearchText, OnTextChange: setColumnsSearchText, placeholder: "Type to search columns", style: { flex: 1 } })),
-            React.createElement(Flex, { paddingLeft: 2, flex: 1, style: { overflow: 'hidden' } },
+            React.createElement(Flex, { className: "twa:overflow-hidden twa:pl-2 twa:flex-1" },
                 React.createElement(NewColumnSelector, { columnFilterText: columnsSearchText, allowReorder: false, availableColumns: scopeColumns, selected: scopeApi.getColumnIdsInScope(props.scope), onChange: onColumnsSelectedChanged })))),
         !props.disableDataTypes && (React.createElement(Tabs.Content, { value: "DataType", style: { flex: 'none' }, "data-name": "datatype-scope" },
             React.createElement(Box, null,
-                props.descriptions.dataTypeScope && (React.createElement(Text, { p: 2, pl: 0, mb: 2, fontSize: 2 }, props.descriptions.dataTypeScope)),
+                props.descriptions.dataTypeScope && (React.createElement(Box, { className: "twa:p-2 twa:pl-0 twa:mb-2 twa:text-2" }, props.descriptions.dataTypeScope)),
                 React.createElement(Flex, { flexDirection: "column" }, dataTypeOptions.map((dataTypeOption) => (React.createElement(CheckBox, { "data-name": "scope", "data-value": dataTypeOption.value, key: dataTypeOption.value, checked: dataTypesInScope && dataTypesInScope.includes(dataTypeOption.value), onChange: (checked) => onCheckBoxDataTypeChecked(checked, dataTypeOption.value) }, dataTypeOption.label))))))),
-        hasColumnTypes && (React.createElement(Tabs.Content, { value: "ColumnType", style: { flex: 'none' }, "data-name": "column-type-scope" },
+        hasColumnTypes && (React.createElement(Tabs.Content, { value: "ColumnType", className: "twa:flex-none", "data-name": "column-type-scope" },
             React.createElement(Box, null,
                 React.createElement(Flex, { flexDirection: "column" }, api.columnApi.getColumnTypes()?.map?.((columnType) => (React.createElement(CheckBox, { "data-name": "scope", "data-value": columnType, key: columnType, checked: 'ColumnTypes' in props.scope && props.scope.ColumnTypes?.includes(columnType), onChange: (checked) => {
                         let columnTypes = [].concat(props.scope.ColumnTypes);

package/src/View/Components/Panels/PanelFooter.js

@@ -1,9 +1,9 @@
 import * as React from 'react';
-import { Flex, Box } from 'rebass';
 import SimpleButton from '../../../components/SimpleButton';
+import { Flex, Box } from '../../../components/Flex';
 export const PanelFooter = (props) => {
-    return (React.createElement(Flex, { className: "ab-Panel__Footer", flexDirection: "row", padding: 1, backgroundColor: "primary", alignItems: "center" },
-        React.createElement(SimpleButton, { margin: 1, variant: "text", "data-name": "action-cancel", onClick: props.onCancel, disabled: props.cancelDisabled }, props.cancelText ?? 'CANCEL'),
-        React.createElement(Box, { flex: 1 }),
-        React.createElement(SimpleButton, { variant: "raised", tone: "accent", "data-name": "action-finish", margin: 1, onClick: props.onAccept, disabled: props.acceptDisabled }, props.cancelText ?? 'Finish')));
+    return (React.createElement(Flex, { className: "ab-Panel__Footer twa:p-1 twa:bg-primary", flexDirection: "row", alignItems: "center" },
+        React.createElement(SimpleButton, { className: "twa:m-1", variant: "text", "data-name": "action-cancel", onClick: props.onCancel, disabled: props.cancelDisabled }, props.cancelText ?? 'CANCEL'),
+        React.createElement(Box, { className: "twa:flex-1" }),
+        React.createElement(SimpleButton, { variant: "raised", tone: "accent", "data-name": "action-finish", className: "twa:m-1", onClick: props.onAccept, disabled: props.acceptDisabled }, props.cancelText ?? 'Finish')));
 };

package/src/View/Components/Panels/PanelToolPanel/index.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { PanelProps } from '../../../../components/Panel';
-export interface PanelToolPanelProps extends PanelProps {
+export interface PanelToolPanelProps extends Omit<PanelProps, 'flex'> {
     headerText: string;
     onConfigure: () => void;
     onClose: () => void;

package/src/View/Components/Panels/PanelToolPanel/index.js

@@ -3,24 +3,23 @@ import Panel from '../../../../components/Panel';
 import { ButtonClose } from '../../Buttons/ButtonClose';
 import { ButtonConfigure } from '../../Buttons/ButtonConfigure';
 import { ButtonMinimise } from '../../Buttons/ButtonMinimise';
-import { Flex } from 'rebass';
-import join from '../../../../components/utils/join';
 import { ButtonMaximise } from '../../Buttons/ButtonMaximise';
+import { twMerge } from '../../../../twMerge';
+import { Flex } from '../../../../components/Flex';
 export class PanelToolPanel extends React.Component {
     render() {
         const { useDefaultPanelStyle, isMinimised, onMinimiseChanged, headerText, onClose, onConfigure, ...props } = this.props;
         let header = (React.createElement(React.Fragment, null,
-            !isMinimised ? (React.createElement(ButtonMinimise, { className: "ab-ToolPanelPanel__header-minimise", onClick: () => onMinimiseChanged(), marginRight: 1 })) : (React.createElement(ButtonMaximise, { className: "ab-ToolPanelPanel__header-maximise", onClick: () => onMinimiseChanged(), marginRight: 1 })),
-            React.createElement(Flex, { className: "ab-ToolPanelPanel__header-text", flex: 1, alignItems: "center", marginLeft: 0 }, headerText),
-            onConfigure && (React.createElement(ButtonConfigure, { iconSize: 16, marginLeft: 1, className: "ab-ToolPanelPanel__header-configure-button", tooltip: 'Configure ' + headerText, onClick: () => onConfigure() })),
-            onClose && (React.createElement(ButtonClose, { marginLeft: 0, className: "ab-ToolPanelPanel__header-close-button", tooltip: 'Close ' + headerText, onClick: () => onClose(), disabled: props.disabled }))));
-        return (React.createElement(Panel, { border: "var(--ab-cmp-toolpanelpanel__border)", ...props, className: join('ab-ToolPanelPanel', props.className), header: header, style: {
-                color: 'var(--ab-cmp-toolpanelpanel__color)',
-                fill: 'var(--ab-cmp-toolpanelpanel__fill)',
+            !isMinimised ? (React.createElement(ButtonMinimise, { className: "ab-ToolPanelPanel__header-minimise twa:mr-1", onClick: () => onMinimiseChanged() })) : (React.createElement(ButtonMaximise, { className: "ab-ToolPanelPanel__header-maximise twa:mr-1", onClick: () => onMinimiseChanged() })),
+            React.createElement(Flex, { className: "ab-ToolPanelPanel__header-text twa:flex-1 twa:ml-0", alignItems: "center" }, headerText),
+            onConfigure && (React.createElement(ButtonConfigure, { iconSize: 16, className: "ab-ToolPanelPanel__header-configure-button twa:ml-1", tooltip: 'Configure ' + headerText, onClick: () => onConfigure() })),
+            onClose && (React.createElement(ButtonClose, { className: "ab-ToolPanelPanel__header-close-button twa:ml-0", tooltip: 'Close ' + headerText, onClick: () => onClose(), disabled: props.disabled }))));
+        return (React.createElement(Panel, { ...props, className: twMerge('ab-ToolPanelPanel', props.className), header: header, style: {
                 ...props.style,
             }, headerProps: {
                 ...props.headerProps,
                 alignItems: 'stretch',
+                className: twMerge('twa:border-none', props.headerProps?.className),
                 style: {
                     padding: 'var(--ab-cmp-toolpanelpanel_header__padding)',
                     background: 'var(--ab-cmp-toolpanelpanel_header__background)',
@@ -30,12 +29,11 @@ export class PanelToolPanel extends React.Component {
                 },
             }, bodyProps: {
                 ...props.bodyProps,
+                className: twMerge('twa:border-none twa:flex twa:flex-col', props.bodyProps?.className),
                 style: {
                     padding: 'var(--ab-cmp-dashboardpanel_body__padding)',
                     background: 'var(--ab-cmp-dashboardpanel_body__background)',
                     ...(props.bodyProps ? props.bodyProps.style : null),
-                    display: 'flex',
-                    flexDirection: 'column',
                 },
             } }));
     }

package/src/View/Components/Panels/PanelWithButton.d.ts

@@ -1,20 +1,18 @@
 import * as React from 'react';
 import { PanelProps } from '../../../components/Panel';
-import { BoxProps } from 'rebass';
 import { AdaptableSystemIconName } from '../../../AdaptableState/Common/AdaptableIcon';
-export interface PanelWithButtonProps extends PanelProps {
+export interface PanelWithButtonProps extends Omit<PanelProps, 'flex' | 'borderRadius' | 'border'> {
     buttonContent?: React.ReactNode;
     buttonClick?: () => void;
     button?: React.ReactElement<any>;
     headerText: string;
-    bodyProps?: BoxProps;
-    headerProps?: BoxProps & {
+    bodyProps?: PanelProps['bodyProps'];
+    headerProps?: PanelProps['headerProps'] & {
         'data-name': string;
     };
     glyphicon?: AdaptableSystemIconName;
     buttonDisabled?: boolean;
     buttonStyle?: string;
-    borderRadius?: string;
     infoLink?: string;
     infoLinkDisabled?: boolean;
 }

package/src/View/Components/Panels/PanelWithButton.js

@@ -1,21 +1,22 @@
 import * as React from 'react';
 import SimpleButton from '../../../components/SimpleButton';
 import Panel from '../../../components/Panel';
-import { Flex, Box } from 'rebass';
 import { allIcons } from '../../../components/icons';
 import { ButtonInfo } from '../Buttons/ButtonInfo';
+import { twMerge } from 'tailwind-merge';
+import { Box, Flex } from '../../../components/Flex';
 export const PanelWithButton = (props) => {
     const { buttonContent } = props;
     const IconCmp = allIcons[props.glyphicon];
-    const header = (React.createElement(Flex, { alignItems: "center", width: "100%" },
+    const header = (React.createElement(Flex, { alignItems: "center", className: "twa:w-full" },
         React.createElement(Flex, { alignItems: "center" },
             props.glyphicon != null && (IconCmp ? React.createElement(IconCmp, null) : null),
-            React.createElement(Box, { marginRight: 2, "data-name": "space-before" }),
+            React.createElement(Box, { "data-name": "space-before", className: "twa:mr-2" }),
             props.headerText,
-            React.createElement(Box, { marginRight: 2, "data-name": "space-after" }),
+            React.createElement(Box, { "data-name": "space-after", className: "twa:mr-2" }),
             props.infoLink != null && !props.infoLinkDisabled && (React.createElement(ButtonInfo, { onClick: () => window.open(props.infoLink, '_blank') }))),
-        React.createElement(Box, { style: { flex: 1 } }),
+        React.createElement(Box, { className: "twa:flex-1" }),
         buttonContent ? (React.createElement(SimpleButton, { variant: "raised", tone: "accent", disabled: props.buttonDisabled, onClick: () => (props.buttonClick ? props.buttonClick() : null) }, buttonContent)) : null,
         props.button ? React.cloneElement(props.button) : null));
-    return (React.createElement(Panel, { flex: 1, className: props.className, bodyScroll: props.bodyScroll != null ? props.bodyScroll : true, bodyProps: props.bodyProps, variant: props.variant || 'primary', header: header, headerProps: props.headerProps, style: props.style, borderRadius: (props.borderRadius || 'none'), border: (props.border || 'none') }, props.children));
+    return (React.createElement(Panel, { className: twMerge('twa:flex-1 twa:rounded-none twa:border-none', props.className), bodyScroll: props.bodyScroll != null ? props.bodyScroll : true, bodyProps: props.bodyProps, variant: props.variant || 'primary', header: header, headerProps: props.headerProps, style: props.style }, props.children));
 };

package/src/View/Components/Panels/PanelWithImage.d.ts

@@ -1,14 +1,13 @@
 import * as React from 'react';
 import { PanelProps } from '../../../components/Panel';
-import { BoxProps } from 'rebass';
 import { AdaptableSystemIconName } from '../../../AdaptableState/Common/AdaptableIcon';
-export interface PanelWithImageProps extends PanelProps {
+export interface PanelWithImageProps extends Omit<PanelProps, 'flex' | 'borderRadius'> {
     glyphicon?: AdaptableSystemIconName;
     icon?: AdaptableSystemIconName;
     infoLink?: string;
     infoLinkDisabled?: boolean;
     borderRadius?: string;
-    bodyProps?: BoxProps;
+    bodyProps?: PanelProps['bodyProps'];
     theme: any;
     headerColor?: string;
     button?: React.ReactElement<any>;

package/src/View/Components/Panels/PanelWithImage.js

@@ -1,9 +1,9 @@
 import * as React from 'react';
-import { withTheme } from 'styled-components';
 import NewPanel from '../../../components/Panel';
-import { Box, Flex } from 'rebass';
 import { allIcons } from '../../../components/icons';
 import { ButtonInfo } from '../Buttons/ButtonInfo';
+import { twMerge } from '../../../twMerge';
+import { Box, Flex } from '../../../components/Flex';
 //We cannot destructure this.props using the react way in typescript which is a real pain as you
 //need to transfer props individually as a consequence
 //let { buttonContent, ...other } = this.props
@@ -15,23 +15,21 @@ class PanelWithImageCmp extends React.Component {
             headerStyle.color = this.props.headerColor;
             headerStyle.fill = this.props.headerColor;
         }
-        let headerRow = (React.createElement(Flex, { flex: 1 },
+        let headerRow = (React.createElement(Flex, { className: "twa:flex-1" },
             React.createElement(Flex, { alignItems: "center" },
-                React.createElement(Flex, { minHeight: 15, alignItems: "center", style: headerStyle },
+                React.createElement(Flex, { className: "twa:min-h-[15px]", alignItems: "center", style: headerStyle },
                     IconCmp ? React.createElement(IconCmp, null) : null,
-                    React.createElement(Box, { marginRight: 2 }),
+                    React.createElement(Box, { className: "twa:mr-2" }),
                     this.props.header ?? '',
-                    React.createElement(Box, { marginRight: 2, "data-name": "space-after" }),
+                    React.createElement(Box, { className: "twa:mr-2", "data-name": "space-after" }),
                     this.props.infoLink != null && !this.props.infoLinkDisabled && (React.createElement(ButtonInfo, { onClick: () => window.open(this.props.infoLink, '_blank' // <- opens the link in a new tab or window.
                         ) }))),
-                React.createElement(Box, { flex: 1 }),
+                React.createElement(Flex, { className: "twa:flex-1" }),
                 this.props.button && React.cloneElement(this.props.button))));
-        return (React.createElement(NewPanel, { flex: this.props.flex, header: headerRow, variant: this.props.variant, style: this.props.style, bodyScroll: this.props.bodyScroll !== undefined ? this.props.bodyScroll : true, border: "none", borderRadius: this.props.borderRadius || 'none', bodyProps: {
-                padding: 0,
+        return (React.createElement(NewPanel, { header: headerRow, variant: this.props.variant, style: this.props.style, bodyScroll: this.props.bodyScroll !== undefined ? this.props.bodyScroll : true, className: twMerge('twa:rounded-none twa:border-none', this.props.className), bodyProps: {
                 ...this.props.bodyProps,
+                className: twMerge('twa:p-0', this.props.bodyProps?.className),
             } }, this.props.children));
     }
 }
-// apparently it's very hard to type `withTheme()` result in typescript
-// @ts-ignore
-export const PanelWithImage = withTheme(PanelWithImageCmp);
+export const PanelWithImage = PanelWithImageCmp;

package/src/View/Components/Panels/PanelWithRow.d.ts

@@ -3,7 +3,6 @@ import { IColItem } from '../../UIInterfaces';
 import { PanelProps } from '../../../components/Panel';
 export interface PanelWithRowProps extends PanelProps {
     colItems: IColItem[];
-    headerAlign?: string;
 }
 export declare class PanelWithRow extends React.Component<PanelWithRowProps, {}> {
     render(): React.JSX.Element;

package/src/View/Components/Panels/PanelWithRow.js

@@ -1,15 +1,15 @@
 import * as React from 'react';
-import { Flex, Text } from 'rebass';
 import Panel from '../../../components/Panel';
+import { Flex, Box } from '../../../components/Flex';
 // We cannot destructure this.props using the react way in typescript which is a real pain as you
 // need to transfer props individually as a consequence
 // let { buttonContent, ...other } = this.props
 export class PanelWithRow extends React.Component {
     render() {
-        const headerItems = this.props.colItems.map((colItem, index) => (React.createElement(Text, { key: colItem.key || colItem.Content || index, fontWeight: "bold", fontSize: 'var(--ab-font-size-3)', paddingLeft: 1, paddingRight: 1, style: {
+        const headerItems = this.props.colItems.map((colItem, index) => (React.createElement(Box, { key: colItem.key || colItem.Content || index, className: "twa:font-bold twa:text-3 twa:px-1", style: {
                 flex: colItem.Size,
             } }, colItem.Content)));
-        const header = (React.createElement(Flex, { alignItems: this.props.headerAlign || 'center', style: { width: '100%' } }, headerItems));
+        const header = (React.createElement(Flex, { alignItems: "center", className: "twa:w-full" }, headerItems));
         return (React.createElement("div", { style: this.props.style, className: this.props.className },
             React.createElement(Panel, { bodyScroll: true, header: header, border: this.props.border, bodyProps: this.props.bodyProps }, this.props.children)));
     }

package/src/View/Components/Panels/PanelWithTwoButtons.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { PanelProps } from '../../../components/Panel';
-export interface PanelWithTwoButtonsProps extends PanelProps {
+export interface PanelWithTwoButtonsProps extends Omit<PanelProps, 'flex'> {
     firstButtonContent?: React.ReactNode;
     firstButton?: React.ReactElement<any>;
     secondButtonContent?: React.ReactNode;

package/src/View/Components/Panels/PanelWithTwoButtons.js

@@ -1,13 +1,13 @@
 import * as React from 'react';
 import Panel from '../../../components/Panel';
-import { Flex } from 'rebass';
+import { Flex } from '../../../components/Flex';
 //We cannot destructure this.props using the react way in typescript which is a real pain as you
 //need to transfer props individually as a consequence
 //let { buttonContent, ...other } = this.props
 export class PanelWithTwoButtons extends React.Component {
     render() {
-        let header = (React.createElement(Flex, { alignItems: "center", width: "100%" },
-            React.createElement(Flex, { flex: 1 }, this.props.headerText),
+        let header = (React.createElement(Flex, { alignItems: "center", className: "twa:w-full" },
+            React.createElement(Flex, { className: "twa:flex-1" }, this.props.headerText),
             this.props.secondButton,
             this.props.firstButton));
         return (React.createElement(Panel, { ...this.props, header: header }, this.props.children));

package/src/View/Components/Popups/AdaptableLoadingScreen.js

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import Dialog from '../../../components/Dialog';
-import { Box } from 'rebass';
+import { Box } from '../../../components/Flex';
 export function AdaptableLoadingScreen(props) {
     const { showLoadingScreen, loadingScreenDelay, loadingScreenTitle, loadingScreenText } = props;
     const [delayElapsed, setDelayElapsed] = React.useState(typeof loadingScreenDelay === 'number' ? false : showLoadingScreen);
@@ -14,10 +14,8 @@ export function AdaptableLoadingScreen(props) {
             };
         }
     }, [loadingScreenDelay]);
-    return (React.createElement(Dialog, { modal: true, isOpen: delayElapsed ? showLoadingScreen : false, onDismiss: props.onClose, showCloseButton: false, className: "ab-LoadingScreen", style: {
-            minHeight: 'auto',
-        } },
-        React.createElement(Box, { padding: 3 },
+    return (React.createElement(Dialog, { modal: true, isOpen: delayElapsed ? showLoadingScreen : false, onDismiss: props.onClose, showCloseButton: false, className: "ab-LoadingScreen twa:min-h-auto" },
+        React.createElement(Box, { className: "twa:p-3" },
             React.createElement("h4", null, loadingScreenTitle ?? 'Initialising Grid'),
             React.createElement("p", null, loadingScreenText ?? 'Retrieving your settings and setting up the grid...'))));
 }

package/src/View/Components/Popups/AdaptablePopup/AdaptablePopup.js

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { Flex } from 'rebass';
+import clsx from 'clsx';
 import * as GeneralConstants from '../../../../Utilities/Constants/GeneralConstants';
 import TopBar from './TopBar';
 import join from '../../../../components/utils/join';
@@ -10,6 +10,7 @@ import { useAdaptable } from '../../../AdaptableContext';
 import { CustomSettingsPanelView } from './CustomSettingsPanelView';
 import { useMenuItems } from './useMenuItems';
 import { AdaptablePopupDialog } from './AdaptablePopupDialog';
+import { Box } from '../../../../components/Flex';
 export const AdaptablePopup = (props) => {
     const adaptable = useAdaptable();
     const settingsPanelOptions = adaptable.adaptableOptions.settingsPanelOptions;
@@ -68,7 +69,7 @@ export const AdaptablePopup = (props) => {
         } },
         React.createElement(AdaptablePopupDialog, { dataName: componentModule, baseClassName: baseClassName, className: className, friendlyName: friendlyName, isActionModule: isStandalone, isWindowModal: isWindowModal, onHide: props.onHide, modalContainer: modalContainer },
             !isStandalone && React.createElement(TopBar, { icon: settingsPanelOptions.icon }, settingsPanelTitle),
-            React.createElement(Flex, { flexDirection: "row", flex: "1 1 0", style: { minHeight: 0 }, className: accessLevel == 'ReadOnly' ? GeneralConstants.READ_ONLY_STYLE : '' },
+            React.createElement(Box, { className: clsx('twa:flex twa:flex-row twa:flex-1 twa:min-h-0', 'twa:bg-defaultbackground twa:text-text-on-defaultbackground', accessLevel == 'ReadOnly' ? GeneralConstants.READ_ONLY_STYLE : '') },
                 !isStandalone && (React.createElement(Navigation, { menuItems: menuItems, api: props.api, activeItem: activeItem, customSettingsPanels: settingsPanelOptions.customSettingsPanels })),
-                React.createElement(Flex, { flex: 1, className: "ab-Adaptable-Popup__Body" }, moduleViewContent)))));
+                React.createElement(Box, { className: clsx('ab-Adaptable-Popup__Body', 'twa:bg-primarylight twa:text-primarylight-foreground', 'twa:flex twa:flex-1 twa:min-w-0 twa:overflow-auto twa:*:p-3') }, moduleViewContent)))));
 };

package/src/View/Components/Popups/AdaptablePopup/AdaptablePopupDialog.js

@@ -5,6 +5,7 @@ import Dialog from '../../../../components/Dialog';
 import { SettingsPanelSet } from '../../../../Redux/ActionsReducers/InternalRedux';
 import { useAdaptable } from '../../../AdaptableContext';
 import { getActionPanelSize, getMiddlePosition, getSettingsPanelSize } from '../Utilities';
+import clsx from 'clsx';
 const WindowDialog = (props) => {
     const { onChange, style, baseClassName, className, isActionModule, settingsPanelOptionsKey, onHide, ...dialogProps } = props;
     const adaptable = useAdaptable();
@@ -33,11 +34,11 @@ const WindowDialog = (props) => {
         position: popupSettings.position,
         onChange: handleWindowSettings,
     };
-    return (React.createElement(Dialog, { windowModal: true, fixed: false, windowModalProps: windowModalProps, style: { ...props.style, height: '100%' }, padding: 0, className: className, onDismiss: onHide, isOpen: true, showCloseButton: true, ...dialogProps }));
+    return (React.createElement(Dialog, { windowModal: true, fixed: false, windowModalProps: windowModalProps, style: props.style, onDismiss: onHide, isOpen: true, showCloseButton: true, ...dialogProps, className: clsx('twa:p-0 twa:h-full', className) }));
 };
 const PopupDialog = (props) => {
     const { style, className, onHide, children, ...dialogProps } = props;
-    return (React.createElement(Dialog, { fixed: false, style: props.style, padding: 0, height: '90vh', width: '90vw', className: className, onDismiss: onHide, isOpen: true, showCloseButton: true, ...dialogProps }, children));
+    return (React.createElement(Dialog, { fixed: false, style: props.style, className: clsx('twa:p-0 twa:h-[90vh] twa:w-[90vw]', className), onDismiss: onHide, isOpen: true, showCloseButton: true, ...dialogProps }, children));
 };
 export const AdaptablePopupDialog = (props) => {
     const { isActionModule, style, friendlyName, baseClassName, className, children, onHide, isWindowModal, modalContainer, } = props;