@tamagui/dialog 1.79.9 → 1.79.11

package/dist/jsx/Dialog.native.js

@@ -20,7 +20,11 @@ import { FocusScope } from "@tamagui/focus-scope";
 import { PortalHost, PortalItem } from "@tamagui/portal";
 import { RemoveScroll } from "@tamagui/remove-scroll";
 import { Overlay, Sheet, SheetController } from "@tamagui/sheet";
-import { ThemeableStack, YStack } from "@tamagui/stacks";
+import {
+  ButtonNestingContext,
+  ThemeableStack,
+  YStack
+} from "@tamagui/stacks";
 import { H2, Paragraph } from "@tamagui/text";
 import { useControllableState } from "@tamagui/use-controllable-state";
 import * as React from "react";
@@ -28,9 +32,9 @@ const DIALOG_NAME = "Dialog", [createDialogContext, createDialogScope] = createC
   name: TRIGGER_NAME
 }), DialogTrigger = DialogTriggerFrame.styleable(
   (props, forwardedRef) => {
-    const { __scopeDialog, ...triggerProps } = props, context = useDialogContext(TRIGGER_NAME, __scopeDialog), composedTriggerRef = useComposedRefs(forwardedRef, context.triggerRef);
-    return <DialogTriggerFrame
-      tag="button"
+    const { __scopeDialog, ...triggerProps } = props, isInsideButton = React.useContext(ButtonNestingContext), context = useDialogContext(TRIGGER_NAME, __scopeDialog), composedTriggerRef = useComposedRefs(forwardedRef, context.triggerRef);
+    return <ButtonNestingContext.Provider value={!0}><DialogTriggerFrame
+      tag={isInsideButton ? "span" : "button"}
       aria-haspopup="dialog"
       aria-expanded={context.open}
       aria-controls={context.contentId}
@@ -38,7 +42,7 @@ const DIALOG_NAME = "Dialog", [createDialogContext, createDialogScope] = createC
       {...triggerProps}
       ref={composedTriggerRef}
       onPress={composeEventHandlers(props.onPress, context.onOpenToggle)}
-    />;
+    /></ButtonNestingContext.Provider>;
   }
 );
 DialogTrigger.displayName = TRIGGER_NAME;
