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

package/src/View/Components/NewScopeComponent.js

@@ -4,7 +4,6 @@ exports.NewScopeComponent = exports.renderScopeSummary = exports.isScopeValid =
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const react_1 = require("react");
-const rebass_1 = require("rebass");
 const Radio_1 = tslib_1.__importDefault(require("../../components/Radio"));
 const CheckBox_1 = require("../../components/CheckBox");
 const Tabs_1 = require("../../components/Tabs");
@@ -12,9 +11,10 @@ const OnePageAdaptableWizard_1 = require("../Wizard/OnePageAdaptableWizard");
 const ColumnSelector_1 = require("./ColumnSelector");
 const AdaptableFormControlTextClear_1 = require("./Forms/AdaptableFormControlTextClear");
 const AdaptableContext_1 = require("../AdaptableContext");
-const ValueSelector_1 = require("./ValueSelector");
 const AdaptableColumn_1 = require("../../AdaptableState/Common/AdaptableColumn");
 const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
+const Flex_1 = require("../../components/Flex");
+const Tag_1 = require("../../components/Tag/Tag");
 const isScopeValid = ({ Scope }) => {
     const result = [];
     if (!Scope) {
@@ -55,14 +55,14 @@ const renderScopeSummary = (scope, labels) => {
     const scopeApi = adaptable.api.columnScopeApi;
     const columnsInScope = scopeApi.getColumnsInScope(scope);
     return (React.createElement(React.Fragment, null,
-        React.createElement(rebass_1.Box, null,
-            React.createElement(OnePageAdaptableWizard_1.SummaryText, { mb: 0 }, scopeApi.scopeIsAll(scope) ? labels.scopeWholeRow : null)),
-        React.createElement(rebass_1.Box, { style: { overflow: 'hidden' } }, 'ColumnIds' in scope ? (React.createElement(React.Fragment, null,
-            React.createElement(OnePageAdaptableWizard_1.SummaryText, { mb: columnsInScope.length ? 2 : 0 }, labels.scopeColumns),
-            columnsInScope.length ? (React.createElement(ValueSelector_1.ValueOptionsTags, { options: columnsInScope, value: columnsInScope.map((c) => c.columnId), toLabel: (c) => c.friendlyName, allowWrap: true, readOnly: true, renderLabel: (c) => React.createElement(OnePageAdaptableWizard_1.SummaryText, { mb: 0 }, c), toIdentifier: (c) => c.columnId })) : null)) : null),
-        React.createElement(rebass_1.Box, null, 'DataTypes' in scope ? (React.createElement(React.Fragment, null,
-            React.createElement(rebass_1.Text, { fontSize: 2, mb: 2 }, labels.scopeDataTypes),
-            React.createElement(ValueSelector_1.ValueOptionsTags, { readOnly: true, options: scope.DataTypes, value: scope.DataTypes, toLabel: (c) => c, allowWrap: true, renderLabel: (c) => React.createElement(rebass_1.Text, { fontSize: 2 }, renderDataTypeLabel(c)), toIdentifier: (c) => c }))) : null)));
+        React.createElement(Flex_1.Box, null,
+            React.createElement(OnePageAdaptableWizard_1.SummaryText, { className: "twa:mb-0" }, scopeApi.scopeIsAll(scope) ? labels.scopeWholeRow : null)),
+        React.createElement(Flex_1.Box, { className: "twa:overflow-hidden" }, 'ColumnIds' in scope ? (React.createElement(React.Fragment, null,
+            React.createElement(OnePageAdaptableWizard_1.SummaryText, { className: columnsInScope.length ? 'twa:mb-2' : '' }, labels.scopeColumns),
+            columnsInScope.length ? (React.createElement(Tag_1.TagList, { tags: columnsInScope.map((c) => c.friendlyName) })) : null)) : null),
+        React.createElement(Flex_1.Box, null, 'DataTypes' in scope ? (React.createElement(React.Fragment, null,
+            React.createElement(Flex_1.Box, { className: "twa:text-2 twa:mb-2" }, labels.scopeDataTypes),
+            React.createElement(Tag_1.TagList, { tags: scope.DataTypes.map((dataType) => renderDataTypeLabel(dataType)) }))) : null)));
 };
 exports.renderScopeSummary = renderScopeSummary;
 const DATA_TYPES_OPTIONS = Object.values(DATA_TYPES_MAP);
