@tamagui/dialog 1.1.8 → 1.1.9

package/dist/esm/Dialog.js

@@ -37,16 +37,19 @@ const DialogTrigger = React.forwardRef(
     const { __scopeDialog, ...triggerProps } = props;
     const context = useDialogContext(TRIGGER_NAME, __scopeDialog);
     const composedTriggerRef = useComposedRefs(forwardedRef, context.triggerRef);
-    return /* @__PURE__ */ jsx(DialogTriggerFrame, {
-      tag: "button",
-      "aria-haspopup": "dialog",
-      "aria-expanded": context.open,
-      "aria-controls": context.contentId,
-      "data-state": getState(context.open),
-      ...triggerProps,
-      ref: composedTriggerRef,
-      onPress: composeEventHandlers(props.onPress, context.onOpenToggle)
-    });
+    return /* @__PURE__ */ jsx(
+      DialogTriggerFrame,
+      {
+        tag: "button",
+        "aria-haspopup": "dialog",
+        "aria-expanded": context.open,
+        "aria-controls": context.contentId,
+        "data-state": getState(context.open),
+        ...triggerProps,
+        ref: composedTriggerRef,
+        onPress: composeEventHandlers(props.onPress, context.onOpenToggle)
+      }
+    );
   }
 );
 DialogTrigger.displayName = TRIGGER_NAME;
@@ -70,14 +73,7 @@ const DialogPortalFrame = styled(YStack, {
 const DialogPortalItem = (props) => {
   const themeName = useThemeName();
   const context = useDialogContext(PORTAL_NAME, props.__scopeDialog);
-  return /* @__PURE__ */ jsx(PortalItem, {
-    hostName: props.hostName,
-    children: /* @__PURE__ */ jsx(DialogPortalItemContent, {
-      ...props,
-      themeName,
-      context
-    })
-  });
+  return /* @__PURE__ */ jsx(PortalItem, { hostName: props.hostName, children: /* @__PURE__ */ jsx(DialogPortalItemContent, { ...props, themeName, context }) });
 };
 function DialogPortalItemContent(props) {
   const {
@@ -98,14 +94,7 @@ function DialogPortalItemContent(props) {
       direction: spaceDirection
     });
   }
-  return /* @__PURE__ */ jsx(DialogProvider, {
-    scope: __scopeDialog,
-    ...context,
-    children: /* @__PURE__ */ jsx(Theme, {
-      name: themeName,
-      children: childrenSpaced
-    })
-  });
+  return /* @__PURE__ */ jsx(DialogProvider, { scope: __scopeDialog, ...context, children: /* @__PURE__ */ jsx(Theme, { name: themeName, children: childrenSpaced }) });
 }
 const DialogPortal = (props) => {
   const { __scopeDialog, forceMount, children, ...frameProps } = props;
@@ -115,12 +104,15 @@ const DialogPortal = (props) => {
   if (isShowing && isFullyHidden) {
     setIsFullyHidden(false);
   }
-  const contents = /* @__PURE__ */ jsx(AnimatePresence, {
-    onExitComplete: () => {
-      setIsFullyHidden(true);
-    },
-    children: isShowing ? children : null
-  });
+  const contents = /* @__PURE__ */ jsx(
+    AnimatePresence,
+    {
+      onExitComplete: () => {
+        setIsFullyHidden(true);
+      },
+      children: isShowing ? children : null
+    }
+  );
   const isSheet = useShowDialogSheet(context);
   if (isSheet) {
     return children;
@@ -129,18 +121,7 @@ const DialogPortal = (props) => {
     if (isFullyHidden) {
       return null;
     }
-    return /* @__PURE__ */ jsx(DialogPortalItem, {
-      __scopeDialog,
-      children: /* @__PURE__ */ jsx(PortalProvider, {
-        scope: __scopeDialog,
-        forceMount,
-        children: /* @__PURE__ */ jsx(DialogPortalFrame, {
-          pointerEvents: isShowing ? "auto" : "none",
-          ...frameProps,
-          children: contents
-        })
-      })
-    });
+    return /* @__PURE__ */ jsx(DialogPortalItem, { __scopeDialog, children: /* @__PURE__ */ jsx(PortalProvider, { scope: __scopeDialog, forceMount, children: /* @__PURE__ */ jsx(DialogPortalFrame, { pointerEvents: isShowing ? "auto" : "none", ...frameProps, children: contents }) }) });
   }
   return contents;
 };
@@ -162,23 +143,26 @@ const DialogOverlay = React.forwardRef(
         return null;
       }
     }
-    return /* @__PURE__ */ jsx(DialogOverlayImpl, {
-      context,
-      ...overlayProps,
-      ref: forwardedRef
-    });
+    return /* @__PURE__ */ jsx(DialogOverlayImpl, { context, ...overlayProps, ref: forwardedRef });
   }
 );
 DialogOverlay.displayName = OVERLAY_NAME;
 const DialogOverlayImpl = React.forwardRef(
   (props, forwardedRef) => {
     const { context, ...overlayProps } = props;
-    return /* @__PURE__ */ jsx(DialogOverlayFrame, {
-      "data-state": getState(context.open),
-      pointerEvents: context.open ? "auto" : "none",
-      ...overlayProps,
-      ref: forwardedRef
-    });
+    return (
+      // Make sure `Content` is scrollable even when it doesn't live inside `RemoveScroll`
+      // ie. when `Overlay` and `Content` are siblings
+      /* @__PURE__ */ jsx(
+        DialogOverlayFrame,
+        {
+          "data-state": getState(context.open),
+          pointerEvents: context.open ? "auto" : "none",
+          ...overlayProps,
+          ref: forwardedRef
+        }
+      )
+    );
   }
 );
 const CONTENT_NAME = "DialogContent";
