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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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 {