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

package/src/components/Dashboard/DashboardToolbar.js

@@ -1,18 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DashboardToolbar = void 0;
+exports.DashboardToolbar = DashboardToolbar;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const SimpleButton_1 = tslib_1.__importDefault(require("../SimpleButton"));
 const join_1 = tslib_1.__importDefault(require("../utils/join"));
-const rebass_1 = require("rebass");
+const Flex_1 = require("../Flex");
 function DashboardToolbar(props) {
     return (React.createElement("div", { className: (0, join_1.default)('ab-Dashboard__toolbar', props.className) },
         React.createElement("div", { className: "ab-Dashboard__toolbar-content" }, props.children),
-        React.createElement(rebass_1.Flex, { className: "ab-Dashboard__toolbar-title", flexDirection: "row", alignItems: "center" },
-            React.createElement("span", null, props.title),
-            props.showConfigure && (React.createElement(SimpleButton_1.default, { "aria-label": `Configure ${props.title}`, icon: "spanner", variant: "text", tone: "none", "data-name": "configure", iconSize: 16, marginLeft: 1, tooltip: props.tooltip || `Configure ${props.title}`, onClick: () => props.onConfigure() })),
-            ' ',
-            props.showClose && (React.createElement(SimpleButton_1.default, { "aria-label": `Close ${props.title}`, style: { alignSelf: 'flex-end' }, disabled: props.accessLevel == 'ReadOnly', "data-name": "close", icon: "close", variant: "text", tone: "none", iconSize: 16, marginLeft: 1, tooltip: props.tooltip || `Close ${props.title} Toolbar`, onClick: () => props.onClose() })))));
+        React.createElement(Flex_1.Flex, { className: "ab-Dashboard__toolbar-title twa:items-center twa:justify-center twa:px-2 twa:pb-1 twa:opacity-70", flexDirection: "row" },
+            React.createElement("span", { className: "twa:text-2" }, props.title),
+            props.showConfigure && (React.createElement(SimpleButton_1.default, { "aria-label": `Configure ${props.title}`, icon: "spanner", variant: "text", tone: "none", "data-name": "configure", iconSize: 16, className: "twa:ml-1", tooltip: props.tooltip || `Configure ${props.title}`, onClick: () => props.onConfigure() })),
+            props.showClose && (React.createElement(SimpleButton_1.default, { "aria-label": `Close ${props.title}`, style: { alignSelf: 'flex-end' }, disabled: props.accessLevel == 'ReadOnly', "data-name": "close", icon: "close", variant: "text", tone: "none", iconSize: 16, className: "twa:ml-1", tooltip: props.tooltip || `Close ${props.title} Toolbar`, onClick: () => props.onClose() })))));
 }
-exports.DashboardToolbar = DashboardToolbar;

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

@@ -1,8 +1,8 @@
 import * as React from 'react';
-import { BoxProps } from 'rebass';
 import { DatepickerButton } from '../../AdaptableOptions/DateInputOptions';
 import { Locale } from 'date-fns';
