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

package/src/View/Components/Popups/AdaptablePopup/PopupPanel.d.ts

@@ -2,10 +2,12 @@ import * as React from 'react';
 export interface PanelWithButtonProps {
     buttonClick?: () => void;
     className?: string;
+    bodyClassName?: string;
     button?: React.ReactElement<any>;
     headerText: string;
     glyphicon?: string;
     infoLink?: string;
     infoLinkDisabled?: boolean;
+    scrollable?: boolean;
 }
 export declare const PopupPanel: React.FunctionComponent<React.PropsWithChildren<PanelWithButtonProps>>;

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

@@ -3,22 +3,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PopupPanel = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
-const rebass_1 = require("rebass");
-const join_1 = tslib_1.__importDefault(require("../../../../components/utils/join"));
+const clsx_1 = tslib_1.__importDefault(require("clsx"));
 const ButtonInfo_1 = require("../../Buttons/ButtonInfo");
-const Noop = () => React.createElement(React.Fragment, null);
+const Flex_1 = require("../../../../components/Flex");
 const PopupPanel = (props) => {
     const baseClassName = 'ab-Adaptable-Popup__Panel';
-    return (React.createElement(rebass_1.Flex, { flexDirection: "column", flex: "1 1 0", className: (0, join_1.default)(props.className, baseClassName) },
-        React.createElement("div", { className: `${baseClassName}__Header` },
-            React.createElement(rebass_1.Flex, { alignItems: "center" },
-                React.createElement(rebass_1.Box, { marginRight: 0, "data-name": "space-before" }),
+    return (React.createElement(Flex_1.Box, { className: (0, clsx_1.default)('twa:flex-1 twa:flex twa:flex-col twa:gap-3 twa:p-1', props.className, baseClassName, props.scrollable === false ? 'twa:overflow-hidden' : 'twa:overflow-auto') },
+        React.createElement("div", { className: `${baseClassName}__Header twa:flex` },
+            React.createElement(Flex_1.Flex, { alignItems: "center" },
+                React.createElement(Flex_1.Box, { className: "twa:mr-0", "data-name": "space-before" }),
                 React.createElement("div", { className: `${baseClassName}__Header__Title` }, props.headerText),
-                React.createElement(rebass_1.Box, { marginRight: 2, "data-name": "space-after" }),
+                React.createElement(Flex_1.Box, { className: "twa:mr-2", "data-name": "space-after" }),
                 props.infoLink != null && !props.infoLinkDisabled && (React.createElement(ButtonInfo_1.ButtonInfo, { tone: "none", variant: "text", iconSize: 24, onClick: () => window.open(props.infoLink, '_blank' // <- opens the link in a new tab or window.
                     ) }))),
-            React.createElement(rebass_1.Box, { style: { flex: 1 } }),
+            React.createElement(Flex_1.Box, { className: "twa:flex-1" }),
             props.button),
-        React.createElement(rebass_1.Box, { className: `${baseClassName}__Body`, width: "100%", height: "100%", flex: 1 }, props.children)));
+        React.createElement(Flex_1.Box, { className: (0, clsx_1.default)('twa:w-full twa:flex twa:flex-col twa:flex-1 twa:min-h-0', `${baseClassName}__Body`, props.bodyClassName) }, props.children)));
 };
 exports.PopupPanel = PopupPanel;

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

@@ -3,11 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TopBar = 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 AdaptableContext_1 = require("../../../AdaptableContext");
 const AdaptableIconComponent_1 = require("../../AdaptableIconComponent");
+const Flex_1 = require("../../../../components/Flex");
+const baseClassName = 'ab-Adaptable-Popup__TopBar';
 const TopBar = (props) => {
-    const baseClassName = 'ab-Adaptable-Popup__TopBar';
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
     const applicationIcon = adaptable.api.optionsApi.getUserInterfaceOptions()?.applicationIcon;
     let icon = React.createElement(React.Fragment, null);
@@ -21,9 +22,9 @@ const TopBar = (props) => {
     else if (typeof props.icon === 'object') {
         icon = React.createElement(AdaptableIconComponent_1.AdaptableIconComponent, { icon: props.icon, iconClassName: iconClassName });
     }
-    return (React.createElement(rebass_1.Flex, { flex: 0, className: baseClassName },
+    return (React.createElement(Flex_1.Box, { className: (0, clsx_1.default)(baseClassName, 'twa:font-medium twa:p-3', 'twa:flex twa:flex-row twa:items-center twa:flex-0 twa:gap-2', 'twa:bg-(--ab-dashboard-header__background) twa:text-(--ab-dashboard-header__color)') },
         icon,
-        React.createElement(rebass_1.Text, { className: `${baseClassName}__Title` }, props.children)));
+        React.createElement(Flex_1.Box, { className: `${baseClassName}__Title` }, props.children)));
 };
 exports.TopBar = TopBar;
 exports.default = exports.TopBar;

package/src/View/Components/Popups/AdaptablePopup/useMenuItems.d.ts

@@ -1,2 +1,2 @@
 import { AdaptableMenuItem } from '../../../../../types';
-export declare const useMenuItems: () => (AdaptableMenuItem | '-')[];
+export declare const useMenuItems: () => (AdaptableMenuItem | "-")[];

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

@@ -5,12 +5,12 @@ const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const PanelWithImage_1 = require("../Panels/PanelWithImage");
 const UIHelper_1 = require("../../UIHelper");
-const rebass_1 = require("rebass");
 const Dialog_1 = tslib_1.__importDefault(require("../../../components/Dialog"));
 const AdaptableFormComponent_1 = require("../../../components/AdaptableFormComponent");
 const react_1 = require("react");
 const AdaptableContext_1 = require("../../AdaptableContext");
 const AdaptableIconComponent_1 = require("../AdaptableIconComponent");
+const Flex_1 = require("../../../components/Flex");
 const AdaptablePopupAlert = (props) => {
     const messageType = props.adaptableAlert.alertDefinition.MessageType || 'Error';
     const msg = props.adaptableAlert.message ?? '';
@@ -43,24 +43,23 @@ const AdaptablePopupAlert = (props) => {
         if (!icon) {
             return null;
         }
-        return (React.createElement(rebass_1.Flex, { flexDirection: "column", alignSelf: "end", alignItems: "right" },
-            ' ',
+        return (React.createElement(Flex_1.Flex, { flexDirection: "column", className: "twa:self-end", alignItems: "end" },
             React.createElement(AdaptableIconComponent_1.AdaptableIconComponent, { icon: icon, iconClassName: 'alert-popup__application-icon' })));
     };
-    const content = (React.createElement(PanelWithImage_1.PanelWithImage, { header: header, headerColor: headerColor, glyphicon: glyph, bodyProps: { padding: 2 } },
+    const content = (React.createElement(PanelWithImage_1.PanelWithImage, { header: header, headerColor: headerColor, glyphicon: glyph, bodyProps: { className: 'twa:p-2' } },
         React.createElement("div", null,
-            React.createElement(rebass_1.Flex, { flexDirection: "column", alignItems: "flex-start" },
+            React.createElement(Flex_1.Flex, { flexDirection: "column", alignItems: "flex-start" },
                 renderApplicationIcon(adaptableOptions.notificationsOptions.showApplicationIcon &&
                     adaptableOptions.userInterfaceOptions.applicationIcon),
                 typeof msg === 'string'
                     ? msg.split('\n').map(function (item, index) {
-                        return (React.createElement(rebass_1.Flex, { flexDirection: "row", key: index },
-                            React.createElement(rebass_1.Text, { key: index, margin: 2 },
+                        return (React.createElement(Flex_1.Flex, { flexDirection: "row", key: index },
+                            React.createElement(Flex_1.Box, { key: index, className: "twa:m-2" },
                                 item,
                                 React.createElement("br", null))));
                     })
                     : msg),
-            React.createElement(rebass_1.Box, { margin: 2 }, adaptableForm ? (React.createElement(AdaptableFormComponent_1.AdaptableFormComponent, { focusFirstButton: props.focusFirstButton, data: formData, formDef: adaptableForm, displayTitle: true, onChange: setFormData, api: api, context: context, onButtonClick: (button) => {
+            React.createElement(Flex_1.Box, { className: "twa:m-2" }, adaptableForm ? (React.createElement(AdaptableFormComponent_1.AdaptableFormComponent, { focusFirstButton: props.focusFirstButton, data: formData, formDef: adaptableForm, displayTitle: true, onChange: setFormData, api: api, context: context, onButtonClick: (button) => {
                     props.onClose();
                     // we want to give the current popup time to close
                     // and we reopen with a delay in case this button action causes another popup
@@ -68,10 +67,6 @@ const AdaptablePopupAlert = (props) => {
                         button.onClick?.(button, context);
                     }, 20);
                 } })) : null))));
-    return props.headless ? (content) : (React.createElement(Dialog_1.default, { "data-name": `alert-popup alert-popup-${messageType.toLowerCase()}`, showCloseButton: false, isOpen: true, onDismiss: props.onClose, style: {
-            minHeight: 'auto',
-            minWidth: '20vw',
-            maxWidth: '70vw',
-        } }, content));
+    return props.headless ? (content) : (React.createElement(Dialog_1.default, { "data-name": `alert-popup alert-popup-${messageType.toLowerCase()}`, showCloseButton: false, isOpen: true, onDismiss: props.onClose, className: "twa:min-h-auto twa:min-w-[20vw] twa:max-w-[70vw]" }, content));
 };
 exports.AdaptablePopupAlert = AdaptablePopupAlert;

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

@@ -6,13 +6,13 @@ const React = tslib_1.__importStar(require("react"));
 const UIHelper_1 = require("../../UIHelper");
 const StringExtensions_1 = require("../../../Utilities/Extensions/StringExtensions");
 const PanelWithImage_1 = require("../Panels/PanelWithImage");
-const rebass_1 = require("rebass");
 const SimpleButton_1 = tslib_1.__importDefault(require("../../../components/SimpleButton"));
 const Input_1 = tslib_1.__importDefault(require("../../../components/Input"));
 const Dialog_1 = tslib_1.__importDefault(require("../../../components/Dialog"));
 const CheckBox_1 = require("../../../components/CheckBox");
 const InternalRedux = tslib_1.__importStar(require("../../../Redux/ActionsReducers/InternalRedux"));
 const react_redux_1 = require("react-redux");
+const Flex_1 = require("../../../components/Flex");
 const AdaptablePopupConfirmation = (props) => {
     const dispatch = (0, react_redux_1.useDispatch)();
     const [disableDeleteConfirmation, setDisableDeleteConfirmation] = React.useState(false);
@@ -46,18 +46,18 @@ const AdaptablePopupConfirmation = (props) => {
         React.createElement(PanelWithImage_1.PanelWithImage, { header: header, icon: glyph, variant: "primary" },
             React.createElement("div", null,
                 React.createElement("div", { style: { display: 'flex', alignItems: 'center' } }, props.messsage.split('\n').map(function (item, index) {
-                    return (React.createElement(rebass_1.Text, { key: index, margin: 2 },
+                    return (React.createElement(Flex_1.Box, { key: index, className: "twa:m-2" },
                         item,
                         React.createElement("br", null)));
                 })),
-                React.createElement(rebass_1.Box, { pl: 2 },
+                React.createElement(Flex_1.Box, { className: "twa:pl-2" },
                     React.createElement(CheckBox_1.CheckBox, { checked: disableDeleteConfirmation, onChange: () => {
                             setDisableDeleteConfirmation(!disableDeleteConfirmation);
                         } }, "Do not show this again")),
-                props.showInputBox && (React.createElement(rebass_1.Box, { padding: 2, "data-name": "body" },
+                props.showInputBox && (React.createElement(Flex_1.Box, { className: "twa:p-2", "data-name": "body" },
                     React.createElement("p", null, "Please enter a comment to confirm"),
-                    React.createElement(Input_1.default, { marginTop: 2, width: '100%', value: promptText, type: "string", placeholder: "Enter text", onChange: (e) => changeContent(e) }))),
-                React.createElement(rebass_1.Flex, { marginTop: 3, padding: 2, "data-name": "footer", justifyContent: "space-between" },
+                    React.createElement(Input_1.default, { className: "twa:mt-2 twa:w-full", value: promptText, type: "string", placeholder: "Enter text", onChange: (e) => changeContent(e) }))),
+                React.createElement(Flex_1.Flex, { className: "twa:mt-3 twa:p-2", "data-name": "footer", justifyContent: "space-between" },
                     props.cancelButtonText != null ? (React.createElement(SimpleButton_1.default, { "data-name": "cancel", tone: "neutral", variant: "raised", onClick: () => onCancelForm() }, props.cancelButtonText)) : (React.createElement("div", null)),
                     React.createElement(SimpleButton_1.default, { tone: "error", "data-name": "delete", variant: "raised", disabled: !canConfirm(), onClick: () => onConfirmmForm() }, props.confirmButtonText))))));
 };

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

@@ -5,10 +5,10 @@ const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const StringExtensions_1 = require("../../../Utilities/Extensions/StringExtensions");
 const Dialog_1 = tslib_1.__importDefault(require("../../../components/Dialog"));
-const rebass_1 = require("rebass");
 const SimpleButton_1 = tslib_1.__importDefault(require("../../../components/SimpleButton"));
 const Input_1 = tslib_1.__importDefault(require("../../../components/Input"));
 const react_redux_1 = require("react-redux");
+const Flex_1 = require("../../../components/Flex");
 const AdaptablePopupPrompt = (props) => {
     const dispatch = (0, react_redux_1.useDispatch)();
     const [promptText, setPromptText] = React.useState(props.defaultValue ?? '');
@@ -28,19 +28,19 @@ const AdaptablePopupPrompt = (props) => {
     const changeContent = (e) => {
         setPromptText(e.target.value);
     };
-    return (React.createElement(Dialog_1.default, { modal: true, "data-name": `prompt-popup`, isOpen: true, onDismiss: props.onClose, showCloseButton: false, style: { minHeight: 'auto', maxWidth: '50%' } },
-        React.createElement(rebass_1.Flex, { flexDirection: "column" },
-            React.createElement(rebass_1.Box, { marginTop: 3, mx: 2 }, props.header),
-            StringExtensions_1.StringExtensions.IsNotNullOrEmpty(props.message) && (React.createElement(rebass_1.Box, { marginTop: 3, mx: 2 },
+    return (React.createElement(Dialog_1.default, { modal: true, "data-name": `prompt-popup`, isOpen: true, onDismiss: props.onClose, showCloseButton: false, className: "twa:min-h-auto twa:max-w-1/2" },
+        React.createElement(Flex_1.Flex, { flexDirection: "column" },
+            React.createElement(Flex_1.Box, { className: "twa:mt-3 twa:mx-2" }, props.header),
+            StringExtensions_1.StringExtensions.IsNotNullOrEmpty(props.message) && (React.createElement(Flex_1.Box, { className: "twa:mt-3 twa:mx-2" },
                 ' ',
                 React.createElement("div", { style: { display: 'flex', alignItems: 'center' } }, props.message.split('\n').map(function (item, index) {
                     return (React.createElement("span", { key: index },
                         item,
                         React.createElement("br", null)));
                 })))),
-            React.createElement(Input_1.default, { autoFocus: true, marginTop: 3, mx: 3, value: promptText, type: "string", placeholder: "Enter text", onChange: (e) => changeContent(e) }),
-            React.createElement(rebass_1.Box, { marginTop: 3 },
-                React.createElement(rebass_1.Flex, { padding: 2, "data-name": "footer", justifyContent: "space-between" },
+            React.createElement(Input_1.default, { autoFocus: true, className: "twa:mt-3 twa:mx-3", value: promptText, type: "string", placeholder: "Enter text", onChange: (e) => changeContent(e) }),
+            React.createElement(Flex_1.Box, { className: "twa:mt-3" },
+                React.createElement(Flex_1.Flex, { className: "twa:p-2", "data-name": "footer", justifyContent: "space-between" },
                     React.createElement(SimpleButton_1.default, { tone: "neutral", variant: "raised", onClick: () => onCloseForm(), "data-name": "cancel" }, "Cancel"),
                     React.createElement(SimpleButton_1.default, { tone: "accent", "data-name": "ok", variant: "raised", disabled: StringExtensions_1.StringExtensions.IsNullOrEmpty(promptText), onClick: () => onConfirmForm() }, "OK"))))));
 };

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

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AdaptablePopupTeamSharing = void 0;
 const tslib_1 = require("tslib");
 const Dialog_1 = tslib_1.__importDefault(require("../../../components/Dialog"));
-const rebass_1 = require("rebass");
 const StringExtensions_1 = require("../../../Utilities/Extensions/StringExtensions");
 const Input_1 = tslib_1.__importDefault(require("../../../components/Input"));
 const react_1 = require("react");
@@ -12,6 +11,7 @@ const React = tslib_1.__importStar(require("react"));
 const FormLayout_1 = tslib_1.__importStar(require("../../../components/FormLayout"));
 const HelpBlock_1 = tslib_1.__importDefault(require("../../../components/HelpBlock"));
 const Radio_1 = tslib_1.__importDefault(require("../../../components/Radio"));
+const Flex_1 = require("../../../components/Flex");
 const AdaptablePopupTeamSharing = (props) => {
     const { showPopup, onClose, onConfirm, header } = props;
     const [config, setConfig] = (0, react_1.useState)({
@@ -19,9 +19,9 @@ const AdaptablePopupTeamSharing = (props) => {
         type: 'Snapshot',
     });
     return (React.createElement(React.Fragment, null,
-        React.createElement(Dialog_1.default, { modal: true, "data-name": "teamsharing-popup", isOpen: showPopup, onDismiss: onClose, autoFocus: false, showCloseButton: false, style: { minHeight: 'auto', maxWidth: '50%' } },
-            React.createElement(rebass_1.Flex, { flexDirection: "column" },
-                React.createElement(HelpBlock_1.default, { "data-name": "teamsharing-popup-description", margin: 2, mb: 2, p: 2, style: { fontSize: 'var(--ab-font-size-3)' } },
+        React.createElement(Dialog_1.default, { modal: true, "data-name": "teamsharing-popup", isOpen: showPopup, onDismiss: onClose, autoFocus: false, showCloseButton: false, className: "twa:min-h-auto twa:max-w-1/2" },
+            React.createElement(Flex_1.Flex, { flexDirection: "column" },
+                React.createElement(HelpBlock_1.default, { "data-name": "teamsharing-popup-description", className: "twa:m-2 twa:mb-2 twa:p-2 twa:text-3" },
                     "Create a ",
                     header,
                     " which may be either:",
@@ -32,19 +32,17 @@ const AdaptablePopupTeamSharing = (props) => {
                         React.createElement("li", null,
                             React.createElement("strong", null, "Active"),
                             ": a \"live\" share that is automatically updated with every local change"))),
-                React.createElement(FormLayout_1.default, { padding: 2 },
+                React.createElement(FormLayout_1.default, { className: "twa:p-2" },
                     React.createElement(FormLayout_1.FormRow, { label: "Name: " },
-                        React.createElement(Input_1.default, { "data-name": "teamsharing-entity-name", autoFocus: true, value: config.description, type: "string", width: 300, placeholder: "Enter text", onChange: (e) => setConfig({ ...config, description: e.target.value }) })),
+                        React.createElement(Input_1.default, { "data-name": "teamsharing-entity-name", autoFocus: true, value: config.description, type: "string", className: "twa:w-[300px]", placeholder: "Enter text", onChange: (e) => setConfig({ ...config, description: e.target.value }) })),
                     React.createElement(FormLayout_1.FormRow, { label: "Share: " },
-                        React.createElement(rebass_1.Flex, { flexDirection: "row" },
+                        React.createElement(Flex_1.Flex, { flexDirection: "row" },
                             React.createElement(Radio_1.default, { "data-name": "teamsharing-entity-type-snapshot", checked: config.type === 'Snapshot', onChange: () => setConfig({ ...config, type: 'Snapshot' }) }, "Snapshot"),
-                            ' ',
-                            React.createElement(Radio_1.default, { "data-name": "teamsharing-entity-type-active", marginLeft: 3, checked: config.type === 'Active', onChange: () => setConfig({ ...config, type: 'Active' }) }, "Active"),
-                            ' '))),
-                React.createElement(rebass_1.Box, { marginTop: 3 },
-                    React.createElement(rebass_1.Flex, { padding: 2 },
+                            React.createElement(Radio_1.default, { "data-name": "teamsharing-entity-type-active", className: "twa:ml-3", checked: config.type === 'Active', onChange: () => setConfig({ ...config, type: 'Active' }) }, "Active")))),
+                React.createElement(Flex_1.Box, { className: "twa:mt-3" },
+                    React.createElement(Flex_1.Flex, { className: "twa:p-2" },
                         React.createElement(SimpleButton_1.default, { "data-name": "cancel", tone: "neutral", variant: "raised", onClick: () => onClose() }, "Cancel"),
-                        React.createElement("div", { style: { flex: 1 } }),
+                        React.createElement("div", { className: "twa:flex-1" }),
                         React.createElement(SimpleButton_1.default, { "data-name": "ok", tone: "accent", variant: "raised", disabled: StringExtensions_1.StringExtensions.IsNullOrEmpty(config.description), onClick: () => onConfirm(config) }, "OK")))))));
 };
 exports.AdaptablePopupTeamSharing = AdaptablePopupTeamSharing;

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

@@ -4,12 +4,12 @@ exports.FormPopups = exports.FormDialog = 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 AdaptableFormComponent_1 = require("../../../../components/AdaptableFormComponent");
 const Dialog_1 = tslib_1.__importDefault(require("../../../../components/Dialog"));
 const AdaptableForm_1 = require("../../../../AdaptableState/Common/AdaptableForm");
 const PopupRedux_1 = require("../../../../Redux/ActionsReducers/PopupRedux");
 const AdaptableContext_1 = require("../../../AdaptableContext");
+const Flex_1 = require("../../../../components/Flex");
 const FormDialog = ({ id, formProps, form, prepareContext, }) => {
     const dispatch = (0, react_redux_1.useDispatch)();
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
@@ -24,8 +24,8 @@ const FormDialog = ({ id, formProps, form, prepareContext, }) => {
         formData: data,
         ...formProps,
     };
-    return (React.createElement(Dialog_1.default, { isOpen: true, showCloseButton: false, style: { minHeight: 'auto', minWidth: 400, maxHeight: '80vh' }, onDismiss: handleDismiss },
-        React.createElement(rebass_1.Flex, { flexDirection: 'column', "data-name": "form-dialog", padding: 4, height: '100%' },
+    return (React.createElement(Dialog_1.default, { isOpen: true, showCloseButton: false, className: "twa:min-h-auto twa:min-w-[400px] twa:max-h-[80vh]", onDismiss: handleDismiss },
+        React.createElement(Flex_1.Flex, { flexDirection: 'column', "data-name": "form-dialog", className: "twa:p-4 twa:h-full" },
             React.createElement(AdaptableFormComponent_1.AdaptableFormComponent, { formDef: form, data: data, context: context, onChange: setData, api: adaptable.api, displayTitle: true, onButtonClick: async (button) => {
                     handleDismiss();
                     const preparedContext = typeof prepareContext === 'function' ? await prepareContext(context) : context;

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;
 };