@@ -152,29 +152,29 @@ const NewScopeComponent = (props) => {
     }, []);
     return (React.createElement(Tabs_1.Tabs, { "data-name": 'scope-component', className: "ab-ScopeComponent", value: scopeChoice, style: { height: '100%', ...props.style }, onValueChange: onScopeSelectChanged },
         props.hideWholeRow ? null : (React.createElement(Tabs_1.Tabs.Tab, { value: "Row" },
-            React.createElement(Radio_1.default, { margin: 0, checked: scopeChoice == 'All', tabIndex: -1 }, "All Columns"))),
+            React.createElement(Radio_1.default, { className: "twa:m-0", checked: scopeChoice == 'All', tabIndex: -1 }, "All Columns"))),
         !props.disableColumns && (React.createElement(Tabs_1.Tabs.Tab, { value: "Column" },
-            React.createElement(Radio_1.default, { margin: 0, value: "Column", checked: scopeChoice == 'Column', tabIndex: -1 }, "Selected Columns"))),
+            React.createElement(Radio_1.default, { className: "twa:m-0", value: "Column", checked: scopeChoice == 'Column', tabIndex: -1 }, "Selected Columns"))),
         !props.disableDataTypes && (React.createElement(Tabs_1.Tabs.Tab, { value: "DataType" },
-            React.createElement(Radio_1.default, { margin: 0, value: "DataType", checked: scopeChoice == 'DataType', tabIndex: -1 }, "Data Types"))),
+            React.createElement(Radio_1.default, { className: "twa:m-0", value: "DataType", checked: scopeChoice == 'DataType', tabIndex: -1 }, "Data Types"))),
         hasColumnTypes && (React.createElement(Tabs_1.Tabs.Tab, { value: "ColumnType" },
-            React.createElement(Radio_1.default, { margin: 0, value: "ColumnType", checked: scopeChoice == 'ColumnType', tabIndex: -1 }, "Column Types"))),
+            React.createElement(Radio_1.default, { className: "twa:m-0", value: "ColumnType", checked: scopeChoice == 'ColumnType', tabIndex: -1 }, "Column Types"))),
         props.hideWholeRow ? null : (React.createElement(Tabs_1.Tabs.Content, { value: "Row", style: { flex: 'none' }, "data-name": "row-scope" },
-            React.createElement(rebass_1.Text, { padding: 2, pl: 0, fontSize: 2 }, props.descriptions.rowScope))),
-        !props.disableColumns && (React.createElement(Tabs_1.Tabs.Content, { value: "Column", style: { flex: 1, overflow: 'auto' }, "data-name": "column-scope", padding: 0 },
-            React.createElement(rebass_1.Flex, { flexDirection: "row", alignItems: "center", padding: 2 },
-                React.createElement(rebass_1.Text, { fontSize: 2 }, props.descriptions.columnScope),
-                React.createElement(rebass_1.Flex, { flex: 3 }),
+            React.createElement(Flex_1.Box, { className: "twa:p-2 twa:pl-0 twa:text-2" }, props.descriptions.rowScope))),
+        !props.disableColumns && (React.createElement(Tabs_1.Tabs.Content, { value: "Column", "data-name": "column-scope", className: "twa:p-0 twa:flex-1 twa:overflow-auto" },
+            React.createElement(Flex_1.Flex, { flexDirection: "row", alignItems: "center", className: "twa:p-2" },
+                React.createElement(Flex_1.Box, { className: "twa:text-2" }, props.descriptions.columnScope),
+                React.createElement(Flex_1.Box, { className: "twa:flex-3" }),
                 React.createElement(AdaptableFormControlTextClear_1.AdaptableFormControlTextClear, { value: columnsSearchText, OnTextChange: setColumnsSearchText, placeholder: "Type to search columns", style: { flex: 1 } })),
-            React.createElement(rebass_1.Flex, { paddingLeft: 2, flex: 1, style: { overflow: 'hidden' } },
+            React.createElement(Flex_1.Flex, { className: "twa:overflow-hidden twa:pl-2 twa:flex-1" },
                 React.createElement(ColumnSelector_1.NewColumnSelector, { columnFilterText: columnsSearchText, allowReorder: false, availableColumns: scopeColumns, selected: scopeApi.getColumnIdsInScope(props.scope), onChange: onColumnsSelectedChanged })))),
         !props.disableDataTypes && (React.createElement(Tabs_1.Tabs.Content, { value: "DataType", style: { flex: 'none' }, "data-name": "datatype-scope" },
-            React.createElement(rebass_1.Box, null,
-                props.descriptions.dataTypeScope && (React.createElement(rebass_1.Text, { p: 2, pl: 0, mb: 2, fontSize: 2 }, props.descriptions.dataTypeScope)),
-                React.createElement(rebass_1.Flex, { flexDirection: "column" }, dataTypeOptions.map((dataTypeOption) => (React.createElement(CheckBox_1.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_1.Tabs.Content, { value: "ColumnType", style: { flex: 'none' }, "data-name": "column-type-scope" },
-            React.createElement(rebass_1.Box, null,
-                React.createElement(rebass_1.Flex, { flexDirection: "column" }, api.columnApi.getColumnTypes()?.map?.((columnType) => (React.createElement(CheckBox_1.CheckBox, { "data-name": "scope", "data-value": columnType, key: columnType, checked: 'ColumnTypes' in props.scope && props.scope.ColumnTypes?.includes(columnType), onChange: (checked) => {
+            React.createElement(Flex_1.Box, null,
+                props.descriptions.dataTypeScope && (React.createElement(Flex_1.Box, { className: "twa:p-2 twa:pl-0 twa:mb-2 twa:text-2" }, props.descriptions.dataTypeScope)),
+                React.createElement(Flex_1.Flex, { flexDirection: "column" }, dataTypeOptions.map((dataTypeOption) => (React.createElement(CheckBox_1.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_1.Tabs.Content, { value: "ColumnType", className: "twa:flex-none", "data-name": "column-type-scope" },
+            React.createElement(Flex_1.Box, null,
+                React.createElement(Flex_1.Flex, { flexDirection: "column" }, api.columnApi.getColumnTypes()?.map?.((columnType) => (React.createElement(CheckBox_1.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);
                         if (checked) {
                             columnTypes.push(columnType);

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

@@ -3,12 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PanelFooter = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
-const rebass_1 = require("rebass");
 const SimpleButton_1 = tslib_1.__importDefault(require("../../../components/SimpleButton"));
+const Flex_1 = require("../../../components/Flex");
 const PanelFooter = (props) => {
-    return (React.createElement(rebass_1.Flex, { className: "ab-Panel__Footer", flexDirection: "row", padding: 1, backgroundColor: "primary", alignItems: "center" },
-        React.createElement(SimpleButton_1.default, { margin: 1, variant: "text", "data-name": "action-cancel", onClick: props.onCancel, disabled: props.cancelDisabled }, props.cancelText ?? 'CANCEL'),
-        React.createElement(rebass_1.Box, { flex: 1 }),
-        React.createElement(SimpleButton_1.default, { variant: "raised", tone: "accent", "data-name": "action-finish", margin: 1, onClick: props.onAccept, disabled: props.acceptDisabled }, props.cancelText ?? 'Finish')));
+    return (React.createElement(Flex_1.Flex, { className: "ab-Panel__Footer twa:p-1 twa:bg-primary", flexDirection: "row", alignItems: "center" },
+        React.createElement(SimpleButton_1.default, { className: "twa:m-1", variant: "text", "data-name": "action-cancel", onClick: props.onCancel, disabled: props.cancelDisabled }, props.cancelText ?? 'CANCEL'),
+        React.createElement(Flex_1.Box, { className: "twa:flex-1" }),
+        React.createElement(SimpleButton_1.default, { variant: "raised", tone: "accent", "data-name": "action-finish", className: "twa:m-1", onClick: props.onAccept, disabled: props.acceptDisabled }, props.cancelText ?? 'Finish')));
 };
 exports.PanelFooter = PanelFooter;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -4,14 +4,14 @@ exports.PanelWithTwoButtons = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const Panel_1 = tslib_1.__importDefault(require("../../../components/Panel"));
-const rebass_1 = require("rebass");
+const Flex_1 = require("../../../components/Flex");
 //We cannot destructure this.props using the react way in typescript which is a real pain as you
 //need to transfer props individually as a consequence
 //let { buttonContent, ...other } = this.props
 class PanelWithTwoButtons extends React.Component {
     render() {
-        let header = (React.createElement(rebass_1.Flex, { alignItems: "center", width: "100%" },
-            React.createElement(rebass_1.Flex, { flex: 1 }, this.props.headerText),
+        let header = (React.createElement(Flex_1.Flex, { alignItems: "center", className: "twa:w-full" },
+            React.createElement(Flex_1.Flex, { className: "twa:flex-1" }, this.props.headerText),
             this.props.secondButton,
             this.props.firstButton));
         return (React.createElement(Panel_1.default, { ...this.props, header: header }, this.props.children));

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

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AdaptableLoadingScreen = void 0;
+exports.AdaptableLoadingScreen = AdaptableLoadingScreen;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const Dialog_1 = tslib_1.__importDefault(require("../../../components/Dialog"));
-const rebass_1 = require("rebass");
+const Flex_1 = require("../../../components/Flex");
 function AdaptableLoadingScreen(props) {
     const { showLoadingScreen, loadingScreenDelay, loadingScreenTitle, loadingScreenText } = props;
     const [delayElapsed, setDelayElapsed] = React.useState(typeof loadingScreenDelay === 'number' ? false : showLoadingScreen);
@@ -18,11 +18,8 @@ function AdaptableLoadingScreen(props) {
             };
         }
     }, [loadingScreenDelay]);
-    return (React.createElement(Dialog_1.default, { modal: true, isOpen: delayElapsed ? showLoadingScreen : false, onDismiss: props.onClose, showCloseButton: false, className: "ab-LoadingScreen", style: {
-            minHeight: 'auto',
-        } },
-        React.createElement(rebass_1.Box, { padding: 3 },
+    return (React.createElement(Dialog_1.default, { modal: true, isOpen: delayElapsed ? showLoadingScreen : false, onDismiss: props.onClose, showCloseButton: false, className: "ab-LoadingScreen twa:min-h-auto" },
+        React.createElement(Flex_1.Box, { className: "twa:p-3" },
             React.createElement("h4", null, loadingScreenTitle ?? 'Initialising Grid'),
             React.createElement("p", null, loadingScreenText ?? 'Retrieving your settings and setting up the grid...'))));
 }
-exports.AdaptableLoadingScreen = AdaptableLoadingScreen;

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AdaptablePopup = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
-const rebass_1 = require("rebass");
+const clsx_1 = tslib_1.__importDefault(require("clsx"));
 const GeneralConstants = tslib_1.__importStar(require("../../../../Utilities/Constants/GeneralConstants"));
 const TopBar_1 = tslib_1.__importDefault(require("./TopBar"));
 const join_1 = tslib_1.__importDefault(require("../../../../components/utils/join"));
@@ -14,6 +14,7 @@ const AdaptableContext_1 = require("../../../AdaptableContext");
 const CustomSettingsPanelView_1 = require("./CustomSettingsPanelView");
 const useMenuItems_1 = require("./useMenuItems");
 const AdaptablePopupDialog_1 = require("./AdaptablePopupDialog");
+const Flex_1 = require("../../../../components/Flex");
 const AdaptablePopup = (props) => {
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
     const settingsPanelOptions = adaptable.adaptableOptions.settingsPanelOptions;
@@ -72,8 +73,8 @@ const AdaptablePopup = (props) => {
         } },
         React.createElement(AdaptablePopupDialog_1.AdaptablePopupDialog, { dataName: componentModule, baseClassName: baseClassName, className: className, friendlyName: friendlyName, isActionModule: isStandalone, isWindowModal: isWindowModal, onHide: props.onHide, modalContainer: modalContainer },
             !isStandalone && React.createElement(TopBar_1.default, { icon: settingsPanelOptions.icon }, settingsPanelTitle),
-            React.createElement(rebass_1.Flex, { flexDirection: "row", flex: "1 1 0", style: { minHeight: 0 }, className: accessLevel == 'ReadOnly' ? GeneralConstants.READ_ONLY_STYLE : '' },
+            React.createElement(Flex_1.Box, { className: (0, clsx_1.default)('twa:flex twa:flex-row twa:flex-1 twa:min-h-0', 'twa:bg-defaultbackground twa:text-text-on-defaultbackground', accessLevel == 'ReadOnly' ? GeneralConstants.READ_ONLY_STYLE : '') },
                 !isStandalone && (React.createElement(Navigation_1.Navigation, { menuItems: menuItems, api: props.api, activeItem: activeItem, customSettingsPanels: settingsPanelOptions.customSettingsPanels })),
-                React.createElement(rebass_1.Flex, { flex: 1, className: "ab-Adaptable-Popup__Body" }, moduleViewContent)))));
+                React.createElement(Flex_1.Box, { className: (0, clsx_1.default)('ab-Adaptable-Popup__Body', 'twa:bg-primarylight twa:text-primarylight-foreground', 'twa:flex twa:flex-1 twa:min-w-0 twa:overflow-auto twa:*:p-3') }, moduleViewContent)))));
 };
 exports.AdaptablePopup = AdaptablePopup;

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

@@ -9,6 +9,7 @@ const Dialog_1 = tslib_1.__importDefault(require("../../../../components/Dialog"
 const InternalRedux_1 = require("../../../../Redux/ActionsReducers/InternalRedux");
 const AdaptableContext_1 = require("../../../AdaptableContext");
 const Utilities_1 = require("../Utilities");
+const clsx_1 = tslib_1.__importDefault(require("clsx"));
 const WindowDialog = (props) => {
     const { onChange, style, baseClassName, className, isActionModule, settingsPanelOptionsKey, onHide, ...dialogProps } = props;
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
@@ -37,11 +38,11 @@ const WindowDialog = (props) => {
         position: popupSettings.position,
         onChange: handleWindowSettings,
     };
-    return (React.createElement(Dialog_1.default, { windowModal: true, fixed: false, windowModalProps: windowModalProps, style: { ...props.style, height: '100%' }, padding: 0, className: className, onDismiss: onHide, isOpen: true, showCloseButton: true, ...dialogProps }));
+    return (React.createElement(Dialog_1.default, { windowModal: true, fixed: false, windowModalProps: windowModalProps, style: props.style, onDismiss: onHide, isOpen: true, showCloseButton: true, ...dialogProps, className: (0, clsx_1.default)('twa:p-0 twa:h-full', className) }));
 };
 const PopupDialog = (props) => {
     const { style, className, onHide, children, ...dialogProps } = props;
-    return (React.createElement(Dialog_1.default, { fixed: false, style: props.style, padding: 0, height: '90vh', width: '90vw', className: className, onDismiss: onHide, isOpen: true, showCloseButton: true, ...dialogProps }, children));
+    return (React.createElement(Dialog_1.default, { fixed: false, style: props.style, className: (0, clsx_1.default)('twa:p-0 twa:h-[90vh] twa:w-[90vw]', className), onDismiss: onHide, isOpen: true, showCloseButton: true, ...dialogProps }, children));
 };
 const AdaptablePopupDialog = (props) => {
     const { isActionModule, style, friendlyName, baseClassName, className, children, onHide, isWindowModal, modalContainer, } = props;

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

@@ -10,13 +10,13 @@ const icons_1 = require("../../../../components/icons");
 const AdaptableObjectList_1 = require("../../AdaptableObjectList");
 const ButtonNew_1 = require("../../Buttons/ButtonNew");
 const PopupPanel_1 = require("./PopupPanel");
-const rebass_1 = require("rebass");
 const CheckBox_1 = require("../../../../components/CheckBox");
 const InternalRedux_1 = require("../../../../Redux/ActionsReducers/InternalRedux");
 const SimpleButton_1 = tslib_1.__importDefault(require("../../../../components/SimpleButton"));
 const AdaptableContext_1 = require("../../../AdaptableContext");
 const react_1 = require("react");
 const useRerender_1 = require("../../../../components/utils/useRerender");
+const Flex_1 = require("../../../../components/Flex");
 const AdaptablePopupModuleView = (props) => {
     /**
      * This triggers a render for each state change.
@@ -104,7 +104,7 @@ const AdaptablePopupModuleView = (props) => {
                 dispatch(unsuspendAllAction);
             }
         };
-        suspendButton = (React.createElement(SimpleButton_1.default, { mr: 2, onMouseDown: () => handleSuspendUnsuspendAll(), tone: isAtLeastOneAbObjectActive ? 'neutral' : 'success', variant: "raised", icon: isAtLeastOneAbObjectActive ? 'pause' : 'resume', accessLevel: props.accessLevel }, isAtLeastOneAbObjectActive ? 'Suspend All' : 'Unsuspend All'));
+        suspendButton = (React.createElement(SimpleButton_1.default, { className: "twa:mr-2", onMouseDown: () => handleSuspendUnsuspendAll(), tone: isAtLeastOneAbObjectActive ? 'neutral' : 'success', variant: "raised", icon: isAtLeastOneAbObjectActive ? 'pause' : 'resume', accessLevel: props.accessLevel }, isAtLeastOneAbObjectActive ? 'Suspend All' : 'Unsuspend All'));
     }
     const handleWizardClose = () => {
         setAbObjectType(null);
@@ -125,8 +125,8 @@ const AdaptablePopupModuleView = (props) => {
         if (!props.api.layoutApi.internalApi.hasLayoutSpecificObjects()) {
             return;
         }
-        return (React.createElement(rebass_1.Flex, { justifyContent: "flex-start" },
-            React.createElement(CheckBox_1.CheckBox, { padding: 0, margin: 0, checked: showLayoutNonExtendedObjects, onChange: (checked) => dispatch((0, InternalRedux_1.LayoutShowNonExtendedObjects)(checked)) },
+        return (React.createElement(Flex_1.Flex, { className: "twa:justify-start" },
+            React.createElement(CheckBox_1.CheckBox, { className: "twa:m-0 twa:p-0", checked: showLayoutNonExtendedObjects, onChange: (checked) => dispatch((0, InternalRedux_1.LayoutShowNonExtendedObjects)(checked)) },
                 "Show ",
                 moduleInfo.FriendlyName,
                 "s not available in current Layout")));

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

@@ -3,56 +3,88 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Navigation = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
+const react_1 = require("react");
 const react_redux_1 = require("react-redux");
-const join_1 = tslib_1.__importDefault(require("../../../../components/utils/join"));
-const useGlobalEvent_1 = require("../../../../components/utils/useGlobalEvent");
+const clsx_1 = tslib_1.__importDefault(require("clsx"));
 const AdaptableIconComponent_1 = require("../../AdaptableIconComponent");
+const twUtils_1 = require("../../../../components/twUtils");
+const AdaptableContext_1 = require("../../../AdaptableContext");
+const navigationItemClassName = 'ab-Adaptable-Popup__Navigation__List__Item';
+const NavigationItem = ({ menuItem, isActive, dataName, customIcon, onAction, showModuleIcons, }) => {
+    const ref = (0, react_1.useRef)(null);
+    (0, react_1.useEffect)(() => {
+        if (isActive) {
+            ref.current?.focus();
+        }
+    }, [isActive]);
+    return (React.createElement("li", { className: (0, clsx_1.default)(navigationItemClassName, {
+            [`${navigationItemClassName}--active`]: isActive,
+        }) },
+        React.createElement("button", { ref: ref, type: "button", className: (0, clsx_1.default)(`${navigationItemClassName}__Button ${twUtils_1.targetOwn.focusOutline}`, {
+                'twa:flex twa:flex-row twa:items-center twa:gap-2': 'layout flex',
+                [`twa:bg-transparent`]: !isActive,
+                'twa:bg-accent twa:text-accentlight': isActive,
+                'twa:px-2 twa:py-1.5': true,
+                'twa:rounded-standard': true,
+            }), onMouseDown: () => onAction(), "data-name": dataName, tabIndex: isActive ? 0 : -1 },
+            showModuleIcons && menuItem.icon && (React.createElement(AdaptableIconComponent_1.AdaptableIconComponent, { icon: menuItem.icon, iconClassName: `${navigationItemClassName}__Icon` })),
+            customIcon ? React.createElement(AdaptableIconComponent_1.AdaptableIconComponent, { icon: customIcon }) : null,
+            menuItem.label)));
+};
 const Navigation = (props) => {
+    const { api } = (0, AdaptableContext_1.useAdaptable)();
+    const makeActive = (menuItem) => {
+        dispatch(menuItem.reduxAction);
+    };
+    const getMenuItemForDirection = (direction) => {
+        const currentIndex = props.menuItems.findIndex((item) => item !== '-' && (item.category === props.activeItem || item.label === props.activeItem));
+        let foundMenuItem = null;
+        if (direction === -1) {
+            let candidate = props.menuItems[currentIndex - 1] !== '-'
+                ? props.menuItems[currentIndex - 1]
+                : props.menuItems[currentIndex - 2];
+            foundMenuItem = candidate ? candidate : props.menuItems[props.menuItems.length - 1];
+        }
+        else {
+            let candidate = props.menuItems[currentIndex + 1] !== '-'
+                ? props.menuItems[currentIndex + 1]
+                : props.menuItems[currentIndex + 2];
+            foundMenuItem = candidate ? candidate : props.menuItems[0];
+        }
+        return foundMenuItem === '-' ? null : foundMenuItem;
+    };
     const dispatch = (0, react_redux_1.useDispatch)();
     const handleKeyPress = React.useCallback((event) => {
-        if ((event.ctrlKey || event.metaKey) &&
-            (event.code === 'ArrowUp' || event.code === 'ArrowDown')) {
-            const isKeyUp = event.code === 'ArrowUp';
-            const currentIndex = props.menuItems.findIndex((item) => item !== '-' && (item.category === props.activeItem || item.label === props.activeItem));
+        const { code } = event;
+        if (code === 'ArrowUp' || code === 'ArrowDown' || code === 'Home' || code === 'End') {
+            event.preventDefault();
+            event.stopPropagation();
             let nextMenuItem = null;
-            if (isKeyUp) {
-                let candidate = props.menuItems[currentIndex - 1] !== '-'
-                    ? props.menuItems[currentIndex - 1]
-                    : props.menuItems[currentIndex - 2];
-                nextMenuItem = candidate ? candidate : props.menuItems[props.menuItems.length - 1];
+            if (code === 'Home') {
+                nextMenuItem = props.menuItems[0];
+            }
+            else if (code === 'End') {
+                nextMenuItem = props.menuItems[props.menuItems.length - 1];
             }
             else {
-                let candidate = props.menuItems[currentIndex + 1] !== '-'
-                    ? props.menuItems[currentIndex + 1]
-                    : props.menuItems[currentIndex + 2];
-                nextMenuItem = candidate ? candidate : props.menuItems[0];
+                nextMenuItem = getMenuItemForDirection(event.code === 'ArrowUp' ? -1 : 1);
             }
-            if (nextMenuItem && nextMenuItem !== '-') {
-                dispatch(nextMenuItem.reduxAction);
+            if (nextMenuItem) {
+                makeActive(nextMenuItem);
             }
         }
     }, [props.activeItem, props.menuItems]);
-    (0, useGlobalEvent_1.useGlobalEvent)('keydown', handleKeyPress);
-    return (React.createElement("nav", { className: "ab-Adaptable-Popup__Navigation" },
-        React.createElement("ul", { className: "ab-Adaptable-Popup__Navigation__List" }, props.menuItems.map((menuItem, index) => {
-            const baseClassName = 'ab-Adaptable-Popup__Navigation__List__Item';
+    return (React.createElement("nav", { className: "ab-Adaptable-Popup__Navigation twa:overflow-auto", tabIndex: -1 },
+        React.createElement("ul", { className: "ab-Adaptable-Popup__Navigation__List twa:m-0 twa:list-none twa:py-3 twa:gap-1 twa:flex twa:flex-col", onKeyDown: handleKeyPress }, props.menuItems.map((menuItem, index) => {
             if (menuItem === '-') {
-                return React.createElement("li", { key: `separator-${index}`, className: `${baseClassName}__Separator` });
+                return (React.createElement("li", { key: `separator-${index}`, className: `${navigationItemClassName}__Separator` }));
             }
             const isActive = props.activeItem === menuItem.category || menuItem.label === props.activeItem;
-            const className = (0, join_1.default)(baseClassName, isActive && `${baseClassName}--active`);
             let customIcon = props.customSettingsPanels?.find?.((customSettingPanel) => customSettingPanel.name === menuItem.label)?.icon ?? null;
             const dataName = menuItem.category === 'CustomSettingsPanel'
                 ? `CSP-${menuItem.label}`
                 : menuItem.category ?? menuItem.label;
-            return (React.createElement("li", { className: className, key: menuItem.label },
-                React.createElement("button", { type: "button", className: `${baseClassName}__Button`, onClick: () => {
-                        dispatch(menuItem.reduxAction);
-                    }, "data-name": dataName },
-                    props.api.optionsApi.getSettingsPanelOptions().showModuleIcons &&
-                        menuItem.icon && (React.createElement(AdaptableIconComponent_1.AdaptableIconComponent, { icon: menuItem.icon, iconClassName: `${baseClassName}__Icon` })),
-                    customIcon && React.createElement(AdaptableIconComponent_1.AdaptableIconComponent, { icon: customIcon }),
-                    menuItem.label)));
+            return (React.createElement(NavigationItem, { key: menuItem.label, menuItem: menuItem, isActive: isActive, dataName: dataName, customIcon: customIcon, showModuleIcons: api.optionsApi.getSettingsPanelOptions().showModuleIcons, onAction: () => makeActive(menuItem) }));
         }))));
 };
 exports.Navigation = Navigation;