@@ -207,29 +191,21 @@ const DialogContent = DialogContentFrame.extractable(
       const portalContext = usePortalContext(CONTENT_NAME, __scopeDialog);
       const { forceMount = portalContext.forceMount, ...contentProps } = props;
       const context = useDialogContext(CONTENT_NAME, __scopeDialog);
-      const contents = context.modal ? /* @__PURE__ */ jsx(DialogContentModal, {
-        context,
-        ...contentProps,
-        ref: forwardedRef
-      }) : /* @__PURE__ */ jsx(DialogContentNonModal, {
-        context,
-        ...contentProps,
-        ref: forwardedRef
-      });
+      const contents = context.modal ? /* @__PURE__ */ jsx(DialogContentModal, { context, ...contentProps, ref: forwardedRef }) : /* @__PURE__ */ jsx(DialogContentNonModal, { context, ...contentProps, ref: forwardedRef });
       if (!isWeb) {
         return contents;
       }
-      return /* @__PURE__ */ jsx(RemoveScroll, {
-        forwardProps: true,
-        enabled: context.open,
-        allowPinchZoom: context.allowPinchZoom,
-        shards: [context.contentRef],
-        removeScrollBar: false,
-        children: /* @__PURE__ */ jsx("div", {
-          className: "_dsp_contents",
-          children: contents
-        })
-      });
+      return /* @__PURE__ */ jsx(
+        RemoveScroll,
+        {
+          forwardProps: true,
+          enabled: context.open,
+          allowPinchZoom: context.allowPinchZoom,
+          shards: [context.contentRef],
+          removeScrollBar: false,
+          children: /* @__PURE__ */ jsx("div", { className: "_dsp_contents", children: contents })
+        }
+      );
     }
   )
 );
@@ -247,67 +223,73 @@ const DialogContentModal = React.forwardRef(
           return hideOthers(content);
       }, [context.open]);
     }
