@conveyorhq/arrow-ds 1.109.0 → 1.110.1

package/package.json

@@ -2,7 +2,7 @@
   "name": "@conveyorhq/arrow-ds",
   "author": "Conveyor",
   "license": "MIT",
-  "version": "1.109.0",
+  "version": "1.110.1",
   "description": "Arrow Design System",
   "repository": "https://github.com/conveyor/arrow-ds",
   "publishConfig": {
@@ -18,7 +18,7 @@
     "components"
   ],
   "dependencies": {
-    "@floating-ui/react-dom-interactions": "^0.13.3",
+    "@floating-ui/react": "^0.22.2",
     "@fortawesome/fontawesome-svg-core": "^1.2.26",
     "@fortawesome/free-regular-svg-icons": "^5.14.0",
     "@fortawesome/free-solid-svg-icons": "^5.14.0",

package/public/components/Floating/FloatingTooltip.d.ts

@@ -1,5 +1,5 @@
 import React, { HTMLProps, PropsWithChildren } from "react";
-import type { Placement } from "@floating-ui/react-dom-interactions";
+import type { Placement } from "@floating-ui/react";
 import { PortalRootElementType } from "../Portal";
 interface FloatingTooltipOptions {
     initialOpen?: boolean;

package/public/components/Floating/FloatingTooltip.js

@@ -25,7 +25,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FloatingTooltip = exports.FloatingTooltipArrow = exports.FloatingTooltipContent = exports.FloatingTooltipTrigger = exports.FloatingTooltipRoot = exports.useFloatingTooltipState = exports.useFloatingTooltip = void 0;
 const react_1 = __importStar(require("react"));
 const react_merge_refs_1 = __importDefault(require("react-merge-refs"));
-const react_dom_interactions_1 = require("@floating-ui/react-dom-interactions");
+const react_2 = require("@floating-ui/react");
 const classnames_1 = __importDefault(require("classnames"));
 const tokens_1 = require("../../style-dictionary/dist/tokens");
 const bem_1 = require("../../utilities/bem");
@@ -36,28 +36,28 @@ function useFloatingTooltip({ initialOpen = false, placement = "top", open: cont
     const arrowRef = react_1.useRef(null);
     const open = controlledOpen !== null && controlledOpen !== void 0 ? controlledOpen : uncontrolledOpen;
     const setOpen = setControlledOpen !== null && setControlledOpen !== void 0 ? setControlledOpen : setUncontrolledOpen;
-    const data = react_dom_interactions_1.useFloating({
+    const data = react_2.useFloating({
         placement,
         open,
         onOpenChange: setOpen,
-        whileElementsMounted: react_dom_interactions_1.autoUpdate,
-        middleware: [react_dom_interactions_1.offset(8), react_dom_interactions_1.flip(), react_dom_interactions_1.shift(), react_dom_interactions_1.arrow({ element: arrowRef })],
+        whileElementsMounted: react_2.autoUpdate,
+        middleware: [react_2.offset(8), react_2.flip(), react_2.shift(), react_2.arrow({ element: arrowRef })],
     });
     const { context } = data;
-    const hover = react_dom_interactions_1.useHover(context, {
+    const hover = react_2.useHover(context, {
         move: false,
         enabled: controlledOpen == null,
     });
-    const focus = react_dom_interactions_1.useFocus(context, {
+    const focus = react_2.useFocus(context, {
         enabled: controlledOpen == null,
     });
-    const dismiss = react_dom_interactions_1.useDismiss(context, {
+    const dismiss = react_2.useDismiss(context, {
         escapeKey: false,
         referencePress: true,
         referencePressEvent: "click",
     });
-    const role = react_dom_interactions_1.useRole(context, { role: "tooltip" });
-    const interactions = react_dom_interactions_1.useInteractions([hover, focus, dismiss, role]);
+    const role = react_2.useRole(context, { role: "tooltip" });
+    const interactions = react_2.useInteractions([hover, focus, dismiss, role]);
     return react_1.useMemo(() => ({
         open,
         setOpen,
@@ -102,7 +102,7 @@ exports.FloatingTooltipContent = react_1.forwardRef(function FloatingTooltipCont
         state.floating,
         propRef,
     ]);
-    return (react_1.default.createElement(react_dom_interactions_1.FloatingPortal, { root: portalRoot }, state.open && (react_1.default.createElement(Box_1.Box, Object.assign({ ref: ref, className: classnames_1.default(`${cn({ e: "content" })}`, className), style: {
+    return (react_1.default.createElement(react_2.FloatingPortal, { root: portalRoot }, state.open && (react_1.default.createElement(Box_1.Box, Object.assign({ ref: ref, className: classnames_1.default(`${cn({ e: "content" })}`, className), style: {
             position: state.strategy,
             top: (_a = state.y) !== null && _a !== void 0 ? _a : 0,
             left: (_b = state.x) !== null && _b !== void 0 ? _b : 0,

package/public/components/Floating/index.d.ts

@@ -1,2 +1,2 @@
 export * from "./FloatingTooltip";
-export type { Placement as FloatingPlacement } from "@floating-ui/react-dom-interactions";
+export type { Placement as FloatingPlacement } from "@floating-ui/react";

package/public/components/Modal/Modal.d.ts

@@ -1,5 +1,6 @@
 import React, { HTMLAttributes, ReactNode } from "react";
 import { BoxProps } from "../Box";
+import { PortalProps, PortalRootElementType } from "../Portal";
 import { CloseButtonProps } from "../CloseButton";
 import { StackProps } from "../Stack";
 export declare enum MODAL_SIZE {
@@ -21,6 +22,7 @@ export interface ModalProps extends BoxProps {
     size?: MODAL_SIZE;
     center?: boolean;
     noHeader?: boolean;
+    portalRoot?: PortalRootElementType;
 }
 export interface ModalBodyProps extends BoxProps {
     padded?: boolean;
@@ -50,10 +52,8 @@ export interface ModalRootProps {
     disableEscClose?: boolean;
 }
 export declare const ModalRoot: ({ children, isOpen, onClose, disableOutsideClick, disableEscClose, }: ModalRootProps) => JSX.Element;
-export interface ModalPortalProps {
-    children: ReactNode;
-}
-export declare const ModalPortal: ({ children }: ModalPortalProps) => JSX.Element;
+export declare type ModalPortalProps = PortalProps;
+export declare const ModalPortal: ({ children, root, id }: ModalPortalProps) => JSX.Element;
 export interface ModalOverlayProps {
     children: ReactNode;
     className?: string;
@@ -74,7 +74,7 @@ export declare const ModalScreen: ({ className, style, ...rest }: HTMLAttributes
 export declare const Modal: {
     (props: ModalProps): JSX.Element;
     Root: ({ children, isOpen, onClose, disableOutsideClick, disableEscClose, }: ModalRootProps) => JSX.Element;
-    Portal: ({ children }: ModalPortalProps) => JSX.Element;
+    Portal: ({ children, root, id }: ModalPortalProps) => JSX.Element;
     Overlay: ({ children, className, lockScroll, autoFocus, }: ModalOverlayProps) => JSX.Element;
     Container: ({ children, className, ...rest }: ModalContainerProps) => JSX.Element;
     Content: React.ForwardRefExoticComponent<Pick<ModalContentProps, "as" | "defaultChecked" | "defaultValue" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "accessKey" | "className" | "contentEditable" | "contextMenu" | "dir" | "draggable" | "hidden" | "id" | "lang" | "placeholder" | "slot" | "spellCheck" | "style" | "tabIndex" | "title" | "translate" | "radioGroup" | "role" | "about" | "datatype" | "inlist" | "prefix" | "property" | "resource" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "color" | "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" | "children" | "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>>;

package/public/components/Modal/Modal.js

@@ -139,8 +139,8 @@ const ModalRoot = ({ children, isOpen, onClose, disableOutsideClick = true, disa
     return (react_1.default.createElement(context_1.ModalContext.Provider, { value: context }, children));
 };
 exports.ModalRoot = ModalRoot;
-const ModalPortal = ({ children }) => {
-    return react_1.default.createElement(Portal_1.Portal, null, children);
+const ModalPortal = ({ children, root, id }) => {
+    return (react_1.default.createElement(Portal_1.Portal, { root: root, id: id }, children));
 };
 exports.ModalPortal = ModalPortal;
 const ModalOverlay = ({ children, className, lockScroll = true, autoFocus = false, }) => {
@@ -183,10 +183,10 @@ const ModalScreen = ({ className, style, ...rest }) => {
 };
 exports.ModalScreen = ModalScreen;
 const Modal = (props) => {
-    const { title, secondaryTitle, description, children, isOpen, onClose, autoFocus = false, lockScroll = true, disableOutsideClick = true, disableEscClose = false, hideCloseButton = false, size = MODAL_SIZE.DEFAULT, center = false, noHeader = false, className, ...rest } = props;
+    const { title, secondaryTitle, description, children, isOpen, onClose, autoFocus = false, lockScroll = true, disableOutsideClick = true, disableEscClose = false, hideCloseButton = false, size = MODAL_SIZE.DEFAULT, center = false, noHeader = false, portalRoot, className, ...rest } = props;
     const showHeader = title || secondaryTitle || !hideCloseButton;
     return (react_1.default.createElement(exports.ModalRoot, { isOpen: isOpen, onClose: onClose, disableOutsideClick: disableOutsideClick, disableEscClose: disableEscClose },
-        react_1.default.createElement(exports.ModalPortal, null,
+        react_1.default.createElement(exports.ModalPortal, { root: portalRoot },
             react_1.default.createElement(exports.ModalOverlay, { autoFocus: autoFocus, lockScroll: lockScroll },
                 react_1.default.createElement(exports.ModalContainer, null,
                     react_1.default.createElement(exports.ModalContent, Object.assign({ className: classnames_1.default([

package/public/components/Portal/Portal.js

@@ -5,6 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Portal = void 0;
 const react_1 = __importDefault(require("react"));
-const react_dom_interactions_1 = require("@floating-ui/react-dom-interactions");
-const Portal = (props) => react_1.default.createElement(react_dom_interactions_1.FloatingPortal, Object.assign({}, props));
+const react_2 = require("@floating-ui/react");
+const Portal = (props) => react_1.default.createElement(react_2.FloatingPortal, Object.assign({}, props));
 exports.Portal = Portal;

package/src/components/Floating/FloatingTooltip.tsx

@@ -24,8 +24,8 @@ import {
   useRole,
   useInteractions,
   FloatingPortal,
-} from "@floating-ui/react-dom-interactions";
-import type { Placement } from "@floating-ui/react-dom-interactions";
+} from "@floating-ui/react";
+import type { Placement } from "@floating-ui/react";
 import classNames from "classnames";
 import { tokens } from "../../style-dictionary/dist/tokens";
 import { bemHOF } from "../../utilities/bem";

package/src/components/Floating/index.ts

@@ -1,2 +1,2 @@
 export * from "./FloatingTooltip";
-export type { Placement as FloatingPlacement } from "@floating-ui/react-dom-interactions";
+export type { Placement as FloatingPlacement } from "@floating-ui/react";

package/src/components/Modal/Modal.tsx

@@ -15,7 +15,7 @@ import { RemoveScroll } from "react-remove-scroll";
 import mergeRefs from "react-merge-refs";
 import { Box, BoxProps } from "../Box";
 import { Flex } from "../Flex";
-import { Portal } from "../Portal";
+import { Portal, PortalProps, PortalRootElementType } from "../Portal";
 import { Description } from "../Description";
 import { CloseButton, CloseButtonProps } from "../CloseButton";
 import { Stack, StackProps } from "../Stack";
@@ -121,6 +121,10 @@ export interface ModalProps extends BoxProps {
    * `hideCloseButton`. Use when you want a custom layout.
    */
   noHeader?: boolean;
+  /**
+   * Root element where the modal portal should be attached
+   */
+  portalRoot?: PortalRootElementType;
 }
 
 export interface ModalBodyProps extends BoxProps {
@@ -342,12 +346,14 @@ export const ModalRoot = ({
   );
 };
 
-export interface ModalPortalProps {
-  children: ReactNode;
-}
+export type ModalPortalProps = PortalProps;
 
-export const ModalPortal = ({ children }: ModalPortalProps) => {
-  return <Portal>{children}</Portal>;
+export const ModalPortal = ({ children, root, id }: ModalPortalProps) => {
+  return (
+    <Portal root={root} id={id}>
+      {children}
+    </Portal>
+  );
 };
 
 export interface ModalOverlayProps {
@@ -477,6 +483,7 @@ export const Modal = (props: ModalProps) => {
     size = MODAL_SIZE.DEFAULT,
     center = false,
     noHeader = false,
+    portalRoot,
     className,
     ...rest
   } = props;
@@ -489,7 +496,7 @@ export const Modal = (props: ModalProps) => {
       disableOutsideClick={disableOutsideClick}
       disableEscClose={disableEscClose}
     >
-      <ModalPortal>
+      <ModalPortal root={portalRoot}>
         <ModalOverlay autoFocus={autoFocus} lockScroll={lockScroll}>
           <ModalContainer>
             <ModalContent

package/src/components/Portal/Portal.story.mdx

@@ -17,7 +17,7 @@ import { Portal } from "./Portal";
   hideDemosLink
 />
 
-Uses FloatingPortal via [@floating-ui/react-dom-interactions](https://floating-ui.com/docs/floatingportal)
+Uses FloatingPortal via [@floating-ui/react](https://floating-ui.com/docs/floatingportal)
 
 ## Installation
 

package/src/components/Portal/Portal.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import { FloatingPortal } from "@floating-ui/react-dom-interactions";
+import { FloatingPortal } from "@floating-ui/react";
 
 export type PortalRootElementType = HTMLElement | null | undefined;