@tamagui/sheet 2.3.3 → 2.4.0
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/.turbo/turbo-build.log +1 -1
- package/dist/cjs/SheetImplementationCustom.cjs +42 -29
- package/dist/cjs/SheetImplementationCustom.native.js +46 -33
- package/dist/cjs/SheetImplementationCustom.native.js.map +1 -1
- package/dist/cjs/SheetScrollView.cjs +64 -22
- package/dist/cjs/SheetScrollView.native.js +66 -23
- package/dist/cjs/SheetScrollView.native.js.map +1 -1
- package/dist/cjs/useGestureHandlerPan.cjs +61 -8
- package/dist/cjs/useGestureHandlerPan.native.js +64 -8
- package/dist/cjs/useGestureHandlerPan.native.js.map +1 -1
- package/dist/cjs/useSheetScrollViewGestures.cjs +13 -3
- package/dist/esm/SheetImplementationCustom.mjs +43 -32
- package/dist/esm/SheetImplementationCustom.mjs.map +1 -1
- package/dist/esm/SheetImplementationCustom.native.js +47 -36
- package/dist/esm/SheetImplementationCustom.native.js.map +1 -1
- package/dist/esm/SheetScrollView.mjs +64 -22
- package/dist/esm/SheetScrollView.mjs.map +1 -1
- package/dist/esm/SheetScrollView.native.js +66 -23
- package/dist/esm/SheetScrollView.native.js.map +1 -1
- package/dist/esm/useGestureHandlerPan.mjs +62 -9
- package/dist/esm/useGestureHandlerPan.mjs.map +1 -1
- package/dist/esm/useGestureHandlerPan.native.js +65 -9
- package/dist/esm/useGestureHandlerPan.native.js.map +1 -1
- package/dist/esm/useSheetScrollViewGestures.mjs +13 -3
- package/dist/esm/useSheetScrollViewGestures.mjs.map +1 -1
- package/dist/jsx/SheetImplementationCustom.mjs +43 -32
- package/dist/jsx/SheetImplementationCustom.mjs.map +1 -1
- package/dist/jsx/SheetImplementationCustom.native.js +46 -33
- package/dist/jsx/SheetImplementationCustom.native.js.map +1 -1
- package/dist/jsx/SheetScrollView.mjs +64 -22
- package/dist/jsx/SheetScrollView.mjs.map +1 -1
- package/dist/jsx/SheetScrollView.native.js +66 -23
- package/dist/jsx/SheetScrollView.native.js.map +1 -1
- package/dist/jsx/useGestureHandlerPan.mjs +62 -9
- package/dist/jsx/useGestureHandlerPan.mjs.map +1 -1
- package/dist/jsx/useGestureHandlerPan.native.js +64 -8
- package/dist/jsx/useGestureHandlerPan.native.js.map +1 -1
- package/dist/jsx/useSheetScrollViewGestures.mjs +13 -3
- package/dist/jsx/useSheetScrollViewGestures.mjs.map +1 -1
- package/package.json +20 -20
- package/src/SheetImplementationCustom.tsx +79 -47
- package/src/SheetScrollView.tsx +61 -13
- package/src/types.tsx +3 -0
- package/src/useGestureHandlerPan.tsx +64 -10
- package/src/useSheetScrollViewGestures.ts +17 -2
- package/types/SheetImplementationCustom.d.ts.map +1 -1
- package/types/SheetScrollView.d.ts.map +1 -1
- package/types/types.d.ts +1 -0
- package/types/types.d.ts.map +1 -1
- package/types/useGestureHandlerPan.d.ts.map +1 -1
- package/types/useSheetScrollViewGestures.d.ts +2 -1
- package/types/useSheetScrollViewGestures.d.ts.map +1 -1
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { isWeb } from "@tamagui/constants";
|
|
2
|
-
import { useCallback, useMemo, useRef } from "react";
|
|
2
|
+
import { useCallback, useEffect, useMemo, useRef } from "react";
|
|
3
3
|
import { getGestureHandlerState, isGestureHandlerEnabled } from "./gestureState.mjs";
|
|
4
4
|
import { getSheetReleasePosition } from "./keyboardAvoidance.mjs";
|
|
5
5
|
const AT_TOP_THRESHOLD = 5;
|
|
6
|
+
const SCROLL_HANDOFF_THRESHOLD = 160;
|
|
6
7
|
function useGestureHandlerPan(config) {
|
|
7
8
|
const {
|
|
8
9
|
positions,
|
|
@@ -47,15 +48,41 @@ function useGestureHandlerPan(config) {
|
|
|
47
48
|
frozenMinY: 0,
|
|
48
49
|
frozenIsKeyboardVisible: false,
|
|
49
50
|
// whether pan gesture actually started (vs just a tap in onBegin)
|
|
50
|
-
panStarted: false
|
|
51
|
+
panStarted: false,
|
|
52
|
+
startedBelowTop: false,
|
|
53
|
+
upwardDragAfterTop: 0,
|
|
54
|
+
scrollUnlockedAfterTop: false,
|
|
55
|
+
keepScrollLockedAfterEnd: false
|
|
51
56
|
});
|
|
57
|
+
const unlockScrollTimer = useRef(null);
|
|
58
|
+
useEffect(() => {
|
|
59
|
+
return () => {
|
|
60
|
+
if (unlockScrollTimer.current) {
|
|
61
|
+
clearTimeout(unlockScrollTimer.current);
|
|
62
|
+
unlockScrollTimer.current = null;
|
|
63
|
+
}
|
|
64
|
+
};
|
|
65
|
+
}, []);
|
|
52
66
|
const onStart = useCallback(() => {
|
|
53
67
|
stopSpring();
|
|
54
68
|
}, [stopSpring]);
|
|
55
|
-
const onEnd = useCallback((closestPoint, animationOverride) => {
|
|
69
|
+
const onEnd = useCallback((closestPoint, animationOverride, keepScrollLocked = false) => {
|
|
70
|
+
if (unlockScrollTimer.current) {
|
|
71
|
+
clearTimeout(unlockScrollTimer.current);
|
|
72
|
+
unlockScrollTimer.current = null;
|
|
73
|
+
}
|
|
56
74
|
setIsDragging(false);
|
|
57
75
|
scrollBridge.setParentDragging(false);
|
|
58
|
-
scrollBridge.
|
|
76
|
+
scrollBridge.lockScrollAtTop = false;
|
|
77
|
+
if (keepScrollLocked) {
|
|
78
|
+
scrollBridge.setScrollEnabled?.(false, 0);
|
|
79
|
+
unlockScrollTimer.current = setTimeout(() => {
|
|
80
|
+
unlockScrollTimer.current = null;
|
|
81
|
+
scrollBridge.setScrollEnabled?.(true);
|
|
82
|
+
}, 160);
|
|
83
|
+
} else {
|
|
84
|
+
scrollBridge.setScrollEnabled?.(true);
|
|
85
|
+
}
|
|
59
86
|
setPosition(closestPoint);
|
|
60
87
|
animateTo(closestPoint, animationOverride);
|
|
61
88
|
}, [setIsDragging, scrollBridge, setPosition, animateTo]);
|
|
@@ -87,6 +114,15 @@ function useGestureHandlerPan(config) {
|
|
|
87
114
|
gs.frozenPositions = [...positions];
|
|
88
115
|
gs.frozenMinY = minY;
|
|
89
116
|
gs.frozenIsKeyboardVisible = releaseConfigRef.current.isKeyboardVisible;
|
|
117
|
+
gs.startedBelowTop = !atTop;
|
|
118
|
+
gs.upwardDragAfterTop = 0;
|
|
119
|
+
gs.scrollUnlockedAfterTop = false;
|
|
120
|
+
gs.keepScrollLockedAfterEnd = false;
|
|
121
|
+
scrollBridge.lockScrollAtTop = false;
|
|
122
|
+
if (unlockScrollTimer.current) {
|
|
123
|
+
clearTimeout(unlockScrollTimer.current);
|
|
124
|
+
unlockScrollTimer.current = null;
|
|
125
|
+
}
|
|
90
126
|
if (!atTop) {
|
|
91
127
|
scrollBridge.setScrollEnabled?.(false, 0);
|
|
92
128
|
}
|
|
@@ -128,13 +164,24 @@ function useGestureHandlerPan(config) {
|
|
|
128
164
|
}
|
|
129
165
|
} else {
|
|
130
166
|
if (hasScrollableContent) {
|
|
131
|
-
|
|
167
|
+
if (gs.startedBelowTop && !gs.scrollUnlockedAfterTop) {
|
|
168
|
+
gs.upwardDragAfterTop += Math.max(0, -deltaY);
|
|
169
|
+
if (gs.upwardDragAfterTop >= SCROLL_HANDOFF_THRESHOLD) {
|
|
170
|
+
gs.scrollUnlockedAfterTop = true;
|
|
171
|
+
panHandles = false;
|
|
172
|
+
} else {
|
|
173
|
+
panHandles = true;
|
|
174
|
+
}
|
|
175
|
+
} else {
|
|
176
|
+
panHandles = false;
|
|
177
|
+
}
|
|
132
178
|
} else {
|
|
133
179
|
panHandles = true;
|
|
134
180
|
}
|
|
135
181
|
}
|
|
136
182
|
}
|
|
137
183
|
if (panHandles) {
|
|
184
|
+
scrollBridge.lockScrollAtTop = gs.startedBelowTop && !gs.scrollUnlockedAfterTop;
|
|
138
185
|
const lockTo = isCurrentlyAtTop && isSwipingDown && gs.scrollEngaged ? void 0 : 0;
|
|
139
186
|
scrollBridge.setScrollEnabled?.(false, lockTo);
|
|
140
187
|
gs.accumulatedOffset += deltaY;
|
|
@@ -143,18 +190,23 @@ function useGestureHandlerPan(config) {
|
|
|
143
190
|
setAnimatedPosition(newPosition);
|
|
144
191
|
scrollBridge.setParentDragging(newPosition > minY);
|
|
145
192
|
} else {
|
|
193
|
+
scrollBridge.lockScrollAtTop = false;
|
|
146
194
|
scrollBridge.setScrollEnabled?.(true);
|
|
195
|
+
scrollBridge.setParentDragging(false);
|
|
147
196
|
}
|
|
148
197
|
}).onEnd(event => {
|
|
149
198
|
const {
|
|
150
199
|
velocityY
|
|
151
200
|
} = event;
|
|
152
201
|
const currentPos = gs.startY + gs.accumulatedOffset;
|
|
153
|
-
|
|
202
|
+
const keepScrollLockedAfterEnd = gs.startedBelowTop && !gs.scrollUnlockedAfterTop;
|
|
203
|
+
scrollBridge.lockScrollAtTop = false;
|
|
204
|
+
scrollBridge.scrollLockY = keepScrollLockedAfterEnd ? 0 : void 0;
|
|
205
|
+
gs.keepScrollLockedAfterEnd = keepScrollLockedAfterEnd;
|
|
154
206
|
const snapPositions = gs.frozenPositions.length > 0 ? gs.frozenPositions : positions;
|
|
155
207
|
const snapMinY = gs.frozenPositions.length > 0 ? gs.frozenMinY : minY;
|
|
156
208
|
if (currentPos <= snapMinY + AT_TOP_THRESHOLD && scrollBridge.y > 0) {
|
|
157
|
-
onEnd(0);
|
|
209
|
+
onEnd(0, void 0, keepScrollLockedAfterEnd);
|
|
158
210
|
return;
|
|
159
211
|
}
|
|
160
212
|
const velocity = velocityY / 1e3;
|
|
@@ -170,9 +222,10 @@ function useGestureHandlerPan(config) {
|
|
|
170
222
|
isKeyboardVisible: gs.frozenIsKeyboardVisible,
|
|
171
223
|
isWeb
|
|
172
224
|
});
|
|
173
|
-
onEnd(closestPoint);
|
|
225
|
+
onEnd(closestPoint, void 0, keepScrollLockedAfterEnd);
|
|
174
226
|
}).onFinalize(() => {
|
|
175
|
-
scrollBridge.
|
|
227
|
+
scrollBridge.lockScrollAtTop = false;
|
|
228
|
+
scrollBridge.scrollLockY = gs.keepScrollLockedAfterEnd ? 0 : void 0;
|
|
176
229
|
if (gs.panStarted) {
|
|
177
230
|
setIsDragging(false);
|
|
178
231
|
} else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["isWeb","useCallback","useMemo","useRef","getGestureHandlerState","isGestureHandlerEnabled","getSheetReleasePosition","AT_TOP_THRESHOLD","useGestureHandlerPan","config","positions","frameSize","setPosition","animateTo","stopSpring","scrollBridge","setIsDragging","getCurrentPosition","resisted","disableDrag","isShowingInnerSheet","setAnimatedPosition","scrollGestureRef","gestureHandlerEnabled","panGestureRef","releaseConfigRef","dismissOnSnapToBottom","snapPointsMode","isKeyboardVisible","current","gestureStateRef","startY","lastPanTranslationY","accumulatedOffset","prevTranslationY","scrollEngaged","frozenPositions","frozenMinY","frozenIsKeyboardVisible","panStarted","onStart","onEnd","closestPoint","animationOverride","setParentDragging","setScrollEnabled","panGesture","Gesture","minY","gs","gesture","Pan","withRef","activeOffsetY","failOffsetX","shouldCancelWhenOutside","onBegin","pauseKeyboardHandler","pos","atTop","currentScrollY","y","initialPosition","onChange","event","translationY","isSwipingDown","deltaY","scrollY","currentPos","isCurrentlyAtTop","nodeIsScrolling","panHandles","hasScrollableContent","lockTo","newPosition","paneY","velocityY","scrollLockY","snapPositions","length","snapMinY","velocity","projectedEnd","releaseConfig","currentPosition","onFinalize","runOnJS","simultaneousWithExternalGesture"],"sources":["../../src/useGestureHandlerPan.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,KAAA,QAAa;AACtB,SAASC,WAAA,EAAaC,OAAA,EAASC,MAAA,QAA8B;
|
|
1
|
+
{"version":3,"names":["isWeb","useCallback","useEffect","useMemo","useRef","getGestureHandlerState","isGestureHandlerEnabled","getSheetReleasePosition","AT_TOP_THRESHOLD","SCROLL_HANDOFF_THRESHOLD","useGestureHandlerPan","config","positions","frameSize","setPosition","animateTo","stopSpring","scrollBridge","setIsDragging","getCurrentPosition","resisted","disableDrag","isShowingInnerSheet","setAnimatedPosition","scrollGestureRef","gestureHandlerEnabled","panGestureRef","releaseConfigRef","dismissOnSnapToBottom","snapPointsMode","isKeyboardVisible","current","gestureStateRef","startY","lastPanTranslationY","accumulatedOffset","prevTranslationY","scrollEngaged","frozenPositions","frozenMinY","frozenIsKeyboardVisible","panStarted","startedBelowTop","upwardDragAfterTop","scrollUnlockedAfterTop","keepScrollLockedAfterEnd","unlockScrollTimer","clearTimeout","onStart","onEnd","closestPoint","animationOverride","keepScrollLocked","setParentDragging","lockScrollAtTop","setScrollEnabled","setTimeout","panGesture","Gesture","minY","gs","gesture","Pan","withRef","activeOffsetY","failOffsetX","shouldCancelWhenOutside","onBegin","pauseKeyboardHandler","pos","atTop","currentScrollY","y","initialPosition","onChange","event","translationY","isSwipingDown","deltaY","scrollY","currentPos","isCurrentlyAtTop","nodeIsScrolling","panHandles","hasScrollableContent","Math","max","lockTo","newPosition","paneY","velocityY","scrollLockY","snapPositions","length","snapMinY","velocity","projectedEnd","releaseConfig","currentPosition","onFinalize","runOnJS","simultaneousWithExternalGesture"],"sources":["../../src/useGestureHandlerPan.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -32,6 +32,7 @@ var import_react = require("react");
|
|
|
32
32
|
var import_gestureState = require("./gestureState.native.js");
|
|
33
33
|
var import_keyboardAvoidance = require("./keyboardAvoidance.native.js");
|
|
34
34
|
var AT_TOP_THRESHOLD = 5;
|
|
35
|
+
var SCROLL_HANDOFF_THRESHOLD = 160;
|
|
35
36
|
function useGestureHandlerPan(config) {
|
|
36
37
|
var {
|
|
37
38
|
positions,
|
|
@@ -78,16 +79,45 @@ function useGestureHandlerPan(config) {
|
|
|
78
79
|
frozenMinY: 0,
|
|
79
80
|
frozenIsKeyboardVisible: false,
|
|
80
81
|
// whether pan gesture actually started (vs just a tap in onBegin)
|
|
81
|
-
panStarted: false
|
|
82
|
+
panStarted: false,
|
|
83
|
+
startedBelowTop: false,
|
|
84
|
+
upwardDragAfterTop: 0,
|
|
85
|
+
scrollUnlockedAfterTop: false,
|
|
86
|
+
keepScrollLockedAfterEnd: false
|
|
82
87
|
});
|
|
88
|
+
var unlockScrollTimer = (0, import_react.useRef)(null);
|
|
89
|
+
(0, import_react.useEffect)(function () {
|
|
90
|
+
return function () {
|
|
91
|
+
if (unlockScrollTimer.current) {
|
|
92
|
+
clearTimeout(unlockScrollTimer.current);
|
|
93
|
+
unlockScrollTimer.current = null;
|
|
94
|
+
}
|
|
95
|
+
};
|
|
96
|
+
}, []);
|
|
83
97
|
var onStart = (0, import_react.useCallback)(function () {
|
|
84
98
|
stopSpring();
|
|
85
99
|
}, [stopSpring]);
|
|
86
100
|
var onEnd = (0, import_react.useCallback)(function (closestPoint, animationOverride) {
|
|
87
|
-
var
|
|
101
|
+
var keepScrollLocked = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : false;
|
|
102
|
+
if (unlockScrollTimer.current) {
|
|
103
|
+
clearTimeout(unlockScrollTimer.current);
|
|
104
|
+
unlockScrollTimer.current = null;
|
|
105
|
+
}
|
|
88
106
|
setIsDragging(false);
|
|
89
107
|
scrollBridge.setParentDragging(false);
|
|
90
|
-
|
|
108
|
+
scrollBridge.lockScrollAtTop = false;
|
|
109
|
+
if (keepScrollLocked) {
|
|
110
|
+
var _scrollBridge_setScrollEnabled;
|
|
111
|
+
(_scrollBridge_setScrollEnabled = scrollBridge.setScrollEnabled) === null || _scrollBridge_setScrollEnabled === void 0 ? void 0 : _scrollBridge_setScrollEnabled.call(scrollBridge, false, 0);
|
|
112
|
+
unlockScrollTimer.current = setTimeout(function () {
|
|
113
|
+
var _scrollBridge_setScrollEnabled2;
|
|
114
|
+
unlockScrollTimer.current = null;
|
|
115
|
+
(_scrollBridge_setScrollEnabled2 = scrollBridge.setScrollEnabled) === null || _scrollBridge_setScrollEnabled2 === void 0 ? void 0 : _scrollBridge_setScrollEnabled2.call(scrollBridge, true);
|
|
116
|
+
}, 160);
|
|
117
|
+
} else {
|
|
118
|
+
var _scrollBridge_setScrollEnabled1;
|
|
119
|
+
(_scrollBridge_setScrollEnabled1 = scrollBridge.setScrollEnabled) === null || _scrollBridge_setScrollEnabled1 === void 0 ? void 0 : _scrollBridge_setScrollEnabled1.call(scrollBridge, true);
|
|
120
|
+
}
|
|
91
121
|
setPosition(closestPoint);
|
|
92
122
|
animateTo(closestPoint, animationOverride);
|
|
93
123
|
}, [setIsDragging, scrollBridge, setPosition, animateTo]);
|
|
@@ -119,6 +149,15 @@ function useGestureHandlerPan(config) {
|
|
|
119
149
|
gs.frozenPositions = [...positions];
|
|
120
150
|
gs.frozenMinY = minY;
|
|
121
151
|
gs.frozenIsKeyboardVisible = releaseConfigRef.current.isKeyboardVisible;
|
|
152
|
+
gs.startedBelowTop = !atTop;
|
|
153
|
+
gs.upwardDragAfterTop = 0;
|
|
154
|
+
gs.scrollUnlockedAfterTop = false;
|
|
155
|
+
gs.keepScrollLockedAfterEnd = false;
|
|
156
|
+
scrollBridge.lockScrollAtTop = false;
|
|
157
|
+
if (unlockScrollTimer.current) {
|
|
158
|
+
clearTimeout(unlockScrollTimer.current);
|
|
159
|
+
unlockScrollTimer.current = null;
|
|
160
|
+
}
|
|
122
161
|
if (!atTop) {
|
|
123
162
|
var _scrollBridge_setScrollEnabled;
|
|
124
163
|
(_scrollBridge_setScrollEnabled = scrollBridge.setScrollEnabled) === null || _scrollBridge_setScrollEnabled === void 0 ? void 0 : _scrollBridge_setScrollEnabled.call(scrollBridge, false, 0);
|
|
@@ -161,7 +200,17 @@ function useGestureHandlerPan(config) {
|
|
|
161
200
|
}
|
|
162
201
|
} else {
|
|
163
202
|
if (hasScrollableContent) {
|
|
164
|
-
|
|
203
|
+
if (gs.startedBelowTop && !gs.scrollUnlockedAfterTop) {
|
|
204
|
+
gs.upwardDragAfterTop += Math.max(0, -deltaY);
|
|
205
|
+
if (gs.upwardDragAfterTop >= SCROLL_HANDOFF_THRESHOLD) {
|
|
206
|
+
gs.scrollUnlockedAfterTop = true;
|
|
207
|
+
panHandles = false;
|
|
208
|
+
} else {
|
|
209
|
+
panHandles = true;
|
|
210
|
+
}
|
|
211
|
+
} else {
|
|
212
|
+
panHandles = false;
|
|
213
|
+
}
|
|
165
214
|
} else {
|
|
166
215
|
panHandles = true;
|
|
167
216
|
}
|
|
@@ -169,6 +218,7 @@ function useGestureHandlerPan(config) {
|
|
|
169
218
|
}
|
|
170
219
|
if (panHandles) {
|
|
171
220
|
var _scrollBridge_setScrollEnabled;
|
|
221
|
+
scrollBridge.lockScrollAtTop = gs.startedBelowTop && !gs.scrollUnlockedAfterTop;
|
|
172
222
|
var lockTo = isCurrentlyAtTop && isSwipingDown && gs.scrollEngaged ? void 0 : 0;
|
|
173
223
|
(_scrollBridge_setScrollEnabled = scrollBridge.setScrollEnabled) === null || _scrollBridge_setScrollEnabled === void 0 ? void 0 : _scrollBridge_setScrollEnabled.call(scrollBridge, false, lockTo);
|
|
174
224
|
gs.accumulatedOffset += deltaY;
|
|
@@ -178,18 +228,23 @@ function useGestureHandlerPan(config) {
|
|
|
178
228
|
scrollBridge.setParentDragging(newPosition > minY);
|
|
179
229
|
} else {
|
|
180
230
|
var _scrollBridge_setScrollEnabled1;
|
|
231
|
+
scrollBridge.lockScrollAtTop = false;
|
|
181
232
|
(_scrollBridge_setScrollEnabled1 = scrollBridge.setScrollEnabled) === null || _scrollBridge_setScrollEnabled1 === void 0 ? void 0 : _scrollBridge_setScrollEnabled1.call(scrollBridge, true);
|
|
233
|
+
scrollBridge.setParentDragging(false);
|
|
182
234
|
}
|
|
183
235
|
}).onEnd(function (event) {
|
|
184
236
|
var {
|
|
185
237
|
velocityY
|
|
186
238
|
} = event;
|
|
187
239
|
var currentPos = gs.startY + gs.accumulatedOffset;
|
|
188
|
-
|
|
240
|
+
var keepScrollLockedAfterEnd = gs.startedBelowTop && !gs.scrollUnlockedAfterTop;
|
|
241
|
+
scrollBridge.lockScrollAtTop = false;
|
|
242
|
+
scrollBridge.scrollLockY = keepScrollLockedAfterEnd ? 0 : void 0;
|
|
243
|
+
gs.keepScrollLockedAfterEnd = keepScrollLockedAfterEnd;
|
|
189
244
|
var snapPositions = gs.frozenPositions.length > 0 ? gs.frozenPositions : positions;
|
|
190
245
|
var snapMinY = gs.frozenPositions.length > 0 ? gs.frozenMinY : minY;
|
|
191
246
|
if (currentPos <= snapMinY + AT_TOP_THRESHOLD && scrollBridge.y > 0) {
|
|
192
|
-
onEnd(0);
|
|
247
|
+
onEnd(0, void 0, keepScrollLockedAfterEnd);
|
|
193
248
|
return;
|
|
194
249
|
}
|
|
195
250
|
var velocity = velocityY / 1e3;
|
|
@@ -205,9 +260,10 @@ function useGestureHandlerPan(config) {
|
|
|
205
260
|
isKeyboardVisible: gs.frozenIsKeyboardVisible,
|
|
206
261
|
isWeb: import_constants.isWeb
|
|
207
262
|
});
|
|
208
|
-
onEnd(closestPoint);
|
|
263
|
+
onEnd(closestPoint, void 0, keepScrollLockedAfterEnd);
|
|
209
264
|
}).onFinalize(function () {
|
|
210
|
-
scrollBridge.
|
|
265
|
+
scrollBridge.lockScrollAtTop = false;
|
|
266
|
+
scrollBridge.scrollLockY = gs.keepScrollLockedAfterEnd ? 0 : void 0;
|
|
211
267
|
if (gs.panStarted) {
|
|
212
268
|
setIsDragging(false);
|
|
213
269
|
} else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["__defProp","Object","defineProperty","__getOwnPropDesc","getOwnPropertyDescriptor","__getOwnPropNames","getOwnPropertyNames","__hasOwnProp","prototype","hasOwnProperty","__export","target","all","name","get","enumerable","__copyProps","to","from","except","desc","key","call","__toCommonJS","mod","value","useGestureHandlerPan_exports","useGestureHandlerPan","module","exports","import_constants","require","import_react","import_gestureState","import_keyboardAvoidance","AT_TOP_THRESHOLD","config","positions","frameSize","setPosition","animateTo","stopSpring","scrollBridge","setIsDragging","getCurrentPosition","resisted","disableDrag","isShowingInnerSheet","setAnimatedPosition","scrollGestureRef","gestureHandlerEnabled","isGestureHandlerEnabled","panGestureRef","useRef","_config_snapPointsMode","releaseConfigRef","dismissOnSnapToBottom","snapPointsMode","isKeyboardVisible","_config_snapPointsMode1","current","gestureStateRef","startY","lastPanTranslationY","accumulatedOffset","prevTranslationY","scrollEngaged","frozenPositions","frozenMinY","frozenIsKeyboardVisible","panStarted","onStart","useCallback","onEnd","closestPoint","animationOverride","
|
|
1
|
+
{"version":3,"names":["__defProp","Object","defineProperty","__getOwnPropDesc","getOwnPropertyDescriptor","__getOwnPropNames","getOwnPropertyNames","__hasOwnProp","prototype","hasOwnProperty","__export","target","all","name","get","enumerable","__copyProps","to","from","except","desc","key","call","__toCommonJS","mod","value","useGestureHandlerPan_exports","useGestureHandlerPan","module","exports","import_constants","require","import_react","import_gestureState","import_keyboardAvoidance","AT_TOP_THRESHOLD","SCROLL_HANDOFF_THRESHOLD","config","positions","frameSize","setPosition","animateTo","stopSpring","scrollBridge","setIsDragging","getCurrentPosition","resisted","disableDrag","isShowingInnerSheet","setAnimatedPosition","scrollGestureRef","gestureHandlerEnabled","isGestureHandlerEnabled","panGestureRef","useRef","_config_snapPointsMode","releaseConfigRef","dismissOnSnapToBottom","snapPointsMode","isKeyboardVisible","_config_snapPointsMode1","current","gestureStateRef","startY","lastPanTranslationY","accumulatedOffset","prevTranslationY","scrollEngaged","frozenPositions","frozenMinY","frozenIsKeyboardVisible","panStarted","startedBelowTop","upwardDragAfterTop","scrollUnlockedAfterTop","keepScrollLockedAfterEnd","unlockScrollTimer","useEffect","clearTimeout","onStart","useCallback","onEnd","closestPoint","animationOverride","keepScrollLocked","arguments","length","setParentDragging","lockScrollAtTop","_scrollBridge_setScrollEnabled","setScrollEnabled","setTimeout","_scrollBridge_setScrollEnabled2","_scrollBridge_setScrollEnabled1","panGesture","useMemo","Gesture","getGestureHandlerState","minY","gs","gesture","Pan","withRef","activeOffsetY","failOffsetX","shouldCancelWhenOutside","onBegin","pauseKeyboardHandler","pos","atTop","currentScrollY","y","initialPosition","onChange","event","translationY","isSwipingDown","deltaY","scrollY","currentPos","isCurrentlyAtTop","nodeIsScrolling","panHandles","hasScrollableContent","Math","max","lockTo","newPosition","paneY","velocityY","scrollLockY","snapPositions","snapMinY","velocity","projectedEnd","releaseConfig","getSheetReleasePosition","currentPosition","isWeb","onFinalize"],"sources":["../../src/useGestureHandlerPan.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -2,7 +2,8 @@ import { useEffect, useRef } from "react";
|
|
|
2
2
|
function useSheetScrollViewGestures({
|
|
3
3
|
scrollRef,
|
|
4
4
|
scrollBridge,
|
|
5
|
-
hasScrollableContent
|
|
5
|
+
hasScrollableContent,
|
|
6
|
+
onManualScroll
|
|
6
7
|
}) {
|
|
7
8
|
const state = useRef({
|
|
8
9
|
startY: 0,
|
|
@@ -13,6 +14,10 @@ function useSheetScrollViewGestures({
|
|
|
13
14
|
dys: [],
|
|
14
15
|
scrollYAtGestureStart: 0
|
|
15
16
|
});
|
|
17
|
+
const onManualScrollRef = useRef(onManualScroll);
|
|
18
|
+
useEffect(() => {
|
|
19
|
+
onManualScrollRef.current = onManualScroll;
|
|
20
|
+
}, [onManualScroll]);
|
|
16
21
|
useEffect(() => {
|
|
17
22
|
if (!scrollRef.current) return;
|
|
18
23
|
const controller = new AbortController();
|
|
@@ -29,6 +34,11 @@ function useSheetScrollViewGestures({
|
|
|
29
34
|
const enableScroll = () => {
|
|
30
35
|
node.style.overflowY = originalOverflow;
|
|
31
36
|
};
|
|
37
|
+
const setScrollTop = nextScrollY => {
|
|
38
|
+
if (node.scrollTop === nextScrollY) return;
|
|
39
|
+
node.scrollTop = nextScrollY;
|
|
40
|
+
onManualScrollRef.current?.(node, nextScrollY);
|
|
41
|
+
};
|
|
32
42
|
const handleTouchStart = e => {
|
|
33
43
|
const touch = e.touches[0];
|
|
34
44
|
if (!touch) return;
|
|
@@ -57,7 +67,7 @@ function useSheetScrollViewGestures({
|
|
|
57
67
|
if (dy === 0) return;
|
|
58
68
|
const isDraggingDown = dy > 0;
|
|
59
69
|
const currentScrollY = node.scrollTop;
|
|
60
|
-
const isPaneAtTop = scrollBridge.paneY <= scrollBridge.paneMinY + 5;
|
|
70
|
+
const isPaneAtTop = scrollBridge.isAtTop ?? scrollBridge.paneY <= scrollBridge.paneMinY + 5;
|
|
61
71
|
scrollBridge.y = currentScrollY;
|
|
62
72
|
let shouldPanOwn = false;
|
|
63
73
|
if (!isPaneAtTop) {
|
|
@@ -97,7 +107,7 @@ function useSheetScrollViewGestures({
|
|
|
97
107
|
const maxScrollY = node.scrollHeight - node.clientHeight;
|
|
98
108
|
const newScrollY = Math.max(0, Math.min(maxScrollY, currentScrollY + scrollDelta));
|
|
99
109
|
if (newScrollY !== currentScrollY) {
|
|
100
|
-
|
|
110
|
+
setScrollTop(newScrollY);
|
|
101
111
|
scrollBridge.y = newScrollY;
|
|
102
112
|
if (newScrollY > 0) scrollBridge.scrollStartY = -1;
|
|
103
113
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["useEffect","useRef","useSheetScrollViewGestures","scrollRef","scrollBridge","hasScrollableContent","state","startY","lastY","owner","hadPanOwner","panDragOffset","dys","scrollYAtGestureStart","current","controller","AbortController","node","getScrollableNode","style","overscrollBehavior","originalOverflow","disableScroll","overflowY","enableScroll","handleTouchStart","e","touch","touches","currentScrollY","
|
|
1
|
+
{"version":3,"names":["useEffect","useRef","useSheetScrollViewGestures","scrollRef","scrollBridge","hasScrollableContent","onManualScroll","state","startY","lastY","owner","hadPanOwner","panDragOffset","dys","scrollYAtGestureStart","onManualScrollRef","current","controller","AbortController","node","getScrollableNode","style","overscrollBehavior","originalOverflow","disableScroll","overflowY","enableScroll","setScrollTop","nextScrollY","scrollTop","handleTouchStart","e","touch","touches","currentScrollY","pageY","scrollStartY","scrollNodeTouched","handleTouchMove","s","dy","isDraggingDown","isPaneAtTop","isAtTop","paneY","paneMinY","y","shouldPanOwn","newOwner","startPanDrag","setParentDragging","scrollLock","cancelable","preventDefault","drag","push","length","slice","isTrusted","scrollDelta","maxScrollY","scrollHeight","clientHeight","newScrollY","Math","max","min","handleTouchEnd","vy","recentDys","dist","reduce","a","b","release","dragAt","snapToPosition","addEventListener","signal","passive","abort"],"sources":["../../src/useSheetScrollViewGestures.ts"],"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.
|
|
3
|
+
"version": "2.4.0",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"source": "src/index.ts",
|
|
6
6
|
"type": "module",
|
|
@@ -54,27 +54,27 @@
|
|
|
54
54
|
"clean": "tamagui-build clean"
|
|
55
55
|
},
|
|
56
56
|
"dependencies": {
|
|
57
|
-
"@tamagui/adapt": "2.
|
|
58
|
-
"@tamagui/animate-presence": "2.
|
|
59
|
-
"@tamagui/animations-react-native": "2.
|
|
60
|
-
"@tamagui/compose-refs": "2.
|
|
61
|
-
"@tamagui/constants": "2.
|
|
62
|
-
"@tamagui/core": "2.
|
|
63
|
-
"@tamagui/create-context": "2.
|
|
64
|
-
"@tamagui/helpers": "2.
|
|
65
|
-
"@tamagui/native": "2.
|
|
66
|
-
"@tamagui/portal": "2.
|
|
67
|
-
"@tamagui/remove-scroll": "2.
|
|
68
|
-
"@tamagui/scroll-view": "2.
|
|
69
|
-
"@tamagui/stacks": "2.
|
|
70
|
-
"@tamagui/use-constant": "2.
|
|
71
|
-
"@tamagui/use-controllable-state": "2.
|
|
72
|
-
"@tamagui/use-did-finish-ssr": "2.
|
|
73
|
-
"@tamagui/use-keyboard-visible": "2.
|
|
74
|
-
"@tamagui/z-index-stack": "2.
|
|
57
|
+
"@tamagui/adapt": "2.4.0",
|
|
58
|
+
"@tamagui/animate-presence": "2.4.0",
|
|
59
|
+
"@tamagui/animations-react-native": "2.4.0",
|
|
60
|
+
"@tamagui/compose-refs": "2.4.0",
|
|
61
|
+
"@tamagui/constants": "2.4.0",
|
|
62
|
+
"@tamagui/core": "2.4.0",
|
|
63
|
+
"@tamagui/create-context": "2.4.0",
|
|
64
|
+
"@tamagui/helpers": "2.4.0",
|
|
65
|
+
"@tamagui/native": "2.4.0",
|
|
66
|
+
"@tamagui/portal": "2.4.0",
|
|
67
|
+
"@tamagui/remove-scroll": "2.4.0",
|
|
68
|
+
"@tamagui/scroll-view": "2.4.0",
|
|
69
|
+
"@tamagui/stacks": "2.4.0",
|
|
70
|
+
"@tamagui/use-constant": "2.4.0",
|
|
71
|
+
"@tamagui/use-controllable-state": "2.4.0",
|
|
72
|
+
"@tamagui/use-did-finish-ssr": "2.4.0",
|
|
73
|
+
"@tamagui/use-keyboard-visible": "2.4.0",
|
|
74
|
+
"@tamagui/z-index-stack": "2.4.0"
|
|
75
75
|
},
|
|
76
76
|
"devDependencies": {
|
|
77
|
-
"@tamagui/build": "2.
|
|
77
|
+
"@tamagui/build": "2.4.0",
|
|
78
78
|
"react": ">=19",
|
|
79
79
|
"react-native": "0.83.2",
|
|
80
80
|
"react-native-gesture-handler": "~2.30.0",
|