@tamagui/sheet 2.0.0-1768883422398 → 2.0.0-1768952492255
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/SheetImplementationCustom.cjs +1 -3
- package/dist/cjs/SheetImplementationCustom.js +1 -2
- package/dist/cjs/SheetImplementationCustom.js.map +1 -1
- package/dist/cjs/SheetImplementationCustom.native.js +2 -4
- package/dist/cjs/SheetImplementationCustom.native.js.map +1 -1
- package/dist/cjs/SheetScrollView.cjs +8 -2
- package/dist/cjs/SheetScrollView.js +6 -2
- package/dist/cjs/SheetScrollView.js.map +1 -1
- package/dist/cjs/SheetScrollView.native.js +8 -3
- package/dist/cjs/SheetScrollView.native.js.map +1 -1
- package/dist/esm/SheetImplementationCustom.js +2 -3
- package/dist/esm/SheetImplementationCustom.js.map +1 -1
- package/dist/esm/SheetImplementationCustom.mjs +2 -4
- package/dist/esm/SheetImplementationCustom.mjs.map +1 -1
- package/dist/esm/SheetImplementationCustom.native.js +3 -5
- package/dist/esm/SheetImplementationCustom.native.js.map +1 -1
- package/dist/esm/SheetScrollView.js +6 -2
- package/dist/esm/SheetScrollView.js.map +1 -1
- package/dist/esm/SheetScrollView.mjs +8 -2
- package/dist/esm/SheetScrollView.mjs.map +1 -1
- package/dist/esm/SheetScrollView.native.js +8 -3
- package/dist/esm/SheetScrollView.native.js.map +1 -1
- package/dist/jsx/SheetImplementationCustom.js +2 -3
- package/dist/jsx/SheetImplementationCustom.js.map +1 -1
- package/dist/jsx/SheetImplementationCustom.mjs +2 -4
- package/dist/jsx/SheetImplementationCustom.mjs.map +1 -1
- package/dist/jsx/SheetImplementationCustom.native.js +2 -4
- package/dist/jsx/SheetImplementationCustom.native.js.map +1 -1
- package/dist/jsx/SheetScrollView.js +6 -2
- package/dist/jsx/SheetScrollView.js.map +1 -1
- package/dist/jsx/SheetScrollView.mjs +8 -2
- package/dist/jsx/SheetScrollView.mjs.map +1 -1
- package/dist/jsx/SheetScrollView.native.js +8 -3
- package/dist/jsx/SheetScrollView.native.js.map +1 -1
- package/package.json +19 -19
- package/src/SheetImplementationCustom.tsx +4 -7
- package/src/SheetScrollView.tsx +14 -3
- package/types/SheetImplementationCustom.d.ts.map +1 -1
- package/types/SheetScrollView.d.ts.map +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["__create","Object","create","__defProp","defineProperty","__getOwnPropDesc","getOwnPropertyDescriptor","__getOwnPropNames","getOwnPropertyNames","__getProtoOf","getPrototypeOf","__hasOwnProp","prototype","hasOwnProperty","__export","target","all","name","get","enumerable","__copyProps","to","from","except","desc","key","call","__toESM","mod","isNodeMode","__esModule","value","__toCommonJS","SheetScrollView_exports","SheetScrollView","module","exports","import_jsx_runtime","require","import_compose_refs","import_core","import_scroll_view","import_use_controllable_state","import_react","import_SheetContext","SHEET_SCROLL_VIEW_NAME","default","forwardRef","param","ref","__scopeSheet","children","onScroll","scrollEnabled","scrollEnabledProp","props","context","useSheetContext","scrollBridge","setHasScrollView","setScrollEnabled_","useControllableState","prop","defaultProp","scrollRef","useRef","setScrollEnabled","next","_scrollRef_current_setNativeProps","_scrollRef_current","current","setNativeProps","state","lastPageY","dragAt","dys","isScrolling","isDraggingScrollArea","useEffect","release","scrollStartY","scrollLock","vy","length","recentDys","slice","dist","reduce","a","b","avgDy","scrollable","isClient","controller","AbortController","node","getScrollableNode","addEventListener","e","isParentDragging","scrollTo","top","y","behavior","signal","passive","disposeBridgeListen","onParentDragging","val","abort","hasScrollableContent","setHasScrollableContent","useState","parentHeight","contentHeight","setIsScrollable","jsxs","ScrollView","onLayout","Math","ceil","nativeEvent","layout","height","composeRefs","flex","scrollEventThrottle","onResponderRelease","className","contentOffset","isWeb","onStartShouldSetResponder","onMoveShouldSetResponder"],"sources":["../../src/SheetScrollView.tsx"],"sourcesContent":[null],"mappings":"AAAA,YAAS;;AACT,IAAAA,QAAS,GAAAC,MAAU,CAAAC,MAAO;AAE1B,IAAAC,SAAS,GAAAF,MAAA,CAAAG,cAAkB;AAC3B,IAAAC,gBAAS,GAAAJ,MAAA,CAAAK,wBAA4B;AACrC,IAAAC,iBAAgB,GAAAN,MAAW,CAAAO,mBAAQ;AAEnC,IAAAC,YAAS,GAAAR,MAAA,CAAAS,cAAuB;EAAAC,YAAA,GAAAV,MAAA,CAAAW,SAAA,CAAAC,cAAA;AAiJ1B,IAAAC,
|
|
1
|
+
{"version":3,"names":["__create","Object","create","__defProp","defineProperty","__getOwnPropDesc","getOwnPropertyDescriptor","__getOwnPropNames","getOwnPropertyNames","__getProtoOf","getPrototypeOf","__hasOwnProp","prototype","hasOwnProperty","__export","target","all","name","get","enumerable","__copyProps","to","from","except","desc","key","call","__toESM","mod","isNodeMode","__esModule","value","__toCommonJS","SheetScrollView_exports","SheetScrollView","module","exports","import_jsx_runtime","require","import_compose_refs","import_core","import_scroll_view","import_use_controllable_state","import_react","import_SheetContext","SHEET_SCROLL_VIEW_NAME","default","forwardRef","param","ref","__scopeSheet","children","onScroll","scrollEnabled","scrollEnabledProp","props","context","useSheetContext","scrollBridge","setHasScrollView","setScrollEnabled_","useControllableState","prop","defaultProp","scrollRef","useRef","setScrollEnabled","next","_scrollRef_current_setNativeProps","_scrollRef_current","current","setNativeProps","state","lastPageY","dragAt","dys","isScrolling","isDraggingScrollArea","useEffect","release","scrollStartY","scrollLock","vy","length","recentDys","slice","dist","reduce","a","b","avgDy","scrollable","isClient","controller","AbortController","node","getScrollableNode","addEventListener","e","isParentDragging","scrollTo","top","y","behavior","signal","passive","disposeBridgeListen","onParentDragging","val","abort","hasScrollableContent","setHasScrollableContent","useState","parentHeight","contentHeight","setIsScrollable","jsxs","ScrollView","onLayout","Math","ceil","nativeEvent","layout","height","composeRefs","flex","scrollEventThrottle","onResponderRelease","className","contentOffset","isWeb","onStartShouldSetResponder","onMoveShouldSetResponder","pageY","dy","abs"],"sources":["../../src/SheetScrollView.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tamagui/sheet",
|
|
3
|
-
"version": "2.0.0-
|
|
3
|
+
"version": "2.0.0-1768952492255",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"sideEffects": [
|
|
6
6
|
"*.css"
|
|
@@ -53,30 +53,30 @@
|
|
|
53
53
|
}
|
|
54
54
|
},
|
|
55
55
|
"dependencies": {
|
|
56
|
-
"@tamagui/adapt": "2.0.0-
|
|
57
|
-
"@tamagui/animate-presence": "2.0.0-
|
|
58
|
-
"@tamagui/animations-react-native": "2.0.0-
|
|
59
|
-
"@tamagui/compose-refs": "2.0.0-
|
|
60
|
-
"@tamagui/constants": "2.0.0-
|
|
61
|
-
"@tamagui/core": "2.0.0-
|
|
62
|
-
"@tamagui/create-context": "2.0.0-
|
|
63
|
-
"@tamagui/helpers": "2.0.0-
|
|
64
|
-
"@tamagui/portal": "2.0.0-
|
|
65
|
-
"@tamagui/remove-scroll": "2.0.0-
|
|
66
|
-
"@tamagui/scroll-view": "2.0.0-
|
|
67
|
-
"@tamagui/stacks": "2.0.0-
|
|
68
|
-
"@tamagui/use-constant": "2.0.0-
|
|
69
|
-
"@tamagui/use-controllable-state": "2.0.0-
|
|
70
|
-
"@tamagui/use-did-finish-ssr": "2.0.0-
|
|
71
|
-
"@tamagui/use-keyboard-visible": "2.0.0-
|
|
72
|
-
"@tamagui/z-index-stack": "2.0.0-
|
|
56
|
+
"@tamagui/adapt": "2.0.0-1768952492255",
|
|
57
|
+
"@tamagui/animate-presence": "2.0.0-1768952492255",
|
|
58
|
+
"@tamagui/animations-react-native": "2.0.0-1768952492255",
|
|
59
|
+
"@tamagui/compose-refs": "2.0.0-1768952492255",
|
|
60
|
+
"@tamagui/constants": "2.0.0-1768952492255",
|
|
61
|
+
"@tamagui/core": "2.0.0-1768952492255",
|
|
62
|
+
"@tamagui/create-context": "2.0.0-1768952492255",
|
|
63
|
+
"@tamagui/helpers": "2.0.0-1768952492255",
|
|
64
|
+
"@tamagui/portal": "2.0.0-1768952492255",
|
|
65
|
+
"@tamagui/remove-scroll": "2.0.0-1768952492255",
|
|
66
|
+
"@tamagui/scroll-view": "2.0.0-1768952492255",
|
|
67
|
+
"@tamagui/stacks": "2.0.0-1768952492255",
|
|
68
|
+
"@tamagui/use-constant": "2.0.0-1768952492255",
|
|
69
|
+
"@tamagui/use-controllable-state": "2.0.0-1768952492255",
|
|
70
|
+
"@tamagui/use-did-finish-ssr": "2.0.0-1768952492255",
|
|
71
|
+
"@tamagui/use-keyboard-visible": "2.0.0-1768952492255",
|
|
72
|
+
"@tamagui/z-index-stack": "2.0.0-1768952492255"
|
|
73
73
|
},
|
|
74
74
|
"peerDependencies": {
|
|
75
75
|
"react": "*",
|
|
76
76
|
"react-native": "*"
|
|
77
77
|
},
|
|
78
78
|
"devDependencies": {
|
|
79
|
-
"@tamagui/build": "2.0.0-
|
|
79
|
+
"@tamagui/build": "2.0.0-1768952492255",
|
|
80
80
|
"react": "*",
|
|
81
81
|
"react-native": "0.81.5"
|
|
82
82
|
},
|
|
@@ -16,7 +16,7 @@ import {
|
|
|
16
16
|
useEvent,
|
|
17
17
|
useThemeName,
|
|
18
18
|
} from '@tamagui/core'
|
|
19
|
-
import {
|
|
19
|
+
import { needsPortalRepropagation, Portal } from '@tamagui/portal'
|
|
20
20
|
import React, { useState } from 'react'
|
|
21
21
|
import type {
|
|
22
22
|
Animated,
|
|
@@ -112,12 +112,9 @@ export const SheetImplementationCustom = React.forwardRef<View, SheetProps>(
|
|
|
112
112
|
* This is a hacky workaround for native:
|
|
113
113
|
*/
|
|
114
114
|
const [isShowingInnerSheet, setIsShowingInnerSheet] = React.useState(false)
|
|
115
|
+
// when using Gorhom portal (no teleport), inner sheets need to hide parent
|
|
115
116
|
const shouldHideParentSheet =
|
|
116
|
-
!isWeb &&
|
|
117
|
-
modal &&
|
|
118
|
-
isShowingInnerSheet &&
|
|
119
|
-
// if not using weird portal limitation we dont need to hide parent sheet
|
|
120
|
-
USE_NATIVE_PORTAL
|
|
117
|
+
!isWeb && modal && isShowingInnerSheet && needsPortalRepropagation()
|
|
121
118
|
|
|
122
119
|
const sheetInsideSheet = React.useContext(SheetInsideSheetContext)
|
|
123
120
|
const onInnerSheet = React.useCallback((hasChild: boolean) => {
|
|
@@ -577,7 +574,7 @@ export const SheetImplementationCustom = React.forwardRef<View, SheetProps>(
|
|
|
577
574
|
</LayoutMeasurementController>
|
|
578
575
|
)
|
|
579
576
|
|
|
580
|
-
if (process.env.TAMAGUI_TARGET === 'native' &&
|
|
577
|
+
if (process.env.TAMAGUI_TARGET === 'native' && needsPortalRepropagation()) {
|
|
581
578
|
// TODO alongside sheet scope="" need to pass scope here
|
|
582
579
|
const adaptContext = useAdaptContext()
|
|
583
580
|
contents = (
|
package/src/SheetScrollView.tsx
CHANGED
|
@@ -189,11 +189,22 @@ export const SheetScrollView = React.forwardRef<
|
|
|
189
189
|
onStartShouldSetResponder={() => {
|
|
190
190
|
scrollBridge.scrollStartY = -1
|
|
191
191
|
state.current.isDraggingScrollArea = true
|
|
192
|
-
|
|
192
|
+
// don't claim responder on start - let children handle taps
|
|
193
|
+
// we'll claim on move if needed
|
|
194
|
+
return false
|
|
193
195
|
}}
|
|
194
|
-
// setting to false while onResponderMove is disabled
|
|
195
196
|
onMoveShouldSetResponder={(e) => {
|
|
196
|
-
return
|
|
197
|
+
if (!scrollable) return false
|
|
198
|
+
// require minimum movement (10px) before claiming responder
|
|
199
|
+
// this allows children (like Select.Item) to handle taps
|
|
200
|
+
// fixes #3436: onPress not firing on physical Android devices
|
|
201
|
+
const { pageY } = e.nativeEvent
|
|
202
|
+
if (state.current.lastPageY === 0) {
|
|
203
|
+
state.current.lastPageY = pageY
|
|
204
|
+
return false
|
|
205
|
+
}
|
|
206
|
+
const dy = Math.abs(pageY - state.current.lastPageY)
|
|
207
|
+
return dy > 10
|
|
197
208
|
}}
|
|
198
209
|
contentContainerStyle={{
|
|
199
210
|
minHeight: '100%',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SheetImplementationCustom.d.ts","sourceRoot":"","sources":["../src/SheetImplementationCustom.tsx"],"names":[],"mappings":"AAmBA,OAAO,KAAmB,MAAM,OAAO,CAAA;AAOvC,OAAO,EAAsC,IAAI,EAAE,MAAM,cAAc,CAAA;AAIvE,OAAO,KAAK,EAAc,cAAc,EAAE,MAAM,SAAS,CAAA;AAWzD,eAAO,MAAM,yBAAyB;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"SheetImplementationCustom.d.ts","sourceRoot":"","sources":["../src/SheetImplementationCustom.tsx"],"names":[],"mappings":"AAmBA,OAAO,KAAmB,MAAM,OAAO,CAAA;AAOvC,OAAO,EAAsC,IAAI,EAAE,MAAM,cAAc,CAAA;AAIvE,OAAO,KAAK,EAAc,cAAc,EAAE,MAAM,SAAS,CAAA;AAWzD,eAAO,MAAM,yBAAyB;;;;;;;;;;;;;;;;;;;;;;;;;;;;8BAgkBrC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SheetScrollView.d.ts","sourceRoot":"","sources":["../src/SheetScrollView.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAsC,MAAM,OAAO,CAAA;AAC1D,OAAO,KAAK,EAAE,UAAU,IAAI,YAAY,EAAE,MAAM,cAAc,CAAA;AAY9D,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"SheetScrollView.d.ts","sourceRoot":"","sources":["../src/SheetScrollView.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAsC,MAAM,OAAO,CAAA;AAC1D,OAAO,KAAK,EAAE,UAAU,IAAI,YAAY,EAAE,MAAM,cAAc,CAAA;AAY9D,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;wCAiQ3B,CAAA"}
|