-    return /* @__PURE__ */ jsx(DialogContentImpl, {
-      ...props,
-      context,
-      ref: composedRefs,
-      disableOutsidePointerEvents: true,
-      onCloseAutoFocus: composeEventHandlers(props.onCloseAutoFocus, (event) => {
-        var _a;
-        event.preventDefault();
-        (_a = context.triggerRef.current) == null ? void 0 : _a.focus();
-      }),
-      onPointerDownOutside: composeEventHandlers(
-        props.onPointerDownOutside,
-        (event) => {
-          const originalEvent = event["detail"].originalEvent;
-          const ctrlLeftClick = originalEvent.button === 0 && originalEvent.ctrlKey === true;
-          const isRightClick = originalEvent.button === 2 || ctrlLeftClick;
-          if (isRightClick)
-            event.preventDefault();
-        }
-      ),
-      onFocusOutside: composeEventHandlers(
-        props.onFocusOutside,
-        (event) => event.preventDefault()
-      ),
-      children
-    });
+    return /* @__PURE__ */ jsx(
+      DialogContentImpl,
+      {
+        ...props,
+        context,
+        ref: composedRefs,
+        disableOutsidePointerEvents: true,
+        onCloseAutoFocus: composeEventHandlers(props.onCloseAutoFocus, (event) => {
+          var _a;
+          event.preventDefault();
+          (_a = context.triggerRef.current) == null ? void 0 : _a.focus();
+        }),
+        onPointerDownOutside: composeEventHandlers(
+          props.onPointerDownOutside,
+          (event) => {
+            const originalEvent = event["detail"].originalEvent;
+            const ctrlLeftClick = originalEvent.button === 0 && originalEvent.ctrlKey === true;
+            const isRightClick = originalEvent.button === 2 || ctrlLeftClick;
+            if (isRightClick)
+              event.preventDefault();
+          }
+        ),
+        onFocusOutside: composeEventHandlers(
+          props.onFocusOutside,
+          (event) => event.preventDefault()
+        ),
+        children
+      }
+    );
   }
 );
 const DialogContentNonModal = React.forwardRef(
   (props, forwardedRef) => {
     const hasInteractedOutsideRef = React.useRef(false);
-    return /* @__PURE__ */ jsx(DialogContentImpl, {
-      ...props,
-      ref: forwardedRef,
-      trapFocus: false,
-      disableOutsidePointerEvents: false,
-      onCloseAutoFocus: (event) => {
-        var _a, _b;
-        (_a = props.onCloseAutoFocus) == null ? void 0 : _a.call(props, event);
-        if (!event.defaultPrevented) {
-          if (!hasInteractedOutsideRef.current) {
-            (_b = props.context.triggerRef.current) == null ? void 0 : _b.focus();
+    return /* @__PURE__ */ jsx(
+      DialogContentImpl,
+      {
+        ...props,
+        ref: forwardedRef,
+        trapFocus: false,
+        disableOutsidePointerEvents: false,
+        onCloseAutoFocus: (event) => {
+          var _a, _b;
+          (_a = props.onCloseAutoFocus) == null ? void 0 : _a.call(props, event);
+          if (!event.defaultPrevented) {
+            if (!hasInteractedOutsideRef.current) {
+              (_b = props.context.triggerRef.current) == null ? void 0 : _b.focus();
+            }
+            event.preventDefault();
           }
-          event.preventDefault();
+          hasInteractedOutsideRef.current = false;
+        },
+        onInteractOutside: (event) => {
+          var _a;
+          (_a = props.onInteractOutside) == null ? void 0 : _a.call(props, event);
+          if (!event.defaultPrevented)
+            hasInteractedOutsideRef.current = true;
+          const target = event.target;
+          const trigger = props.context.triggerRef.current;
+          if (!(trigger instanceof HTMLElement))
+            return;
+          const targetIsTrigger = trigger.contains(target);
+          if (targetIsTrigger)
+            event.preventDefault();
         }
-        hasInteractedOutsideRef.current = false;
-      },
-      onInteractOutside: (event) => {
-        var _a;
-        (_a = props.onInteractOutside) == null ? void 0 : _a.call(props, event);
-        if (!event.defaultPrevented)
-          hasInteractedOutsideRef.current = true;
-        const target = event.target;
-        const trigger = props.context.triggerRef.current;
-        if (!(trigger instanceof HTMLElement))
-          return;
-        const targetIsTrigger = trigger.contains(target);
-        if (targetIsTrigger)
-          event.preventDefault();
       }
-    });
+    );
   }
 );
 const DialogContentImpl = React.forwardRef(
@@ -328,55 +310,58 @@ const DialogContentImpl = React.forwardRef(
     const contentRef = React.useRef(null);
     const composedRefs = useComposedRefs(forwardedRef, contentRef);
     const showSheet = useShowDialogSheet(context);
-    const contents = /* @__PURE__ */ jsx(DialogContentFrame, {
-      id: context.contentId,
-      "aria-describedby": context.descriptionId,
-      "aria-labelledby": context.titleId,
-      "data-state": getState(context.open),
-      ...contentProps
-    });
+    const contents = /* @__PURE__ */ jsx(
+      DialogContentFrame,
+      {
+        id: context.contentId,
+        "aria-describedby": context.descriptionId,
+        "aria-labelledby": context.titleId,
+        "data-state": getState(context.open),
+        ...contentProps
+      }
+    );
     if (showSheet) {
-      return /* @__PURE__ */ jsx(DialogPortalItem, {
-        hostName: getSheetContentsName(context),
-        children: contentProps.children
-      });
+      return /* @__PURE__ */ jsx(DialogPortalItem, { hostName: getSheetContentsName(context), children: contentProps.children });
     }
     if (!isWeb) {
       return contents;
     }
-    return /* @__PURE__ */ jsxs(Fragment, {
-      children: [
-        /* @__PURE__ */ jsx(FocusScope, {
+    return /* @__PURE__ */ jsxs(Fragment, { children: [
+      /* @__PURE__ */ jsx(
+        FocusScope,
+        {
           loop: true,
           trapped: trapFocus,
           onMountAutoFocus: onOpenAutoFocus,
           forceUnmount: !context.open,
           onUnmountAutoFocus: onCloseAutoFocus,
-          children: /* @__PURE__ */ jsx(Dismissable, {
-            disableOutsidePointerEvents: context.open && disableOutsidePointerEvents,
-            forceUnmount: !context.open,
-            onEscapeKeyDown,
-            onPointerDownOutside,
-            onFocusOutside,
-            onInteractOutside,
-            ref: composedRefs,
-            onDismiss: () => context.onOpenChange(false),
-            children: contents
-          })
-        }),
-        process.env.NODE_ENV === "development" && /* @__PURE__ */ jsxs(Fragment, {
-          children: [
-            /* @__PURE__ */ jsx(TitleWarning, {
-              titleId: context.titleId
-            }),
-            /* @__PURE__ */ jsx(DescriptionWarning, {
-              contentRef,
-              descriptionId: context.descriptionId
-            })
-          ]
-        })
-      ]
-    });
+          children: /* @__PURE__ */ jsx(
+            Dismissable,
+            {
+              disableOutsidePointerEvents: context.open && disableOutsidePointerEvents,
+              forceUnmount: !context.open,
+              onEscapeKeyDown,
+              onPointerDownOutside,
+              onFocusOutside,
+              onInteractOutside,
+              ref: composedRefs,
+              onDismiss: () => context.onOpenChange(false),
+              children: contents
+            }
+          )
+        }
+      ),
+      process.env.NODE_ENV === "development" && /* @__PURE__ */ jsxs(Fragment, { children: [
+        /* @__PURE__ */ jsx(TitleWarning, { titleId: context.titleId }),
+        /* @__PURE__ */ jsx(
+          DescriptionWarning,
+          {
+            contentRef,
+            descriptionId: context.descriptionId
+          }
+        )
+      ] })
+    ] });
   }
 );
 const TITLE_NAME = "DialogTitle";
@@ -387,11 +372,7 @@ const DialogTitle = React.forwardRef(
   (props, forwardedRef) => {
     const { __scopeDialog, ...titleProps } = props;
     const context = useDialogContext(TITLE_NAME, __scopeDialog);
-    return /* @__PURE__ */ jsx(DialogTitleFrame, {
-      id: context.titleId,
-      ...titleProps,
-      ref: forwardedRef
-    });
+    return /* @__PURE__ */ jsx(DialogTitleFrame, { id: context.titleId, ...titleProps, ref: forwardedRef });
   }
 );
 DialogTitle.displayName = TITLE_NAME;
@@ -403,11 +384,14 @@ const DialogDescription = React.forwardRef(
   (props, forwardedRef) => {
     const { __scopeDialog, ...descriptionProps } = props;
     const context = useDialogContext(DESCRIPTION_NAME, __scopeDialog);
-    return /* @__PURE__ */ jsx(DialogDescriptionFrame, {
-      id: context.descriptionId,
-      ...descriptionProps,
-      ref: forwardedRef
-    });
+    return /* @__PURE__ */ jsx(
+      DialogDescriptionFrame,
+      {
+        id: context.descriptionId,
+        ...descriptionProps,
+        ref: forwardedRef
+      }
+    );
   }
 );
 DialogDescription.displayName = DESCRIPTION_NAME;
@@ -420,15 +404,18 @@ const DialogClose = React.forwardRef(
     if (isSheet && !displayWhenAdapted) {
       return null;
     }
-    return /* @__PURE__ */ jsx(YStack, {
-      tag: "button",
-      ...closeProps,
-      ref: forwardedRef,
-      onPress: composeEventHandlers(
-        props.onPress,
-        () => context.onOpenChange(false)
-      )
-    });
+    return /* @__PURE__ */ jsx(
+      YStack,
+      {
+        tag: "button",
+        ...closeProps,
+        ref: forwardedRef,
+        onPress: composeEventHandlers(
+          props.onPress,
+          () => context.onOpenChange(false)
+        )
+      }
+    );
   }
 );
 DialogClose.displayName = CLOSE_NAME;
@@ -533,10 +520,7 @@ const Dialog = withStaticProperties(
     const { when, AdaptProvider } = useAdaptParent({
       Contents: React.useCallback(
         (props2) => {
-          return /* @__PURE__ */ jsx(PortalHost, {
-            forwardProps: props2,
-            name: sheetContentsName
-          });
+          return /* @__PURE__ */ jsx(PortalHost, { forwardProps: props2, name: sheetContentsName });
         },
         [sheetContentsName]
       )
@@ -548,17 +532,7 @@ const Dialog = withStaticProperties(
       }),
       [setOpen]
     );
-    return /* @__PURE__ */ jsx(AdaptProvider, {
-      children: /* @__PURE__ */ jsx(DialogProvider, {
-        ...context,
-        sheetBreakpoint: when,
-        children: /* @__PURE__ */ jsx(DialogSheetController, {
-          onOpenChange: setOpen,
-          __scopeDialog,
-          children
-        })
-      })
-    });
+    return /* @__PURE__ */ jsx(AdaptProvider, { children: /* @__PURE__ */ jsx(DialogProvider, { ...context, sheetBreakpoint: when, children: /* @__PURE__ */ jsx(DialogSheetController, { onOpenChange: setOpen, __scopeDialog, children }) }) });
   }),
   {
     Trigger: DialogTrigger,
@@ -577,10 +551,7 @@ const DialogSheetContents = ({
   name,
   ...props
 }) => {
-  return /* @__PURE__ */ jsx(PortalHost, {
-    forwardProps: props,
-    name
-  });
+  return /* @__PURE__ */ jsx(PortalHost, { forwardProps: props, name });
 };
 DialogSheetContents.displayName = SHEET_CONTENTS_NAME;
 const getSheetContentsName = ({
@@ -592,16 +563,19 @@ const DialogSheetController = (props) => {
   const showSheet = useShowDialogSheet(context);
   const breakpointActive = useSheetBreakpointActive(context);
   const getShowSheet = useGet(showSheet);
-  return /* @__PURE__ */ jsx(SheetController, {
-    onOpenChange: (val) => {
-      if (getShowSheet()) {
-        props.onOpenChange(val);
-      }
-    },
-    open: context.open,
-    hidden: breakpointActive === false,
-    children: props.children
-  });
+  return /* @__PURE__ */ jsx(
+    SheetController,
+    {
+      onOpenChange: (val) => {
+        if (getShowSheet()) {
+          props.onOpenChange(val);
+        }
+      },
+      open: context.open,
+      hidden: breakpointActive === false,
+      children: props.children
+    }
+  );
 };
 const useSheetBreakpointActive = (context) => {
   const media = useMedia();