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

package/src/View/Charting/useChartingElements.d.ts

@@ -4,7 +4,7 @@ import { AccessLevel, ChartDefinition } from '../../types';
 export declare const useChartingElements: ({ elementType, accessLevel, size, }: {
     elementType: string;
     accessLevel: AccessLevel;
-    size?: 'small' | 'normal';
+    size?: "small" | "normal";
 }) => {
     chartSelector: React.JSX.Element;
     containerSelector: React.JSX.Element;

package/src/View/Charting/useChartingElements.js

@@ -85,7 +85,7 @@ export const useChartingElements = ({ elementType, accessLevel, size = 'normal',
                 setSelectedContainer(chartContainers.find((containerOption) => containerOption.name === containerName));
             }
         }, options: containerOptions, placeholder: "Select Container" }));
-    const chartButton = (React.createElement(SimpleButton, { style: style, mr: 1, onClick: () => (isOpen ? hideChart() : showChart(selectedContainer)), disabled: !Boolean(selectedChart), variant: 'text', tone: 'neutral', icon: isOpen ? 'visibility-off' : 'visibility-on', tooltip: isOpen ? 'Hide Chart' : 'Show Chart' }));
+    const chartButton = (React.createElement(SimpleButton, { style: style, className: "twa:mr-1", onClick: () => (isOpen ? hideChart() : showChart(selectedContainer)), disabled: !Boolean(selectedChart), variant: 'text', tone: 'neutral', icon: isOpen ? 'visibility-off' : 'visibility-on', tooltip: isOpen ? 'Hide Chart' : 'Show Chart' }));
     const deleteButton = (React.createElement(DeleteChartButton, { iconSize: iconSize, chart: selectedChart, accessLevel: chartAccessLevel }));
     const editButton = (React.createElement(EditChartButton, { iconSize: iconSize, chart: selectedChart, accessLevel: chartAccessLevel, isOpen: isOpen }));
     return {

package/src/View/ColumnInfo/ColumnInfo.js

@@ -1,5 +1,4 @@
 import * as React from 'react';
-import { Box, Flex } from 'rebass';
 import FormLayout, { FormRow } from '../../components/FormLayout';
 import { DataSource, InfiniteTableGrid } from '../../components/InfiniteTable';
 import Panel from '../../components/Panel';
@@ -9,12 +8,10 @@ import { AdaptableObjectList } from '../Components/AdaptableObjectList';
 import { ButtonNew } from '../Components/Buttons/ButtonNew';
 import { ColumnSelector } from '../Components/Selectors/ColumnSelector';
 import ArrayExtensions from '../../Utilities/Extensions/ArrayExtensions';
+import { Box, Flex } from '../../components/Flex';
 const BASE_CLASS_NAME = 'ab-AdaptableColumns';
 const domProps = {
-    style: {
-        height: '460px',
-        width: '100%',
-    },
+    className: 'twa:flex-1 twa:min-h-0 twa:w-full',
 };
 // TODOS:
 // - use column from props as initial value
@@ -199,10 +196,10 @@ const ModuleView = (props) => {
         setIsWizardOpen(false);
     }, []);
     // filter out items with scope