-export type DatepickerProps = Omit<BoxProps, 'value' | 'onChange' | 'defaultValue'> & {
+import { InputProps } from '../Input';
+export type DatepickerProps = Omit<InputProps, 'value' | 'onChange' | 'defaultValue'> & {
     value: Date | undefined;
     defaultValue?: Date | undefined;
     autoFocus?: boolean;

package/src/components/Datepicker/index.js

@@ -8,13 +8,14 @@ const react_1 = require("react");
 const useProperty_1 = tslib_1.__importDefault(require("../utils/useProperty"));
 const FieldWrap_1 = tslib_1.__importDefault(require("../FieldWrap"));
 const SimpleButton_1 = tslib_1.__importDefault(require("../SimpleButton"));
-const rebass_1 = require("rebass");
 const FormatHelper_1 = require("../../Utilities/Helpers/FormatHelper");
 const DatepickerContext_1 = require("./DatepickerContext");
 const react_day_picker_1 = require("react-day-picker");
 const AdaptableDateInlineInput_1 = require("../../View/Components/AdaptableInput/AdaptableDateInlineInput");
 const date_fns_1 = require("date-fns");
 const Select_1 = require("../Select");
+const Flex_1 = require("../Flex");
+const clsx_1 = tslib_1.__importDefault(require("clsx"));
 const onDatePickerDropdownKeyDown = (e) => {
     if (e.key === 'Escape' || e.key === 'Enter') {
         e.stopPropagation();
@@ -65,7 +66,7 @@ const DatepickerOverlay = ({ onHide, children, onKeyDown, onMouseDown, overlayDO
 const END_MONTH = (0, date_fns_1.endOfYear)((0, date_fns_1.addYears)(new Date(), 10));
 const START_MONTH = (0, date_fns_1.startOfYear)((0, date_fns_1.addYears)(new Date(), -50));
 exports.Datepicker = React.forwardRef((props, ref) => {
-    const { dateProps, required, disabled, style, placeholder, showWeekNumber, showOutsideDays, value: _, defaultValue: __, onChange: ___, datepickerButtons, showClearButton, autoFocus, ...boxProps } = props;
+    const { dateProps, required, disabled, style, className, placeholder, showWeekNumber, showOutsideDays, value: _, defaultValue: __, onChange: ___, datepickerButtons, showClearButton, autoFocus, ...boxProps } = props;
     const datepickerContext = (0, DatepickerContext_1.useDatepickerContext)();
     let [value, setValue] = (0, useProperty_1.default)(props, 'value', undefined, {
         onChange: props.onChange,
@@ -95,7 +96,7 @@ exports.Datepicker = React.forwardRef((props, ref) => {
     const clearValue = () => {
         updateValue(undefined);
     };
-    const renderButton = (label, onClick) => (React.createElement(SimpleButton_1.default, { onClick: onClick, margin: '2px' }, label));
+    const renderButton = (label, onClick) => (React.createElement(SimpleButton_1.default, { onClick: onClick, className: "twa:m-[2px]" }, label));
     const todayDate = new Date();
     const footerButtonsMap = {
         clear: renderButton('Clear', () => clearValue()),
@@ -109,25 +110,25 @@ exports.Datepicker = React.forwardRef((props, ref) => {
         '|': React.createElement("hr", { style: { width: '100%', height: 0, margin: 0, border: 'none' } }),
     };
     const footerButtons = datepickerButtons.map((buttonKey, index) => React.cloneElement(footerButtonsMap[buttonKey], { key: index }));
-    const clearButton = showClearButton !== false ? (React.createElement(SimpleButton_1.default, { "data-name": "clear", variant: "text", tooltip: "Clear", iconSize: 20, padding: 0, icon: "close", onMouseDown: (e) => {
+    const clearButton = showClearButton !== false ? (React.createElement(SimpleButton_1.default, { "data-name": "clear", variant: "text", tooltip: "Clear", iconSize: 20, className: "twa:p-0", icon: "close", onMouseDown: (e) => {
             e.preventDefault();
             clearValue();
         }, accessLevel: 'Full' })) : null;
-    const calendarButton = (React.createElement(SimpleButton_1.default, { disabled: disabled, variant: "text", icon: "calendar", tooltip: "Date", iconSize: 20, px: 0, py: 0, onClick: () => setVisible(true) }));
+    const calendarButton = (React.createElement(SimpleButton_1.default, { disabled: disabled, variant: "text", icon: "calendar", tooltip: "Date", iconSize: 20, className: "twa:p-0", onClick: () => setVisible(true) }));
     const overlayDOMRef = (0, react_1.useRef)(null);
-    return (React.createElement(rebass_1.Flex, null,
+    return (React.createElement(Flex_1.Flex, null,
         React.createElement(OverlayTrigger_1.default, { visible: visible, render: () => (React.createElement(DatepickerOverlay, { overlayDOMRef: overlayDOMRef, onMouseDown: props.onMouseDown, onHide: () => setVisible(false), onKeyDown: (e) => {
                     if (e.key === 'Escape' || e.key === 'Enter') {
                         setVisible(false, e.key);
                     }
                 } },
-                React.createElement(react_day_picker_1.DayPicker, { fixedWeeks: true, autoFocus: autoFocus ?? true, showWeekNumber: showWeekNumber, showOutsideDays: showOutsideDays, mode: "single", captionLayout: "dropdown", month: isNaN(+month) ? new Date() : month, selected: value, onMonthChange: setMonth, onSelect: updateValue, startMonth: START_MONTH, endMonth: END_MONTH, components: DatePickerComponents, footer: React.createElement(rebass_1.Flex, { justifyContent: "space-between", mt: 2, flexWrap: 'wrap' }, footerButtons) }))) },
+                React.createElement(react_day_picker_1.DayPicker, { fixedWeeks: true, autoFocus: autoFocus ?? true, showWeekNumber: showWeekNumber, showOutsideDays: showOutsideDays, mode: "single", captionLayout: "dropdown", month: isNaN(+month) ? new Date() : month, selected: value, onMonthChange: setMonth, onSelect: updateValue, startMonth: START_MONTH, endMonth: END_MONTH, components: DatePickerComponents, footer: React.createElement(Flex_1.Flex, { justifyContent: "space-between", className: "twa:mt-2", flexWrap: 'wrap' }, footerButtons) }))) },
             React.createElement(FieldWrap_1.default, { ...boxProps, style: {
                     borderRadius: style?.borderRadius,
                     width: style?.width,
                     maxWidth: style?.maxWidth,
                     border: style?.border,
-                }, className: "ab-Datepicker", onFocus: () => {
+                }, className: (0, clsx_1.default)('ab-Datepicker twa:min-h-input', className), onFocus: () => {
                     if (!visible) {
                         setVisible(true);
                     }
@@ -147,7 +148,7 @@ exports.Datepicker = React.forwardRef((props, ref) => {
                         if ((0, date_fns_1.isValid)(date)) {
                             updateValue(date);
                         }
-                    }, style: style, disabled: disabled }),
+                    }, className: className?.includes('twa:w-full') ? 'twa:w-full' : '', style: style, disabled: disabled }),
                 !!inputValue ? clearButton : null,
                 calendarButton))));
 });

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

@@ -1,7 +1,7 @@
 import * as React from 'react';
-import { BoxProps } from 'rebass';
 import { ModalProps } from '../Modal';
 import { WindowModalProps } from '../WindowModal';
+import { BoxProps } from '../Flex';
 type TypeProps = {
     modal?: boolean;
     autoFocus?: boolean;
@@ -17,11 +17,17 @@ type TypeProps = {
     dismissOnClickOutside?: boolean;
 };
 export interface DialogProps extends Omit<BoxProps, 'ref'>, TypeProps {
+    onKeyDown?: (event: React.KeyboardEvent<HTMLDivElement>) => void;
+    onClick?: (event: React.MouseEvent<HTMLDivElement>) => void;
+    onChange?: (event: React.FormEvent<HTMLDivElement>) => void;
+    className?: string;
+    children?: React.ReactNode;
+    style?: React.CSSProperties;
 }
 export type DialogRefType = {
     bringToFront: VoidFunction;
 };
 export declare const Dialog: React.ForwardRefExoticComponent<DialogProps & {
-    children?: React.ReactNode;
+    children?: React.ReactNode | undefined;
 } & React.RefAttributes<DialogRefType>>;
 export default Dialog;

package/src/components/Dialog/index.js

@@ -4,18 +4,19 @@ exports.Dialog = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const react_1 = require("react");
-const join_1 = tslib_1.__importDefault(require("../utils/join"));
 const contains_1 = tslib_1.__importDefault(require("../utils/contains"));
 const captureTabNavigation_1 = tslib_1.__importDefault(require("../utils/captureTabNavigation"));
-const rebass_1 = require("rebass");
 const Modal_1 = require("../Modal");
 const useIsOpen_1 = tslib_1.__importDefault(require("./useIsOpen"));
 const useAutoFocus_1 = tslib_1.__importDefault(require("../utils/useAutoFocus"));
 const icons_1 = require("../icons");
 const WindowModal_1 = require("../WindowModal");
+const Flex_1 = require("../Flex");
+const clsx_1 = tslib_1.__importDefault(require("clsx"));
+const twUtils_1 = require("../twUtils");
 const baseClassName = 'ab-Dialog';
 exports.Dialog = React.forwardRef((props, dialogRef) => {
-    let { modal, fixed, focusOnBrowserVisible = false, autoFocus = true, className, children, modalProps, dismissOnClickOutside = false, onDismiss, windowModal, windowModalProps, ...boxProps } = props;
+    let { modal, fixed, focusOnBrowserVisible = false, autoFocus = true, className, children, modalProps, dismissOnClickOutside = false, onDismiss, windowModal, windowModalProps, showCloseButton = true, isOpen: _isOpenProp, ...boxProps } = props;
     modal = props.modal === undefined ? true : props.modal;
     fixed = props.fixed === undefined ? true : props.fixed;
     const [isOpen, setIsOpen] = (0, useIsOpen_1.default)(props);
@@ -26,7 +27,6 @@ exports.Dialog = React.forwardRef((props, dialogRef) => {
         previous: ({ autoFocus }) => autoFocus && isOpen,
         shouldFocus: ({ autoFocus }) => autoFocus && isOpen,
     }, boxRef);
-    const showCloseButton = props.showCloseButton === undefined ? true : props.showCloseButton;
     const onKeyDown = (e) => {
         if (props.onKeyDown) {
             props.onKeyDown(e);
@@ -98,22 +98,22 @@ exports.Dialog = React.forwardRef((props, dialogRef) => {
     if (!isOpen) {
         return null;
     }
-    const closeButton = showCloseButton ? (React.createElement(rebass_1.Box, { padding: 1, title: "Close dialog", onClick: () => setIsOpen(false), className: `${baseClassName}__close-button` },
+    const closeButton = showCloseButton ? (React.createElement(Flex_1.Box, { title: "Close dialog", onClick: () => setIsOpen(false), className: (0, clsx_1.default)(`${baseClassName}__close-button twa:p-1`, 'twa:text-accentlight', 'twa:text-shadow-[0_1px_0_#fff]', `twa:text-3 twa:cursor-pointer twa:leading-none twa:font-bold`, 'twa:absolute twa:top-[6px] twa:right-[6px]') },
         React.createElement(icons_1.Icon, { size: 20, name: "close" }))) : null;
     const setPreventDismissFlag = (e) => {
         if (dismissOnClickOutside) {
             e.nativeEvent.preventDialogDismiss = true;
         }
     };
-    const box = (React.createElement(rebass_1.Box, { ...boxProps, onClick: (e) => {
+    const box = (React.createElement(Flex_1.Box, { ...boxProps, onClick: (e) => {
             setPreventDismissFlag(e);
             if (boxProps && boxProps.onClick) {
                 boxProps.onClick(e);
             }
-        }, onKeyDown: onKeyDown, className: (0, join_1.default)(baseClassName, modal ? `${baseClassName}--modal` : `${baseClassName}--not-modal`, className), ref: boxRef },
+        }, onKeyDown: onKeyDown, className: (0, clsx_1.default)('twa:relative', 'twa:bg-defaultbackground', 'twa:text-text-on-defaultbackground', 'twa:fill-text-on-defaultbackground', 'twa:rounded-standard', 'twa:flex twa:flex-col', twUtils_1.targetOwn.focusOutline, twUtils_1.targetOwn.focusWithinOutline, baseClassName, modal ? `${baseClassName}--modal` : `${baseClassName}--not-modal`, className), ref: boxRef },
         children,
         closeButton));
-    const content = fixed ? (React.createElement("div", { onClick: setPreventDismissFlag, className: `${baseClassName}-fixed-wrapper` }, box)) : (box);
+    const content = fixed ? (React.createElement("div", { onClick: setPreventDismissFlag, className: (0, clsx_1.default)(`${baseClassName}-fixed-wrapper`, 'twa:fixed twa:inset-0', 'twa:m-auto', 'twa:flex twa:items-center twa:justify-center') }, box)) : (box);
     if (windowModal) {
         return React.createElement(WindowModal_1.WindowModal, { ...windowModalProps }, content);
     }

package/src/components/DragAndDropContext/DragAndDropContext.d.ts

@@ -3,5 +3,5 @@ import { ModuleManagerProps } from './ModuleManager';
 import { ModuleDraggableItem } from './types';
 export declare const DragAndDropContext: React.Context<{
     availableItems: ModuleDraggableItem[];
-    permittedActions: ModuleManagerProps['permittedActions'];
+    permittedActions: ModuleManagerProps["permittedActions"];
 }>;

package/src/components/DragAndDropContext/ModuleManager.d.ts

@@ -2,6 +2,7 @@ import * as React from 'react';
 import { BaseModuleTab, ModuleDraggableItem } from './types';
 export interface ModuleManagerProps {
     availableItems: ModuleDraggableItem[];
+    className?: string;
     disabled: boolean;
     onTabsChange: (tabs: BaseModuleTab[]) => void;
     tabs: BaseModuleTab[];

package/src/components/DragAndDropContext/ModuleManager.js

@@ -4,13 +4,14 @@ exports.ModuleManager = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const dnd_1 = require("../dnd");
-const PanelWithButton_1 = require("../../View/Components/Panels/PanelWithButton");
-const SimpleButton_1 = tslib_1.__importDefault(require("../SimpleButton"));
 const DragAndDropContext_1 = require("./DragAndDropContext");
 const TabList_1 = require("./TabList");
 const UnusedPanel_1 = require("./UnusedPanel");
+const Flex_1 = require("../Flex");
+const clsx_1 = tslib_1.__importDefault(require("clsx"));
+const Card_1 = require("../Card");
 const ModuleManager = (props) => {
-    const { availableItems, tabs, onTabsChange, tabsTitle, disabled, unusedPanelTitle, dragItemText, permittedActions, } = props;
+    const { availableItems, tabs, onTabsChange, tabsTitle, disabled, unusedPanelTitle, dragItemText, permittedActions, className, } = props;
     const contextValue = React.useMemo(() => {
         const preparedPermittedAction = {
             createTab: true,
@@ -86,9 +87,11 @@ const ModuleManager = (props) => {
                 handleToolbarDragEnd(result);
         } },
         React.createElement(DragAndDropContext_1.DragAndDropContext.Provider, { value: contextValue },
-            React.createElement("div", { className: "ab-ModuleSelector", style: { display: 'flex', flexDirection: 'column' } },
+            React.createElement(Flex_1.Flex, { flexDirection: "column", className: (0, clsx_1.default)('ab-ModuleSelector twa:flex-1', className) },
                 React.createElement(UnusedPanel_1.UnusedPanel, { title: unusedPanelTitle, disabled: disabled, items: unusedItems, dragItemText: dragItemText }),
-                React.createElement(PanelWithButton_1.PanelWithButton, { className: "ab-ModuleSelector-UsedPanel", headerText: tabsTitle, button: contextValue.permittedActions.createTab && (React.createElement(SimpleButton_1.default, { disabled: disabled, onClick: handleTabAdd }, "Add Tab")) },
-                    React.createElement(TabList_1.TabList, { disabled: disabled, tabs: tabs, onRemoveTab: handleRemoveTab, onRemoveToolbar: handleRemoveToolbar, onChangeTabName: handleChangeTabName }))))));
+                React.createElement(Card_1.Card, { className: "twa:flex-1 twa:m-2 ab-ModuleSelector-UsedPanel" },
+                    React.createElement(Card_1.Card.Title, { border: false }, tabsTitle),
+                    React.createElement(Card_1.Card.Body, { className: "twa:px-2" },
+                        React.createElement(TabList_1.TabList, { disabled: disabled, tabs: tabs, onRemoveTab: handleRemoveTab, onRemoveToolbar: handleRemoveToolbar, onChangeTabName: handleChangeTabName, onNewTab: contextValue.permittedActions.createTab ? handleTabAdd : undefined })))))));
 };
 exports.ModuleManager = ModuleManager;

package/src/components/DragAndDropContext/TabList.d.ts

@@ -1,11 +1,12 @@
 import * as React from 'react';
 import { BaseModuleTab } from './types';
-export declare function TabList({ tabs, onRemoveTab, onRemoveToolbar, onChangeTabName, disabled, }: {
+export declare function TabList({ tabs, onRemoveTab, onRemoveToolbar, onChangeTabName, disabled, onNewTab, }: {
     disabled: boolean;
     tabs: BaseModuleTab[];
     onRemoveTab: (tabIndex: number) => void;
     onRemoveToolbar: (tabIndex: number, toolbarIndex: number) => void;
     onChangeTabName: (tabIndex: number, tabName: string) => void;
+    onNewTab?: () => void;
 }): React.JSX.Element;
 export declare function TabItem({ tab, tabIndex, onRemove, onRemoveToolbar, onChangeTabName, disabled, }: {
     tab: BaseModuleTab;

package/src/components/DragAndDropContext/TabList.js

@@ -1,53 +1,72 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ToolbarItem = exports.ToolbarList = exports.TabItem = exports.TabList = void 0;
+exports.TabList = TabList;
+exports.TabItem = TabItem;
+exports.ToolbarList = ToolbarList;
+exports.ToolbarItem = ToolbarItem;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const dnd_1 = require("../dnd");
-const rebass_1 = require("rebass");
 const icons_1 = require("../icons");
 const SimpleButton_1 = tslib_1.__importDefault(require("../SimpleButton"));
 const DragAndDropContext_1 = require("./DragAndDropContext");
-function TabList({ tabs, onRemoveTab, onRemoveToolbar, onChangeTabName, disabled, }) {
-    return (React.createElement(dnd_1.Droppable, { droppableId: "MAIN", type: "TAB", direction: "horizontal" }, (provided) => (React.createElement("div", { ...provided.droppableProps, className: "ab-ModuleSelector__TabList", ref: provided.innerRef, style: { display: 'flex' }, "data-name": "dashboard-tabs" },
+const Flex_1 = require("../Flex");
+function TabList({ tabs, onRemoveTab, onRemoveToolbar, onChangeTabName, disabled, onNewTab, }) {
+    return (React.createElement(dnd_1.Droppable, { droppableId: "MAIN", type: "TAB", direction: "horizontal" }, (provided) => (React.createElement("div", { ...provided.droppableProps, className: "ab-ModuleSelector__TabList twa:flex twa:flex-1 twa:overflow-auto", ref: provided.innerRef, "data-name": "dashboard-tabs" },
         tabs.map((tab, tabIndex) => (React.createElement(TabItem, { disabled: disabled, key: tabIndex, tabIndex: tabIndex, tab: tab, onRemove: () => onRemoveTab(tabIndex), onRemoveToolbar: (toolbarIndex) => onRemoveToolbar(tabIndex, toolbarIndex), onChangeTabName: (tabName) => onChangeTabName(tabIndex, tabName) }))),
+        !disabled && onNewTab ? (React.createElement(Flex_1.Flex, { alignItems: "center", justifyContent: "center", className: "ab-ModuleSelector__TabItem twa:min-w-32 twa:border-dashed twa:cursor-pointer twa:bg-primarylight twa:text-primary-foreground twa:hover:bg-primary", onClick: onNewTab },
+            React.createElement("div", { className: "twa:text-8 twa:flex twa:flex-col twa:gap-4 twa:items-center twa:italic" },
+                React.createElement(icons_1.Icon, { name: "plus", size: 32 }),
+                "Click to add tab"))) : null,
         provided.placeholder))));
 }
-exports.TabList = TabList;
 function TabItem({ tab, tabIndex, onRemove, onRemoveToolbar, onChangeTabName, disabled, }) {
     const context = React.useContext(DragAndDropContext_1.DragAndDropContext);
     const isDragDisabled = disabled || !context.permittedActions.dragAndDropTab;
-    return (React.createElement(dnd_1.Draggable, { isDragDisabled: isDragDisabled, draggableId: String(tabIndex), index: tabIndex }, (provided) => (React.createElement("div", { className: "ab-ModuleSelector__TabItem", "data-name": "dashboard-tab", ref: provided.innerRef, ...provided.draggableProps, style: {
-            ...(isDragDisabled ? {} : provided.draggableProps.style),
-        } },
-        React.createElement("div", { className: "ab-ModuleSelector__TabItem__header" },
-            React.createElement("div", { ...(disabled ? {} : provided.dragHandleProps), style: context.permittedActions.dragAndDropTab
-                    ? {}
-                    : {
-                        display: 'none',
-                    } },
-                React.createElement(icons_1.Icon, { name: "drag" })),
-            context.permittedActions.editTabName ? (React.createElement("input", { className: "ab-ModuleSelector__TabItem__header-input", type: "text", disabled: disabled, value: tab.Name, onChange: (event) => {
-                    onChangeTabName(event.target.value);
-                } })) : (tab.Name),
-            context.permittedActions.deleteTab && (React.createElement(SimpleButton_1.default, { disabled: disabled, icon: "delete", variant: "text", onClick: onRemove }))),
-        React.createElement(ToolbarList, { disabled: disabled, toolbars: tab.Items, droppableId: String(tabIndex), onRemove: onRemoveToolbar })))));
+    return (React.createElement(dnd_1.Draggable, { isDragDisabled: isDragDisabled, draggableId: String(tabIndex), index: tabIndex }, (provided) => {
+        let showHeader = true;
+        if (tab.Name === '' &&
+            !context.permittedActions.editTabName &&
+            !context.permittedActions.deleteTab) {
+            showHeader = false;
+        }
+        return (React.createElement("div", { className: "ab-ModuleSelector__TabItem twa:min-w-32", "data-name": "dashboard-tab", ref: provided.innerRef, ...provided.draggableProps, style: {
+                ...(isDragDisabled ? {} : provided.draggableProps.style),
+            } },
+            showHeader ? (React.createElement("div", { className: "ab-ModuleSelector__TabItem__header" },
+                React.createElement("div", { ...(disabled ? {} : provided.dragHandleProps), style: context.permittedActions.dragAndDropTab
+                        ? {}
+                        : {
+                            display: 'none',
+                        } },
+                    React.createElement(icons_1.Icon, { name: "drag" })),
+                context.permittedActions.editTabName ? (React.createElement("input", { className: "ab-ModuleSelector__TabItem__header-input", type: "text", disabled: disabled, value: tab.Name, onChange: (event) => {
+                        onChangeTabName(event.target.value);
+                    } })) : (tab.Name),
+                context.permittedActions.deleteTab && (React.createElement(SimpleButton_1.default, { disabled: disabled, icon: "delete", variant: "text", onClick: onRemove })))) : null,
+            React.createElement(ToolbarList, { disabled: disabled, toolbars: tab.Items, droppableId: String(tabIndex), onRemove: onRemoveToolbar })));
+    }));
 }
-exports.TabItem = TabItem;
 function ToolbarList({ toolbars, droppableId, onRemove, disabled, }) {
-    return (React.createElement(dnd_1.Droppable, { droppableId: droppableId, type: "TOOLBAR" }, (provided, snapshot) => (React.createElement(rebass_1.Box, { className: "ab-ModuleSelector__ToolbarList", ref: provided.innerRef, ...(disabled ? {} : provided.droppableProps), "data-name": "dashboard-toolbar-drop-target", backgroundColor: snapshot.isDraggingOver ? 'var(--ab-dashboard-tab-drop-target__background)' : '' },
+    return (React.createElement(dnd_1.Droppable, { droppableId: droppableId, type: "TOOLBAR" }, (provided, snapshot) => (React.createElement(Flex_1.Box, { className: "ab-ModuleSelector__ToolbarList", ref: provided.innerRef, ...(disabled ? {} : provided.droppableProps), "data-name": "dashboard-toolbar-drop-target", style: {
+            backgroundColor: snapshot.isDraggingOver
+                ? 'var(--ab-dashboard-tab-drop-target__background)'
+                : '',
+        } },
         toolbars?.map((toolbar, toolbarIndex) => (React.createElement(ToolbarItem, { disabled: disabled, key: toolbar, toolbar: toolbar, toolbarIndex: toolbarIndex, onRemove: () => onRemove(toolbarIndex) }))),
+        toolbars.length === 0 ? (React.createElement("div", { className: "ab-ModuleSelector__ToolbarList__placeholder twa:flex twa:items-center twa:justify-center twa:h-full twa:italic twa:text-center" }, "Drag and drop toolbar here")) : null,
         provided.placeholder))));
 }
-exports.ToolbarList = ToolbarList;
 function ToolbarItem({ toolbar, toolbarIndex, onRemove, disabled, }) {
     const { availableItems } = React.useContext(DragAndDropContext_1.DragAndDropContext);
     let currentItem = availableItems.find((t) => t.Id === toolbar);
     const title = currentItem ? currentItem.Title : toolbar;
-    return (React.createElement(dnd_1.Draggable, { isDragDisabled: disabled, draggableId: toolbar, index: toolbarIndex }, (provided, snapshot) => (React.createElement(rebass_1.Flex, { className: "ab-ModuleSelector__ToolbarItem", alignItems: "center", mb: 1, pl: 1, backgroundColor: snapshot.isDragging
-            ? 'var(--ab-dashboard-toolbar-drag__background)'
-            : 'var(--ab-color-primarylight)', ref: provided.innerRef, ...provided.draggableProps, ...provided.dragHandleProps, style: provided.draggableProps.style },
-        React.createElement("div", { style: { flex: 1 } }, title),
-        React.createElement(SimpleButton_1.default, { disabled: disabled, icon: "close", variant: "text", padding: 1, onClick: onRemove })))));
+    return (React.createElement(dnd_1.Draggable, { isDragDisabled: disabled, draggableId: toolbar, index: toolbarIndex }, (provided, snapshot) => (React.createElement(Flex_1.Flex, { className: `ab-ModuleSelector__ToolbarItem twa:mb-1 twa:pl-1`, alignItems: "center", ref: provided.innerRef, ...provided.draggableProps, ...provided.dragHandleProps, style: {
+            ...provided.draggableProps.style,
+            backgroundColor: snapshot.isDragging
+                ? 'var(--ab-dashboard-toolbar-drag__background)'
+                : 'var(--ab-color-primarylight)',
+        } },
+        React.createElement("div", { className: "twa:flex-1" }, title),
+        React.createElement(SimpleButton_1.default, { disabled: disabled, icon: "close", variant: "text", className: "twa:p-1", onClick: onRemove })))));
 }
-exports.ToolbarItem = ToolbarItem;

package/src/components/DragAndDropContext/UnusedPanel.js

@@ -1,29 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UnusedPanel = void 0;
+exports.UnusedPanel = UnusedPanel;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const dnd_1 = require("../dnd");
-const rebass_1 = require("rebass");
 const DragAndDropContext_1 = require("./DragAndDropContext");
+const Flex_1 = require("../Flex");
+const clsx_1 = tslib_1.__importDefault(require("clsx"));
 function UnusedPanel({ items, disabled, title, dragItemText, }) {
-    return (React.createElement(rebass_1.Box, { pb: 1, mb: 2, className: "ab-ModuleSelector__UnusedPanel", "data-name": "unusedpanel-items" },
-        React.createElement(rebass_1.Box, { p: 2 },
+    return (React.createElement(Flex_1.Box, { className: "ab-ModuleSelector__UnusedPanel twa:mb-2 twa:pb-1", "data-name": "unusedpanel-items" },
+        React.createElement(Flex_1.Box, { className: "twa:p-2" },
             React.createElement("b", null, title),
             " (",
             dragItemText,
             ")"),
         React.createElement(UnusedItemList, { disabled: disabled, items: items })));
 }
-exports.UnusedPanel = UnusedPanel;
 function UnusedItemList({ items, disabled }) {
-    return (React.createElement(dnd_1.Droppable, { droppableId: "UNUSED", type: "TOOLBAR", isDropDisabled: true, direction: "horizontal" }, (provided) => (React.createElement("div", { ref: provided.innerRef, "data-name": "unusedpanel-items-list", ...provided.droppableProps, style: {
-            display: 'flex',
-            flexDirection: 'row',
-            flexWrap: 'wrap',
-            paddingLeft: 'var(--ab-space-2)',
-            paddingRight: 'var(--ab-space-2)',
-        } },
+    return (React.createElement(dnd_1.Droppable, { droppableId: "UNUSED", type: "TOOLBAR", isDropDisabled: true, direction: "horizontal" }, (provided) => (React.createElement("div", { ref: provided.innerRef, "data-name": "unusedpanel-items-list", ...provided.droppableProps, className: 'twa:px-2 twa:flex-wrap twa:flex twa:flex-row twa:gap-1' },
         items.map((unusedItem, unusedItemIndex) => (React.createElement(UnusedItem, { disabled: disabled, key: unusedItem, unusedItem: unusedItem, unusedItemIndex: unusedItemIndex }))),
         provided.placeholder))));
 }
@@ -39,15 +33,12 @@ function UnusedItem({ unusedItem, unusedItemIndex, disabled, }) {
                 ...provided.dragHandleProps,
             };
         const dragStyle = disabled ? {} : provided.draggableProps.style;
-        return (React.createElement("div", { "data-name": "unused-item", ref: provided.innerRef, ...eventHandlers, style: {
+        return (React.createElement("div", { "data-name": "unused-item", ref: provided.innerRef, ...eventHandlers, className: (0, clsx_1.default)('twa:rounded-md twa:text-sm twa:text-text-on-primary twa:p-2'), style: {
                 ...dragStyle,
                 border: '1px solid var(--ab-color-primary)',
                 backgroundColor: snapshot.isDragging
                     ? 'var(--ab-dashboard-toolbar-drag__background)'
-                    : 'var(--ab-color-primarylight)',
-                padding: 'var(--ab-space-1) var(--ab-space-2)',
-                marginRight: 'var(--ab-space-1)',
-                marginBottom: 'var(--ab-space-1)',
+                    : 'var(--ab-color-primary)',
             } }, title));
     }));
 }

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

@@ -1,11 +1,11 @@
 import * as React from 'react';
 import { ReactNode } from 'react';
-import { BoxProps } from 'rebass';
+import { FlexProps } from '../Flex';
 export type DropdownOption = {
     label: string;
     value: string;
 };
-export type DropdownProps = Omit<BoxProps, 'onChange' | 'value'> & {
+export type DropdownProps = Omit<FlexProps & React.HTMLProps<HTMLDivElement>, 'onChange' | 'value' | 'as' | 'flexDirection' | 'alignItems' | 'height' | 'size'> & {
     autoFocus?: boolean;
     expanded?: boolean;
     disabled?: boolean;

package/src/components/Dropdown/index.js

@@ -3,11 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const react_1 = require("react");
-const rebass_1 = require("rebass");
 const join_1 = tslib_1.__importDefault(require("../utils/join"));
 const useProperty_1 = tslib_1.__importDefault(require("../utils/useProperty"));
 const Arrows_1 = tslib_1.__importDefault(require("./Arrows"));
 const SimpleButton_1 = tslib_1.__importDefault(require("../SimpleButton"));
+const Flex_1 = require("../Flex");
+const twMerge_1 = require("../../twMerge");
 const baseClassName = 'ab-Dropdown';
 const Dropdown = (props) => {
     let { options, multiple, name, autoFocus, showEmptyItem = true, showClearButton, disabled, allowSearch, clearButtonProps, value: _, onChange: __, style, onExpand, ...boxProps } = props;
@@ -79,16 +80,14 @@ const Dropdown = (props) => {
         selectedText = placeholder;
     }
     //20  ... 20 16
-    const renderClearButton = () => (React.createElement(SimpleButton_1.default, { variant: "text", icon: "close", tone: "none", tooltip: "Clear", iconSize: 20, px: 0, py: 0, marginRight: 1, ...clearButtonProps, style: {
-            zIndex: 10,
-            color: 'inherit',
+    const renderClearButton = () => (React.createElement(SimpleButton_1.default, { variant: "text", icon: "close", tone: "none", tooltip: "Clear", iconSize: 20, ...clearButtonProps, className: (0, twMerge_1.twMerge)('twa:p-0 twa:mr-1 twa:z-10 twa:color-inherit', clearButtonProps.className), style: {
             ...(clearButtonProps ? clearButtonProps.style : null),
         }, onClick: (e) => {
             e.preventDefault();
             onChange(null, e);
         } }));
-    return (React.createElement(rebass_1.Flex, { ref: domRef, flexDirection: "row", alignItems: "center", ...boxProps, className: (0, join_1.default)(props.className, baseClassName, !selectedOption ? `${baseClassName}--empty` : `${baseClassName}--not-empty`, focused ? `${baseClassName}--focused` : `${baseClassName}--not-focused`, disabled ? `${baseClassName}--disabled` : null), style: style, tabIndex: focused ? -1 : props.tabIndex || 0, onFocus: onFocus, onBlur: onBlur },
-        React.createElement("div", { style: { display: 'inline-block' }, className: `${baseClassName}__text` },
+    return (React.createElement(Flex_1.Flex, { ref: domRef, flexDirection: 'row', alignItems: "center", ...boxProps, className: (0, join_1.default)(props.className, baseClassName, !selectedOption ? `${baseClassName}--empty` : `${baseClassName}--not-empty`, focused ? `${baseClassName}--focused` : `${baseClassName}--not-focused`, disabled ? `${baseClassName}--disabled` : null), style: style, tabIndex: focused ? -1 : props.tabIndex || 0, onFocus: onFocus, onBlur: onBlur },
+        React.createElement("div", { className: `${baseClassName}__text twa:inline-block` },
             selectedText,
             React.createElement(Arrows_1.default, null)),
         React.createElement("select", { ref: selectRef, tabIndex: -1, disabled: disabled, value: value == null ? '' : value, onChange: (e) => {

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

@@ -1,9 +1,9 @@
 import * as React from 'react';
-import { BoxProps } from 'rebass';
 import { SimpleButtonProps } from '../SimpleButton';
 import { ExpandedProps } from './useExpanded';
 import DropdownButtonItem from './DropdownButtonItem';
 import { OverlayTriggerProps } from '../OverlayTrigger';
+import { BoxProps } from '../Flex';
 export declare const DROPDOWN_ICON: React.JSX.Element;
 export type DropdownButtonProps = React.PropsWithChildren<Omit<BoxProps, 'ref'>> & Omit<React.HTMLProps<HTMLElement>, 'ref'> & SimpleButtonProps & ExpandedProps & {
     collapseOnItemClick?: boolean;
@@ -24,25 +24,5 @@ export type DropdownButtonProps = React.PropsWithChildren<Omit<BoxProps, 'ref'>>
     isItemDisabled?: (item: DropdownButtonItem) => boolean | undefined;
     showToggleIcon?: boolean;
 };
-declare const DropdownButton: React.ForwardRefExoticComponent<Omit<BoxProps, "ref"> & {
-    children?: React.ReactNode;
-} & Omit<React.HTMLProps<HTMLElement>, "ref"> & SimpleButtonProps & ExpandedProps & {
-    collapseOnItemClick?: boolean;
-    columns?: string[];
-    overlayProps?: OverlayTriggerProps;
-    listOffset?: number;
-    items?: DropdownButtonItem[];
-    stopPropagationOnOverlay?: boolean;
-    idProperty?: string;
-    showClearButton?: boolean;
-    focusOnClear?: boolean;
-    onClear?: () => void;
-    clearButtonProps?: SimpleButtonProps;
-    listItemClassName?: string;
-    listStyle?: React.CSSProperties;
-    listMinWidth?: number;
-    listItemStyle?: React.CSSProperties | ((item: DropdownButtonItem, index: number) => React.CSSProperties);
-    isItemDisabled?: (item: DropdownButtonItem) => boolean | undefined;
-    showToggleIcon?: boolean;
-} & React.RefAttributes<HTMLButtonElement>>;
+declare const DropdownButton: React.ForwardRefExoticComponent<Omit<React.PropsWithChildren<DropdownButtonProps>, "ref"> & React.RefAttributes<HTMLButtonElement>>;
 export default DropdownButton;

package/src/components/DropdownButton/index.js

@@ -9,9 +9,10 @@ const SimpleButton_1 = tslib_1.__importDefault(require("../SimpleButton"));
 const useExpanded_1 = tslib_1.__importDefault(require("./useExpanded"));
 const renderItem_1 = tslib_1.__importDefault(require("./renderItem"));
 const OverlayTrigger_1 = tslib_1.__importDefault(require("../OverlayTrigger"));
+const clsx_1 = tslib_1.__importDefault(require("clsx"));
 exports.DROPDOWN_ICON = (React.createElement("svg", { width: "20", height: "20", viewBox: "0 0 24 24" },
     React.createElement("path", { d: "M7 10l5 5 5-5H7z" })));
-const spacer = React.createElement("div", { style: { flex: 1 } });
+const spacer = React.createElement("div", { className: "twa:flex-1" });
 const baseClassName = 'ab-DropdownButton';
 const defaultListItemStyle = {
     padding: 'var(--ab-cmp-dropdownbutton-list-item__padding)',
@@ -103,7 +104,7 @@ const DropdownButton = React.forwardRef((props, theRef) => {
                 onClear();
             }
             buttonRef.current?.focus();
-        }, ml: 2, padding: 0, variant: 'text', icon: "close", ...clearButtonProps, style: {
+        }, className: "twa:ml-2 twa:p-0", variant: 'text', icon: "close", ...clearButtonProps, style: {
             ...clearButtonProps?.style,
             visibility: showClearButton ? 'visible' : 'hidden',
         } })) : null;
@@ -124,7 +125,7 @@ const DropdownButton = React.forwardRef((props, theRef) => {
                     }
                 } }, content));
         }, ...overlayProps },
-        React.createElement(SimpleButton_1.default, { iconPosition: "end", ...(showToggleIcon && { icon, paddingRight: 0 }), ...domProps, ref: (btn) => {
+        React.createElement(SimpleButton_1.default, { iconPosition: "end", ...(showToggleIcon && { icon }), ...domProps, ref: (btn) => {
                 buttonRef.current = btn;
                 if (!theRef) {
                     return;
@@ -135,7 +136,9 @@ const DropdownButton = React.forwardRef((props, theRef) => {
                 else {
                     theRef.current = btn;
                 }
-            }, style: domProps.style, className: className, onClick: (e) => {
+            }, style: domProps.style, className: (0, clsx_1.default)(className, {
+                'twa:pr-0': showToggleIcon,
+            }), onClick: (e) => {
                 if (domProps.onClick) {
                     domProps.onClick(e);
                 }

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

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { HTMLProps } from 'react';
-import { FlexProps } from 'rebass';
-type EmptyContentProps = HTMLProps<HTMLElement> & FlexProps & {};
+import { FlexProps } from '../Flex';
+type EmptyContentProps = HTMLProps<HTMLDivElement> & FlexProps & {};
 declare const EmptyContent: ({ children, className, style, ...flexProps }: EmptyContentProps) => React.JSX.Element;
 export default EmptyContent;

package/src/components/EmptyContent/index.js

@@ -2,14 +2,14 @@
 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 Flex_1 = require("../Flex");
+const clsx_1 = tslib_1.__importDefault(require("clsx"));
 const baseClassName = 'ab-EmptyContent';
 const EmptyContent = ({ children, className, style, ...flexProps }) => {
     if (typeof children === 'string') {
         children = React.createElement("p", null, children);
     }
-    return (React.createElement(rebass_1.Box, { flex: 1, className: `${baseClassName}__wrapper` },
-        React.createElement(rebass_1.Flex, { alignItems: "center", justifyContent: "center", flexDirection: "column", ...flexProps, className: (0, join_1.default)(baseClassName, className), style: style }, children)));
+    return (React.createElement(Flex_1.Box, { className: `${baseClassName}__wrapper twa:flex-1 twa:relative twa:size-full` },
+        React.createElement(Flex_1.Flex, { alignItems: "center", justifyContent: "center", flexDirection: "column", ...flexProps, className: (0, clsx_1.default)('twa:absolute twa:inset-0 twa:text-3 twa:text-center twa:p-4', 'twa:[&_p]:text-primary-foreground', baseClassName, className), style: style }, children)));
 };
 exports.default = EmptyContent;

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

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