@@ -283,25 +287,16 @@ const DialogDescriptionFrame = styled(Paragraph, {
 DialogDescription.displayName = DESCRIPTION_NAME;
 const CLOSE_NAME = "DialogClose", DialogCloseFrame = styled(View, {
   name: CLOSE_NAME,
-  tag: "button",
-  variants: {
-    unstyled: {
-      false: {
-        zIndex: 100
-      }
-    }
-  },
-  defaultVariants: {
-    unstyled: process.env.TAMAGUI_HEADLESS === "1"
-  }
+  tag: "button"
 }), DialogClose = DialogCloseFrame.styleable(
   (props, forwardedRef) => {
     const { __scopeDialog, displayWhenAdapted, ...closeProps } = props, context = useDialogContext(CLOSE_NAME, __scopeDialog, {
       warn: !1,
       fallback: {}
-    });
-    return useShowDialogSheet(context) && !displayWhenAdapted ? null : <DialogCloseFrame
+    }), isSheet = useShowDialogSheet(context), isInsideButton = React.useContext(ButtonNestingContext);
+    return isSheet && !displayWhenAdapted ? null : <DialogCloseFrame
       accessibilityLabel="Dialog Close"
+      tag={isInsideButton ? "span" : "button"}
       {...closeProps}
       ref={forwardedRef}
       onPress={composeEventHandlers(

package/dist/jsx/Dialog.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/Dialog.tsx"],
-  "mappings": "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",
+  "mappings": "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",
   "names": ["props"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/dialog",
-  "version": "1.79.9",
+  "version": "1.79.11",
   "source": "src/index.ts",
   "types": "./types/index.d.ts",
   "main": "dist/cjs",
@@ -31,29 +31,29 @@
     }
   },
   "dependencies": {
-    "@tamagui/adapt": "1.79.9",
-    "@tamagui/animate-presence": "1.79.9",
-    "@tamagui/aria-hidden": "1.79.9",
-    "@tamagui/compose-refs": "1.79.9",
-    "@tamagui/core": "1.79.9",
-    "@tamagui/create-context": "1.79.9",
-    "@tamagui/dismissable": "1.79.9",
-    "@tamagui/focus-scope": "1.79.9",
-    "@tamagui/polyfill-dev": "1.79.9",
-    "@tamagui/popper": "1.79.9",
-    "@tamagui/portal": "1.79.9",
-    "@tamagui/remove-scroll": "1.79.9",
-    "@tamagui/sheet": "1.79.9",
-    "@tamagui/stacks": "1.79.9",
-    "@tamagui/text": "1.79.9",
-    "@tamagui/use-controllable-state": "1.79.9"
+    "@tamagui/adapt": "1.79.11",
+    "@tamagui/animate-presence": "1.79.11",
+    "@tamagui/aria-hidden": "1.79.11",
+    "@tamagui/compose-refs": "1.79.11",
+    "@tamagui/core": "1.79.11",
+    "@tamagui/create-context": "1.79.11",
+    "@tamagui/dismissable": "1.79.11",
+    "@tamagui/focus-scope": "1.79.11",
+    "@tamagui/polyfill-dev": "1.79.11",
+    "@tamagui/popper": "1.79.11",
+    "@tamagui/portal": "1.79.11",
+    "@tamagui/remove-scroll": "1.79.11",
+    "@tamagui/sheet": "1.79.11",
+    "@tamagui/stacks": "1.79.11",
+    "@tamagui/text": "1.79.11",
+    "@tamagui/use-controllable-state": "1.79.11"
   },
   "peerDependencies": {
     "react": "*",
     "react-native": "*"
   },
   "devDependencies": {
-    "@tamagui/build": "1.79.9",
+    "@tamagui/build": "1.79.11",
     "react": "^18.2.0",
     "react-native": "^0.72.1"
   },

package/src/Dialog.tsx

@@ -25,7 +25,12 @@ import { FocusScope, FocusScopeProps } from '@tamagui/focus-scope'
 import { PortalHost, PortalItem, PortalItemProps } from '@tamagui/portal'
 import { RemoveScroll } from '@tamagui/remove-scroll'
 import { Overlay, Sheet, SheetController } from '@tamagui/sheet'
-import { ThemeableStack, YStack, YStackProps } from '@tamagui/stacks'
+import {
+  ButtonNestingContext,
+  ThemeableStack,
+  YStack,
+  YStackProps,
+} from '@tamagui/stacks'
 import { H2, Paragraph } from '@tamagui/text'
 import { useControllableState } from '@tamagui/use-controllable-state'
 import * as React from 'react'
@@ -92,19 +97,22 @@ interface DialogTriggerProps extends StackProps {}
 const DialogTrigger = DialogTriggerFrame.styleable(
   (props: ScopedProps<DialogTriggerProps>, forwardedRef) => {
     const { __scopeDialog, ...triggerProps } = props
+    const isInsideButton = React.useContext(ButtonNestingContext)
     const context = useDialogContext(TRIGGER_NAME, __scopeDialog)
     const composedTriggerRef = useComposedRefs(forwardedRef, context.triggerRef)
     return (
-      <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 as any, context.onOpenToggle)}
-      />
+      <ButtonNestingContext.Provider value={true}>
+        <DialogTriggerFrame
+          tag={isInsideButton ? 'span' : 'button'}
+          aria-haspopup="dialog"
+          aria-expanded={context.open}
+          aria-controls={context.contentId}
+          data-state={getState(context.open)}
+          {...triggerProps}
+          ref={composedTriggerRef}
+          onPress={composeEventHandlers(props.onPress as any, context.onOpenToggle)}
+        />
+      </ButtonNestingContext.Provider>
     )
   }
 )
@@ -669,18 +677,6 @@ const CLOSE_NAME = 'DialogClose'
 const DialogCloseFrame = styled(View, {
   name: CLOSE_NAME,
   tag: 'button',
-
-  variants: {
-    unstyled: {
-      false: {
-        zIndex: 100,
-      },
-    },
-  } as const,
-
-  defaultVariants: {
-    unstyled: process.env.TAMAGUI_HEADLESS === '1' ? true : false,
-  },
 })
 
 type DialogCloseProps = GetProps<typeof DialogCloseFrame> & {
@@ -695,6 +691,7 @@ const DialogClose = DialogCloseFrame.styleable<DialogCloseProps>(
       fallback: {},
     })
     const isSheet = useShowDialogSheet(context)
+    const isInsideButton = React.useContext(ButtonNestingContext)
 
     if (isSheet && !displayWhenAdapted) {
       return null
@@ -703,6 +700,7 @@ const DialogClose = DialogCloseFrame.styleable<DialogCloseProps>(
     return (
       <DialogCloseFrame
         accessibilityLabel="Dialog Close"
+        tag={isInsideButton ? 'span' : 'button'}
         {...closeProps}
         ref={forwardedRef}
         onPress={composeEventHandlers(props.onPress as any, () =>