-    return (React.createElement(Box, { "data-name": module.moduleInfo.ModuleName, className: `${BASE_CLASS_NAME}__module-list`, key: module.moduleInfo.ModuleName, mb: 4 },
+    return (React.createElement(Box, { "data-name": module.moduleInfo.ModuleName, className: `${BASE_CLASS_NAME}__module-list twa:mb-4`, key: module.moduleInfo.ModuleName },
         React.createElement(Flex, null,
             React.createElement("b", { className: `${BASE_CLASS_NAME}__header` }, module.moduleInfo.FriendlyName),
-            React.createElement(Box, { flex: 1 }),
+            React.createElement(Box, { className: "twa:flex-1" }),
             React.createElement(ButtonNew, { onClick: () => setIsWizardOpen(true) }, "New")),
         itemsInScope?.length ? React.createElement(AdaptableObjectList, { items: itemsInScope, module: module }) : null,
         isWizardOpen && EditWizard && (React.createElement(EditWizard, { popupParams: {
@@ -215,18 +212,16 @@ export const ColumnInfo = (props) => {
     const adaptable = useAdaptable();
     const [selectedColumnId, setSelectedColumnId] = React.useState(props.selectedColumnId);
     const column = adaptable.api.columnApi.getColumnWithColumnId(selectedColumnId);
-    return (React.createElement(Panel, { flex: 1 },
-        React.createElement(Box, { mb: 3 },
+    return (React.createElement(Panel, { className: "twa:flex-1 twa:border-none twa:shadow-md twa:overflow-hidden" },
+        React.createElement(Panel.FlexBody, { className: "twa:gap-3" },
             React.createElement(FormLayout, null,
                 React.createElement(FormRow, { label: "Select Column" },
-                    React.createElement(ColumnSelector, { value: selectedColumnId, onChange: (columnId) => setSelectedColumnId(columnId) })))),
-        selectedColumnId && (React.createElement(Tabs, { mb: 3 },
-            React.createElement(Tabs.Tab, null, "Column Summary"),
-            React.createElement(Tabs.Tab, null, "Column State"),
-            React.createElement(Tabs.Content, null,
-                React.createElement(Flex, { flex: 1 }, selectedColumnId && React.createElement(ColumnDefPreview, { column: column }))),
-            ' ',
-            React.createElement(Tabs.Content, null, selectedColumnId && (React.createElement(Box, { className: BASE_CLASS_NAME }, MODULES_WITH_COLUMN.map((moduleName) => {
-                return (React.createElement(ModuleView, { key: moduleName, moduleName: moduleName, selectedColumnId: selectedColumnId }));
-            }))))))));
+                    React.createElement(ColumnSelector, { value: selectedColumnId, onChange: (columnId) => setSelectedColumnId(columnId) }))),
+            selectedColumnId && (React.createElement(Tabs, { className: "twa:min-h-0 twa:flex-1" },
+                React.createElement(Tabs.Tab, null, "Column Summary"),
+                React.createElement(Tabs.Tab, null, "Column State"),
+                React.createElement(Tabs.Content, null, selectedColumnId && React.createElement(ColumnDefPreview, { column: column })),
+                React.createElement(Tabs.Content, null, selectedColumnId && (React.createElement(Box, { className: BASE_CLASS_NAME }, MODULES_WITH_COLUMN.map((moduleName) => {
+                    return (React.createElement(ModuleView, { key: moduleName, moduleName: moduleName, selectedColumnId: selectedColumnId }));
+                })))))))));
 };

package/src/View/ColumnInfo/ColumnInfoPopup.js

@@ -1,9 +1,9 @@
 import * as React from 'react';
-import { Flex } from 'rebass';
 import { PopupPanel } from '../Components/Popups/AdaptablePopup/PopupPanel';
 import { ColumnInfo } from './ColumnInfo';
+import { Flex } from '../../components/Flex';
 export const ColumnInfoPopup = (props) => {
     return (React.createElement(PopupPanel, { headerText: 'Column Info', glyphicon: 'info' },
-        React.createElement(Flex, { flexDirection: "column", flex: 1, height: "100%" },
+        React.createElement(Flex, { flexDirection: "column", className: "twa:flex-1 twa:h-full twa:[--ab-grid-row-height:45px]" },
             React.createElement(ColumnInfo, { selectedColumnId: props.popupParams?.column?.columnId }))));
 };

package/src/View/Comments/CommentsEditor.js

@@ -1,6 +1,5 @@
 import * as React from 'react';
 import { useSelector } from 'react-redux';
-import { Box, Flex, Text } from 'rebass';
 import { Icon } from '../../components/icons';
 import Panel from '../../components/Panel';
 import SimpleButton from '../../components/SimpleButton';
@@ -9,6 +8,7 @@ import { CommentsAndNotesSelector } from '../../Redux/ActionsReducers/InternalRe
 import { useAdaptable } from '../AdaptableContext';
 import AdaptableInput from '../Components/AdaptableInput';
 import FormatHelper from '../../Utilities/Helpers/FormatHelper';
+import { Box, Flex } from '../../components/Flex';
 // Edit Mode
 // [author] [edit, delete]
 // [text-editor] * this is different
@@ -51,21 +51,18 @@ export const CommentsEditor = (props) => {
     const formatDate = (date, format) => {
         return FormatHelper.DateFormatter(date, { Pattern: format });
     };
-    return (React.createElement(Panel, { color: "var(--ab-color-text-on-primary)", onClick: () => props.enableEditMode(), minWidth: 250, className: "ab-CommentPopup", onKeyDown: (event) => {
+    return (React.createElement(Panel, { color: "var(--ab-color-text-on-primary)", onClick: () => props.enableEditMode(), className: "ab-CommentPopup twa:min-w-[250px]", onKeyDown: (event) => {
             if (event.key === 'Escape') {
                 api.commentApi.hideCommentsPopup();
             }
         } },
         showCloseButton && (React.createElement(Flex, null,
-            React.createElement(Box, { flex: 1 }),
+            React.createElement(Box, { className: "twa:flex-1" }),
             React.createElement(SimpleButton, { onClick: (event) => {
                     event.stopPropagation();
                     api.commentApi.hideCommentsPopup();
                 }, variant: "text", icon: "close" }))),
-        React.createElement(Flex, { style: {
-                overflow: 'auto',
-                maxHeight: 300,
-            }, flexDirection: "column", ref: commentsWrapperRef }, comments &&
+        React.createElement(Flex, { className: "twa:overflow-auto twa:max-h-[300px]", flexDirection: "column", ref: commentsWrapperRef }, comments &&
             comments.length > 0 &&
             comments.map((comment, index) => {
                 if (!comment) {
@@ -74,12 +71,12 @@ export const CommentsEditor = (props) => {
                 const isOwnComment = comment?.Author?.UserName
                     ? comment?.Author?.UserName === userId
                     : true; // no owner means it's the current user
-                return (React.createElement(Box, { p: 2, key: comment.Uuid ?? index, className: "ab-Comment" },
-                    React.createElement(Flex, { mb: 2, alignItems: "center" },
+                return (React.createElement(Box, { key: comment.Uuid ?? index, className: "ab-Comment twa:p-2" },
+                    React.createElement(Flex, { alignItems: "center", className: "twa:mb-2" },
                         React.createElement(Box, null,
-                            React.createElement(Box, { "data-name": "comment-username", fontSize: 3, fontWeight: "bold" }, comment?.Author?.UserName),
-                            comment.Timestamp && (React.createElement(Box, { "data-name": "comment-timestamp", fontSize: 2 }, formatDate(comment.Timestamp, api.commentApi.internalApi.getCommentsDateFormat())))),
-                        React.createElement(Box, { flex: 1 }),
+                            React.createElement(Box, { "data-name": "comment-username", className: "twa:text-3 twa:font-bold" }, comment?.Author?.UserName),
+                            comment.Timestamp && (React.createElement(Box, { "data-name": "comment-timestamp", className: "twa:text-2" }, formatDate(comment.Timestamp, api.commentApi.internalApi.getCommentsDateFormat())))),
+                        React.createElement(Box, { className: "twa:flex-1" }),
                         React.createElement(SimpleButton, { variant: "text", icon: "edit", disabled: !isOwnComment || isReadOnlyModule, onClick: () => setActiveEditingComment(comment.Uuid) }),
                         React.createElement(SimpleButton, { variant: "text", icon: "delete", disabled: !isOwnComment || isReadOnlyModule, onClick: () => {
                                 api.commentApi.deleteComment(comment, cellAddress);
@@ -87,7 +84,7 @@ export const CommentsEditor = (props) => {
                                     props.onRefreshContent();
                                 });
                             } })),
-                    React.createElement(Box, { onClick: () => setActiveEditingComment(comment.Uuid) }, comment.Uuid === activeEditingComment ? (React.createElement(AdaptableInput, { autoFocus: true, width: "100%", defaultValue: comment.Value, disabled: isReadOnlyModule, onBlur: () => {
+                    React.createElement(Box, { onClick: () => setActiveEditingComment(comment.Uuid) }, comment.Uuid === activeEditingComment ? (React.createElement(AdaptableInput, { autoFocus: true, className: "twa:w-full", defaultValue: comment.Value, disabled: isReadOnlyModule, onBlur: () => {
                             if (comment.Uuid === activeEditingComment) {
                                 setActiveEditingComment(null);
                             }
@@ -96,7 +93,7 @@ export const CommentsEditor = (props) => {
                                 ...comment,
                                 Value: event.target.value,
                             }, cellAddress);
-                        } })) : (React.createElement(Text, { "data-name": "comment-text" }, comment.Value)))));
+                        } })) : (React.createElement(Box, { "data-name": "comment-text" }, comment.Value)))));
             })),
         React.createElement(AdaptableInput, { autoFocus: !comments || comments.length === 0, value: newCommentText, disabled: isReadOnlyModule, onChange: (event) => {
                 setNewCommentText(event.target.value);
@@ -109,12 +106,12 @@ export const CommentsEditor = (props) => {
                         scrollToBottom();
                     });
                 }
-            }, mt: 2, mb: "2", width: "100%", placeholder: "Write new Comment" }),
-        React.createElement(SimpleButton, { width: "100%", variant: "raised", onClick: () => {
+            }, className: "twa:w-full twa:my-2", placeholder: "Write new Comment" }),
+        React.createElement(SimpleButton, { className: "twa:w-full", variant: "raised", onClick: () => {
                 api.settingsPanelApi.openSettingsPanel('Comment');
                 api.internalApi.getAnnotationsService().hidePopup();
             } },
-            React.createElement(Box, { mr: 2 },
+            React.createElement(Box, { className: "twa:mr-2" },
                 React.createElement(Icon, { name: "folder" })),
             ' ',
             "Open all Comments")));

package/src/View/Comments/CommentsPopup.js

@@ -2,11 +2,11 @@ import * as React from 'react';
 import { useSelector } from 'react-redux';
 import { DataSource, InfiniteTableGrid } from '../../components/InfiniteTable';
 import Panel from '../../components/Panel';
-import { Box, Flex } from 'rebass';
 import { useAdaptable } from '../AdaptableContext';
 import { PopupPanel } from '../Components/Popups/AdaptablePopup/PopupPanel';
 import { AdaptableButtonComponent } from '../Components/AdaptableButton';
 import FormatHelper from '../../Utilities/Helpers/FormatHelper';
+import { Box, Flex } from '../../components/Flex';
 const tableDOMProps = {
     style: {
         minHeight: 160,
@@ -57,12 +57,12 @@ const CellComments = (props) => {
         return adaptable.api.columnApi.getFriendlyNameForColumnId(primaryKey);
     }, []);
     const columnFriendlyName = adaptable.api.columnApi.getFriendlyNameForColumnId(props.commentThread.ColumnId);
-    return (React.createElement(Panel, { mb: 2, header: React.createElement(Flex, { width: "100%", alignItems: "center" },
-            React.createElement(Box, { mr: 2 },
+    return (React.createElement(Panel, { className: "twa:mb-2", header: React.createElement(Flex, { alignItems: "center", className: "twa:w-full" },
+            React.createElement(Box, { className: "twa:mr-2" },
                 React.createElement("b", null, "Cell Value:"),
                 " ",
                 cellValue),
-            React.createElement(Box, { mr: 2 },
+            React.createElement(Box, { className: "twa:mr-2" },
                 React.createElement("b", null,
                     primaryKeyHeader,
                     ":"),
@@ -72,8 +72,8 @@ const CellComments = (props) => {
                 React.createElement("b", null, "Column:"),
                 " ",
                 columnFriendlyName),
-            React.createElement(Box, { flex: 1 }),
-            React.createElement(AdaptableButtonComponent, { mr: 1, variant: "text", icon: "visibility-on", onClick: () => {
+            React.createElement(Box, { className: "twa:flex-1" }),
+            React.createElement(AdaptableButtonComponent, { className: "twa:mr-1", variant: "text", icon: "visibility-on", onClick: () => {
                     adaptable.api.internalApi.getAnnotationsService().showPopup({
                         ColumnId: props.commentThread.ColumnId,
                         PrimaryKeyValue: props.commentThread.PrimaryKeyValue,

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

@@ -3,7 +3,7 @@ import { Datepicker } from '../../../components/Datepicker';
 import { useAdaptable } from '../../AdaptableContext';
 import useProperty from '../../../components/utils/useProperty';
 import { dateToISO, parseDateValue } from '../../../Utilities/Helpers/DateHelper';
-const AdaptableDateInput = React.forwardRef((props, ref) => {
+const AdaptableDateInput = React.forwardRef(function AdaptableDateInputCmp(props, ref) {
     const dateInputOptions = useAdaptable().adaptableOptions.userInterfaceOptions.dateInputOptions;
     const { value: _, defaultValue: __, onChange, required, disabled, showClearButton, ...inputProps } = props;
     const [value, setValue] = useProperty(props, 'value', undefined, {

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

@@ -4,13 +4,14 @@ import { useAdaptable } from '../../AdaptableContext';
 import AdaptableDateInput from '../AdaptableDateInput';
 const AdaptableInput = React.forwardRef((props, ref) => {
     const useNativeInputDate = useAdaptable().adaptableOptions.userInterfaceOptions?.dateInputOptions?.useNativeInput;
+    const { showClearButton, ...inputProps } = props;
     if (props.type === 'date' && !useNativeInputDate) {
         // use AdapTable date input
-        return React.createElement(AdaptableDateInput, { ...props, ref: ref });
+        return (React.createElement(AdaptableDateInput, { showClearButton: showClearButton, ...inputProps, ref: ref }));
     }
     else {
         // native input
-        return React.createElement(Input, { ...props, ref: ref });
+        return React.createElement(Input, { ...inputProps, ref: ref });
     }
 });
 export default AdaptableInput;

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

@@ -1,11 +1,11 @@
 import * as React from 'react';
 import { IColItem } from '../../UIInterfaces';
-import { BoxProps } from 'rebass';
+import { BoxProps } from '../../../components/Flex';
 export interface AdaptableObjectCollectionProps extends BoxProps {
+    className?: string;
     colItems: IColItem[];
     items: any[];
     allowOverflow?: boolean;
     style?: React.CSSProperties;
-    headerAlign?: string;
 }
 export declare const AdaptableObjectCollection: React.FunctionComponent<AdaptableObjectCollectionProps>;

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

@@ -1,10 +1,14 @@
 import * as React from 'react';
 /// <reference path="../../typings/.d.ts" />
 import { PanelWithRow } from '../Panels/PanelWithRow';
-import { Box } from 'rebass';
+import { Box } from '../../../components/Flex';
+import clsx from 'clsx';
+import { twMerge } from '../../../twMerge';
 export const AdaptableObjectCollection = (props) => {
-    const allowOverflow = props.allowOverflow ? 'visible' : 'auto';
-    return (React.createElement(Box, { style: { ...props.style }, className: "ab-ObjectCollection" },
-        React.createElement(PanelWithRow, { border: "none", colItems: props.colItems, headerAlign: props.headerAlign }),
-        React.createElement("div", { className: "ab-ObjectCollection__items", style: { overflowY: allowOverflow, boxShadow: 'none' } }, props.items)));
+    return (React.createElement(Box, { style: props.style, className: twMerge('ab-ObjectCollection twa:flex twa:flex-col', props.className) },
+        React.createElement(PanelWithRow, { border: "none", colItems: props.colItems }),
+        React.createElement("div", { className: clsx('ab-ObjectCollection__items twa:shadow-none twa:flex-1', {
+                'twa:overflow-y-visible': props.allowOverflow,
+                'twa:overflow-y-auto': !props.allowOverflow,
+            }) }, props.items)));
 };

package/src/View/Components/AdaptableObjectList/AdaptableObjectCompactList.js

@@ -1,9 +1,9 @@
 import * as React from 'react';
 import { useDispatch } from 'react-redux';
-import { Box, Flex } from 'rebass';
 import SimpleButton from '../../../components/SimpleButton';
 import { useAdaptable } from '../../AdaptableContext';
-import { ValueOptionsTags } from '../ValueSelector';
+import { Box, Flex } from '../../../components/Flex';
+import { TagList } from '../../../components/Tag/Tag';
 const baseClassName = 'ab-Adaptable-Object-Compact-List';
 const ICON_SIZE = 20;
 export const AdaptableObjectCompactListItem = (props) => {
@@ -37,17 +37,17 @@ export const AdaptableObjectCompactListItem = (props) => {
     }
     labelEl = labelEl ?? objectView.item.name;
     return (React.createElement(Flex, { className: `${baseClassName}__Item`, alignItems: "center" },
-        labelEl && (React.createElement(Flex, { flex: '1 1 auto', className: `${baseClassName}__Item__Name` }, labelEl)),
-        React.createElement(Box, { flex: '2 1 auto' },
+        labelEl && (React.createElement(Flex, { className: `${baseClassName}__Item__Name twa:flex-[1_1_auto]` }, labelEl)),
+        React.createElement(Box, { className: "twa:flex-[2_1_auto]" },
             typeof objectView.item.view === 'function'
                 ? React.createElement(objectView.item.view, {
                     data: props.abObject,
                 })
                 : objectView.item.view,
-            Boolean(objectView.item?.values && objectView.item?.values?.length) && (React.createElement(Box, { mb: 2, className: `${baseClassName}__Item__Values` },
-                React.createElement(ValueOptionsTags, { style: { marginRight: 0 }, readOnly: true, options: objectView.item.values, value: objectView.item.values, allowWrap: true, toIdentifier: (c) => c, toLabel: (c) => React.createElement(React.Fragment, null, c) })))),
+            Boolean(objectView.item?.values && objectView.item?.values?.length) && (React.createElement(Box, { className: `${baseClassName}__Item__Values` },
+                React.createElement(TagList, { tags: objectView.item.values.map(String) })))),
         suspendAction && unSuspendAction && (React.createElement(SimpleButton, { onMouseDown: handleSuspendUnSuspend, tone: isSuspended ? 'neutral' : 'success', variant: "text", icon: isSuspended ? 'resume' : 'pause' })),
-        React.createElement(Flex, { ml: 1, flex: '0 0 auto' }, deleteAction && (React.createElement(SimpleButton, { iconSize: ICON_SIZE, icon: "delete", variant: "text", onMouseDown: handleDelete, accessLevel: moduleAccessLevel })))));
+        React.createElement(Flex, { className: "twa:ml-1 twa:flex-[0_0_auto]" }, deleteAction && (React.createElement(SimpleButton, { iconSize: ICON_SIZE, icon: "delete", variant: "text", onMouseDown: handleDelete, accessLevel: moduleAccessLevel })))));
 };
 export const AdaptableObjectCompactList = (props) => {
     const adaptable = useAdaptable();
@@ -71,10 +71,10 @@ export const AdaptableObjectCompactList = (props) => {
         }
     }, [isAtLeastOneAbObjectActive]);
     return (React.createElement(Flex, { flexDirection: "column", className: baseClassName },
-        React.createElement(Flex, { className: `${baseClassName}__Header`, fontSize: 3 },
+        React.createElement(Flex, { className: `${baseClassName}__Header twa:text-3` },
             React.createElement(Flex, { className: `${baseClassName}__Title`, alignItems: 'center' }, props.module.moduleInfo.FriendlyName),
-            React.createElement(Box, { flex: 1 }),
-            suspendAllAction && unSuspendAllAction && (React.createElement(SimpleButton, { mr: 2, onMouseDown: handleSuspendUnsuspendAll, tone: isAtLeastOneAbObjectActive ? 'neutral' : 'success', variant: "raised", icon: isAtLeastOneAbObjectActive ? 'pause' : 'resume', accessLevel: accessLevel }, isAtLeastOneAbObjectActive ? 'Suspend All' : 'Unsuspend All')),
+            React.createElement(Box, { className: "twa:flex-1" }),
+            suspendAllAction && unSuspendAllAction && (React.createElement(SimpleButton, { className: "twa:mr-2", onMouseDown: handleSuspendUnsuspendAll, tone: isAtLeastOneAbObjectActive ? 'neutral' : 'success', variant: "raised", icon: isAtLeastOneAbObjectActive ? 'pause' : 'resume', accessLevel: accessLevel }, isAtLeastOneAbObjectActive ? 'Suspend All' : 'Unsuspend All')),
             deleteAllAction && (React.createElement(SimpleButton, { onMouseDown: () => dispatch(deleteAllAction), variant: "raised", tone: "neutral", accessLevel: accessLevel }, "Clear All"))),
         React.createElement(Box, { className: `${baseClassName}__Body` }, props.abObjects.map((abObject) => {
             return (React.createElement(AdaptableObjectCompactListItem, { key: abObject.Uuid, abObject: abObject, module: props.module }));

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

@@ -43,12 +43,14 @@ interface AdaptableObjectListItemProps {
      */
     deleteDisabled?: boolean;
     deleteTooltip?: string;
+    className?: string;
 }
 export declare const AdaptableObjectListItem: React.FunctionComponent<AdaptableObjectListItemProps>;
 interface AdaptableObjectListProps {
     items: AdaptableObjectView[];
     module: IModule;
     itemProps?: Partial<AdaptableObjectListItemProps>;
+    className?: string;
 }
 export declare const AdaptableObjectList: React.FunctionComponent<AdaptableObjectListProps>;
 export {};

package/src/View/Components/AdaptableObjectList/AdaptableObjectList.js

@@ -1,16 +1,17 @@
 import * as React from 'react';
 import { useDispatch, useSelector } from 'react-redux';
-import { Box, Flex } from 'rebass';
 import * as InternalRedux from '../../../Redux/ActionsReducers/InternalRedux';
 import SimpleButton from '../../../components/SimpleButton';
-import join from '../../../components/utils/join';
 import AdaptableHelper from '../../../Utilities/Helpers/AdaptableHelper';
 import { useAdaptable } from '../../AdaptableContext';
 import { ButtonDelete } from '../Buttons/ButtonDelete';
 import { ButtonEdit } from '../Buttons/ButtonEdit';
 import { ButtonShare } from '../Buttons/ButtonShare';
 import { SuspendToggleButton } from '../Buttons/SuspendToggleButton/SuspendToggleButton';
-import { ValueOptionsTags } from '../ValueSelector';
+import { Box, Flex } from '../../../components/Flex';
+import { twMerge } from '../../../twMerge';
+import clsx from 'clsx';
+import { TagList } from '../../../components/Tag/Tag';
 const ICON_SIZE = 26;
 const LIST_BASE_CLASS_NAME = 'ab-Adaptable-Object-List';
 const ITEM_BASE_CLASS_NAME = `${LIST_BASE_CLASS_NAME}__Item`;
@@ -33,25 +34,25 @@ export const AdaptableObjectListItemView = (props) => {
         };
     }
     const deleteActionButton = React.createElement(ButtonDelete, { ...deleteActionProps });
-    return (React.createElement(Flex, { "data-name": "adaptable-object-list-item", "data-value": props.abObject.Uuid, as: "li", mb: 3, className: join(props.className, baseClassName), style: props.style },
-        React.createElement(Box, { flex: 1, className: `${baseClassName}__rows` }, props.items.filter?.(Boolean)?.map((tag, index) => {
+    return (React.createElement(Flex, { "data-name": "adaptable-object-list-item", "data-value": props.abObject.Uuid, as: "li", className: twMerge(baseClassName, 'twa:rounded-standard', props.className), style: props.style },
+        React.createElement(Box, { className: `twa:flex-1 ${baseClassName}__rows twa:gap-2 twa:flex twa:flex-col` }, props.items.filter?.(Boolean)?.map((tag, index) => {
             const labelElement = typeof tag.label === 'function'
                 ? React.createElement(tag.label, { key: index, data: props.abObject })
                 : tag.label ?? tag.name;
-            return (React.createElement(Flex, { "data-name": tag.name, key: `${index}-${tag.name}`, mb: 2, className: `${baseClassName}__row` },
-                !tag.isLabelInline && (React.createElement(Box, { className: `${baseClassName}__label`, mr: 3 },
+            return (React.createElement(Flex, { "data-name": tag.name, key: `${index}-${tag.name}`, className: `${baseClassName}__row twa:gap-3` },
+                !tag.isLabelInline && (React.createElement(Box, { className: `${baseClassName}__label twa:flex twa:items-center twa:flex-row twa:text-nowrap` },
                     labelElement,
-                    props.showEditButton && (React.createElement(SimpleButton, { "data-name": `${tag.name}-edit-button`, accessLevel: props.accessLevel, className: `${baseClassName}__edit-property`, ml: 1, icon: "edit", tooltip: "edit", iconSize: 18, variant: "text", onClick: () => {
+                    props.showEditButton && (React.createElement(SimpleButton, { "data-name": `${tag.name}-edit-button`, accessLevel: props.accessLevel, className: `${baseClassName}__edit-property twa:ml-1`, icon: "edit", tooltip: "edit", iconSize: 18, variant: "text", onClick: () => {
                             props.handleOnEdit(tag.name);
                         } })))),
-                React.createElement(Box, { flex: 1, className: `${baseClassName}__values` },
+                React.createElement(Box, { className: `twa:flex-1 ${baseClassName}__values` },
                     typeof tag.view === 'function'
                         ? React.createElement(tag.view, {
                             data: props.abObject,
                             module: props.module,
                         })
                         : tag.view,
-                    Boolean(tag?.values && tag?.values?.length) && (React.createElement(ValueOptionsTags, { style: { marginRight: 0 }, readOnly: true, options: tag.values, value: tag.values, allowWrap: true, toIdentifier: (c) => c, toLabel: (c) => React.createElement(React.Fragment, null, c) })),
+                    Boolean(tag?.values && tag?.values?.length) ? (React.createElement(TagList, { tags: tag.values.map(String) })) : null,
                     typeof tag.viewAfter === 'function'
                         ? React.createElement(tag.viewAfter, {
                             data: props.abObject,
@@ -59,16 +60,17 @@ export const AdaptableObjectListItemView = (props) => {
                         })
                         : tag.viewAfter)));
         })),
-        props.showActions && (React.createElement(Flex, { flexDirection: "column", className: `${baseClassName}__buttons` },
-            React.createElement(Flex, { justifyContent: "end" },
+        props.showActions && (React.createElement(Flex, { flexDirection: "column", className: `${baseClassName}__buttons twa:ml-3 twa:pl-3 twa:text-right twa:min-w-[80px]` },
+            React.createElement(Flex, { className: "twa:justify-end" },
                 props.actions,
                 props.teamSharingActivated && (React.createElement(ButtonShare, { iconSize: ICON_SIZE, Header: `TeamSharing ${props.entityType}`, accessLevel: props.accessLevel, onShare: props.onShare })),
                 props.onDelete && (React.createElement(SimpleButton, { "data-name": "delete", disabled: props.deleteDisabled, iconSize: ICON_SIZE, tooltip: props.deleteTooltip, icon: "delete", onClick: props.onDelete, variant: "text" })),
-                props.deleteAction && deleteActionButton,
+                props.deleteAction ? deleteActionButton : null,
                 props.showEditButton && (React.createElement(ButtonEdit, { iconSize: ICON_SIZE, disabled: props.editDisabled, accessLevel: props.accessLevel, onClick: () => props.handleOnEdit() }))),
-            React.createElement(Box, { flex: 1 }),
-            props.suspendedEnabled && (React.createElement(Flex, { justifyContent: "end" },
-                React.createElement(SuspendToggleButton, { onSuspend: props.onSuspend, onUnSuspend: props.onUnSuspend, suspendableObject: props.abObject, accessLevel: props.accessLevel })))))));
+            props.suspendedEnabled && (React.createElement(React.Fragment, null,
+                React.createElement(Box, { className: "twa:flex-1 twa:min-h-[20px]" }),
+                React.createElement(Flex, { className: "twa:justify-end" },
+                    React.createElement(SuspendToggleButton, { onSuspend: props.onSuspend, onUnSuspend: props.onUnSuspend, suspendableObject: props.abObject, accessLevel: props.accessLevel }))))))));
 };
 export const AdaptableObjectListItem = (props) => {
     const adaptable = useAdaptable();
@@ -85,7 +87,7 @@ export const AdaptableObjectListItem = (props) => {
     const entityType = props.module.moduleInfo.FriendlyName;
     const moduleAccessLevel = adaptable.api.entitlementApi.getEntitlementAccessLevelForModule(props.module.moduleInfo.ModuleName);
     const accessLevel = AdaptableHelper.getAccessLevelForObject(props.data.abObject, moduleAccessLevel);
-    const itemClassName = join(props.data.className, ITEM_BASE_CLASS_NAME, props.data.abObject.IsSuspended &&
+    const itemClassName = clsx(props.className, props.data.className, ITEM_BASE_CLASS_NAME, props.data.abObject.IsSuspended &&
         `${ITEM_BASE_CLASS_NAME}--is-suspended`);
     const handleCloseWizard = React.useCallback(() => {
         setIsEditWizardVisible(false);
@@ -120,5 +122,5 @@ export const AdaptableObjectListItem = (props) => {
         isEditWizardVisible && EditWizard && (React.createElement(EditWizard, { defaultCurrentSectionName: wizardStepName, moduleInfo: props.module.moduleInfo, data: props.data.abObject, configEntities: null, onCloseWizard: handleCloseWizard, onFinishWizard: handleCloseWizard }))));
 };
 export const AdaptableObjectList = (props) => {
-    return (React.createElement("ul", { className: LIST_BASE_CLASS_NAME }, props?.items?.map((item, index) => (React.createElement(AdaptableObjectListItem, { key: item.abObject.Uuid ?? index, data: item, module: props.module, ...props.itemProps })))));
+    return (React.createElement("ul", { className: twMerge(clsx(LIST_BASE_CLASS_NAME, 'twa:list-none twa:p-0 twa:gap-3 twa:flex twa:flex-col', props.className)) }, props?.items?.map((item, index) => (React.createElement(AdaptableObjectListItem, { key: item.abObject.Uuid ?? index, data: item, module: props.module, ...props.itemProps })))));
 };

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

@@ -5,6 +5,7 @@ export interface AdaptableObjectRowProps extends React.ClassAttributes<Adaptable
     fontSize?: string;
     onClick?: (e: React.SyntheticEvent) => void;
     style?: React.CSSProperties;
+    className?: string;
     isSuspended?: boolean;
 }
 export declare class AdaptableObjectRow extends React.Component<AdaptableObjectRowProps, {}> {

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

@@ -1,11 +1,10 @@
 import * as React from 'react';
-/// <reference path="../../typings/.d.ts" />
-import { Flex, Text } from 'rebass';
-import join from '../../../components/utils/join';
+import { Flex, Box } from '../../../components/Flex';
+import clsx from 'clsx';
 export class AdaptableObjectRow extends React.Component {
     render() {
-        const colItems = this.props.colItems.map((colItem, index) => (React.createElement(Text, { className: "ab-AdaptableObjectRow__cell", "data-name": "list-group-cell", key: index, title: typeof colItem.Content === 'string' ? colItem.Content : undefined, flex: colItem.Size, paddingLeft: 1, paddingRight: 1 }, colItem.Content)));
-        const className = join('ab-AdaptableObjectRow', this.props.isSuspended && 'ab-AdaptableObjectRow--is-suspended');
+        const colItems = this.props.colItems.map((colItem, index) => (React.createElement(Box, { className: `ab-AdaptableObjectRow__cell twa:px-1`, style: { flex: colItem.Size }, "data-name": "list-group-cell", key: index, title: typeof colItem.Content === 'string' ? colItem.Content : undefined }, colItem.Content)));
+        const className = clsx('ab-AdaptableObjectRow', 'twa:p-3', 'twa:m-0', this.props.isSuspended && 'ab-AdaptableObjectRow--is-suspended', this.props.className);
         return (React.createElement(Flex, { className: className, onClick: this.props.onClick, style: this.props.style }, colItems));
     }
 }

package/src/View/Components/Buttons/ButtonBase/index.d.ts

@@ -1,7 +1,6 @@
 import * as React from 'react';
-import { ButtonProps as BtnProps } from 'rebass';
 import { AccessLevel } from '../../../../AdaptableState/Common/Entitlement';
-export interface ButtonBaseProps extends BtnProps {
+export interface ButtonBaseProps extends React.HTMLProps<HTMLButtonElement | HTMLDivElement> {
     overrideDisableButton?: boolean;
     transformGlyph?: boolean;
     className?: string;

package/src/View/Components/Buttons/ButtonBase/index.js

@@ -1,10 +1,11 @@
 import * as React from 'react';
-import { Button } from 'rebass';
-import join from '../../../../components/utils/join';
+import { Box } from '../../../../components/Flex';
+import clsx from 'clsx';
+import { twMerge } from '../../../../twMerge';
 const Glyphicon = ({ glyph, style }) => {
     return React.createElement("span", { style: style, className: `glyphicon glyphicon-${glyph}` });
 };
-const baseClassName = 'ab-Button';
+const baseClassName = 'ab-Button twa:text-current';
 export class ButtonBase extends React.Component {
     render() {
         let isDisabled;
@@ -53,7 +54,7 @@ export class ButtonBase extends React.Component {
                 ' ',
                 this.props.iconPosition !== 'end' ? text : null));
         }
-        let button = (React.createElement(Button, { ...this.props, style: { color: 'currentColor', ...this.props.style }, className: join(baseClassName, `${baseClassName}--size-${'normal'}`, `${baseClassName}--style-${'normal'}`, isDisabled ? `${baseClassName}--disabled` : `${baseClassName}--enabled`), disabled: isDisabled, onClick: this.props.onClick, onMouseDown: this.props.onMouseDown || ((e) => e.preventDefault()) }, content));
+        let button = (React.createElement(Box, { ...this.props, as: "button", style: this.props.style, className: twMerge(clsx(baseClassName, `${baseClassName}--size-normal`, `${baseClassName}--style-normal`, isDisabled ? `${baseClassName}--disabled` : `${baseClassName}--enabled`), this.props.className), disabled: isDisabled, onClick: this.props.onClick, onMouseDown: this.props.onMouseDown || ((e) => e.preventDefault()) }, content));
         let buttonwithtooltip = React.createElement("div", null, button);
         return hideToolTip ? button : buttonwithtooltip;
     }

package/src/View/Components/Buttons/ButtonClear.js

@@ -2,6 +2,7 @@ import * as React from 'react';
 import SimpleButton from '../../../components/SimpleButton';
 export class ButtonClear extends React.Component {
     render() {
-        return (React.createElement(SimpleButton, { "data-name": "clear", tooltip: "Clear", iconSize: 20, icon: this.props.showIcon == false ? '' : 'close', ...this.props, variant: "text" }, this.props.showText ? 'Clear' : ''));
+        const { showText, showIcon, ...innerProps } = this.props;
+        return (React.createElement(SimpleButton, { "data-name": "clear", tooltip: "Clear", iconSize: 20, icon: showIcon == false ? '' : 'close', ...innerProps, variant: "text" }, showText ? 'Clear' : ''));
     }
 }

package/src/View/Components/Buttons/ButtonFunction.js

@@ -1,7 +1,8 @@
 import * as React from 'react';
 import SimpleButton from '../../../components/SimpleButton';
+import { twMerge } from '../../../twMerge';
 export class ButtonFunction extends React.Component {
     render() {
-        return (React.createElement(SimpleButton, { "data-name": "function", tooltip: "Module", iconSize: 20, icon: "function", mr: 1, ...this.props }));
+        return (React.createElement(SimpleButton, { "data-name": "function", tooltip: "Module", iconSize: 20, icon: "function", ...this.props, className: twMerge('twa:mr-1', this.props.className) }));
     }
 }

package/src/View/Components/Buttons/ButtonNew.d.ts

@@ -1,3 +1,13 @@
 import * as React from 'react';
 import { SimpleButtonProps } from '../../../components/SimpleButton';
-export declare const ButtonNew: (props: SimpleButtonProps) => React.JSX.Element;
+type ButtonNewProps = {
+    variant?: SimpleButtonProps['variant'];
+    className?: string;
+    tone?: SimpleButtonProps['tone'];
+    tooltip?: SimpleButtonProps['tooltip'];
+    accessLevel?: SimpleButtonProps['accessLevel'];
+    children?: React.ReactNode;
+    onClick?: () => void;
+};
+export declare const ButtonNew: (props: ButtonNewProps) => React.JSX.Element;
+export {};

package/src/View/Components/Buttons/ButtonNew.js

@@ -1,5 +1,6 @@
 import * as React from 'react';
 import SimpleButton from '../../../components/SimpleButton';
+import { twMerge } from '../../../twMerge';
 export const ButtonNew = (props) => {
-    return (React.createElement(SimpleButton, { "data-name": "new", tooltip: "New", tone: "accent", icon: "plus", variant: "raised", ...props }, props.children === undefined ? 'New' : props.children));
+    return (React.createElement(SimpleButton, { "data-name": "new", tone: props.tone || 'accent', icon: "plus", variant: props.variant || 'raised', tooltip: props.tooltip || 'New', accessLevel: props.accessLevel, onClick: props.onClick, className: twMerge(`twa:flex twa:flex-row twa:items-center`, props.className) }, props.children === undefined ? 'New' : props.children));
 };

package/src/View/Components/Buttons/EntityListActionButtons.d.ts

@@ -25,7 +25,7 @@ export interface EntityListActionButtonsProps extends React.ClassAttributes<Enti
     overrideTooltipShare?: string;
     confirmDeleteAction: Redux.Action;
     entityType: string;
-    justifyContent?: string;
+    justifyContent?: 'start' | 'center' | 'end';
     accessLevel: AccessLevel;
     cloneAccessLevel?: AccessLevel;
     editSize: any;