@tamagui/dialog 1.125.27 → 1.125.29-1742879698913
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/Dialog.cjs +10 -7
- package/dist/cjs/Dialog.js +8 -7
- package/dist/cjs/Dialog.js.map +1 -1
- package/dist/cjs/Dialog.native.js +8 -6
- package/dist/cjs/Dialog.native.js.map +2 -2
- package/dist/esm/Dialog.js +16 -8
- package/dist/esm/Dialog.js.map +1 -1
- package/dist/esm/Dialog.mjs +11 -8
- package/dist/esm/Dialog.mjs.map +1 -1
- package/dist/esm/Dialog.native.js +11 -8
- package/dist/esm/Dialog.native.js.map +1 -1
- package/dist/jsx/Dialog.js +16 -8
- package/dist/jsx/Dialog.js.map +1 -1
- package/dist/jsx/Dialog.mjs +11 -8
- package/dist/jsx/Dialog.mjs.map +1 -1
- package/dist/jsx/Dialog.native.js +9 -7
- package/dist/jsx/Dialog.native.js.map +2 -2
- package/package.json +21 -21
- package/src/Dialog.tsx +22 -12
- package/types/Dialog.d.ts +1 -0
- package/types/Dialog.d.ts.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tamagui/dialog",
|
|
3
|
-
"version": "1.125.
|
|
3
|
+
"version": "1.125.29-1742879698913",
|
|
4
4
|
"source": "src/index.ts",
|
|
5
5
|
"types": "./types/index.d.ts",
|
|
6
6
|
"main": "dist/cjs",
|
|
@@ -36,31 +36,31 @@
|
|
|
36
36
|
}
|
|
37
37
|
},
|
|
38
38
|
"dependencies": {
|
|
39
|
-
"@tamagui/adapt": "1.125.
|
|
40
|
-
"@tamagui/animate-presence": "1.125.
|
|
41
|
-
"@tamagui/aria-hidden": "1.125.
|
|
42
|
-
"@tamagui/compose-refs": "1.125.
|
|
43
|
-
"@tamagui/constants": "1.125.
|
|
44
|
-
"@tamagui/core": "1.125.
|
|
45
|
-
"@tamagui/create-context": "1.125.
|
|
46
|
-
"@tamagui/dismissable": "1.125.
|
|
47
|
-
"@tamagui/focus-scope": "1.125.
|
|
48
|
-
"@tamagui/helpers": "1.125.
|
|
49
|
-
"@tamagui/polyfill-dev": "1.125.
|
|
50
|
-
"@tamagui/popper": "1.125.
|
|
51
|
-
"@tamagui/portal": "1.125.
|
|
52
|
-
"@tamagui/remove-scroll": "1.125.
|
|
53
|
-
"@tamagui/sheet": "1.125.
|
|
54
|
-
"@tamagui/stacks": "1.125.
|
|
55
|
-
"@tamagui/text": "1.125.
|
|
56
|
-
"@tamagui/use-controllable-state": "1.125.
|
|
57
|
-
"@tamagui/z-index-stack": "1.125.
|
|
39
|
+
"@tamagui/adapt": "1.125.29-1742879698913",
|
|
40
|
+
"@tamagui/animate-presence": "1.125.29-1742879698913",
|
|
41
|
+
"@tamagui/aria-hidden": "1.125.29-1742879698913",
|
|
42
|
+
"@tamagui/compose-refs": "1.125.29-1742879698913",
|
|
43
|
+
"@tamagui/constants": "1.125.29-1742879698913",
|
|
44
|
+
"@tamagui/core": "1.125.29-1742879698913",
|
|
45
|
+
"@tamagui/create-context": "1.125.29-1742879698913",
|
|
46
|
+
"@tamagui/dismissable": "1.125.29-1742879698913",
|
|
47
|
+
"@tamagui/focus-scope": "1.125.29-1742879698913",
|
|
48
|
+
"@tamagui/helpers": "1.125.29-1742879698913",
|
|
49
|
+
"@tamagui/polyfill-dev": "1.125.29-1742879698913",
|
|
50
|
+
"@tamagui/popper": "1.125.29-1742879698913",
|
|
51
|
+
"@tamagui/portal": "1.125.29-1742879698913",
|
|
52
|
+
"@tamagui/remove-scroll": "1.125.29-1742879698913",
|
|
53
|
+
"@tamagui/sheet": "1.125.29-1742879698913",
|
|
54
|
+
"@tamagui/stacks": "1.125.29-1742879698913",
|
|
55
|
+
"@tamagui/text": "1.125.29-1742879698913",
|
|
56
|
+
"@tamagui/use-controllable-state": "1.125.29-1742879698913",
|
|
57
|
+
"@tamagui/z-index-stack": "1.125.29-1742879698913"
|
|
58
58
|
},
|
|
59
59
|
"peerDependencies": {
|
|
60
60
|
"react": "*"
|
|
61
61
|
},
|
|
62
62
|
"devDependencies": {
|
|
63
|
-
"@tamagui/build": "1.125.
|
|
63
|
+
"@tamagui/build": "1.125.29-1742879698913",
|
|
64
64
|
"react": "*",
|
|
65
65
|
"react-native": "^0.76.5"
|
|
66
66
|
},
|
package/src/Dialog.tsx
CHANGED
|
@@ -4,7 +4,14 @@ import { hideOthers } from '@tamagui/aria-hidden'
|
|
|
4
4
|
import { useComposedRefs } from '@tamagui/compose-refs'
|
|
5
5
|
import { isWeb } from '@tamagui/constants'
|
|
6
6
|
import type { GetProps, StackProps, TamaguiElement } from '@tamagui/core'
|
|
7
|
-
import {
|
|
7
|
+
import {
|
|
8
|
+
Theme,
|
|
9
|
+
View,
|
|
10
|
+
getExpandedShorthand,
|
|
11
|
+
spacedChildren,
|
|
12
|
+
styled,
|
|
13
|
+
useThemeName,
|
|
14
|
+
} from '@tamagui/core'
|
|
8
15
|
import type { Scope } from '@tamagui/create-context'
|
|
9
16
|
import { createContext, createContextScope } from '@tamagui/create-context'
|
|
10
17
|
import type { DismissableProps } from '@tamagui/dismissable'
|
|
@@ -63,6 +70,7 @@ type DialogContextValue = {
|
|
|
63
70
|
modal: NonNull<DialogProps['modal']>
|
|
64
71
|
allowPinchZoom: NonNull<DialogProps['allowPinchZoom']>
|
|
65
72
|
scopeKey: string
|
|
73
|
+
adaptName: string
|
|
66
74
|
}
|
|
67
75
|
|
|
68
76
|
const [DialogProvider, useDialogContext] =
|
|
@@ -174,12 +182,12 @@ const DialogPortalItem = (props: ScopedProps<DialogPortalProps>) => {
|
|
|
174
182
|
|
|
175
183
|
// until we can use react-native portals natively
|
|
176
184
|
// have to re-propogate context, sketch
|
|
177
|
-
|
|
178
185
|
// when adapted we portal to the adapt, when not we portal to root modal if needed
|
|
186
|
+
|
|
179
187
|
return isAdapted ? (
|
|
180
188
|
<AdaptPortalContents>{content}</AdaptPortalContents>
|
|
181
189
|
) : (
|
|
182
|
-
<PortalItem>{content}</PortalItem>
|
|
190
|
+
<PortalItem hostName={context.adaptName}>{content}</PortalItem>
|
|
183
191
|
)
|
|
184
192
|
}
|
|
185
193
|
|
|
@@ -201,9 +209,11 @@ const DialogPortal: React.FC<DialogPortalProps> = (
|
|
|
201
209
|
setIsFullyHidden(true)
|
|
202
210
|
}, [])
|
|
203
211
|
|
|
212
|
+
const zIndex = getExpandedShorthand('zIndex', props)
|
|
213
|
+
|
|
204
214
|
if (context.modal) {
|
|
205
215
|
const contents = (
|
|
206
|
-
<StackZIndexContext zIndex={resolveViewZIndex(
|
|
216
|
+
<StackZIndexContext zIndex={resolveViewZIndex(zIndex)}>
|
|
207
217
|
<AnimatePresence onExitComplete={handleExitComplete}>
|
|
208
218
|
{isShowing || isAdapted ? children : null}
|
|
209
219
|
</AnimatePresence>
|
|
@@ -225,7 +235,7 @@ const DialogPortal: React.FC<DialogPortalProps> = (
|
|
|
225
235
|
if (isWeb) {
|
|
226
236
|
return (
|
|
227
237
|
<Portal
|
|
228
|
-
zIndex={
|
|
238
|
+
zIndex={zIndex}
|
|
229
239
|
// set to 1000 which "boosts" it 1000 above baseline for current context
|
|
230
240
|
// this makes sure its above (this first 1k) popovers on the same layer
|
|
231
241
|
stackZIndex={1000}
|
|
@@ -409,13 +419,12 @@ const DialogContentModal = React.forwardRef<TamaguiElement, DialogContentTypePro
|
|
|
409
419
|
const composedRefs = useComposedRefs(forwardedRef, context.contentRef, contentRef)
|
|
410
420
|
|
|
411
421
|
// aria-hide everything except the content (better supported equivalent to setting aria-modal)
|
|
412
|
-
|
|
413
|
-
|
|
414
|
-
|
|
415
|
-
|
|
416
|
-
|
|
417
|
-
|
|
418
|
-
}
|
|
422
|
+
React.useEffect(() => {
|
|
423
|
+
if (!isWeb) return
|
|
424
|
+
if (!context.open) return
|
|
425
|
+
const content = contentRef.current
|
|
426
|
+
if (content) return hideOthers(content)
|
|
427
|
+
}, [context.open])
|
|
419
428
|
|
|
420
429
|
return (
|
|
421
430
|
<DialogContentImpl
|
|
@@ -834,6 +843,7 @@ const Dialog = withStaticProperties(
|
|
|
834
843
|
modal,
|
|
835
844
|
allowPinchZoom,
|
|
836
845
|
disableRemoveScroll,
|
|
846
|
+
adaptName,
|
|
837
847
|
}
|
|
838
848
|
|
|
839
849
|
React.useImperativeHandle(
|
package/types/Dialog.d.ts
CHANGED
package/types/Dialog.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Dialog.d.ts","sourceRoot":"","sources":["../src/Dialog.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;
|
|
1
|
+
{"version":3,"file":"Dialog.d.ts","sourceRoot":"","sources":["../src/Dialog.tsx"],"names":[],"mappings":"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"}
|