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

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

@@ -4,13 +4,13 @@ exports.GridCellPopup = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const react_redux_1 = require("react-redux");
-const rebass_1 = require("rebass");
 const NoteRedux_1 = require("../../../../Redux/ActionsReducers/NoteRedux");
 const InternalRedux_1 = require("../../../../Redux/ActionsReducers/InternalRedux");
 const AdaptableContext_1 = require("../../../AdaptableContext");
 const CommentsEditor_1 = require("../../../Comments/CommentsEditor");
 const NoteEditor_1 = require("../../../Note/NoteEditor");
 const CellPopup_1 = require("../../CellPopup");
+const Flex_1 = require("../../../../components/Flex");
 const ConnectedNoteEditor = ({ enableEditMode }) => {
     const { api } = (0, AdaptableContext_1.useAdaptable)();
     const isReadonly = api.entitlementApi.isModuleReadOnlyEntitlement('Note');
@@ -23,7 +23,7 @@ const ConnectedNoteEditor = ({ enableEditMode }) => {
     const handleNoteChange = React.useCallback((value) => {
         api.noteApi.updateNoteText(value, note);
     }, [note]);
-    return (React.createElement(rebass_1.Flex, { onClick: () => enableEditMode(), flexDirection: "column", className: "ab-NotePopup" },
+    return (React.createElement(Flex_1.Flex, { onClick: () => enableEditMode(), flexDirection: "column", className: "ab-NotePopup" },
         React.createElement(NoteEditor_1.NoteEditor, { isReadonly: isReadonly, editMode: editMode, key: note?.Uuid, onClose: () => annotationsService.hidePopup(), note: note?.Text, onNoteChange: (value) => handleNoteChange(value) })));
 };
 const GridCellPopup = (props) => {

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

@@ -41,7 +41,7 @@ const WindowPopups = () => {
             Component = Component ?? NoopComponent;
             componentNode = (React.createElement(Component, { api: adaptable.api, onDismiss: handleDismiss, popupProps: restPopupProps }));
         }
-        return (React.createElement(Dialog_1.default, { "data-name": windowItem.Id, style: { height: '100%' }, className: "ab-Window-Modal", key: windowItem.Id, windowModal: true, windowModalProps: {
+        return (React.createElement(Dialog_1.default, { "data-name": windowItem.Id, className: "ab-Window-Modal twa:h-full twa:p-0", key: windowItem.Id, windowModal: true, windowModalProps: {
                 ...windowModalProps,
                 onChange: (settings) => {
                     setWindowModalSettings((settingsMap) => ({
@@ -52,8 +52,8 @@ const WindowPopups = () => {
                 handleSelector: '.ab-Window-Modal .ab-Panel__header',
                 size: size,
                 position: position,
-            }, fixed: false, padding: 0, onDismiss: handleDismiss, isOpen: true, showCloseButton: true },
-            React.createElement(PanelWithImage_1.PanelWithImage, { style: { height: '100%' }, bodyProps: { padding: 0, height: '100%' }, header: windowItem.Title, glyphicon: windowItem.Icon, variant: "primary" }, componentNode)));
+            }, fixed: false, onDismiss: handleDismiss, isOpen: true, showCloseButton: true },
+            React.createElement(PanelWithImage_1.PanelWithImage, { className: "twa:h-full", bodyProps: { className: 'twa:h-full twa:p-0' }, header: windowItem.Title, glyphicon: windowItem.Icon, variant: "primary" }, componentNode)));
     })));
 };
 exports.WindowPopups = WindowPopups;

package/src/View/Components/Popups/WindowPopups/windowFactory.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { WindowPopupChildProps } from './WindowPopups';
 export declare const WINDOW_GRID_FILTER_EDITOR = "WINDOW_GRID_FILTER_EDITOR";
 export declare const SHOW_PIVOT_COLUMN_DETAILS = "SHOW_PIVOT_COLUMN_DETAILS";

package/src/View/Components/PredicateEditor/PredicateEditor.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PredicateEditor = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
-const rebass_1 = require("rebass");
 const Icon_1 = require("../../../components/Icon");
 const HelpBlock_1 = tslib_1.__importDefault(require("../../../components/HelpBlock"));
 const Tag_1 = require("../../../components/Tag");
@@ -14,6 +13,7 @@ const ListBoxFilterForm_1 = require("../FilterForm/ListBoxFilterForm");
 const AdaptableContext_1 = require("../../AdaptableContext");
 const FloatingFilterValues_1 = require("../ColumnFilter/components/FloatingFilterValues");
 const react_1 = require("react");
+const Flex_1 = require("../../../components/Flex");
 const PredicateEditor = (props) => {
     const baseClassName = 'ab-PredicateEditor';
     const predicateDefsOptions = React.useMemo(() => props?.predicateDefs?.map((item) => ({
@@ -68,9 +68,9 @@ const PredicateEditor = (props) => {
         }
     }, []);
     const { skipDefaultSearch } = quickFilterValues;
-    return (React.createElement(rebass_1.Box, { className: baseClassName },
-        React.createElement(rebass_1.Flex, { justifyContent: "stretch", alignItems: "center" },
-            icon && React.createElement(Tag_1.Tag, { mr: 2 }, icon),
+    return (React.createElement(Flex_1.Box, { className: baseClassName },
+        React.createElement(Flex_1.Flex, { alignItems: "center", className: "twa:justify-stretch" },
+            icon && React.createElement(Tag_1.Tag, { className: "twa:mr-2" }, icon),
             React.createElement(Select_1.Select, { isClearable: true, options: predicateDefsOptions, "data-name": "select-predicate", placeholder: "Select Rule", value: currentPredicateDef?.id, onChange: (value) => {
                     const option = predicateDefsOptions.find((x) => x.value === value);
                     props.onChange({
@@ -79,11 +79,11 @@ const PredicateEditor = (props) => {
                         Inputs: (option?.inputs ?? []).map((input) => input.defaultValue ?? ''),
                     });
                 } })),
-        React.createElement(rebass_1.Flex, null, currentPredicateDef?.inputs?.map((predicateDefInput, index) => (React.createElement(React.Fragment, null,
-            index > 0 && React.createElement(HelpBlock_1.default, { margin: 2 }, "AND"),
-            React.createElement(rebass_1.Flex, { key: index, flex: 1, flexDirection: "column" },
-                React.createElement(AdaptableInput_1.default, { "data-name": `predicate-input-${index}`, marginTop: 2, type: predicateDefInput.type, autoFocus: index === 0, value: props.predicate.Inputs?.[index] ?? '', onChange: (e) => handlePredicateInputChange(e, index) })))))),
-        adaptable.api.predicateApi.internalApi.IsInOrNotInPredicateDef(currentPredicateDef) && (React.createElement(rebass_1.Box, { mt: 2 },
+        React.createElement(Flex_1.Flex, null, currentPredicateDef?.inputs?.map((predicateDefInput, index) => (React.createElement(React.Fragment, null,
+            index > 0 && React.createElement(HelpBlock_1.default, { className: "twa:m-2" }, "AND"),
+            React.createElement(Flex_1.Flex, { key: index, className: "twa:flex-1", flexDirection: "column" },
+                React.createElement(AdaptableInput_1.default, { "data-name": `predicate-input-${index}`, className: "twa:mt-2", type: predicateDefInput.type, autoFocus: index === 0, value: props.predicate.Inputs?.[index] ?? '', onChange: (e) => handlePredicateInputChange(e, index) })))))),
+        adaptable.api.predicateApi.internalApi.IsInOrNotInPredicateDef(currentPredicateDef) && (React.createElement(Flex_1.Box, { className: "twa:mt-2" },
             React.createElement(ListBoxFilterForm_1.ColumnValuesSelect, { isLoading: isDistinctColumnValuesLoading, column: column, options: quickFilterValues.values, selectProps: {
                     onMenuOpen,
                     onInputChange,

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

@@ -9,6 +9,7 @@ export interface PreviewResultsPanelProps extends React.ClassAttributes<PreviewR
     showPanel: boolean;
     style?: React.CSSProperties;
     showHeader: boolean;
+    className?: string;
 }
 export declare class PreviewResultsPanel extends React.Component<PreviewResultsPanelProps, {}> {
     render(): any;

package/src/View/Components/PreviewResultsPanel.js

@@ -7,7 +7,7 @@ const AdaptablePopover_1 = require("../AdaptablePopover");
 const InfiniteTable_1 = require("../../components/InfiniteTable");
 const check_1 = tslib_1.__importDefault(require("../../components/icons/check"));
 const UIHelper_1 = tslib_1.__importDefault(require("../UIHelper"));
-const Panel_1 = tslib_1.__importDefault(require("../../components/Panel"));
+const Card_1 = require("../../components/Card");
 const columnsMap = {
     InitialValue: {
         field: 'InitialValue',
@@ -51,18 +51,11 @@ class PreviewResultsPanel extends React.Component {
                     React.createElement(check_1.default, { style: { color: successColor, fill: 'currentColor' } }))),
             };
         });
-        return this.props.showPanel ? (React.createElement(Panel_1.default, { header: previewHeader, style: { flex: 1 }, bodyProps: {
-                style: {
-                    border: 0,
-                    padding: 0,
-                    display: 'flex',
-                    flexFlow: 'column',
-                    minWidth: '17rem',
-                    minHeight: '20rem',
-                },
-            } },
-            React.createElement(InfiniteTable_1.DataSource, { data: dataSource, primaryKey: "Id" },
-                React.createElement(InfiniteTable_1.InfiniteTableGrid, { sortable: false, domProps: tableDOMProps, columns: columnsMap })))) : null;
+        return this.props.showPanel ? (React.createElement(Card_1.Card, { className: "twa:flex-1 twa:overflow-hidden", shadow: false },
+            React.createElement(Card_1.Card.Title, null, previewHeader),
+            React.createElement(Card_1.Card.Body, null,
+                React.createElement(InfiniteTable_1.DataSource, { data: dataSource, primaryKey: "Id" },
+                    React.createElement(InfiniteTable_1.InfiniteTableGrid, { sortable: false, domProps: tableDOMProps, columns: columnsMap }))))) : null;
     }
     getValidationErrorMessage(alertDefinitions) {
         let validationService = this.props.api.internalApi.getValidationService();

package/src/View/Components/RangesComponent.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RangesComponent = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
-const rebass_1 = require("rebass");
 const ColorPicker_1 = require("../../components/ColorPicker");
 const clamp_1 = tslib_1.__importDefault(require("lodash/clamp"));
 const CheckBox_1 = require("../../components/CheckBox");
@@ -14,6 +13,7 @@ const UIHelper_1 = require("../UIHelper");
 const ColumnSelector_1 = require("./Selectors/ColumnSelector");
 const Tabs_1 = require("../../components/Tabs");
 const Radio_1 = tslib_1.__importDefault(require("../../components/Radio"));
+const Flex_1 = require("../../components/Flex");
 class RangesComponent extends React.Component {
     constructor(props) {
         super(props);
@@ -47,43 +47,43 @@ class RangesComponent extends React.Component {
             : undefined;
         const isRangeValueTypeNumber = (this.props.rangeValueType ?? 'Number') === 'Number';
         return (React.createElement(React.Fragment, null,
-            React.createElement(rebass_1.Flex, { flexDirection: "row" },
-                React.createElement(CheckBox_1.CheckBox, { marginTop: 3, checked: this.state.rangesType == 'ColumnComparison', onChange: (checked) => this.onRangesTypeChanged(checked) }, "Use a Column Comparison")),
-            this.state.rangesType == 'Standard' && (React.createElement(Tabs_1.Tabs, { autoFocus: false, marginTop: 2 },
+            React.createElement(Flex_1.Flex, { flexDirection: "row" },
+                React.createElement(CheckBox_1.CheckBox, { className: "twa:mt-3", checked: this.state.rangesType == 'ColumnComparison', onChange: (checked) => this.onRangesTypeChanged(checked) }, "Use a Column Comparison")),
+            this.state.rangesType == 'Standard' && (React.createElement(Tabs_1.Tabs, { autoFocus: false, className: "twa:mt-2" },
                 React.createElement(Tabs_1.Tabs.Tab, null, "Ranges"),
                 React.createElement(Tabs_1.Tabs.Content, null,
-                    React.createElement(rebass_1.Flex, { alignItems: "center", mb: 2 },
-                        React.createElement(rebass_1.Text, { mr: 3 }, "Range Type"),
-                        React.createElement(Radio_1.default, { onChange: () => this.handleRangeValueTypeChange('Number'), checked: isRangeValueTypeNumber, mr: 2 }, "Number"),
+                    React.createElement(Flex_1.Flex, { alignItems: "center", className: "twa:mb-2" },
+                        React.createElement(Flex_1.Box, { className: "twa:mr-3" }, "Range Type"),
+                        React.createElement(Radio_1.default, { onChange: () => this.handleRangeValueTypeChange('Number'), checked: isRangeValueTypeNumber, className: "twa:mr-2" }, "Number"),
                         React.createElement(Radio_1.default, { onChange: () => this.handleRangeValueTypeChange('Percentage'), checked: !isRangeValueTypeNumber }, "Percentage")),
-                    this.props.ranges?.map((range, index, list) => (React.createElement(rebass_1.Flex, { key: index, alignItems: "end", mb: 2, "data-name": "percent-bar-range" },
-                        React.createElement(rebass_1.Flex, { flexDirection: "column" },
-                            isRangeValueTypeNumber && index === 0 && (React.createElement(CheckBox_1.CheckBox, { onClick: () => this.setRangeColMin(range), checked: range.Min === 'Col-Min', mt: 0, mb: 1, fontSize: 3, disabled: this.props.disabled }, "Col Min")),
+                    this.props.ranges?.map((range, index, list) => (React.createElement(Flex_1.Flex, { key: index, alignItems: "end", className: "twa:mb-2", "data-name": "percent-bar-range" },
+                        React.createElement(Flex_1.Flex, { flexDirection: "column" },
+                            isRangeValueTypeNumber && index === 0 && (React.createElement(CheckBox_1.CheckBox, { onClick: () => this.setRangeColMin(range), checked: range.Min === 'Col-Min', className: "twa:mt-0 twa:mb-1 twa:text-3", disabled: this.props.disabled }, "Col Min")),
                             React.createElement(NumberInput_1.NumberInput, { disabled: this.props.disabled ||
                                     range.Min === 'Col-Min' ||
                                     (index === 0 && !isRangeValueTypeNumber), value: range.Min, onChange: (value) => {
                                     this.changeRangeMin(index, value);
-                                }, mr: 2 })),
-                        React.createElement(rebass_1.Flex, { flexDirection: "column" },
-                            isRangeValueTypeNumber && index === list.length - 1 && (React.createElement(CheckBox_1.CheckBox, { mt: 0, mb: 1, onClick: () => this.setRangeColMax(range), checked: range.Max === 'Col-Max', fontSize: 3, disabled: this.props.disabled }, "Col Max")),
+                                }, className: "twa:mr-2" })),
+                        React.createElement(Flex_1.Flex, { flexDirection: "column" },
+                            isRangeValueTypeNumber && index === list.length - 1 && (React.createElement(CheckBox_1.CheckBox, { className: "twa:mt-0 twa:mb-1 twa:text-3", onClick: () => this.setRangeColMax(range), checked: range.Max === 'Col-Max', disabled: this.props.disabled }, "Col Max")),
                             React.createElement(NumberInput_1.NumberInput, { value: range.Max, disabled: this.props.disabled ||
                                     range.Max === 'Col-Max' ||
                                     (index === list.length - 1 && !isRangeValueTypeNumber), onChange: (value) => {
                                     this.changeRangeMax(index, value);
-                                }, mr: 2 })),
-                        React.createElement(rebass_1.Flex, { alignItems: "center", height: "100%" },
+                                }, className: "twa:mr-2" })),
+                        React.createElement(Flex_1.Flex, { alignItems: "center", className: "twa:h-full" },
                             React.createElement(ColorPicker_1.ColorPicker, { api: this.props.api, value: range.Color, onChange: (color) => {
                                     this.changeRangeColor(index, color);
-                                }, mr: 2, height: 33 })),
-                        this.props.showRangeDirection && (React.createElement(CheckBox_1.CheckBox, { disabled: this.props.disabled, checked: range.ReverseGradient && range.ReverseGradient == true, onChange: (checked) => this.changeRangeDirectionUp(index, checked), ml: 2 }, "Reverse Gradient")),
-                        React.createElement(SimpleButton_1.default, { ml: 2, mb: 1, icon: "delete", disabled: this.props.disabled || (this.props.ranges && this.props.ranges.length == 1), onClick: () => this.removeRange(index) })))),
+                                }, className: "twa:mr-2 twa:h-[33px]" })),
+                        this.props.showRangeDirection && (React.createElement(CheckBox_1.CheckBox, { disabled: this.props.disabled, checked: range.ReverseGradient && range.ReverseGradient == true, onChange: (checked) => this.changeRangeDirectionUp(index, checked), className: "twa:ml-2" }, "Reverse Gradient")),
+                        React.createElement(SimpleButton_1.default, { className: "twa:ml-2 twa:mb-1", icon: "delete", disabled: this.props.disabled || (this.props.ranges && this.props.ranges.length == 1), onClick: () => this.removeRange(index) })))),
                     React.createElement("div", null,
                         React.createElement(SimpleButton_1.default, { disabled: this.props.disabled, variant: "raised", "data-name": "add", onClick: () => this.addRange() }, "Add New Range"))))),
-            this.state.rangesType == 'ColumnComparison' && (React.createElement(Tabs_1.Tabs, { autoFocus: false, marginTop: 2 },
+            this.state.rangesType == 'ColumnComparison' && (React.createElement(Tabs_1.Tabs, { autoFocus: false, className: "twa:mt-2" },
                 React.createElement(Tabs_1.Tabs.Tab, null, "Column Comparison"),
                 React.createElement(Tabs_1.Tabs.Content, null,
-                    React.createElement(rebass_1.Flex, { flexDirection: "column", key: 'cc', "data-name": "percent-bar-column-comparison" },
-                        React.createElement(rebass_1.Text, { padding: 2, fontSize: 2 },
+                    React.createElement(Flex_1.Flex, { flexDirection: "column", key: 'cc', "data-name": "percent-bar-column-comparison" },
+                        React.createElement(Flex_1.Box, { className: "twa:p-2 twa:text-2" },
                             "Create Minimum and Maximum Values by providing a value or selecting another Column, and choose a",
                             ' ',
                             this.props.api.internalApi.getCorrectEnglishVariant('Colour'),
@@ -91,14 +91,14 @@ class RangesComponent extends React.Component {
                         React.createElement(FormLayout_1.default, { columns: ['label', 'first', 'or', 'second'], sizes: ['auto', 'auto', 'auto', '1fr'] },
                             React.createElement(FormLayout_1.FormRow, { label: "Min Value:", first: React.createElement(NumberInput_1.NumberInput, { disabled: this.props.disabled, type: "number", value: comparisonMinValueNumber, onChange: (value) => {
                                         this.changeColumnComparisonMinValue(value);
-                                    } }), or: "OR", second: React.createElement(rebass_1.Box, { maxWidth: '15rem' },
+                                    } }), or: "OR", second: React.createElement(Flex_1.Box, { className: "twa:max-w-[15rem]" },
                                     React.createElement(ColumnSelector_1.ColumnSelector, { menuPosition: "fixed", disabled: this.props.disabled, value: comparisonMinValueColumnId, type: "number", onChange: (columnId) => {
                                             this.onMinColumnSelectedChanged(columnId);
                                         } })) }),
                             ' ',
                             React.createElement(FormLayout_1.FormRow, { label: "Max Value:", first: React.createElement(NumberInput_1.NumberInput, { disabled: this.props.disabled, type: "number", value: comparisonMaxValueNumber, onChange: (value) => {
                                         this.changeColumnComparisonMaxValue(value);
-                                    } }), or: "OR", second: React.createElement(rebass_1.Box, { maxWidth: '15rem' },
+                                    } }), or: "OR", second: React.createElement(Flex_1.Box, { className: "twa:max-w-[15rem]" },
                                     React.createElement(ColumnSelector_1.ColumnSelector, { menuPosition: "fixed", disabled: this.props.disabled, value: comparisonMaxValueColumnId, type: "number", onChange: (columnId) => this.onMaxColumnSelectedChanged(columnId) })) }),
                             React.createElement(FormLayout_1.FormRow, { label: `Bar ${this.props.api.internalApi.getCorrectEnglishVariant('Colour')}`, first: React.createElement(ColorPicker_1.ColorPicker, { disabled: this.props.disabled, api: this.props.api, value: comparisonColor, onChange: (color) => {
                                         this.changeColumnComparisonColor(color);

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

@@ -4,8 +4,10 @@ export type ReorderDraggableProps<OPTION_TYPE, ID_TYPE extends number | string>
     order: OPTION_TYPE[];
     onChange: (newOrder: OPTION_TYPE[]) => void;
     renderOption: (option: OPTION_TYPE, index: number) => ReactNode;
+    optionClassName?: (option: OPTION_TYPE) => string;
     toIdentifier?: (v: OPTION_TYPE) => ID_TYPE;
     isOptionDraggable?: (option: OPTION_TYPE) => boolean;
+    onOptionClick?: (option: OPTION_TYPE, event: React.MouseEvent<HTMLDivElement>) => void;
     disabled?: boolean;
     style?: React.CSSProperties;
 };

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

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ReorderDraggable = void 0;
+exports.ReorderDraggable = ReorderDraggable;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
-const rebass_1 = require("rebass");
 const dnd_1 = require("../../../components/dnd");
 const icons_1 = require("../../../components/icons");
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../../../Utilities/Extensions/ArrayExtensions"));
+const Flex_1 = require("../../../components/Flex");
+const clsx_1 = tslib_1.__importDefault(require("clsx"));
 function ReorderDraggable(props) {
     const { onChange, order, toIdentifier, isOptionDraggable, disabled, } = props;
     const baseClassName = 'ab-ReorderDraggable';
@@ -14,10 +15,10 @@ function ReorderDraggable(props) {
         const identifier = toIdentifier(option);
         const renderNode = (flexProps, dragHandleProps) => {
             const reorderable = isOptionDraggable ? isOptionDraggable(option) : true;
-            return (React.createElement(rebass_1.Flex, { className: `${baseClassName}__option`, alignItems: "center", mt: index ? 1 : 0, key: identifier ?? index, backgroundColor: 'primary', padding: 2, "data-index": index, "data-id": identifier, "data-name": "option", ...flexProps },
-                React.createElement(rebass_1.Flex, { flex: 1, flexDirection: "row", alignItems: "center" },
-                    reorderable ? (React.createElement(rebass_1.Box, { mr: 3, ...dragHandleProps },
-                        React.createElement(icons_1.Icon, { name: "drag", style: { cursor: 'grab' } }))) : (React.createElement(rebass_1.Box, { mr: 3 },
+            return (React.createElement(Flex_1.Flex, { alignItems: "center", key: identifier ?? index, "data-index": index, "data-id": identifier, "data-name": "option", ...flexProps, className: (0, clsx_1.default)(`${baseClassName}__option ${index ? 'twa:mt-1' : 'twa:mt-0'} twa:bg-primary twa:p-2 ${flexProps?.className || ''}`, props.optionClassName?.(option)), onClick: (e) => props.onOptionClick?.(option, e) },
+                React.createElement(Flex_1.Flex, { className: "twa:flex-1", flexDirection: "row", alignItems: "center" },
+                    reorderable ? (React.createElement(Flex_1.Box, { ...dragHandleProps, className: `twa:mr-3 ${dragHandleProps?.className || ''}` },
+                        React.createElement(icons_1.Icon, { name: "drag", style: { cursor: 'grab' } }))) : (React.createElement(Flex_1.Box, { className: "twa:mr-3" },
                         React.createElement(icons_1.Icon, { name: "drag", style: { cursor: 'not-allowed', opacity: 0.3 } }))),
                     props.renderOption(option, index))));
         };
@@ -30,17 +31,16 @@ function ReorderDraggable(props) {
             }, draggableProvided.dragHandleProps);
         }));
     };
-    return (React.createElement(rebass_1.Flex, { style: props.style, className: baseClassName, flexDirection: "column", flex: 1 },
+    return (React.createElement(Flex_1.Flex, { style: props.style, className: `${baseClassName} twa:flex-1`, flexDirection: "column" },
         React.createElement(dnd_1.DragDropContext, { onDragEnd: (result) => {
                 const { source, destination } = result;
                 const newOrder = ArrayExtensions_1.default.reorderArray(props.order, source.index, destination.index);
                 onChange(newOrder);
             } },
-            React.createElement(rebass_1.Flex, { className: `${baseClassName}__body`, flexDirection: "column", flex: 1, style: { overflow: 'auto' } },
+            React.createElement(Flex_1.Flex, { className: `${baseClassName}__body twa:flex-1 twa:overflow-auto`, flexDirection: "column" },
                 React.createElement(dnd_1.Droppable, { droppableId: "droppable" }, (droppableProvided) => {
                     return (React.createElement("div", { ref: droppableProvided.innerRef, ...droppableProvided.droppableProps },
                         order.map(renderOption),
                         droppableProvided.placeholder));
                 })))));
 }
-exports.ReorderDraggable = ReorderDraggable;

package/src/View/Components/Selectors/BulkUpdateValueSelector.js

@@ -6,11 +6,12 @@ const React = tslib_1.__importStar(require("react"));
 const FieldWrap_1 = tslib_1.__importDefault(require("../../../components/FieldWrap"));
 const UIHelper_1 = tslib_1.__importDefault(require("../../UIHelper"));
 const AdaptableInput_1 = tslib_1.__importDefault(require("../AdaptableInput"));
-const rebass_1 = require("rebass");
 const PermittedValuesSelector_1 = require("./PermittedValuesSelector");
 const Select_1 = require("../../../components/Select");
 const AdaptableContext_1 = require("../../AdaptableContext");
 const react_1 = require("react");
+const clsx_1 = tslib_1.__importDefault(require("clsx"));
+const Flex_1 = require("../../../components/Flex");
 const BulkUpdateValueSelector = (props) => {
     const [valueType, setValueType] = React.useState('existing');
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
@@ -20,7 +21,7 @@ const BulkUpdateValueSelector = (props) => {
     // TODO = this seems to be called whenever we edit a cell
     // which is then triggering a get all values
     // not sure that we need to
-    const permittedValueSelector = (React.createElement(rebass_1.Box, null,
+    const permittedValueSelector = (React.createElement(Flex_1.Box, null,
         React.createElement(PermittedValuesSelector_1.PermittedValuesSelector, { allowNewValues: true, searchable: 'inline', disabled: props.disabled || !props.selectedColumn, value: props.selectedColumnValue === '' ? null : props.selectedColumnValue, columnId: columnId, placeholder: isDateType ? 'Select' : 'Select or type new value', loadValues: (0, react_1.useCallback)(({ currentSearchValue }) => {
                 if (!columnId || !props.selectedGridCells.length) {
                     return Promise.resolve([]);
@@ -41,7 +42,7 @@ const BulkUpdateValueSelector = (props) => {
             ? UIHelper_1.default.getDescriptionForDataType(props.selectedColumn.dataType)
             : 'text', placeholder: props.selectedColumn
             ? UIHelper_1.default.getPlaceholderForDataType(props.selectedColumn.dataType)
-            : 'Enter Value', autoFocus: true, disabled: props.disabled, style: { width: '100%' }, value: props.selectedColumnValue, onChange: (e) => {
+            : 'Enter Value', autoFocus: true, disabled: props.disabled, className: "twa:w-full", value: props.selectedColumnValue, onChange: (e) => {
             props.onColumnValueChange(e.target.value);
         } }));
     let valueTypeSelector = null;
@@ -53,11 +54,7 @@ const BulkUpdateValueSelector = (props) => {
                 setValueType(value);
             } }));
     }
-    return (React.createElement(FieldWrap_1.default, { className: props.className, style: {
-            ...props.style,
-            overflow: 'visible',
-            maxWidth: '100%',
-        } }, isDateType ? (React.createElement(React.Fragment, null,
+    return (React.createElement(FieldWrap_1.default, { className: (0, clsx_1.default)('twa:overflow-visible twa:max-w-full', props.className), style: props.style }, isDateType ? (React.createElement(React.Fragment, null,
         valueType === 'new' ? input : permittedValueSelector,
         valueTypeSelector)) : (permittedValueSelector)));
 };

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

@@ -13,7 +13,7 @@ const ColumnSelector = function (props) {
     const getColumn = (columnId) => columns.find((c) => c.columnId === columnId);
     const options = columns
         .map((column) => {
-        let label = React.createElement(React.Fragment, null, column.friendlyName ?? column.columnId);
+        let label = column.friendlyName ?? column.columnId;
         if (props.renderOption) {
             label = props.renderOption(column);
         }

package/src/View/Components/Selectors/ColumnSelectorOld.js

@@ -35,7 +35,7 @@ class ColumnSelector extends React.Component {
         return (React.createElement("div", { "data-name": 'column-selector' },
             React.createElement(FormLayout_1.default, { columns: [{ name: 'columnSelector', style: { display: 'flex' } }], style: this.props.style },
                 React.createElement(FormLayout_1.FormRow, null,
-                    React.createElement(DropdownButton_1.default, { marginRight: 2, columns: ['label'], showClearButton: currentColumnName != 'Select a column', onClear: () => this.onClearButton(), style: { width: '100%', fontSize: 'small' }, items: sortedColumnOptions, disabled: this.props.disabled || sortedColumnOptions.length == 0 }, currentColumnName)))));
+                    React.createElement(DropdownButton_1.default, { className: "twa:w-full twa:text-0 twa:mr-2", columns: ['label'], showClearButton: currentColumnName != 'Select a column', onClear: () => this.onClearButton(), items: sortedColumnOptions, disabled: this.props.disabled || sortedColumnOptions.length == 0 }, currentColumnName)))));
     }
     onClearButton() {
         this.props.onColumnChange([]);

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

@@ -2,7 +2,7 @@ import * as React from 'react';
 import { CSSProperties } from 'react';
 import { AdaptableApi } from '../../Api/AdaptableApi';
 import { AdaptableStyle } from '../../AdaptableState/Common/AdaptableStyle';
-export interface StyleComponentProps extends React.ClassAttributes<StyleComponent> {
+export interface StyleComponentProps {
     className?: string;
     style?: CSSProperties;
     api: AdaptableApi;
@@ -13,28 +13,4 @@ export interface StyleComponentProps extends React.ClassAttributes<StyleComponen
     showFontSizeAs?: 'radio' | 'dropdown';
     UpdateStyle: (style: AdaptableStyle) => void;
 }
-export interface StyleComponentState {
-    componentStyle: AdaptableStyle;
-    ShowClassName: boolean;
-}
-export declare class StyleComponent extends React.Component<StyleComponentProps, StyleComponentState> {
-    constructor(props: StyleComponentProps);
-    static getDerivedStateFromProps(nextProps: StyleComponentProps, prevState: StyleComponentState): {
-        componentStyle: AdaptableStyle;
-    };
-    render(): React.JSX.Element;
-    onShowClassNameChanged: (checked: boolean) => void;
-    private onStyleClassNameChanged;
-    private onUseBackColorCheckChange;
-    private onUseForeColorCheckChange;
-    private onUseBorderColorCheckChange;
-    private onUseFontSizeCheckChange;
-    private onBackColorSelectChange;
-    private onForeColorSelectChange;
-    private onBorderColorSelectChange;
-    private onFontWeightChange;
-    private onFontStyleChange;
-    private onTextDecorationChange;
-    private onBorderRadiusChange;
-    private onFontSizeChange;
-}
+export declare const StyleComponent: React.FC<StyleComponentProps>;