@aivenio/aquarium 1.12.0 → 1.13.0

package/dist/_variables.scss

@@ -1,6 +1,6 @@
 
 // Do not edit directly
-// Generated on Fri, 24 Mar 2023 10:10:33 GMT
+// Generated on Tue, 28 Mar 2023 13:29:27 GMT
 
 $border-radius-none: 0px !default;
 $border-radius-sm: 0.125rem !default;

package/dist/_variables_timescale.scss

@@ -1,6 +1,6 @@
 
 // Do not edit directly
-// Generated on Fri, 24 Mar 2023 10:10:33 GMT
+// Generated on Tue, 28 Mar 2023 13:29:28 GMT
 
 $border-radius-none: 0px;
 $border-radius-sm: 0.125rem;

package/dist/atoms.cjs

@@ -3287,9 +3287,10 @@ var ContentContainer = ({ children }) => /* @__PURE__ */ import_react20.default.
 DropdownMenu.ContentContainer = ContentContainer;
 var List = import_react20.default.forwardRef(
   (_a, ref) => {
-    var _b = _a, { children } = _b, props = __objRest(_b, ["children"]);
+    var _b = _a, { children, className } = _b, props = __objRest(_b, ["children", "className"]);
     return /* @__PURE__ */ import_react20.default.createElement("ul", __spreadValues({
-      ref
+      ref,
+      className: classNames(className, "outline-none ring-0")
     }, props), children);
   }
 );
@@ -3548,14 +3549,20 @@ var PopoverPanel = import_react25.default.forwardRef((_a, ref) => {
     ref,
     className: classNames(
       className,
-      tw(
-        "rounded-sm shadow-16dp bg-white mt-1 overflow-y-auto flex flex-col focus-visible:outline-0 focus-visible:border-info-70 border border-grey-20"
-      )
+      tw("rounded-sm shadow-16dp bg-white mt-1 overflow-y-auto flex flex-col border border-grey-20 outline-none")
     )
   }, props), children);
 });
+PopoverPanel.displayName = "Popover.Panel";
+var PopoverUnderlay = import_react25.default.forwardRef((props, ref) => /* @__PURE__ */ import_react25.default.createElement("div", __spreadProps(__spreadValues({
+  ref
+}, props), {
+  className: tw("fixed inset-0")
+})));
+PopoverUnderlay.displayName = "Popover.Underlay";
 var Popover = {
-  Panel: PopoverPanel
+  Panel: PopoverPanel,
+  Underlay: PopoverUnderlay
 };
 
 // src/atoms/PopoverDialog/PopoverDialog.tsx

package/dist/atoms.mjs

@@ -3251,9 +3251,10 @@ var ContentContainer = ({ children }) => /* @__PURE__ */ React16.createElement("
 DropdownMenu.ContentContainer = ContentContainer;
 var List = React16.forwardRef(
   (_a, ref) => {
-    var _b = _a, { children } = _b, props = __objRest(_b, ["children"]);
+    var _b = _a, { children, className } = _b, props = __objRest(_b, ["children", "className"]);
     return /* @__PURE__ */ React16.createElement("ul", __spreadValues({
-      ref
+      ref,
+      className: classNames(className, "outline-none ring-0")
     }, props), children);
   }
 );
@@ -3512,14 +3513,20 @@ var PopoverPanel = React21.forwardRef((_a, ref) => {
     ref,
     className: classNames(
       className,
-      tw(
-        "rounded-sm shadow-16dp bg-white mt-1 overflow-y-auto flex flex-col focus-visible:outline-0 focus-visible:border-info-70 border border-grey-20"
-      )
+      tw("rounded-sm shadow-16dp bg-white mt-1 overflow-y-auto flex flex-col border border-grey-20 outline-none")
     )
   }, props), children);
 });
+PopoverPanel.displayName = "Popover.Panel";
+var PopoverUnderlay = React21.forwardRef((props, ref) => /* @__PURE__ */ React21.createElement("div", __spreadProps(__spreadValues({
+  ref
+}, props), {
+  className: tw("fixed inset-0")
+})));
+PopoverUnderlay.displayName = "Popover.Underlay";
 var Popover = {
-  Panel: PopoverPanel
+  Panel: PopoverPanel,
+  Underlay: PopoverUnderlay
 };
 
 // src/atoms/PopoverDialog/PopoverDialog.tsx

package/dist/src/atoms/DropdownMenu/DropdownMenu.js

