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

package/src/components/FieldWrap/index.js

@@ -2,14 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
-const rebass_1 = require("rebass");
-const join_1 = tslib_1.__importDefault(require("../utils/join"));
-const defaulProps = {
-    flexDirection: 'row',
-    alignItems: 'center',
-};
+const Flex_1 = require("../Flex");
+const clsx_1 = tslib_1.__importDefault(require("clsx"));
 const FieldWrap = (props) => {
-    const flexProps = { ...defaulProps, ...props };
-    return React.createElement(rebass_1.Flex, { ...flexProps, className: (0, join_1.default)(props.className, 'ab-FieldWrap') });
+    return (React.createElement(Flex_1.Flex, { flexDirection: "row", alignItems: "center", ...props, className: (0, clsx_1.default)('ab-FieldWrap', props.className) }));
 };
 exports.default = FieldWrap;

package/src/components/FileDroppable/FileDroppableState.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export interface FileDroppableState {
     dragOver: boolean;
     message?: React.ReactNode;

package/src/components/FileDroppable/index.d.ts

@@ -1,6 +1,7 @@
 import * as React from 'react';
-import { FlexProps } from 'rebass';
-interface FileDroppableProps extends FlexProps {
+import { HTMLProps } from 'react';
+import { FlexProps } from '../Flex';
+interface FileDroppableProps extends FlexProps, HTMLProps<HTMLDivElement> {
     buttonText?: React.ReactNode;
     fileAccept?: string;
     icon?: React.ReactNode;

package/src/components/FileDroppable/index.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.readJSONFile = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
-const rebass_1 = require("rebass");
 const react_1 = require("react");
 const join_1 = tslib_1.__importDefault(require("../../components/utils/join"));
 const contains_1 = tslib_1.__importDefault(require("../../components/utils/contains"));
@@ -11,6 +10,7 @@ const SimpleButton_1 = tslib_1.__importDefault(require("../SimpleButton"));
 const icons_1 = require("../icons");
 const HelpBlock_1 = tslib_1.__importDefault(require("../HelpBlock"));
 const reducer_1 = tslib_1.__importStar(require("./reducer"));
+const Flex_1 = require("../Flex");
 const initialState = {
     dragOver: false,
     message: null,
@@ -76,7 +76,7 @@ const FileDroppable = (props = {}) => {
                 dispatch({
                     type: reducer_1.ActionTypes.DROP_SUCCES,
                     payload: {
-                        message: (React.createElement(rebass_1.Box, null, props.loadingText === undefined ? 'Initializing adaptable...' : props.loadingText)),
+                        message: (React.createElement(Flex_1.Box, null, props.loadingText === undefined ? 'Initializing adaptable...' : props.loadingText)),
                     },
                 });
                 requestAnimationFrame(() => {
@@ -91,7 +91,7 @@ const FileDroppable = (props = {}) => {
                 dispatch({
                     type: reducer_1.ActionTypes.SET_INVALID_FILE,
                     payload: {
-                        message: React.createElement(rebass_1.Box, null, 'The file is not a valid JSON file! Please try again!'),
+                        message: React.createElement(Flex_1.Box, null, 'The file is not a valid JSON file! Please try again!'),
                     },
                 });
             }
@@ -114,13 +114,13 @@ const FileDroppable = (props = {}) => {
                     zIndex: 1,
                 } }))));
     const msg = message || state.message;
-    return (React.createElement(rebass_1.Flex, { ...domProps, flexDirection: "column", className: (0, join_1.default)(props.className, 'ab-FileDroppable', state.dragOver ? 'ab-FileDroppable--drag-over' : ''), alignItems: "center", justifyContent: "center", onDragEnter: onDragEnter, onDragLeave: onDragLeave, onDrop: onDrop, onDragOver: preventEventPropagation, ref: domRef },
+    return (React.createElement(Flex_1.Flex, { ...domProps, flexDirection: "column", className: (0, join_1.default)(props.className, 'ab-FileDroppable', state.dragOver ? 'ab-FileDroppable--drag-over' : ''), alignItems: "center", justifyContent: "center", onDragEnter: onDragEnter, onDragLeave: onDragLeave, onDrop: onDrop, onDragOver: preventEventPropagation, ref: domRef },
         props.children,
-        helpText || icon ? (React.createElement(rebass_1.Flex, { flexDirection: "column" },
-            helpText ? (React.createElement(rebass_1.Flex, { flexDirection: "column", alignItems: "center", margin: 2 },
+        helpText || icon ? (React.createElement(Flex_1.Flex, { flexDirection: "column" },
+            helpText ? (React.createElement(Flex_1.Flex, { flexDirection: "column", alignItems: "center", className: "twa:m-2" },
                 React.createElement(HelpBlock_1.default, null,
                     React.createElement("b", null, helpText)))) : null,
-            icon ? (React.createElement(rebass_1.Flex, { flexDirection: "column", alignItems: "center", margin: 2 }, icon)) : null)) : null,
+            icon ? (React.createElement(Flex_1.Flex, { flexDirection: "column", alignItems: "center", className: "twa:m-2" }, icon)) : null)) : null,
         msg,
         form));
 };

package/src/components/Flex.d.ts

@@ -1 +1,15 @@
-export { Flex } from 'rebass';
+import * as React from 'react';
+type AsProp = 'summary' | 'form' | 'label' | 'button' | 'ul' | string;
+export type FlexProps = {
+    as?: AsProp;
+    flexDirection?: 'row' | 'column';
+    justifyContent?: 'space-between' | 'space-around' | 'space-evenly' | 'space-start' | 'space-end' | 'center';
+    flexWrap?: 'wrap' | 'nowrap' | 'wrap-reverse';
+    alignItems?: 'center' | 'flex-start' | 'flex-end' | 'stretch' | 'baseline' | 'start' | 'end';
+};
+export declare const Flex: React.ForwardRefExoticComponent<Omit<React.HTMLProps<HTMLDivElement> & FlexProps, "ref"> & React.RefAttributes<unknown>>;
+export type BoxProps = {
+    as?: AsProp;
+};
+export declare const Box: React.ForwardRefExoticComponent<Omit<React.HTMLProps<HTMLDivElement> & BoxProps, "ref"> & React.RefAttributes<unknown>>;
+export {};

package/src/components/Flex.js

@@ -1,5 +1,44 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Flex = void 0;
-var rebass_1 = require("rebass");
-Object.defineProperty(exports, "Flex", { enumerable: true, get: function () { return rebass_1.Flex; } });
+exports.Box = exports.Flex = void 0;
+const tslib_1 = require("tslib");
+const React = tslib_1.__importStar(require("react"));
+const clsx_1 = tslib_1.__importDefault(require("clsx"));
+const twMerge_1 = require("../twMerge");
+const ALIGN_ITEMS_MAP = {
+    center: 'twa:items-center',
+    'flex-start': 'twa:items-start',
+    start: 'twa:items-start',
+    'flex-end': 'twa:items-end',
+    end: 'twa:items-end',
+    stretch: 'twa:items-stretch',
+    baseline: 'twa:items-baseline',
+};
+const FLEX_DIRECTION_MAP = {
+    row: 'twa:flex-row',
+    column: 'twa:flex-col',
+};
+const JUSTIFY_CONTENT_MAP = {
+    'space-between': 'twa:justify-between',
+    'space-around': 'twa:justify-around',
+    'space-evenly': 'twa:justify-evenly',
+    'space-start': 'twa:justify-start',
+    'space-end': 'twa:justify-end',
+    center: 'twa:justify-center',
+};
+const FLEX_WRAP_MAP = {
+    wrap: 'twa:flex-wrap',
+    nowrap: 'twa:flex-nowrap',
+    'wrap-reverse': 'twa:flex-wrap-reverse',
+};
+exports.Flex = React.forwardRef((props, ref) => {
+    const { className: _, flexDirection, alignItems, justifyContent, flexWrap, as, ...domProps } = props;
+    const className = (0, clsx_1.default)('twa:flex', 'twa:box-border', FLEX_DIRECTION_MAP[flexDirection], ALIGN_ITEMS_MAP[alignItems], JUSTIFY_CONTENT_MAP[justifyContent], FLEX_WRAP_MAP[flexWrap]);
+    const Cmp = (as || 'div');
+    return (React.createElement(Cmp, { ref: ref, ...domProps, className: (0, twMerge_1.twMerge)(className, props.className) }));
+});
+exports.Box = React.forwardRef((props, ref) => {
+    const { className, as, ...domProps } = props;
+    const Cmp = (as || 'div');
+    return (React.createElement(Cmp, { ref: ref, ...domProps, className: (0, twMerge_1.twMerge)('twa:box-border', className) }));
+});

package/src/components/FlexWithFooter.d.ts

@@ -1,8 +1,9 @@
 import * as React from 'react';
-import { FlexProps } from 'rebass';
+import { FlexProps } from './Flex';
+import { HTMLProps } from 'react';
 interface TypeProps extends FlexProps {
     footer: React.ReactNode;
-    footerProps?: FlexProps;
+    footerProps?: FlexProps & HTMLProps<HTMLDivElement>;
 }
 declare const FlexWithFooter: (props: TypeProps & React.HTMLProps<HTMLDivElement>) => React.JSX.Element;
 export default FlexWithFooter;

package/src/components/FlexWithFooter.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
-const rebass_1 = require("rebass");
+const Flex_1 = require("./Flex");
 const defaultStyle = {
     height: '100%',
     maxHeight: '90vh',
@@ -11,9 +11,9 @@ const defaultStyle = {
 };
 const FlexWithFooter = (props) => {
     const { footer, footerProps, children, style, ...domProps } = props;
-    return (React.createElement(rebass_1.Flex, { flexDirection: "column", ...domProps, style: { ...defaultStyle, ...style } },
-        React.createElement(rebass_1.Flex, { flexDirection: "column", padding: 0, flex: 1 },
-            React.createElement(rebass_1.Flex, { flexDirection: "column", flex: 1 }, children)),
-        footer ? (React.createElement(rebass_1.Flex, { padding: 2, backgroundColor: "primary", ...footerProps }, footer)) : null));
+    return (React.createElement(Flex_1.Flex, { flexDirection: "column", ...domProps, style: { ...defaultStyle, ...style } },
+        React.createElement(Flex_1.Flex, { flexDirection: "column", className: "twa:p-0 twa:flex-1" },
+            React.createElement(Flex_1.Flex, { flexDirection: "column", className: "twa:flex-1" }, children)),
+        footer ? (React.createElement(Flex_1.Flex, { className: "twa:p-2 twa:bg-primary", ...footerProps }, footer)) : null));
 };
 exports.default = FlexWithFooter;

package/src/components/FormLayout/index.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
-import { BoxProps } from 'rebass';
 import { ReactNode } from 'react';
+import { BoxProps } from '../Flex';
 type FormColumn = {
     name: string;
     component?: React.ComponentType<any>;
@@ -21,6 +21,10 @@ type TypeFormLayout = {
 export type AdaptableFormConfig = TypeFormLayout;
 export type FormLayoutColumn = FormColumn;
 interface FormLayoutProps extends Omit<BoxProps, keyof TypeFormLayout>, TypeFormLayout {
+    children?: React.ReactNode;
+    className?: string;
+    style?: React.CSSProperties;
+    onKeyDown?: (event: React.KeyboardEvent<HTMLDivElement>) => void;
 }
 declare const FormLayout: (props: FormLayoutProps) => React.JSX.Element;
 interface FormRowProps {

package/src/components/FormLayout/index.js

@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FormRow = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
-const rebass_1 = require("rebass");
 const react_1 = require("react");
 const merge_1 = tslib_1.__importDefault(require("lodash/merge"));
 const join_1 = tslib_1.__importDefault(require("../utils/join"));
+const Flex_1 = require("../Flex");
 const FormLayoutContext = (0, react_1.createContext)(null);
 const defaultColumns = {
     label: {
@@ -18,7 +18,7 @@ const defaultColumns = {
 };
 const PLACEHOLDER = React.createElement("div", null);
 const FormLayout = (props) => {
-    let { placeholder = PLACEHOLDER, columns = ['label', 'children'], defaultComponent = rebass_1.Box, sizes = ['auto', '1fr'], gridColumnGap = 'var(--ab-space-2)', gridRowGap = 'var(--ab-space-2)', style, childrenToColumns = true, ...boxProps } = props;
+    let { placeholder = PLACEHOLDER, columns = ['label', 'children'], defaultComponent = Flex_1.Box, sizes = ['auto', '1fr'], gridColumnGap = 'var(--ab-space-2)', gridRowGap = 'var(--ab-space-2)', style, childrenToColumns = true, ...boxProps } = props;
     columns = columns.map((c) => {
         if (typeof c === 'string' || typeof c === 'number') {
             c = {
@@ -53,7 +53,7 @@ const FormLayout = (props) => {
             currentRow: 0,
             childrenToColumns,
         } },
-        React.createElement(rebass_1.Box, { ...boxProps, className: (0, join_1.default)(boxProps.className, 'ab-FormLayout'), style: { ...style, ...formStyle } })));
+        React.createElement(Flex_1.Box, { ...boxProps, className: (0, join_1.default)(boxProps.className, 'ab-FormLayout'), style: { ...style, ...formStyle } })));
 };
 const FormRow = (props) => {
     const ctx = (0, react_1.useContext)(FormLayoutContext);

package/src/components/HelpBlock/index.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { BoxProps } from 'rebass';
 export declare const baseClassName = "ab-HelpBlock";
-declare const HelpBlock: (props: BoxProps) => React.JSX.Element;
+export declare const HelpBlockClassName: string;
+declare const HelpBlock: (props: React.HTMLProps<HTMLDivElement>) => React.JSX.Element;
 export default HelpBlock;

package/src/components/HelpBlock/index.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.baseClassName = void 0;
+exports.HelpBlockClassName = exports.baseClassName = 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("../utils/join"));
+const Flex_1 = require("../Flex");
+const clsx_1 = tslib_1.__importDefault(require("clsx"));
 exports.baseClassName = 'ab-HelpBlock';
+exports.HelpBlockClassName = (0, clsx_1.default)('twa:text-2/relaxed twa:p-2 twa:rounded-standard', 'twa:bg-primarylight twa:text-primary-foreground', exports.baseClassName);
 const HelpBlock = (props) => {
-    return React.createElement(rebass_1.Box, { ...props, className: (0, join_1.default)(props.className, exports.baseClassName) });
+    return React.createElement(Flex_1.Box, { ...props, className: (0, clsx_1.default)(exports.HelpBlockClassName, props.className) });
 };
 exports.default = HelpBlock;

package/src/components/IconSelector/IconSelector.js

@@ -3,14 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.IconSelector = void 0;
 const tslib_1 = require("tslib");
 const react_1 = tslib_1.__importDefault(require("react"));
-const rebass_1 = require("rebass");
 const AdaptableInput_1 = tslib_1.__importDefault(require("../../View/Components/AdaptableInput"));
 const Icon_1 = require("../Icon");
 const icons_1 = require("../icons");
 const OverlayTrigger_1 = tslib_1.__importDefault(require("../OverlayTrigger"));
 const SimpleButton_1 = tslib_1.__importDefault(require("../SimpleButton"));
+const Flex_1 = require("../Flex");
 const IconButton = (props) => {
-    return (react_1.default.createElement(SimpleButton_1.default, { onClick: () => props.onClick(), p: 2, variant: props.active ? 'raised' : 'text', tone: props.active ? 'accent' : 'none', icon: props.icon }, props.children));
+    return (react_1.default.createElement(SimpleButton_1.default, { onClick: () => props.onClick(), className: "twa:p-2", variant: props.active ? 'raised' : 'text', tone: props.active ? 'accent' : 'none', icon: props.icon }, props.children));
 };
 const IconSelector = (props) => {
     const [query, setQuery] = react_1.default.useState('');
@@ -21,18 +21,18 @@ const IconSelector = (props) => {
         })
         : allIconsNames;
     const iconsElements = filteredIcons.map((iconName) => {
-        return (react_1.default.createElement(rebass_1.Flex, { key: iconName },
+        return (react_1.default.createElement(Flex_1.Flex, { key: iconName },
             react_1.default.createElement(IconButton, { onClick: () => props.onChange(iconName), active: iconName === props.value, icon: iconName })));
     });
     const customIconsElements = props.customIcons?.map((def) => {
         return (react_1.default.createElement(IconButton, { key: def.name, active: false, onClick: () => props.onChange(def.name) },
             react_1.default.createElement(Icon_1.IconComponent, { key: def.name, icon: def.icon })));
     });
-    const popup = (react_1.default.createElement(rebass_1.Box, { className: "ab-IconSelector__Popup" },
-        react_1.default.createElement(rebass_1.Box, { mb: 2 },
-            react_1.default.createElement(rebass_1.Box, { mb: 2, fontSize: 4 }, "Select an Icon"),
-            react_1.default.createElement(AdaptableInput_1.default, { value: query, onChange: (event) => setQuery(event.target.value ?? ''), width: "100%" })),
-        react_1.default.createElement(rebass_1.Flex, { p: 2, style: { width: 300, maxHeight: 300, overflow: 'auto' }, flexWrap: "wrap" },
+    const popup = (react_1.default.createElement(Flex_1.Box, { className: "ab-IconSelector__Popup" },
+        react_1.default.createElement(Flex_1.Box, { className: "twa:mb-2" },
+            react_1.default.createElement(Flex_1.Box, { className: "twa:mb-2 twa:text-4" }, "Select an Icon"),
+            react_1.default.createElement(AdaptableInput_1.default, { value: query, onChange: (event) => setQuery(event.target.value ?? ''), className: "twa:w-full" })),
+        react_1.default.createElement(Flex_1.Flex, { className: "twa:p-2 twa:w-[300px] twa:max-h-[300px] twa:overflow-auto twa:flex-wrap" },
             iconsElements,
             " ",
             customIconsElements)));
@@ -45,10 +45,10 @@ const IconSelector = (props) => {
         if (icon)
             value = react_1.default.createElement(Icon_1.IconComponent, { icon: icon.icon });
     }
-    return (react_1.default.createElement(rebass_1.Flex, { className: "ab-IconSelector" },
+    return (react_1.default.createElement(Flex_1.Flex, { className: "ab-IconSelector" },
         react_1.default.createElement(OverlayTrigger_1.default, { preventPortalEventPropagation: false, render: () => popup, showEvent: "mouseenter", hideEvent: "mouseleave", hideDelay: 300 },
-            react_1.default.createElement(SimpleButton_1.default, { className: "ab-IconSelector__trigger", textAlign: "center", onClick: () => null, variant: "raised", width: 150, justifyContent: "center" }, value)),
-        (props.clearable ?? true) && (react_1.default.createElement(SimpleButton_1.default, { disabled: !props.value, className: "ab-IconSelector__clear-button", ml: 2, onClick: (event) => {
+            react_1.default.createElement(SimpleButton_1.default, { className: "ab-IconSelector__trigger twa:text-center twa:w-[150px] twa:justify-center", onClick: () => null, variant: "raised" }, value)),
+        (props.clearable ?? true) && (react_1.default.createElement(SimpleButton_1.default, { disabled: !props.value, className: "ab-IconSelector__clear-button twa:ml-2", onClick: (event) => {
                 event.stopPropagation();
                 event.preventDefault();
                 props.onChange('');

package/src/components/InfiniteTable/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.InfiniteTableGrid = void 0;
+exports.InfiniteTableGrid = InfiniteTableGrid;
 const tslib_1 = require("tslib");
 const infinite_react_1 = require("@infinite-table/infinite-react");
 tslib_1.__exportStar(require("@infinite-table/infinite-react"), exports);
@@ -9,5 +9,4 @@ const React = tslib_1.__importStar(require("react"));
 function InfiniteTableGrid(props) {
     return (React.createElement(infinite_react_1.InfiniteTable, { sortable: false, rowHeight: '--ab-grid-row-height', draggableColumns: false, keyboardNavigation: false, ...props, licenseKey: EnvVars_1.INFINITE_TABLE_LICENSE_KEY }));
 }
-exports.InfiniteTableGrid = InfiniteTableGrid;
 infinite_react_1.InfiniteTable.licenseKey = EnvVars_1.INFINITE_TABLE_LICENSE_KEY;

package/src/components/Input/index.d.ts

@@ -1,11 +1,10 @@
 import * as React from 'react';
 import { HTMLProps } from 'react';
-import { BoxProps } from 'rebass';
 export declare const baseClassName = "ab-Input";
 export type InputProps = HTMLProps<HTMLInputElement> & {
     type?: string;
     disabled?: boolean;
     list?: any;
-} & BoxProps;
+};
 declare const Input: React.ForwardRefExoticComponent<Omit<InputProps, "ref"> & React.RefAttributes<HTMLInputElement>>;
 export default Input;

package/src/components/Input/index.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.baseClassName = 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("../utils/join"));
+const Flex_1 = require("../Flex");
+const clsx_1 = tslib_1.__importDefault(require("clsx"));
 exports.baseClassName = 'ab-Input';
 const Input = React.forwardRef((props, ref) => {
     const { disabled, className, ...inputProps } = props;
@@ -15,6 +15,9 @@ const Input = React.forwardRef((props, ref) => {
     if (type === 'string') {
         type = 'text';
     }
-    return (React.createElement(rebass_1.Box, { as: "input", ref: ref, ...inputProps, type: type, disabled: disabled, className: (0, join_1.default)(className, exports.baseClassName, type ? `${exports.baseClassName}--type-${type}` : '', disabled ? `${exports.baseClassName}--disabled` : '') }));
+    return (React.createElement(Flex_1.Box, { as: "input", ref: ref, ...inputProps, type: type, disabled: disabled, className: (0, clsx_1.default)(className, exports.baseClassName, 'twa:min-h-input', type ? `${exports.baseClassName}--type-${type}` : '', disabled ? `${exports.baseClassName}--disabled` : '', {
+            'twa:bg-(--ab-cmp-input__background)': !disabled,
+            'twa:bg-(--ab-cmp-input--disabled__background)': disabled,
+        }) }));
 });
 exports.default = Input;

package/src/components/Modal/Backdrop.js

@@ -26,7 +26,7 @@ const Backdrop = (props) => {
         });
         return () => (0, exports.updatePositionInStack)(uuid, null);
     }, []);
-    return backdropVisible ? (React.createElement("div", { "data-id": uuid, style: { zIndex }, className: `${exports.baseClassName}-backdrop` })) : null;
+    return backdropVisible ? (React.createElement("div", { "data-id": uuid, style: { zIndex }, className: `${exports.baseClassName}-backdrop twa:fixed twa:inset-0 twa:z-900 twa:bg-(--ab-cmp-modal-backdrop__background)` })) : null;
 };
 const stack = {};
 const updatePositionInStack = (id, data) => {

package/src/components/Modal/index.d.ts

@@ -1,8 +1,9 @@
 import * as React from 'react';
-import { FlexProps } from 'rebass';
+import { HTMLProps } from 'react';
+import { FlexProps } from '../Flex';
 export declare const ensurePortalElement: () => HTMLElement;
 export declare const ensureLoadingScreenPortalElement: () => HTMLElement;
-export interface ModalProps extends FlexProps {
+export interface ModalProps extends FlexProps, HTMLProps<HTMLDivElement> {
     isOpen?: boolean;
     baseZIndex?: number;
     onBringToFront?: () => void;

package/src/components/Modal/index.js

@@ -5,13 +5,13 @@ const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const react_dom_1 = require("react-dom");
 const react_1 = require("react");
-const join_1 = tslib_1.__importDefault(require("../utils/join"));
 const react_remove_scroll_1 = require("react-remove-scroll");
-const rebass_1 = require("rebass");
 const Backdrop_1 = tslib_1.__importStar(require("./Backdrop"));
 const uuid_1 = require("../utils/uuid");
 const UIHelper_1 = require("../../View/UIHelper");
 const useStacking_1 = require("../WindowModal/useStacking");
+const Flex_1 = require("../Flex");
+const clsx_1 = tslib_1.__importDefault(require("clsx"));
 let portalElement;
 let loadingScreenPortalElement;
 const ensurePortalElement = () => {
@@ -51,6 +51,6 @@ const Modal = (props) => {
     return (0, react_dom_1.createPortal)(isOpen ? (React.createElement(React.Fragment, null,
         React.createElement(Backdrop_1.default, { timestamp: openTimestamp, uuid: uuid, zIndex: zIndex - backdropZIndexOffset, onBringToFront: onBringToFront }),
         React.createElement(react_remove_scroll_1.RemoveScroll, null,
-            React.createElement(rebass_1.Flex, { alignItems: "center", justifyContent: "center", flexDirection: "column", ...boxProps, style: { zIndex, ...style }, className: (0, join_1.default)(Backdrop_1.baseClassName, className) }, children)))) : null, portalElement);
+            React.createElement(Flex_1.Flex, { alignItems: "center", justifyContent: "center", flexDirection: "column", ...boxProps, style: { zIndex, ...style }, className: (0, clsx_1.default)('twa:fixed twa:inset-0 twa:z-1000 twa:font-(family-name:--ab__font-family)', Backdrop_1.baseClassName, className) }, children)))) : null, portalElement);
 };
 exports.Modal = Modal;

package/src/components/OverlayTrigger/index.js

@@ -100,6 +100,9 @@ const OverlayTrigger = React.forwardRef((givenProps, ref) => {
     // when moving the mouse cursor from the trigger to the overlay
     // for this case we debounce the visible change for a very small amount of time
     (0, debounce_1.default)((visible) => {
+        // if (!visible) {
+        //   return;
+        // }
         onVisibleChange?.(visible);
         if (!visible) {
             hideTimeoutRef.current = setTimeout(() => {

package/src/components/Panel/index.d.ts

@@ -1,18 +1,34 @@
 import * as React from 'react';
-import { BoxProps, FlexProps } from 'rebass';
 import { ReactNode, HTMLProps } from 'react';
+import { FlexProps } from '../Flex';
 export declare const baseClassName = "ab-Panel";
 export interface HeaderProps extends FlexProps {
+    className?: string;
+    style?: React.CSSProperties;
+    onClick?: () => void;
 }
-export type PanelProps = HTMLProps<HTMLElement> & {
+export type PanelProps = HTMLProps<HTMLDivElement> & {
     header?: ReactNode | string;
     children?: ReactNode;
     headerProps?: HeaderProps;
-    bodyProps?: BoxProps;
+    bodyProps?: {
+        className?: string;
+        style?: React.CSSProperties;
+    };
     variant?: 'default' | 'primary' | 'modern';
     border?: string | number;
-    borderRadius?: string | number;
     bodyScroll?: string | boolean;
-} & BoxProps;
-declare const Panel: React.FC<PanelProps>;
+} & FlexProps;
+declare const PlainHeader: ({ children, className }: {
+    children?: ReactNode;
+    className?: string;
+}) => React.JSX.Element;
+declare const FlexBody: ({ children, className }: {
+    children?: ReactNode;
+    className?: string;
+}) => React.JSX.Element;
+declare const Panel: React.FC<PanelProps> & {
+    FlexBody: typeof FlexBody;
+    PlainHeader: typeof PlainHeader;
+};
 export default Panel;

package/src/components/Panel/index.js

@@ -3,32 +3,38 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.baseClassName = 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("../utils/join"));
+const clsx_1 = tslib_1.__importDefault(require("clsx"));
+const Flex_1 = require("../Flex");
+const twMerge_1 = require("../../twMerge");
 exports.baseClassName = 'ab-Panel';
-const Header = ({ children, variant = 'default', ...headerProps }) => {
+const DEFAULT_BODY_CLS = 'twa:relative twa:flex-1 twa:p-2 twa:bg-defaultbackground twa:text-text-on-defaultbackground';
+const Header = ({ children, variant = 'default', className, style, onClick, ...flexProps }) => {
     if (!children) {
         return null;
     }
-    const style = {};
-    return (React.createElement(rebass_1.Flex, { flexDirection: "row", alignItems: "center", ...headerProps, style: { ...style, ...headerProps.style }, className: (0, join_1.default)(`${exports.baseClassName}__header`, `${exports.baseClassName}__header--variant-${variant}`) }, children));
+    return (React.createElement(Flex_1.Flex, { flexDirection: "row", alignItems: "center", style: { ...style }, onClick: onClick, className: (0, twMerge_1.twMerge)(`${exports.baseClassName}__header ${exports.baseClassName}__header--variant-${variant}`, className), ...flexProps }, children));
 };
-const Body = ({ children, bodyScroll, variant, ...bodyProps }) => {
+const Body = ({ children, bodyScroll, variant, className, style, }) => {
     if (!children) {
         return null;
     }
     if (bodyScroll === true) {
         bodyScroll = 'auto';
     }
-    return (React.createElement(rebass_1.Box, { ...bodyProps, className: (0, join_1.default)(`${exports.baseClassName}__body`, variant && `${exports.baseClassName}__body--variant-${variant}`, bodyScroll ? `${exports.baseClassName}__body--scroll-${bodyScroll}` : null) }, children));
+    const bodyCls = (0, clsx_1.default)(DEFAULT_BODY_CLS, `${exports.baseClassName}__body`, variant && `${exports.baseClassName}__body--variant-${variant}`, bodyScroll ? `twa:overflow-auto` : null, {
+        'twa:bg-primarylight twa:text-text-on-primary twa:border-0': variant === 'modern',
+    }, className);
+    return (React.createElement(Flex_1.Box, { style: style, className: bodyCls }, children));
+};
+const PlainHeader = ({ children, className }) => {
+    return (React.createElement(Flex_1.Box, { className: (0, clsx_1.default)(`${exports.baseClassName}__header`, `${exports.baseClassName}__header--variant-plain`, className) }, children));
+};
+const FlexBody = ({ children, className }) => {
+    return (React.createElement(Flex_1.Box, { className: (0, clsx_1.default)(DEFAULT_BODY_CLS, `${exports.baseClassName}__body`, `${exports.baseClassName}__body--variant-flex`, 'twa:overflow-auto twa:min-h-0', 'twa:flex-1 twa:flex twa:flex-col', className) }, children));
 };
 const Panel = (props) => {
-    const { borderRadius, border, className, header, children, headerProps, bodyProps, bodyScroll, variant = 'default', ...boxProps } = props;
+    const { border, className, header, children, headerProps, bodyProps, bodyScroll, variant = 'default', ...boxProps } = props;
     const style = {};
-    if (borderRadius !== undefined) {
-        style['--ab-cmp-panel__border-radius'] =
-            typeof borderRadius == 'number' ? `var(--ab-space-${borderRadius})` : borderRadius;
-    }
     const headerStyle = {
         border,
         ...(headerProps ? headerProps.style : null),
@@ -37,8 +43,41 @@ const Panel = (props) => {
         border,
         ...(bodyProps ? bodyProps.style : null),
     };
-    return (React.createElement(rebass_1.Box, { ...boxProps, style: { ...style, ...boxProps.style }, className: (0, join_1.default)(className, exports.baseClassName, `${exports.baseClassName}--variant-${variant}`, !header ? `${exports.baseClassName}--no-header` : `${exports.baseClassName}--with-header`) },
-        React.createElement(Header, { ...headerProps, style: headerStyle, variant: variant }, header),
-        React.createElement(Body, { ...bodyProps, style: bodyStyle, bodyScroll: bodyScroll, variant: variant }, children)));
+    const cls = (0, twMerge_1.twMerge)((0, clsx_1.default)(exports.baseClassName, `${exports.baseClassName}--variant-${variant}`, !header ? `${exports.baseClassName}--no-header` : `${exports.baseClassName}--with-header`, 'twa:rounded-standard', 'twa:flex twa:flex-col'), className);
+    let headerCls = headerProps?.className;
+    if (cls.includes('twa:rounded-none')) {
+        headerCls = (0, twMerge_1.twMerge)(headerCls, 'twa:rounded-none');
+    }
+    let bodyCls = bodyProps?.className;
+    if (cls.includes('twa:rounded-none')) {
+        bodyCls = (0, twMerge_1.twMerge)(bodyCls, 'twa:rounded-none');
+    }
+    if (cls.includes('twa:border-none')) {
+        bodyCls = (0, twMerge_1.twMerge)(bodyCls, 'twa:border-none');
+    }
+    let childrenArr = React.Children.toArray(children);
+    let theBody;
+    let theHeader;
+    childrenArr.forEach((child) => {
+        if (React.isValidElement(child) && child.type === FlexBody) {
+            theBody = child;
+        }
+        else if (React.isValidElement(child) && child.type === PlainHeader) {
+            theHeader = child;
+        }
+    });
+    if (theHeader) {
+        childrenArr = childrenArr.filter((child) => child !== theHeader);
+        theHeader = (React.createElement(PlainHeader, { ...theHeader.props, className: (0, clsx_1.default)(headerCls, theHeader.props.className ?? '') }));
+    }
+    if (theBody) {
+        theBody = (React.createElement(FlexBody, { ...theBody.props, className: (0, clsx_1.default)(bodyCls, theBody.props.className ?? '') }));
+    }
+    return (React.createElement(Flex_1.Box, { ...boxProps, style: { ...style, ...boxProps.style }, className: cls },
+        theHeader ?? (React.createElement(Header, { ...headerProps, style: headerStyle, variant: variant, className: headerCls }, header)),
+        theBody ??
+            (childrenArr.length > 0 ? (React.createElement(Body, { ...bodyProps, style: bodyStyle, bodyScroll: bodyScroll, variant: variant, className: (0, twMerge_1.twMerge)(bodyCls) }, childrenArr)) : null)));
 };
+Panel.PlainHeader = PlainHeader;
+Panel.FlexBody = FlexBody;
 exports.default = Panel;

package/src/components/PopupWithFooter.js

@@ -5,12 +5,11 @@ const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const Dialog_1 = tslib_1.__importDefault(require("./Dialog"));
 const FlexWithFooter_1 = tslib_1.__importDefault(require("./FlexWithFooter"));
+const twMerge_1 = require("../twMerge");
 exports.PopupWithFooter = React.forwardRef((props, ref) => {
     const { showModal, onHide, footer, maxWidth, style, ...dialogProps } = props;
-    return (React.createElement(Dialog_1.default, { ...dialogProps, ref: ref, isOpen: showModal, onDismiss: onHide, showCloseButton: false, padding: 0 },
+    return (React.createElement(Dialog_1.default, { ...dialogProps, ref: ref, isOpen: showModal, onDismiss: onHide, showCloseButton: false, className: (0, twMerge_1.twMerge)('twa:p-0', dialogProps.className) },
         React.createElement(FlexWithFooter_1.default, { flexDirection: "column", style: style, footer: footer, footerProps: {
-                padding: 2,
-                backgroundColor: 'primary',
-                className: 'ab-Popup__footer',
+                className: 'ab-Popup__footer twa:p-2 twa:bg-primary',
             }, children: props.children })));
 });

package/src/components/ProgressIndicator/ProgressIndicator.js

@@ -9,7 +9,7 @@ const Loader_1 = require("../Loader");
 const AdaptableContext_1 = require("../../View/AdaptableContext");
 const ExternalRenderer_1 = require("../../View/Components/ExternalRenderer");
 const Dialog_1 = tslib_1.__importDefault(require("../Dialog"));
-const rebass_1 = require("rebass");
+const Flex_1 = require("../Flex");
 const ProgressIndicator = () => {
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
     const { active, text, render, frameworkComponent, renderMode } = (0, react_redux_1.useSelector)((state) => state.Popup.ProgressIndicator);
@@ -65,11 +65,11 @@ const ProgressIndicator = () => {
         customEl) : (
         // Otherwise use the default Flex layout
         (React.createElement(
-            rebass_1.Flex,
-            { alignItems: "center", flexDirection: "column", p: 3, className: "ab-ProgressIndicator-body" },
+            Flex_1.Flex,
+            { alignItems: "center", flexDirection: "column", className: "ab-ProgressIndicator-body twa:p-3" },
             React.createElement(Loader_1.LoaderSpinner, null),
-            React.createElement(rebass_1.Box, { mt: 3 },
-                text && React.createElement(rebass_1.Box, null, text),
+            React.createElement(Flex_1.Box, { className: "twa:mt-3" },
+                text && React.createElement(Flex_1.Box, null, text),
                 customEl)
         )))))
     ));