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

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

@@ -1,5 +1,4 @@
 import * as React from 'react';
-import { Box, Flex } from 'rebass';
 import OverlayTrigger from '../../../components/OverlayTrigger';
 import SimpleButton from '../../../components/SimpleButton';
 import { useAdaptable } from '../../AdaptableContext';
@@ -8,6 +7,7 @@ import { ColumnFilterMenu } from './components/ColumnFilterMenu';
 import { FloatingFilterInputList } from './components/FloatingFilterInputList';
 import { isPredicateEmpty, qlPredicateToString } from './utils';
 import { AG_GRID_GROUPED_COLUMN } from '../../../Utilities/Constants/GeneralConstants';
+import { Box, Flex } from '../../../components/Flex';
 export const FloatingFilter = (props) => {
     const adaptable = useAdaptable();
     /**
@@ -53,7 +53,7 @@ export const FloatingFilter = (props) => {
                 : {}),
         } },
         React.createElement(Box, null, !isManualApply && singleFilterPredicateDef?.icon ? (singleFilterPredicateDef?.icon) : (React.createElement(AdaptableIconComponent, { icon: { name: 'filter' } }))),
-        showLabel && (React.createElement(Box, { ml: 2, className: "ab-FloatingFilter-label", title: label, flex: 1 }, label))));
+        showLabel && (React.createElement(Box, { className: "ab-FloatingFilter-label twa:ml-2 twa:flex-1", title: label }, label))));
     if (isInlineEditable) {
         filterDropdown = showQuickFilterDropdown && (React.createElement(OverlayTrigger, { className: "ab-FloatingFilter-overlay", showEvent: showEvent, hideEvent: hideEvent, preventPortalEventPropagation: showEvent === 'click', targetOffset: 10, hideDelay: 50, "data-name": "floating-filter-overlay", render: () => {
                 // we render this only for single filter
@@ -68,9 +68,9 @@ export const FloatingFilter = (props) => {
     else {
         filterDropdown = filterDropdownButton;
     }
-    return (React.createElement(Flex, { className: "ab-FloatingFilter", style: { width: '100%' } },
+    return (React.createElement(Flex, { className: "ab-FloatingFilter twa:w-full" },
         filterDropdown,
-        isInlineEditable && (React.createElement(Flex, { flex: 1, minWidth: 0 },
+        isInlineEditable && (React.createElement(Flex, { className: "twa:flex-1 twa:min-w-0" },
             React.createElement(FloatingFilterInputList, { onKeyDown: props.onKeydown, columnId: props.columnId, disabled: props.disabled, 
                 // It works only with a predicate
                 predicate: props.predicate.args[0], predicateDefs: props.predicateDefs, onPredicateChange: (predicate) => {
@@ -79,11 +79,11 @@ export const FloatingFilter = (props) => {
                         args: [predicate],
                     });
                 } }))),
-        isInlineEditable && (React.createElement(SimpleButton, { px: 0, onClick: () => {
+        isInlineEditable && (React.createElement(SimpleButton, { className: "twa:px-0", onClick: () => {
                 adaptable.api.filterApi.columnFilterApi.internalApi.openColumnFilterPopup(props.columnId, {
                     onChange: props.onChange,
                 });
             }, "data-name": "expand-filter", icon: "expand", variant: "text" })),
         (isMultiple ||
-            !isPredicateEmpty(props.predicate.args[0], singleFilterPredicateDef)) && (React.createElement(SimpleButton, { "data-name": "clear-filter", p: 0, variant: "text", onClick: handleClear, icon: "close" }))));
+            !isPredicateEmpty(props.predicate.args[0], singleFilterPredicateDef)) && (React.createElement(SimpleButton, { "data-name": "clear-filter", className: "twa:p-0", variant: "text", onClick: handleClear, icon: "close" }))));
 };

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

@@ -20,7 +20,7 @@ export declare const ColumnFilterInput: (props: {
     disabled: boolean;
     onClear: () => void;
     onKeyDown?: (event: React.KeyboardEventHandler<HTMLInputElement>) => void;
-    filterType?: 'floating' | 'default';
+    filterType?: "floating" | "default";
     usePrimitiveInputs?: boolean;
     columnId: string;
 } & ColumnFilterEditorChangeProps) => React.JSX.Element;

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

@@ -71,7 +71,7 @@ export const ColumnFilterInput = (props) => {
         }
     };
     if (type === 'date' && !showDatePicker) {
-        return (React.createElement(AdaptableDateInlineInput, { "data-name": "floating-filter-input", value: liveValue, disabled: disabled, onFocus: onFocus, onBlur: onBlur, pr: 0, style: { border: 'none' }, onKeyDownCapture: onKeyDownCapture, onChange: (value) => {
+        return (React.createElement(AdaptableDateInlineInput, { "data-name": "floating-filter-input", value: liveValue, disabled: disabled, onFocus: onFocus, onBlur: onBlur, className: "twa:border-none twa:pr-0", onKeyDownCapture: onKeyDownCapture, onChange: (value) => {
                 onChange(value);
                 setLiveValue(value);
             } }));
@@ -100,7 +100,7 @@ export const ColumnFilterInput = (props) => {
             : {}, "data-name": "floating-filter-input", onFocus: onFocus, onBlur: onBlur, disabled: disabled, type: type === 'number' ? 'text' : type, 
         // autoFocus has to be FALSE because if the input receives focus in the init phase,
         // it may scroll the AG Grid header viewport into view and de-synchronize it (relative to the content viewport)
-        autoFocus: false, value: liveValue ?? '', onKeyDown: onKeyDown, showClearButton: false, onChange: (e) => {
+        autoFocus: false, value: liveValue ?? '', onKeyDown: onKeyDown, showClearButton: false, className: "twa:flex-1", onChange: (e) => {
             const prevValue = `${liveValue}`;
             const value = e.target.value;
             if (value) {

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

@@ -21,7 +21,7 @@ export const ColumnFilterInputList = (props) => {
         props.onPredicateChange(predicate);
     }, 300), [props.predicate, props.columnId]);
     if (['date[]', 'number[]', 'text[]'].includes(matchingInputs[0])) {
-        return (React.createElement(Panel, { bodyProps: { p: 0 }, borderRadius: 1, border: 0, p: 0, style: { width: '100%' } },
+        return (React.createElement(Panel, { bodyProps: { className: 'twa:p-0' }, className: "twa:w-full twa:rounded-sm twa:border-none twa:p-0" },
             React.createElement(FloatingFilterValues, { inline: false, columnId: props.columnId, disabled: props.disabled, onClear: () => {
                     props.onPredicateChange({ operator: props.predicate.operator, args: [] });
                 }, onChange: (inputs) => {

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

@@ -1,15 +1,15 @@
 import * as React from 'react';
-import { Box, Flex } from 'rebass';
 import Panel from '../../../../components/Panel';
 import SimpleButton from '../../../../components/SimpleButton';
+import { Box, Flex } from '../../../../components/Flex';
 const ColumnFilterMenuItem = ({ active, onClick, icon, label, }) => {
-    return (React.createElement(SimpleButton, { p: 1, variant: "text", width: "100%", tone: active ? 'info' : 'none', onClick: onClick },
-        React.createElement(Box, { mr: 2 }, icon),
-        React.createElement(Box, { fontSize: 2 }, label)));
+    return (React.createElement(SimpleButton, { className: "twa:p-1 twa:w-full", variant: "text", tone: active ? 'info' : 'none', onClick: onClick },
+        React.createElement(Box, { className: "twa:mr-2" }, icon),
+        React.createElement(Box, { className: "twa:text-2" }, label)));
 };
 export const ColumnFilterMenu = (props) => {
-    return (React.createElement(Panel, { minWidth: "max-content" }, props.predicateDefs?.map((predicateDef, index) => {
-        return (React.createElement(Flex, { mb: 1, key: index, onMouseDownCapture: (e) => {
+    return (React.createElement(Panel, { className: "twa:min-w-max" }, props.predicateDefs?.map((predicateDef, index) => {
+        return (React.createElement(Flex, { className: "twa:mb-1", key: index, onMouseDownCapture: (e) => {
                 e.stopPropagation();
             } },
             React.createElement(ColumnFilterMenuItem, { onClick: () => props.onPredicateChange({ operator: predicateDef.operator, args: [] }), icon: predicateDef.icon, label: predicateDef.label, active: props.predicate.operator === predicateDef.operator })));

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

@@ -1,7 +1,7 @@
 import { QlLogicalOperator, QlPredicate } from '../../../parser/src/predicate';
 import * as LayoutRedux from '../../../Redux/ActionsReducers/LayoutRedux';
 import { AdaptablePredicate, ColumnFilter } from '../../../types';
-export declare const useAdaptableFilterWrapper: (columnId: string, filterComponent: 'FilterBar' | 'FilterForm', handleOnChangeOverride?: (columnFilter: ColumnFilter) => void) => {
+export declare const useAdaptableFilterWrapper: (columnId: string, filterComponent: "FilterBar" | "FilterForm", handleOnChangeOverride?: (columnFilter: ColumnFilter) => void) => {
     qlPredicate: QlPredicate;
     qlPredicateDefs: import("@adaptabletools/adaptable/src/parser/src/predicate/types").QlPredicateDef[];
     columnFilter: ColumnFilter;

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

@@ -14,7 +14,15 @@ export const useAdaptableFilterWrapper = (columnId, filterComponent, handleOnCha
     const column = api.columnApi.getColumnWithColumnId(columnId);
     const columnFilterOptions = api.optionsApi.getFilterOptions().columnFilterOptions;
     const qlPredicateDefs = React.useMemo(() => {
-        const predicateDefs = api.filterApi.columnFilterApi.getFilterPredicateDefsForColumn(column);
+        // this is NOT the ideal place to do this, but it is what it is: autoGroupCol should NOT have the 'Blanks'/'NonBlanks' predicates
+        const predicateDefs = api.filterApi.columnFilterApi
+            .getFilterPredicateDefsForColumn(column)
+            .filter((predDef) => {
+            if (api.columnApi.isAutoRowGroupColumnForSingle(column.columnId)) {
+                return predDef.id !== 'Blanks' && predDef.id !== 'NonBlanks';
+            }
+            return true;
+        });
         const qlDataType = mapColumnDataTypeToExpressionFunctionType(columnType);
         return predicateDefs.map((predDef) => mapAdaptablePredicateDefToQlPredicateDef(predDef, qlDataType));
     }, [columnId]);

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

@@ -15,7 +15,5 @@ export const NewColumnSelector = ({ allowReorder = true, ...props }) => {
             else {
                 onChange(colIds);
             }
-        }, toIdentifier: (c) => c.columnId, toLabel: (c) => c.friendlyName, noSelectionLabel: singleSelect ? 'Please select a column' : 'You have not selected any columns.', xSelectedLabel: singleSelect
-            ? () => null
-            : (count) => (count > 1 ? `You selected ${count} columns.` : 'You selected one column.') }));
+        }, toIdentifier: (c) => c.columnId, toLabel: (c) => c.friendlyName }));
 };

package/src/View/Components/EntityRulesEditor/EntityRulePredicatesEditor/EntityRulePredicateEditor.js

@@ -1,10 +1,10 @@
 import * as React from 'react';
-import { Box, Flex } from 'rebass';
-import DropdownButton from '../../../../components/DropdownButton';
 import FormLayout, { FormRow } from '../../../../components/FormLayout';
 import SimpleButton from '../../../../components/SimpleButton';
 import { useAdaptable } from '../../../AdaptableContext';
 import { PredicateEditor } from '../../PredicateEditor/PredicateEditor';
+import { Box, Flex } from '../../../../components/Flex';
+import { Select } from '../../../../components/Select';
 export const EntityRulePredicateEditor = (props) => {
     const { api } = useAdaptable();
     const { predicate } = props;
@@ -55,12 +55,10 @@ export const EntityRulePredicateEditor = (props) => {
         return preparedPredicates;
     }, [props.predicate]);
     const columnIdPredicateScopeEnabled = Boolean(props.columnPredicateEnabled);
-    const columnFriendlyName = allColumns.find((col) => col.value === predicate?.ColumnId)?.label;
+    const selectedColumn = allColumns.find((col) => col.value === predicate?.ColumnId);
     const columnOptions = allColumns.map((col) => ({
         label: col.label,
-        onClick: () => {
-            handlePredicateChange({ PredicateId: null, ColumnId: col.value, Inputs: [] });
-        },
+        value: col.value,
     }));
     // use global scope or custom scope
     let predicateColumnId = null;
@@ -70,13 +68,15 @@ export const EntityRulePredicateEditor = (props) => {
     else if ('ColumnIds' in props.data.Scope && props.data.Scope?.ColumnIds?.[0]) {
         predicateColumnId = props.data.Scope?.ColumnIds?.[0];
     }
-    return (React.createElement(Flex, { className: "ab-EntityRulePredicateEditor", p: 3, mb: 3 },
-        React.createElement(Box, { flex: 1 },
+    return (React.createElement(Flex, { className: "ab-EntityRulePredicateEditor twa:p-3 twa:mb-3" },
+        React.createElement(Box, { className: "twa:flex-1" },
             React.createElement(FormLayout, null,
                 columnIdPredicateScopeEnabled && (React.createElement(FormRow, { label: "Column" },
-                    React.createElement(DropdownButton, { width: "100%", columns: ['label'], items: columnOptions }, columnFriendlyName ?? 'Select Column'))),
+                    React.createElement(Select, { placeholder: "Select Column", options: columnOptions, value: selectedColumn?.value, onChange: (value) => {
+                            handlePredicateChange({ PredicateId: null, ColumnId: value, Inputs: [] });
+                        } }))),
                 React.createElement(FormRow, { label: "Predicate" },
                     React.createElement(PredicateEditor, { columnId: predicateColumnId, predicateDefs: predicateDefs, predicate: predicate, onChange: handlePredicateChange, onClear: handleClear })))),
         React.createElement(Box, null,
-            React.createElement(SimpleButton, { disabled: !predicate, ml: 2, onClick: handleClear, icon: "delete" }))));
+            React.createElement(SimpleButton, { disabled: !predicate, className: "twa:ml-2 twa:h-input", onClick: handleClear, icon: "delete" }))));
 };

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

@@ -1,5 +1,4 @@
 import * as React from 'react';
-import { Box, Flex, Text } from 'rebass';
 import HelpBlock from '../../../../components/HelpBlock';
 import { useAdaptable } from '../../../AdaptableContext';
 import { ButtonInfo } from '../../Buttons/ButtonInfo';
@@ -9,6 +8,7 @@ import { Tag } from '../../../../components/Tag';
 import { EntityRulePredicateEditor } from './EntityRulePredicateEditor';
 import Radio from '../../../../components/Radio';
 import { getScopeViewItems } from '../../../../Utilities/getScopeViewItems';
+import { Box, Flex } from '../../../../components/Flex';
 export const EntityRulePredicatesEditor = (props) => {
     const { api } = useAdaptable();
     const showDocumentationLinks = api.internalApi.isDocumentationLinksDisplayed();
@@ -57,15 +57,14 @@ export const EntityRulePredicatesEditor = (props) => {
     const scopeString = getScopeViewItems(props.data.Scope, api).values.join(', ');
     const enablePredicateColumnId = props.enablePredicateColumnId ?? true;
     return (React.createElement(React.Fragment, null,
-        React.createElement(Flex, { mb: 2, justifyContent: "space-between" },
-            React.createElement(Text, { fontSize: 2, mb: 2 }, props.descriptions.selectPredicate),
+        React.createElement(Flex, { justifyContent: "space-between", className: "twa:mb-2" },
+            React.createElement(Box, { className: "twa:text-2 twa:mb-2" }, props.descriptions.selectPredicate),
             React.createElement(SimpleButton, { disabled: !props.data.Rule?.Predicates?.length, onClick: handleAddNewPredicate, icon: "plus", variant: "raised" }, "Add Predicate")),
-        enablePredicateColumnId && (React.createElement(Flex, { className: "ab-EntityRulePredicateEditor-ScopeTypeSelector", p: 2, mb: 2, flexDirection: "column" },
-            React.createElement(Text, { mb: 2 }, "Create Predicate Rule(s) using"),
-            React.createElement(Radio, { "data-name": "entity-scope", onClick: () => handlePredicateScopeTypeChange(false), mr: 3, checked: !columnPredicateEnabled },
-                "Active Column:",
-                ' ',
-                React.createElement(Tag, { ml: 1, mr: 1 }, scopeString || 'Not Defined'),
+        enablePredicateColumnId && (React.createElement(Flex, { className: "ab-EntityRulePredicateEditor-ScopeTypeSelector twa:p-2 twa:mb-2", flexDirection: "column" },
+            React.createElement(Box, { className: "twa:mb-2" }, "Create Predicate Rule(s) using"),
+            React.createElement(Radio, { "data-name": "entity-scope", onClick: () => handlePredicateScopeTypeChange(false), className: "twa:mr-3", checked: !columnPredicateEnabled },
+                "Active Column: ",
+                React.createElement(Tag, { className: "twa:mx-1" }, scopeString || 'Not Defined'),
                 ' '),
             React.createElement(Radio, { "data-name": "column-scope", onClick: () => handlePredicateScopeTypeChange(true), checked: columnPredicateEnabled }, "Selected Columns (overriding Active Column)"))),
         (props.data.Rule?.Predicates?.length ? props.data.Rule.Predicates : [null]).map((predicate, index) => {
@@ -76,13 +75,10 @@ export const EntityRulePredicatesEditor = (props) => {
             }
             return (React.createElement(React.Fragment, { key: `${index}-${predicate?.PredicateId}` },
                 index > 0 && (React.createElement(Box, null,
-                    React.createElement(Tag, { mb: 3 }, "AND"))),
+                    React.createElement(Tag, { className: "twa:mb-3" }, "AND"))),
                 React.createElement(EntityRulePredicateEditor, { data: props.data, predicate: predicate, onChange: props.onChange, predicateDefs: editorPredicateDefs, getPredicateDefsForColId: props.getPredicateDefsForColId, columnPredicateEnabled: columnPredicateEnabled })));
         }),
-        showDocumentationLinks && (React.createElement(HelpBlock, { "data-name": "query-documentation", mt: 3, mb: 2, style: {
-                fontSize: 'var(--ab-font-size-3)',
-                padding: 0,
-            } },
-            React.createElement(ButtonInfo, { mr: 2, onClick: () => window.open(PredicateDocsLink, '_blank') }),
+        showDocumentationLinks && (React.createElement(HelpBlock, { "data-name": "query-documentation", className: "twa:mt-3 twa:mb-2 twa:p-0 twa:text-3" },
+            React.createElement(ButtonInfo, { className: "twa:mr-2", onClick: () => window.open(PredicateDocsLink, '_blank') }),
             "See Predicate documentation for more details and examples"))));
 };

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

@@ -1,8 +1,8 @@
 import * as React from 'react';
-import { FlexProps } from 'rebass';
 import type { AdaptableColumnPredicate, AdaptableModule, AdaptablePredicateDef, ColumnScope } from '../../../types';
 import type { XOR } from '../../../Utilities/Extensions/TypeExtensions';
 import { AdaptableQuery } from '../../../AdaptableState/Common/AdaptableQuery';
+import { FlexProps } from '../../../components/Flex';
 export type RuleType = XOR<{
     Predicates: AdaptableColumnPredicate[];
 }, AdaptableQuery>;
@@ -26,7 +26,10 @@ export type EntityRulesEditorProps<T> = {
         useObservableQuery: React.ReactNode;
         useAggregationQuery: React.ReactNode;
     };
-    flexProps?: FlexProps;
+    flexProps?: FlexProps & {
+        className?: string;
+        style?: React.CSSProperties;
+    };
     showQueryBuilder?: boolean;
 };
 export declare const EntityRulesSummary: <T extends {

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;