@@ -21,8 +21,8 @@ export const DropdownMenu = React.forwardRef((_a, ref) => {
 const ContentContainer = ({ children }) => (React.createElement("div", { className: tw('p-3 overflow-y-auto overflow-x-hidden') }, children));
 DropdownMenu.ContentContainer = ContentContainer;
 const List = React.forwardRef((_a, ref) => {
-    var { children } = _a, props = __rest(_a, ["children"]);
-    return (React.createElement("ul", Object.assign({ ref: ref }, props), children));
+    var { children, className } = _a, props = __rest(_a, ["children", "className"]);
+    return (React.createElement("ul", Object.assign({ ref: ref, className: classNames(className, 'outline-none ring-0') }, props), children));
 });
 DropdownMenu.List = List;
 const Group = React.forwardRef((_a, ref) => {
@@ -59,4 +59,4 @@ const EmptyStateContainer = (_a) => {
     return (React.createElement("div", Object.assign({ className: classNames(tw('border border-dashed border-grey-10 p-3'), className) }, props), children));
 };
 DropdownMenu.EmptyStateContainer = EmptyStateContainer;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRHJvcGRvd25NZW51LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL2F0b21zL0Ryb3Bkb3duTWVudS9Ecm9wZG93bk1lbnUudHN4Il0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7O0FBQUEsT0FBTyxLQUE2QixNQUFNLE9BQU8sQ0FBQztBQUVsRCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDckQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLHFDQUFxQyxDQUFDO0FBRWpFLE9BQU8sRUFBRSxVQUFVLEVBQUUsRUFBRSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFHcEQsT0FBTyxJQUFJLE1BQU0sZ0JBQWdCLENBQUM7QUFzQmxDLE1BQU0sQ0FBQyxNQUFNLFlBQVksR0FBMEIsS0FBSyxDQUFDLFVBQVUsQ0FDakUsQ0FBQyxFQUFvRixFQUFFLEdBQUcsRUFBRSxFQUFFO1FBQTdGLEVBQUUsU0FBUyxHQUFHLE9BQU8sRUFBRSxRQUFRLEdBQUcsT0FBTyxFQUFFLFFBQVEsRUFBRSxTQUFTLEVBQUUsUUFBUSxPQUFZLEVBQVAsS0FBSyxjQUFsRiw4REFBb0YsQ0FBRjtJQUFZLE9BQUEsQ0FDN0YsMkNBQ0UsR0FBRyxFQUFFLEdBQUcsRUFDUixLQUFLLEVBQUUsRUFBRSxTQUFTLEVBQUUsUUFBUSxFQUFFLFFBQVEsRUFBRSxFQUN4QyxTQUFTLEVBQUUsVUFBVSxDQUFDLFNBQVMsRUFBRSwrRUFBK0UsQ0FBQyxJQUM3RyxLQUFLLEdBRVIsUUFBUSxDQUNMLENBQ1AsQ0FBQTtDQUFBLENBQ3VCLENBQUM7QUFFM0IsTUFBTSxnQkFBZ0IsR0FBYSxDQUFDLEVBQUUsUUFBUSxFQUFFLEVBQUUsRUFBRSxDQUFDLENBQ25ELDZCQUFLLFNBQVMsRUFBRSxFQUFFLENBQUMsdUNBQXVDLENBQUMsSUFBRyxRQUFRLENBQU8sQ0FDOUUsQ0FBQztBQUVGLFlBQVksQ0FBQyxnQkFBZ0IsR0FBRyxnQkFBZ0Is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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRHJvcGRvd25NZW51LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL2F0b21zL0Ryb3Bkb3duTWVudS9Ecm9wZG93bk1lbnUudHN4Il0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7O0FBQUEsT0FBTyxLQUE2QixNQUFNLE9BQU8sQ0FBQztBQUVsRCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDckQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLHFDQUFxQyxDQUFDO0FBRWpFLE9BQU8sRUFBRSxVQUFVLEVBQUUsRUFBRSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFHcEQsT0FBTyxJQUFJLE1BQU0sZ0JBQWdCLENBQUM7QUFzQmxDLE1BQU0sQ0FBQyxNQUFNLFlBQVksR0FBMEIsS0FBSyxDQUFDLFVBQVUsQ0FDakUsQ0FBQyxFQUFvRixFQUFFLEdBQUcsRUFBRSxFQUFFO1FBQTdGLEVBQUUsU0FBUyxHQUFHLE9BQU8sRUFBRSxRQUFRLEdBQUcsT0FBTyxFQUFFLFFBQVEsRUFBRSxTQUFTLEVBQUUsUUFBUSxPQUFZLEVBQVAsS0FBSyxjQUFsRiw4REFBb0YsQ0FBRjtJQUFZLE9BQUEsQ0FDN0YsMkNBQ0UsR0FBRyxFQUFFLEdBQUcsRUFDUixLQUFLLEVBQUUsRUFBRSxTQUFTLEVBQUUsUUFBUSxFQUFFLFFBQVEsRUFBRSxFQUN4QyxTQUFTLEVBQUUsVUFBVSxDQUFDLFNBQVMsRUFBRSwrRUFBK0UsQ0FBQyxJQUM3RyxLQUFLLEdBRVIsUUFBUSxDQUNMLENBQ1AsQ0FBQTtDQUFBLENBQ3VCLENBQUM7QUFFM0IsTUFBTSxnQkFBZ0IsR0FBYSxDQUFDLEVBQUUsUUFBUSxFQUFFLEVBQUUsRUFBRSxDQUFDLENBQ25ELDZCQUFLLFNBQVMsRUFBRSxFQUFFLENBQUMsdUNBQXVDLENBQUMsSUFBRyxRQUFRLENBQU8sQ0FDOUUsQ0FBQztBQUVGLFlBQVksQ0FBQyxnQkFBZ0IsR0FBRyxnQkFBZ0Is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

package/dist/src/atoms/Popover/Popover.d.ts

@@ -1,8 +1,10 @@
 import React from 'react';
 declare type DivProps = React.HTMLProps<HTMLDivElement>;
 declare const PopoverPanel: React.ForwardRefExoticComponent<Pick<DivProps, "default" | "start" | "hidden" | "color" | "content" | "size" | "style" | "wrap" | "open" | "height" | "translate" | "width" | "multiple" | "disabled" | "prefix" | "src" | "cite" | "data" | "form" | "label" | "slot" | "span" | "summary" | "title" | "pattern" | "children" | "key" | "accept" | "acceptCharset" | "action" | "allowFullScreen" | "allowTransparency" | "alt" | "as" | "async" | "autoComplete" | "autoFocus" | "autoPlay" | "capture" | "cellPadding" | "cellSpacing" | "charSet" | "challenge" | "checked" | "classID" | "cols" | "colSpan" | "controls" | "coords" | "crossOrigin" | "dateTime" | "defer" | "download" | "encType" | "formAction" | "formEncType" | "formMethod" | "formNoValidate" | "formTarget" | "frameBorder" | "headers" | "high" | "href" | "hrefLang" | "htmlFor" | "httpEquiv" | "integrity" | "keyParams" | "keyType" | "kind" | "list" | "loop" | "low" | "manifest" | "marginHeight" | "marginWidth" | "max" | "maxLength" | "media" | "mediaGroup" | "method" | "min" | "minLength" | "muted" | "name" | "nonce" | "noValidate" | "optimum" | "defaultChecked" | "defaultValue" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "accessKey" | "className" | "contentEditable" | "contextMenu" | "dir" | "draggable" | "id" | "lang" | "placeholder" | "spellCheck" | "tabIndex" | "radioGroup" | "role" | "about" | "datatype" | "inlist" | "property" | "resource" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "inputMode" | "is" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "target" | "type" | "playsInline" | "poster" | "preload" | "readOnly" | "rel" | "required" | "reversed" | "rows" | "rowSpan" | "sandbox" | "scope" | "scoped" | "scrolling" | "seamless" | "selected" | "shape" | "sizes" | "srcDoc" | "srcLang" | "srcSet" | "step" | "useMap" | "value" | "wmode" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocus" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChange" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEnd" | "onTransitionEndCapture"> & React.RefAttributes<HTMLDivElement>>;
+declare const PopoverUnderlay: React.ForwardRefExoticComponent<Pick<DivProps, "default" | "start" | "hidden" | "color" | "content" | "size" | "style" | "wrap" | "open" | "height" | "translate" | "width" | "multiple" | "disabled" | "prefix" | "src" | "cite" | "data" | "form" | "label" | "slot" | "span" | "summary" | "title" | "pattern" | "children" | "key" | "accept" | "acceptCharset" | "action" | "allowFullScreen" | "allowTransparency" | "alt" | "as" | "async" | "autoComplete" | "autoFocus" | "autoPlay" | "capture" | "cellPadding" | "cellSpacing" | "charSet" | "challenge" | "checked" | "classID" | "cols" | "colSpan" | "controls" | "coords" | "crossOrigin" | "dateTime" | "defer" | "download" | "encType" | "formAction" | "formEncType" | "formMethod" | "formNoValidate" | "formTarget" | "frameBorder" | "headers" | "high" | "href" | "hrefLang" | "htmlFor" | "httpEquiv" | "integrity" | "keyParams" | "keyType" | "kind" | "list" | "loop" | "low" | "manifest" | "marginHeight" | "marginWidth" | "max" | "maxLength" | "media" | "mediaGroup" | "method" | "min" | "minLength" | "muted" | "name" | "nonce" | "noValidate" | "optimum" | "defaultChecked" | "defaultValue" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "accessKey" | "className" | "contentEditable" | "contextMenu" | "dir" | "draggable" | "id" | "lang" | "placeholder" | "spellCheck" | "tabIndex" | "radioGroup" | "role" | "about" | "datatype" | "inlist" | "property" | "resource" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "inputMode" | "is" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "target" | "type" | "playsInline" | "poster" | "preload" | "readOnly" | "rel" | "required" | "reversed" | "rows" | "rowSpan" | "sandbox" | "scope" | "scoped" | "scrolling" | "seamless" | "selected" | "shape" | "sizes" | "srcDoc" | "srcLang" | "srcSet" | "step" | "useMap" | "value" | "wmode" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocus" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChange" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEnd" | "onTransitionEndCapture"> & React.RefAttributes<HTMLDivElement>>;
 declare type Popover = {
     Panel: typeof PopoverPanel;
+    Underlay: typeof PopoverUnderlay;
 };
 export declare const Popover: Popover;
 export {};

package/dist/src/atoms/Popover/Popover.js

@@ -13,9 +13,13 @@ import React from 'react';
 import { classNames, tw } from '../../../src/utils/tailwind';
 const PopoverPanel = React.forwardRef((_a, ref) => {
     var { className, children } = _a, props = __rest(_a, ["className", "children"]);
-    return (React.createElement("div", Object.assign({ ref: ref, className: classNames(className, tw('rounded-sm shadow-16dp bg-white mt-1 overflow-y-auto flex flex-col focus-visible:outline-0 focus-visible:border-info-70 border border-grey-20')) }, props), children));
+    return (React.createElement("div", Object.assign({ ref: ref, className: classNames(className, tw('rounded-sm shadow-16dp bg-white mt-1 overflow-y-auto flex flex-col border border-grey-20 outline-none')) }, props), children));
 });
+PopoverPanel.displayName = 'Popover.Panel';
+const PopoverUnderlay = React.forwardRef((props, ref) => (React.createElement("div", Object.assign({ ref: ref }, props, { className: tw('fixed inset-0') }))));
+PopoverUnderlay.displayName = 'Popover.Underlay';
 export const Popover = {
     Panel: PopoverPanel,
+    Underlay: PopoverUnderlay,
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUG9wb3Zlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9hdG9tcy9Qb3BvdmVyL1BvcG92ZXIudHN4Il0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7O0FBQUEsT0FBTyxLQUFLLE1BQU0sT0FBTyxDQUFDO0FBRTFCLE9BQU8sRUFBRSxVQUFVLEVBQUUsRUFBRSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFNcEQsTUFBTSxZQUFZLEdBQUcsS0FBSyxDQUFDLFVBQVUsQ0FBb0MsQ0FBQyxFQUFpQyxFQUFFLEdBQUcsRUFBRSxFQUFFO1FBQTFDLEVBQUUsU0FBUyxFQUFFLFFBQVEsT0FBWSxFQUFQLEtBQUssY0FBL0IseUJBQWlDLENBQUY7SUFBWSxPQUFBLENBQ25ILDJDQUNFLEdBQUcsRUFBRSxHQUFHLEVBQ1IsU0FBUyxFQUFFLFVBQVUsQ0FDbkIsU0FBUyxFQUNULEVBQUUsQ0FDQSwrSUFBK0ksQ0FDaEosQ0FDRixJQUNHLEtBQUssR0FFUixRQUFRLENBQ0wsQ0FDUCxDQUFBO0NBQUEsQ0FBQyxDQUFDO0FBTUgsTUFBTSxDQUFDLE1BQU0sT0FBTyxHQUFZO0lBQzlCLEtBQUssRUFBRSxZQUFZO0NBQ3BCLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUG9wb3Zlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9hdG9tcy9Qb3BvdmVyL1BvcG92ZXIudHN4Il0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7O0FBQUEsT0FBTyxLQUFLLE1BQU0sT0FBTyxDQUFDO0FBRTFCLE9BQU8sRUFBRSxVQUFVLEVBQUUsRUFBRSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFNcEQsTUFBTSxZQUFZLEdBQUcsS0FBSyxDQUFDLFVBQVUsQ0FBb0MsQ0FBQyxFQUFpQyxFQUFFLEdBQUcsRUFBRSxFQUFFO1FBQTFDLEVBQUUsU0FBUyxFQUFFLFFBQVEsT0FBWSxFQUFQLEtBQUssY0FBL0IseUJBQWlDLENBQUY7SUFBWSxPQUFBLENBQ25ILDJDQUNFLEdBQUcsRUFBRSxHQUFHLEVBQ1IsU0FBUyxFQUFFLFVBQVUsQ0FDbkIsU0FBUyxFQUNULEVBQUUsQ0FBQyx1R0FBdUcsQ0FBQyxDQUM1RyxJQUNHLEtBQUssR0FFUixRQUFRLENBQ0wsQ0FDUCxDQUFBO0NBQUEsQ0FBQyxDQUFDO0FBQ0gsWUFBWSxDQUFDLFdBQVcsR0FBRyxlQUFlLENBQUM7QUFJM0MsTUFBTSxlQUFlLEdBQUcsS0FBSyxDQUFDLFVBQVUsQ0FBdUMsQ0FBQyxLQUFLLEVBQUUsR0FBRyxFQUFFLEVBQUUsQ0FBQyxDQUM3RiwyQ0FBSyxHQUFHLEVBQUUsR0FBRyxJQUFNLEtBQUssSUFBRSxTQUFTLEVBQUUsRUFBRSxDQUFDLGVBQWUsQ0FBQyxJQUFJLENBQzdELENBQUMsQ0FBQztBQUNILGVBQWUsQ0FBQyxXQUFXLEdBQUcsa0JBQWtCLENBQUM7QUFPakQsTUFBTSxDQUFDLE1BQU0sT0FBTyxHQUFZO0lBQzlCLEtBQUssRUFBRSxZQUFZO0lBQ25CLFFBQVEsRUFBRSxlQUFlO0NBQzFCLENBQUMifQ==

package/dist/src/molecules/Combobox/Combobox.js

@@ -11,12 +11,12 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 // https://www.w3.org/TR/wai-aria-practices/examples/listbox/listbox-collapsible.html
 import React, { useEffect, useRef, useState } from 'react';
-import { useOverlayPosition } from '@react-aria/overlays';
+import { ariaHideOutside } from '@react-aria/overlays';
 import { useCombobox } from 'downshift';
 import omit from 'lodash/omit';
 import uniqueId from 'lodash/uniqueId';
 import { matchSorter } from 'match-sorter';
-import { PopoverWrapper } from '../../../src/molecules/Popover/PopoverWrapper';
+import { PopoverOverlay } from '../../../src/molecules/Popover/PopoverOverlay';
 import { Skeleton } from '../../../src/molecules/Skeleton/Skeleton';
 import { getOptionLabelBuiltin, isOptionDisabledBuiltin, Select } from '../../../src/atoms/Select/Select';
 import { getLabelControlProps, LabelControl } from '../../../src/utils/form/Label/Label';
@@ -24,15 +24,17 @@ import { tw } from '../../../src/utils/tailwind';
 export const ComboboxBase = (_a) => {
     var _b;
     var { id, name, placeholder, maxHeight, options, optionKeys = ['label', 'value'], noResults, optionToString: itemToString = getOptionLabelBuiltin, createOption, renderOption = (opt) => itemToString(opt), isOptionDisabled = isOptionDisabledBuiltin, defaultValue, value, onChange, children, valid = true, disabled = false, readOnly = false } = _a, props = __rest(_a, ["id", "name", "placeholder", "maxHeight", "options", "optionKeys", "noResults", "optionToString", "createOption", "renderOption", "isOptionDisabled", "defaultValue", "value", "onChange", "children", "valid", "disabled", "readOnly"]);
+    const popoverRef = useRef(null);
     const targetRef = useRef(null);
-    const overlayRef = useRef(null);
+    const menuRef = useRef(null);
+    const inputRef = useRef(null);
     const [inputItems, setInputItems] = useState(options);
     const [hasFocus, setFocus] = useState(false);
     const updateInputItems = (query) => {
         const keys = typeof options[0] === 'string' ? undefined : optionKeys;
         setInputItems(query ? matchSorter(options, query, { keys }) : options);
     };
-    const { isOpen, getToggleButtonProps, getMenuProps, getInputProps, highlightedIndex, inputValue, getItemProps, selectedItem, closeMenu, openMenu, } = useCombobox({
+    const { isOpen, openMenu, closeMenu, toggleMenu, getToggleButtonProps, getMenuProps, getInputProps, highlightedIndex, inputValue, getItemProps, selectedItem, } = useCombobox({
         id,
         selectedItem: value,
         defaultSelectedItem: defaultValue,
@@ -50,23 +52,27 @@ export const ComboboxBase = (_a) => {
         onSelectedItemChange: (e) => onChange === null || onChange === void 0 ? void 0 : onChange(e.selectedItem),
         onInputValueChange: ({ inputValue }) => updateInputItems(inputValue),
     });
-    const { overlayProps } = useOverlayPosition({
-        targetRef,
-        overlayRef,
-        placement: 'bottom start',
-        shouldFlip: true,
+    const state = {
         isOpen,
-    });
+        close: closeMenu,
+        open: openMenu,
+        toggle: toggleMenu,
+        setOpen: (isOpen) => (isOpen ? openMenu() : closeMenu()),
+    };
     useEffect(() => {
         updateInputItems(inputValue);
     }, [JSON.stringify(options)]);
-    const inputProps = getInputProps({ disabled: disabled || readOnly });
+    useEffect(() => {
+        if (state.isOpen && inputRef.current && popoverRef.current) {
+            return ariaHideOutside([inputRef.current, popoverRef.current]);
+        }
+    }, [state.isOpen, inputRef, popoverRef]);
+    const menuProps = getMenuProps({ ref: menuRef }, { suppressRefError: !isOpen });
+    const inputProps = getInputProps({ ref: inputRef, disabled: disabled || readOnly });
     const hasNoResults = options.length === 0 || inputItems.length === 0;
-    const width = (_b = targetRef.current) === null || _b === void 0 ? void 0 : _b.offsetWidth;
-    const style = isOpen ? Object.assign(Object.assign({}, overlayProps.style), { width }) : { display: 'none' };
     return (React.createElement("div", { className: tw('relative') },
         React.createElement(Select.InputContainer, { ref: targetRef, variant: disabled ? 'disabled' : !valid ? 'error' : readOnly ? 'readOnly' : hasFocus ? 'focused' : 'default' },
-            React.createElement(Select.Input, Object.assign({ id: id, name: name, placeholder: readOnly ? undefined : placeholder }, inputProps, props, { disabled: disabled, readOnly: readOnly, onClick: readOnly ? undefined : openMenu, onFocus: () => {
+            React.createElement(Select.Input, Object.assign({ id: id, ref: inputRef, name: name, placeholder: readOnly ? undefined : placeholder }, inputProps, props, { disabled: disabled, readOnly: readOnly, onClick: readOnly ? undefined : openMenu, onFocus: () => {
                     setFocus(true);
                 }, onBlur: (e) => {
                     var _a;
@@ -78,15 +84,10 @@ export const ComboboxBase = (_a) => {
                     (_a = inputProps.onKeyDown) === null || _a === void 0 ? void 0 : _a.call(inputProps, e);
                 }, onKeyUp: (e) => e.stopPropagation() })),
             !readOnly && React.createElement(Select.Toggle, Object.assign({ hasFocus: hasFocus, isOpen: isOpen }, getToggleButtonProps({ disabled })))),
-        React.createElement(PopoverWrapper
-        // Downshift expects the menu to be in the DOM all the time.
-        , Object.assign({ 
-            // Downshift expects the menu to be in the DOM all the time.
-            isOpen: true, isDismissable: true, autoFocus: true }, getMenuProps({ ref: overlayRef }), { style: style, onClose: closeMenu }),
-            React.createElement(Select.Menu, { maxHeight: maxHeight },
-                isOpen && hasNoResults && React.createElement(Select.NoResults, null, noResults),
-                isOpen &&
-                    inputItems.map((item, index) => (React.createElement(Select.Item, Object.assign({ key: itemToString(item), selected: item === selectedItem, highlighted: index === highlightedIndex }, getItemProps({ item, index, disabled: isOptionDisabled(item, index) })), renderOption(item))))))));
+        isOpen && (React.createElement(PopoverOverlay, { ref: popoverRef, triggerRef: targetRef, state: state, placement: "bottom-left", shouldFlip: true, isNonModal: true, style: { width: (_b = targetRef.current) === null || _b === void 0 ? void 0 : _b.offsetWidth } },
+            React.createElement(Select.Menu, Object.assign({ ref: menuRef, maxHeight: maxHeight }, menuProps),
+                hasNoResults && React.createElement(Select.NoResults, null, noResults),
+                inputItems.map((item, index) => (React.createElement(Select.Item, Object.assign({ key: itemToString(item), selected: item === selectedItem, highlighted: index === highlightedIndex }, getItemProps({ item, index, disabled: isOptionDisabled(item, index) })), renderOption(item)))))))));
 };
 const ComboboxBaseSkeleton = () => React.createElement(Skeleton, { height: 38 });
 ComboboxBase.Skeleton = ComboboxBaseSkeleton;
@@ -106,4 +107,4 @@ const ComboboxSkeleton = () => (React.createElement(LabelControl.Skeleton, null,
     React.createElement(ComboboxBase.Skeleton, null)));
 Combobox.Skeleton = ComboboxSkeleton;
 Combobox.Skeleton.displayName = 'Combobox.Skeleton';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ29tYm9ib3guanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvbW9sZWN1bGVzL0NvbWJvYm94L0NvbWJvYm94LnRzeCJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7OztBQUFBLHFGQUFxRjtBQUNyRixPQUFPLEtBQUssRUFBRSxFQUFFLFNBQVMsRUFBRSxNQUFNLEVBQUUsUUFBUSxFQUFFLE1BQU0sT0FBTyxDQUFDO0FBQzNELE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQzFELE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxXQUFXLENBQUM7QUFDeEMsT0FBTyxJQUFJLE1BQU0sYUFBYSxDQUFDO0FBQy9CLE9BQU8sUUFBUSxNQUFNLGlCQUFpQixDQUFDO0FBQ3ZDLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFFM0MsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLHNDQUFzQyxDQUFDO0FBQ3RFLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUUzRCxPQUFPLEVBQUUscUJBQXFCLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFakcsT0FBTyxFQUEwQixvQkFBb0IsRUFBRSxZQUFZLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQztBQUN4RyxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFzQnhDLE1BQU0sQ0FBQyxNQUFNLFlBQVksR0FBRyxDQUF5QixFQW9CQSxFQUFpRCxFQUFFOztRQXBCbkQsRUFDbkQsRUFBRSxFQUNGLElBQUksRUFDSixXQUFXLEVBQ1gsU0FBUyxFQUNULE9BQU8sRUFDUCxVQUFVLEdBQUcsQ0FBQyxPQUFPLEVBQUUsT0FBTyxDQUFDLEVBQy9CLFNBQVMsRUFDVCxjQUFjLEVBQUUsWUFBWSxHQUFHLHFCQUFxQixFQUNwRCxZQUFZLEVBQ1osWUFBWSxHQUFHLENBQUMs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
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Combobox.js","sourceRoot":"","sources":["../../../../src/molecules/Combobox/Combobox.tsx"],"names":[],"mappings":"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"}

package/dist/src/molecules/DataList/DataList.d.ts

@@ -1,10 +1,10 @@
 /// <reference types="react" />
 import { type DataListColumn, type DataTableRow } from '../../../src/utils/table/types';
-export declare type DataListProps<R extends DataTableRow> = {
+export declare type DataListProps<C extends DataListColumn<R>, R extends DataTableRow> = {
     /**
      * Array of column definitions that correspond to the data rows.
      */
-    columns: Array<DataListColumn<R>>;
+    columns: C[];
     /**
      * Array of data rows to be displayed.
      */
@@ -16,4 +16,4 @@ export declare type DataListProps<R extends DataTableRow> = {
      */
     sticky?: boolean;
 };
-export declare const DataList: <R extends DataTableRow>({ columns, rows, sticky }: DataListProps<R>) => JSX.Element;
+export declare const DataList: <C extends DataListColumn<R>, R extends DataTableRow>({ columns, rows, sticky, }: DataListProps<C, R>) => JSX.Element;

package/dist/src/molecules/DataList/DataList.js

@@ -1,5 +1,4 @@
 import React from 'react';
-import orderBy from 'lodash/orderBy';
 import { SecondaryButton } from '../../../src/molecules/Button/Button';
 import { StatusChip } from '../../../src/molecules/Chip/Chip';
 import { Template } from '../../../src/molecules/Template/Template';
@@ -7,18 +6,19 @@ import { DataList as DataListBase } from '../../../src/atoms/DataList/DataList';
 import { Item } from '../../../src/atoms/Table/Table';
 import { List } from '../../../src/molecules';
 import { renameProperty } from '../../../src/utils/object';
-import { cellProps, toSortDirection } from '../../../src/utils/table/types';
+import { cellProps, columnIsFieldColumn } from '../../../src/utils/table/types';
 import { useTableSort } from '../../../src/utils/table/useTableSort';
-export const DataList = ({ columns, rows, sticky }) => {
+import { sortRowsBy } from '../../../src/utils/table/utils';
+export const DataList = ({ columns, rows, sticky, }) => {
     const [sort, updateSort] = useTableSort();
-    const sortedRows = orderBy(rows, [sort === null || sort === void 0 ? void 0 : sort.key], [toSortDirection(sort === null || sort === void 0 ? void 0 : sort.direction)]);
+    const sortedRows = sortRowsBy(rows, sort);
     const templateColumns = columns.map((column) => { var _a; return (_a = column.width) !== null && _a !== void 0 ? _a : 'auto'; });
     return (React.createElement(Template, { columns: templateColumns },
-        columns.map((column) => (column.type === 'text' || column.type === 'number') && column.sortable ? (React.createElement(DataListBase.SortCell, Object.assign({ direction: sort && sort.key === column.field ? sort.direction : 'none', onClick: () => updateSort(column.field), sticky: sticky }, cellProps(column)), column.headerName)) : (React.createElement(DataListBase.HeadCell, Object.assign({}, cellProps(column), { sticky: sticky }), column.headerName))),
+        columns.map((column) => (columnIsFieldColumn(column) && column.sortable) || column.sort ? (React.createElement(DataListBase.SortCell, Object.assign({ direction: sort && sort.column.headerName === column.headerName ? sort.direction : 'none', onClick: () => updateSort(column), sticky: sticky }, cellProps(column)), column.headerName)) : (React.createElement(DataListBase.HeadCell, Object.assign({}, cellProps(column), { sticky: sticky }), column.headerName))),
         React.createElement(List, { items: sortedRows, renderItem: (row, index) => (React.createElement(DataListBase.Row, { key: row.id },
                 React.createElement(List, { items: columns, renderItem: (column) => column.type === 'status' ? (React.createElement(DataListBase.Cell, Object.assign({}, cellProps(column)),
                         React.createElement(StatusChip, Object.assign({ dense: true }, column.status(row, index, sortedRows))))) : column.type === 'action' ? (React.createElement(DataListBase.Cell, Object.assign({}, cellProps(column)),
-                        React.createElement(SecondaryButton, Object.assign({ dense: true }, renameProperty('text', 'children', column.action(row, index, sortedRows)))))) : column.type === 'custom' ? (React.createElement(DataListBase.Cell, Object.assign({}, cellProps(column)), column.UNSAFE_render(row, index, sortedRows))) : column.type === 'item' ? (React.createElement(DataListBase.Cell, null,
+                        React.createElement(SecondaryButton, Object.assign({ dense: true }, renameProperty('text', 'children', column.action(row, index, sortedRows)))))) : column.type === 'custom' ? (React.createElement(DataListBase.Cell, Object.assign({}, cellProps(column)), column.UNSAFE_render(row, index, sortedRows))) : column.type === 'item' ? (React.createElement(DataListBase.Cell, Object.assign({}, cellProps(column)),
                         React.createElement(Item, Object.assign({}, column.item(row, index, sortedRows))))) : (React.createElement(DataListBase.Cell, Object.assign({}, cellProps(column)), column.formatter ? column.formatter(row[column.field], row, index, sortedRows) : row[column.field])) }))) })));
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGF0YUxpc3QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvbW9sZWN1bGVzL0RhdGFMaXN0L0RhdGFMaXN0LnRzeCJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssTUFBTSxPQUFPLENBQUM7QUFDMUIsT0FBTyxPQUFPLE1BQU0sZ0JBQWdCLENBQUM7QUFFckMsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQzlELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUNyRCxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFM0QsT0FBTyxFQUFFLFFBQVEsSUFBSSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUN2RSxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFN0MsT0FBTyxFQUFFLElBQUksRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUNyQyxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDbEQsT0FBTyxFQUEwQyxTQUFTLEVBQUUsZUFBZSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDM0csT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBcUI1RCxNQUFNLENBQUMsTUFBTSxRQUFRLEdBQUcsQ0FBeUIsRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0sRUFBb0IsRUFBZSxFQUFFO0lBQzNHLE1BQU0sQ0FBQyxJQUFJLEVBQUUsVUFBVSxDQUFDLEdBQUcsWUFBWSxFQUFLLENBQUM7SUFDN0MsTUFBTSxVQUFVLEdBQUcsT0FBTyxDQUFDLElBQUksRUFBRSxDQUFDLElBQUksYUFBSixJQUFJLHVCQUFKLElBQUksQ0FBRSxHQUFHLENBQUMsRUFBRSxDQUFDLGVBQWUsQ0FBQyxJQUFJLGFBQUosSUFBSSx1QkFBSixJQUFJLENBQUUsU0FBUyxDQUFDLENBQUMsQ0FB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGF0YUxpc3QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvbW9sZWN1bGVzL0RhdGFMaXN0L0RhdGFMaXN0LnRzeCJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssTUFBTSxPQUFPLENBQUM7QUFFMUIsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQzlELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUNyRCxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFM0QsT0FBTyxFQUFFLFFBQVEsSUFBSSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUN2RSxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFN0MsT0FBTyxFQUFFLElBQUksRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUNyQyxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDbEQsT0FBTyxFQUEwQyxTQUFTLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUMvRyxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFDNUQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBcUJuRCxNQUFNLENBQUMsTUFBTSxRQUFRLEdBQUcsQ0FBc0QsRUFDNUUsT0FBTyxFQUNQLElBQUksRUFDSixNQUFNLEdBQ2MsRUFBZSxFQUFFO0lBQ3JDLE1BQU0sQ0FBQyxJQUFJLEVBQUUsVUFBVSxDQUFDLEdBQUcsWUFBWSxFQUFRLENBQUM7SUFDaEQsTUFBTSxVQUFVLEdBQUcsVUFBVSxDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsQ0FBQztJQUUxQyxNQUFNLGVBQWUsR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUMsTUFBTSxFQUFFLEVBQUUsV0FBQyxPQUFBLE1BQUEsTUFBTSxDQUFDLEtB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

package/dist/src/molecules/DataTable/DataTable.d.ts

@@ -1,11 +1,11 @@
 /// <reference types="react" />
 import { type TableProps } from '../../../src/molecules/Table/Table';
 import { type DataTableColumn, type DataTableRow } from '../../../src/utils/table/types';
-export declare type DataTableProps<R extends DataTableRow> = {
+export declare type DataTableProps<C extends DataTableColumn<R>, R extends DataTableRow> = {
     /**
      * Array of column definitions that correspond to the data rows.
      */
-    columns: Array<DataTableColumn<R>>;
+    columns: C[];
     /**
      * Array of data rows to be displayed.
      */
@@ -26,4 +26,4 @@ export declare type DataTableProps<R extends DataTableRow> = {
      */
     sticky?: boolean;
 } & Pick<TableProps, 'ariaLabel' | 'onNext' | 'onPrev'>;
-export declare const DataTable: <T extends DataTableRow>({ columns, rows, noWrap, layout, sticky, ...rest }: DataTableProps<T>) => JSX.Element;
+export declare const DataTable: <C extends DataTableColumn<R>, R extends DataTableRow>({ columns, rows, noWrap, layout, sticky, ...rest }: DataTableProps<C, R>) => JSX.Element;

package/dist/src/molecules/DataTable/DataTable.js

@@ -10,26 +10,26 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 import React from 'react';
-import orderBy from 'lodash/orderBy';
 import { SecondaryButton } from '../../../src/molecules/Button/Button';
 import { StatusChip } from '../../../src/molecules/Chip/Chip';
 import { Table } from '../../../src/molecules/Table/Table';
 import { Item } from '../../../src/atoms/Table/Table';
 import { List } from '../../../src/molecules';
 import { renameProperty } from '../../../src/utils/object';
-import { cellProps, toSortDirection } from '../../../src/utils/table/types';
+import { cellProps, columnIsFieldColumn } from '../../../src/utils/table/types';
 import { useTableSort } from '../../../src/utils/table/useTableSort';
+import { sortRowsBy } from '../../../src/utils/table/utils';
 import { tw } from '../../../src/utils/tailwind';
 export const DataTable = (_a) => {
     var { columns, rows, noWrap = false, layout = 'auto', sticky } = _a, rest = __rest(_a, ["columns", "rows", "noWrap", "layout", "sticky"]);
     const [sort, updateSort] = useTableSort();
-    const sortedRows = orderBy(rows, [sort === null || sort === void 0 ? void 0 : sort.key], [toSortDirection(sort === null || sort === void 0 ? void 0 : sort.direction)]);
+    const sortedRows = sortRowsBy(rows, sort);
     return (React.createElement(Table, Object.assign({}, rest, { className: tw({
             'whitespace-nowrap': noWrap,
             'table-auto': layout === 'auto',
             'table-fixed': layout === 'fixed',
         }) }),
-        React.createElement(Table.Head, { sticky: sticky }, columns.map((column) => (column.type === 'text' || column.type === 'number') && column.sortable ? (React.createElement(Table.SortCell, Object.assign({ direction: sort && sort.key === column.field ? sort.direction : 'none', onClick: () => updateSort(column.field), style: { width: column.width }, "aria-label": column.headerInvisible ? column.headerName : undefined }, cellProps(column)), !column.headerInvisible && column.headerName)) : (React.createElement(Table.Cell, Object.assign({}, cellProps(column), { style: { width: column.width }, "aria-label": column.headerInvisible ? column.headerName : undefined }), !column.headerInvisible && column.headerName)))),
+        React.createElement(Table.Head, { sticky: sticky }, columns.map((column) => (columnIsFieldColumn(column) && column.sortable) || column.sort ? (React.createElement(Table.SortCell, Object.assign({ direction: sort && sort.column.headerName === column.headerName ? sort.direction : 'none', onClick: () => updateSort(column), style: { width: column.width }, "aria-label": column.headerInvisible ? column.headerName : undefined }, cellProps(column)), !column.headerInvisible && column.headerName)) : (React.createElement(Table.Cell, Object.assign({}, cellProps(column), { style: { width: column.width }, "aria-label": column.headerInvisible ? column.headerName : undefined }), !column.headerInvisible && column.headerName)))),
         React.createElement(Table.Body, null,
             React.createElement(List, { items: sortedRows, renderItem: (row, index) => (React.createElement(Table.Row, { key: row.id },
                     React.createElement(List, { items: columns, renderItem: (column) => column.type === 'status' ? (React.createElement(Table.Cell, Object.assign({}, cellProps(column)),
@@ -39,4 +39,4 @@ export const DataTable = (_a) => {
                             ? column.formatter(row[column.field], row, index, sortedRows)
                             : row[column.field])) }))) }))));
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGF0YVRhYmxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL21vbGVjdWxlcy9EYXRhVGFibGUvRGF0YVRhYmxlLnRzeCJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7OztBQUFBLE9BQU8sS0FBSyxNQUFNLE9BQU8sQ0FBQztBQUMxQixPQUFPLE9BQU8sTUFBTSxnQkFBZ0IsQ0FBQztBQUVyQyxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDOUQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ3JELE9BQU8sRUFBbUIsS0FBSyxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFFbkUsT0FBTyxFQUFFLElBQUksRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRTdDLE9BQU8sRUFBRSxJQUFJLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDckMsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBQ2xELE9BQU8sRUFBMkMsU0FBUyxFQUFFLGVBQWUsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQzVHLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUM1RCxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFnQ3hDLE1BQU0sQ0FBQyxNQUFNLFNBQVMsR0FBRyxDQUF5QixFQU85QixFQUFlLEVBQUU7UUFQYSxFQUNoRCxPQUFPLEVBQ1AsSUFBSSxFQUNKLE1BQU0sR0FBRyxLQUFLLEVBQ2QsTUFBTSxHQUFHLE1BQU0sRUFDZixNQUFNLE9BRVksRUFEZixJQUFJLGNBTnlDLGlEQU9qRCxDQURRO0lBRVAsTUFBTSxDQUFDLElBQUksRUFBRSxVQUFVLENBQUMsR0FBRyxZQUFZLEVBQUssQ0FBQztJQUM3QyxNQUFNLFVBQVUsR0FBRyxPQUFPLENBQUMsSUFBSSxFQUFFLENBQUMsSUFBSSxhQUFKLElBQUksdUJBQUosSUFBSSxD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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGF0YVRhYmxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL21vbGVjdWxlcy9EYXRhVGFibGUvRGF0YVRhYmxlLnRzeCJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7OztBQUFBLE9BQU8sS0FBSyxNQUFNLE9BQU8sQ0FBQztBQUUxQixPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDOUQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ3JELE9BQU8sRUFBbUIsS0FBSyxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFFbkUsT0FBTyxFQUFFLElBQUksRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRTdDLE9BQU8sRUFBRSxJQUFJLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDckMsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBQ2xELE9BQU8sRUFBMkMsU0FBUyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDaEgsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBQzVELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUNuRCxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFnQ3hDLE1BQU0sQ0FBQyxNQUFNLFNBQVMsR0FBRyxDQUF1RCxFQU96RCxFQUFlLEVBQUU7UUFQd0MsRUFDOUUsT0FBTyxFQUNQLElBQUksRUFDSixNQUFNLEdBQUcsS0FBSyxFQUNkLE1BQU0sR0FBRyxNQUFNLEVBQ2YsTUFBTSxPQUVlLEVBRGxCLElBQUksY0FOdUUsaURBTy9FLENBRFE7SUFFUCxNQUFNLENBQUMsSUFBSSxFQUFFLFVBQVUsQ0FBQyxHQUFHLFlBQVksRUFBUSxDQUFDO0lBQ2hELE1BQU0sVUFBVSxHQUFHLFVBQVUsQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFFMUMsT0FBTyxDQUNMLG9CQUFDLEtBQUssb0JBQ0EsSUFBSSxJQUNSLFNBQVMsRUFBRSxFQUFFLENBQUM7WUFDWixtQkFBbUIsRUFBRSxNQUFNO1lBQzNCLFlBQVksRUFBRSxNQUFNLEtBQUssTUFBTTtZQUMvQixhQUFhLEVBQUUsTUFBTSxLQUFLLE9BQU87U0FDbEMsQ0FBQztRQUVGLG9CQUFDLEtBQUssQ0FBQyxJQUFJLElBQUMsTUFBTSxFQUFFLE1BQU0sSUFDdkIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDLE1BQU0sRUFBRSxFQUFFLENBQ3RCLENBQUMsbUJBQW1CLENBQUMsTUFBTSxDQUFDLElBQUksTUFBTSxDQUFDLFFBQVEsQ0FBQyxJQUFJLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQ2hFLG9CQUFDLEtBQUssQ0FBQyxRQUFRLGtCQUNiLFNBQVMsRUFBRSxJQUFJLElBQUksSUFBSSxDQUFDLE1BQU0sQ0FBQyxVQUFVLEtBQUssTUFBTSxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsTUFBTSxFQUN6RixPQUFPLEVBQUUsR0FBRyxFQUFFLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxFQUNqQyxLQUFLLEVBQUUsRUFBRSxLQUFLLEVBQUUsTUFBTSxDQUFDLEtBQUssRUFBRSxnQkFDbEIsTUFBTSxDQUFDLGVBQWUsQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUMsU0FBUyxJQUM5RCxTQUFTLENBQUMsTUFBTSxDQUFDLEdBRXBCLENBQUMsTUFBTSxDQUFDLGVBQWUsSUFBSSxNQUFNLENBQUMsVUFBVSxDQUM5QixDQUNsQixDQUFDLENBQUMsQ0FBQyxDQUNGLG9CQUFDLEtBQUssQ0FBQyxJQUFJLG9CQUNMLFNBQVMsQ0FBQyxNQUFNLENBQUMsSUFDckIsS0FBSyxFQUFFLEVBQUUsS0FBSyxFQUFFLE1BQU0sQ0FBQyxLQUFLLEVBQUUsZ0JBQ2xCLE1BQU0sQ0FBQyxlQUFlLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDLFNBQVMsS0FFakUsQ0FBQyxNQUFNLENBQUMsZUFBZSxJQUFJLE1BQU0sQ0FBQyxVQUFVLENBQ2xDLENBQ2QsQ0FDRixDQUNVO1FBQ2Isb0JBQUMsS0FBSyxDQUFDLElBQUk7WUFDVCxvQkFBQyxJQUFJLElBQ0gsS0FBSyxFQUFFLFVBQVUsRUFDakIsVUFBVSxFQUFFLENBQUMsR0FBRyxFQUFFLEtBQUssRUFBRSxFQUFFLENBQUMsQ0FDMUIsb0JBQUMsS0FBSyxDQUFDLEdBQUcsSUFBQyxHQUFHLEVBQUUsR0FBRyxDQUFDLEVBQUU7b0JBQ3BCLG9CQUFDLElBQUksSUFDSCxLQUFLLEVBQUUsT0FBTyxFQUNkLFVBQVUsRUFBRSxDQUFDLE1BQU0sRUFBRSxFQUFFLENBQ3JCLE1BQU0sQ0FBQyxJQUFJLEtBQUssUUFBUSxDQUFDLENBQUMsQ0FBQyxDQUN6QixvQkFBQyxLQUFLLENBQUMsSUFBSSxvQkFBSyxTQUFTLENBQUMsTUFBTSxDQUFDOzRCQUMvQixvQkFBQyxVQUFVLGtCQUFDLEtBQUssVUFBSyxNQUFNLENBQUMsTUFBTSxDQUFDLEdBQUcsRUFBRSxLQUFLLEVBQUUsVUFBVSxDQUFDLEVBQUksQ0FDcEQsQ0FDZCxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsSUFBSSxLQUFLLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FDN0Isb0JBQUMsS0FBSyxDQUFDLElBQUksb0JBQUssU0FBUyxDQUFDLE1BQU0sQ0FBQzs0QkFDL0Isb0JBQUMsZUFBZSxrQkFDZCxLQUFLLFVBQ0QsY0FBYyxDQUFDLE1BQU0sRUFBRSxVQUFVLEVBQUUsTUFBTSxDQUFDLE1BQU0sQ0FBQyxHQUFHLEVBQUUsS0FBSyxFQUFFLFVBQVUsQ0FBQyxDQUFDLEVBQzdFLENBQ1MsQ0FDZCxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsSUFBSSxLQUFLLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FDN0Isb0JBQUMsS0FBSyxDQUFDLElBQUksb0JBQUssU0FBUyxDQUFDLE1BQU0sQ0FBQyxHQUFHLE1BQU0sQ0FBQyxhQUFhLENBQUMsR0FBRyxFQUFFLEtBQUssRUFBRSxVQUFVLENBQUMsQ0FBYyxDQUMvRixDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsSUFBSSxLQUFLLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FDM0Isb0JBQUMsS0FBSyxDQUFDLElBQUksb0JBQUssU0FBUyxDQUFDLE1BQU0sQ0FBQzs0QkFDL0Isb0JBQUMsSUFBSSxvQkFBSyxNQUFNLENBQUMsSUFBSSxDQUFDLEdBQUcsRUFBRSxLQUFLLEVBQUUsVUFBVSxDQUFDLEVBQUksQ0FDdEMsQ0FDZCxDQUFDLENBQUMsQ0FBQyxDQUNGLG9CQUFDLEtBQUssQ0FBQyxJQUFJLG9CQUFLLFNBQVMsQ0FBQyxNQUFNLENBQUMsR0FDOUIsTUFBTSxDQUFDLFNBQVM7NEJBQ2YsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsRUFBRSxHQUFHLEVBQUUsS0FBSyxFQUFFLFVBQVUsQ0FBQzs0QkFDN0QsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQ1YsQ0FDZCxHQUVILENBQ1EsQ0FDYixHQUNELENBQ1MsQ0FDUCxDQUNULENBQUM7QUFDSixDQUFDLENBQUMifQ==

package/dist/src/molecules/Dialog/Dialog.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { type DialogType } from '../../../src/atoms/Dialog/Dialog';
-import { Modal } from '../../../src/atoms/Modal/Modal';
+import { Modal as BaseModal } from '../../../src/atoms/Modal/Modal';
 import { type ActionType, type AsyncActionType } from '../../../types/ActionType';
 export declare type DialogProps = {
     /** Title of the dialog. Use 'Confirmation', 'Warning' or 'Danger'. */
@@ -8,9 +8,9 @@ export declare type DialogProps = {
     /** Type of the dialog. Will determine title and icon color. */
     type: DialogType;
     /** State of the dialog */
-    open: React.ComponentProps<typeof Modal>['open'];
+    open: React.ComponentProps<typeof BaseModal>['open'];
     /** Dialog body text or content. */
-    children: React.ComponentProps<typeof Modal.Body>['children'];
+    children: React.ComponentProps<typeof BaseModal.Body>['children'];
     /** Primary action. Maximum of one is allowed. */
     primaryAction: AsyncActionType;
     /** Secondary actions. Maximum of one is allowed. */

package/dist/src/molecules/Dialog/Dialog.js

@@ -1,6 +1,5 @@
 import React from 'react';
 import { useDialog } from '@react-aria/dialog';
-import { FocusScope } from '@react-aria/focus';
 import { Overlay, useModalOverlay } from '@react-aria/overlays';
 import { useId } from '@react-aria/utils';
 import { useOverlayTriggerState } from '@react-stately/overlays';
@@ -8,11 +7,23 @@ import omit from 'lodash/omit';
 import { GhostButton, SecondaryButton } from '../../../src/molecules/Button/Button';
 import { Icon } from '../../../src/molecules/Icon/Icon';
 import { DIALOG_ICONS_AND_COLORS } from '../../../src/atoms/Dialog/Dialog';
-import { Modal } from '../../../src/atoms/Modal/Modal';
-export const Dialog = ({ title, type = 'confirmation', open, children, primaryAction, secondaryAction, }) => {
+import { Modal as BaseModal } from '../../../src/atoms/Modal/Modal';
+import { tw } from '../../../src/utils/tailwind';
+export const Dialog = (props) => {
+    const ref = React.useRef(null);
+    const state = useOverlayTriggerState({ isOpen: props.open });
+    const { modalProps, underlayProps } = useModalOverlay({}, state, ref);
+    if (!state.isOpen) {
+        return null;
+    }
+    return (React.createElement(Overlay, null,
+        React.createElement(BaseModal, { open: true },
+            React.createElement(BaseModal.BackDrop, Object.assign({}, underlayProps)),
+            React.createElement(BaseModal.Dialog, Object.assign({ ref: ref, size: "sm" }, modalProps),
+                React.createElement(DialogWrapper, Object.assign({}, props))))));
+};
+const DialogWrapper = ({ title, type = 'confirmation', children, primaryAction, secondaryAction, }) => {
     const ref = React.useRef(null);
-    const state = useOverlayTriggerState({ isOpen: open });
-    const { modalProps, underlayProps } = useModalOverlay({ isDismissable: false }, state, ref);
     const labelledBy = useId();
     const describedBy = useId();
     // useDialog() also returns 'titleProps', but it doesn't work correctly
@@ -21,21 +32,14 @@ export const Dialog = ({ title, type = 'confirmation', open, children, primaryAc
     // it render twice when it is opened and that causes the useSlotId() hook
     // in react-aria to think that the title is not rendered correctly.
     const { dialogProps } = useDialog({ 'role': 'alertdialog', 'aria-labelledby': labelledBy, 'aria-describedby': describedBy }, ref);
-    if (!open) {
-        return null;
-    }
-    return (React.createElement(Overlay, null,
-        React.createElement(Modal, { open: open },
-            React.createElement(Modal.BackDrop, Object.assign({}, underlayProps)),
-            React.createElement(FocusScope, { contain: true, restoreFocus: true, autoFocus: true },
-                React.createElement(Modal.Dialog, Object.assign({ ref: ref, size: "sm" }, modalProps, dialogProps),
-                    React.createElement(Modal.Header, null,
-                        React.createElement(Icon, { icon: DIALOG_ICONS_AND_COLORS[type].icon, color: DIALOG_ICONS_AND_COLORS[type].color, fontSize: 20 }),
-                        React.createElement(Modal.Title, { id: labelledBy, variant: "large-strong", color: DIALOG_ICONS_AND_COLORS[type].color }, title)),
-                    React.createElement(Modal.Body, { id: describedBy }, children),
-                    React.createElement(Modal.Footer, null,
-                        React.createElement(Modal.Actions, null,
-                            secondaryAction && (React.createElement(GhostButton, Object.assign({ key: secondaryAction.text }, omit(secondaryAction, 'text')), secondaryAction.text)),
-                            React.createElement(SecondaryButton, Object.assign({ key: primaryAction.text }, omit(primaryAction, 'text')), primaryAction.text))))))));
+    return (React.createElement("div", Object.assign({ ref: ref }, dialogProps, { className: tw('outline-none') }),
+        React.createElement(BaseModal.Header, null,
+            React.createElement(Icon, { icon: DIALOG_ICONS_AND_COLORS[type].icon, color: DIALOG_ICONS_AND_COLORS[type].color, fontSize: 20 }),
+            React.createElement(BaseModal.Title, { id: labelledBy, variant: "large-strong", color: DIALOG_ICONS_AND_COLORS[type].color }, title)),
+        React.createElement(BaseModal.Body, { id: describedBy }, children),
+        React.createElement(BaseModal.Footer, null,
+            React.createElement(BaseModal.Actions, null,
+                secondaryAction && (React.createElement(GhostButton, Object.assign({ key: secondaryAction.text }, omit(secondaryAction, 'text')), secondaryAction.text)),
+                React.createElement(SecondaryButton, Object.assign({ key: primaryAction.text }, omit(primaryAction, 'text')), primaryAction.text)))));
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGlhbG9nLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL21vbGVjdWxlcy9EaWFsb2cvRGlhbG9nLnRzeCJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssTUFBTSxPQUFPLENBQUM7QUFDMUIsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQy9DLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUMvQyxPQUFPLEVBQUUsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ2hFLE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUMxQyxPQUFPLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUNqRSxPQUFPLElBQUksTUFBTSxhQUFhLENBQUM7QUFFL0IsT0FBTyxFQUFFLFdBQVcsRUFBRSxlQUFlLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUMzRSxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFL0MsT0FBTyxFQUFtQix1QkFBdUIsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ25GLE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQXdCOUMsTUFBTSxDQUFDLE1BQU0sTUFBTSxHQUEwQixDQUFDLEVBQzVDLEtBQUssRUFDTCxJQUFJLEdBQUcsY0FBYyxFQUNyQixJQUFJLEVBQ0osUUFBUSxFQUNSLGFBQWEsRUFDYixlQUFlLEdBQ2hCLEVBQUUsRUFBRTtJQUNILE1BQU0sR0FBRyxHQUFHLEtBQUssQ0FBQyxNQUFNLENBQWlCLElBQUksQ0FBQyxDQUFDO0lBQy9DLE1BQU0sS0FBSyxHQUFHLHNCQUFzQixDQUFDLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7SUFDdkQsTUFBTSxFQUFFLFVBQVUsRUFBRSxhQUFhLEVBQUUsR0FBRyxlQUFlLENBQUMsRUFBRSxhQUFhLEVBQUUsS0FBSyxFQUFFLEVBQUUsS0FBSyxFQUFFLEdBQUcsQ0FBQyxDQUFDO0lBQzVGLE1BQU0sVUFBVSxHQUFHLEtBQUssRUFBRSxDQUFDO0lBQzNCLE1BQU0sV0FBVyxHQUFHLEtBQUssRUFBRSxDQUFDO0lBQzVCLHVFQUF1RTtJQUN2RSw0RUFBNEU7SUFDNUUsd0VBQXdFO0lBQ3hFLHlFQUF5RTtJQUN6RSxtRUFBbUU7SUFDbkUsTUFBTSxFQUFFLFdBQVcsRUFBRSxHQUFHLFNBQVMsQ0FDL0IsRUFBRSxNQUFNLEVBQUUsYUFBYSxFQUFFLGlCQUFpQixFQUFFLFVBQVUsRUFBRSxrQkFBa0IsRUFBRSxXQUFXLEVBQUUsRUFDekYsR0FBRyxDQUNKLENBQUM7SUFFRixJQUFJLENBQUMsSUFBSSxFQUFFO1FBQ1QsT0FBTyxJQUFJLENBQUM7S0FDYjtJQUVELE9BQU8sQ0FDTCxvQkFBQyxPQUFPO1FBQ04sb0JBQUMsS0FBSyxJQUFDLElBQUksRUFBRSxJQUFJO1lBQ2Ysb0JBQUMsS0FBSyxDQUFDLFFBQVEsb0JBQUssYUFBYSxFQUFJO1lBQ3JDLG9CQUFDLFVBQVUsSUFBQyxPQUFPLFFBQUMsWUFBWSxRQUFDLFNBQVM7Z0JBQ3hDLG9CQUFDLEtBQUssQ0FBQyxNQUFNLGtCQUFDLEdBQUcsRUFBRSxHQUFHLEVBQUUsSUFBSSxFQUFDLElBQUksSUFBSyxVQUFVLEVBQU0sV0FBVztvQkFLL0Qsb0JBQUMsS0FBSyxDQUFDLE1BQU07d0JBQ1gsb0JBQUMsSUFBSSxJQUNILElBQUksRUFBRSx1QkFBdUIsQ0FBQyxJQUFJLENBQUMsQ0FBQyxJQUFJLEVBQ3hDLEtBQUssRUFBRSx1QkFBdUIsQ0FBQyxJQUFJLENBQUMsQ0FBQyxLQUFLLEVBQzFDLFFBQVEsRUFBRSxFQUFFLEdBQ1o7d0JBQ0Ysb0JBQUMsS0FBSyxDQUFDLEtBQUssSUFBQyxFQUFFLEVBQUUsVUFBVSxFQUFFLE9BQU8sRUFBQyxjQUFjLEVBQUMsS0FBSyxFQUFFLHVCQUF1QixDQUFDLElBQUksQ0FBQyxDQUFDLEtBQUssSUFDM0YsS0FBSyxDQUNNLENBQ0Q7b0JBQ2Ysb0JBQUMsS0FBSyxDQUFDLElBQUksSUFBQyxFQUFFLEVBQUUsV0FBVyxJQUFHLFFBQVEsQ0FBYztvQkFDcEQsb0JBQUMsS0FBSyxDQUFDLE1BQU07d0JBQ1gsb0JBQUMsS0FBSyxDQUFDLE9BQU87NEJBQ1gsZUFBZSxJQUFJLENBQ2xCLG9CQUFDLFdBQVcsa0JBQUMsR0FBRyxFQUFFLGVBQWUsQ0FBQyxJQUFJLElBQU0sSUFBSSxDQUFDLGVBQWUsRUFBRSxNQUFNLENBQUMsR0FDdEUsZUFBZSxDQUFDLElBQUksQ0FDVCxDQUNmOzRCQUNELG9CQUFDLGVBQWUsa0JBQUMsR0FBRyxFQUFFLGFBQWEsQ0FBQyxJQUFJLElBQU0sSUFBSSxDQUFDLGFBQWEsRUFBRSxNQUFNLENBQUMsR0FDdEUsYUFBYSxDQUFDLElBQUksQ0FDSCxDQUNKLENBQ0gsQ0FDRixDQUNKLENBQ1AsQ0FDQSxDQUNYLENBQUM7QUFDSixDQUFDLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGlhbG9nLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL21vbGVjdWxlcy9EaWFsb2cvRGlhbG9nLnRzeCJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssTUFBTSxPQUFPLENBQUM7QUFDMUIsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQy9DLE9BQU8sRUFBRSxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDaEUsT0FBTyxFQUFFLEtBQUssRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQzFDLE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ2pFLE9BQU8sSUFBSSxNQUFNLGFBQWEsQ0FBQztBQUUvQixPQUFPLEVBQUUsV0FBVyxFQUFFLGVBQWUsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQzNFLE9BQU8sRUFBRSxJQUFJLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUUvQyxPQUFPLEVBQW1CLHVCQUF1QixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDbkYsT0FBTyxFQUFFLEtBQUssSUFBSSxTQUFTLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUUzRCxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUF1QnhDLE1BQU0sQ0FBQyxNQUFNLE1BQU0sR0FBMEIsQ0FBQyxLQUFLLEVBQUUsRUFBRTtJQUNyRCxNQUFNLEdBQUcsR0FBRyxLQUFLLENBQUMsTUFBTSxDQUFpQixJQUFJLENBQUMsQ0FBQztJQUMvQyxNQUFNLEtBQUssR0FBRyxzQkFBc0IsQ0FBQyxFQUFFLE1BQU0sRUFBRSxLQUFLLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQztJQUM3RCxNQUFNLEVBQUUsVUFBVSxFQUFFLGFBQWEsRUFBRSxHQUFHLGVBQWUsQ0FBQyxFQUFFLEVBQUUsS0FBSyxFQUFFLEdBQUcsQ0FBQyxDQUFDO0lBQ3RFLElBQUksQ0FBQyxLQUFLLENBQUMsTUFBTSxFQUFFO1FBQ2pCLE9BQU8sSUFBSSxDQUFDO0tBQ2I7SUFFRCxPQUFPLENBQ0wsb0JBQUMsT0FBTztRQUNOLG9CQUFDLFNBQVMsSUFBQyxJQUFJO1lBQ2Isb0JBQUMsU0FBUyxDQUFDLFFBQVEsb0JBQUssYUFBYSxFQUFJO1lBQ3pDLG9CQUFDLFNBQVMsQ0FBQyxNQUFNLGtCQUFDLEdBQUcsRUFBRSxHQUFHLEVBQUUsSUFBSSxFQUFDLElBQUksSUFBSyxVQUFVO2dCQUNsRCxvQkFBQyxhQUFhLG9CQUFLLEtBQUssRUFBSSxDQUNYLENBQ1QsQ0FDSixDQUNYLENBQUM7QUFDSixDQUFDLENBQUM7QUFFRixNQUFNLGFBQWEsR0FBMEIsQ0FBQyxFQUM1QyxLQUFLLEVBQ0wsSUFBSSxHQUFHLGNBQWMsRUFDckIsUUFBUSxFQUNSLGFBQWEsRUFDYixlQUFlLEdBQ2hCLEVBQUUsRUFBRTtJQUNILE1BQU0sR0FBRyxHQUFHLEtBQUssQ0FBQyxNQUFNLENBQWlCLElBQUksQ0FBQyxDQUFDO0lBQy9DLE1BQU0sVUFBVSxHQUFHLEtBQUssRUFBRSxDQUFDO0lBQzNCLE1BQU0sV0FBVyxHQUFHLEtBQUssRUFBRSxDQUFDO0lBQzVCLHVFQUF1RTtJQUN2RSw0RUFBNEU7SUFDNUUsd0VBQXdFO0lBQ3hFLHlFQUF5RTtJQUN6RSxtRUFBbUU7SUFDbkUsTUFBTSxFQUFFLFdBQVcsRUFBRSxHQUFHLFNBQVMsQ0FDL0IsRUFBRSxNQUFNLEVBQUUsYUFBYSxFQUFFLGlCQUFpQixFQUFFLFVBQVUsRUFBRSxrQkFBa0IsRUFBRSxXQUFXLEVBQUUsRUFDekYsR0FBRyxDQUNKLENBQUM7SUFFRixPQUFPLENBQ0wsMkNBQUssR0FBRyxFQUFFLEdBQUcsSUFBTSxXQUFXLElBQUUsU0FBUyxFQUFFLEVBQUUsQ0FBQyxjQUFjLENBQUM7UUFLM0Qsb0JBQUMsU0FBUyxDQUFDLE1BQU07WUFDZixvQkFBQyxJQUFJLElBQUMsSUFBSSxFQUFFLHVCQUF1QixDQUFDLElBQUksQ0FBQyxDQUFDLElBQUksRUFBRSxLQUFLLEVBQUUsdUJBQXVCLENBQUMsSUFBSSxDQUFDLENBQUMsS0FBSyxFQUFFLFFBQVEsRUFBRSxFQUFFLEdBQUk7WUFDNUcsb0JBQUMsU0FBUyxDQUFDLEtBQUssSUFBQyxFQUFFLEVBQUUsVUFBVSxFQUFFLE9BQU8sRUFBQyxjQUFjLEVBQUMsS0FBSyxFQUFFLHVCQUF1QixDQUFDLElBQUksQ0FBQyxDQUFDLEtBQUssSUFDL0YsS0FBSyxDQUNVLENBQ0Q7UUFDbkIsb0JBQUMsU0FBUyxDQUFDLElBQUksSUFBQyxFQUFFLEVBQUUsV0FBVyxJQUFHLFFBQVEsQ0FBa0I7UUFDNUQsb0JBQUMsU0FBUyxDQUFDLE1BQU07WUFDZixvQkFBQyxTQUFTLENBQUMsT0FBTztnQkFDZixlQUFlLElBQUksQ0FDbEIsb0JBQUMsV0FBVyxrQkFBQyxHQUFHLEVBQUUsZUFBZSxDQUFDLElBQUksSUFBTSxJQUFJLENBQUMsZUFBZSxFQUFFLE1BQU0sQ0FBQyxHQUN0RSxlQUFlLENBQUMsSUFBSSxDQUNULENBQ2Y7Z0JBQ0Qsb0JBQUMsZUFBZSxrQkFBQyxHQUFHLEVBQUUsYUFBYSxDQUFDLElBQUksSUFBTSxJQUFJLENBQUMsYUFBYSxFQUFFLE1BQU0sQ0FBQyxHQUN0RSxhQUFhLENBQUMsSUFBSSxDQUNILENBQ0EsQ0FDSCxDQUNmLENBQ1AsQ0FBQztBQUNKLENBQUMsQ0FBQyJ9