react-native-screen-transitions 3.2.0 → 3.3.0-beta.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/README.md +1 -1
- package/lib/commonjs/shared/components/create-transition-aware-component.js +8 -2
- package/lib/commonjs/shared/components/create-transition-aware-component.js.map +1 -1
- package/lib/commonjs/shared/components/{root-transition-aware.js → screen-container.js} +28 -12
- package/lib/commonjs/shared/components/screen-container.js.map +1 -0
- package/lib/commonjs/shared/configs/presets.js +3 -3
- package/lib/commonjs/shared/configs/presets.js.map +1 -1
- package/lib/commonjs/shared/configs/specs.js +6 -1
- package/lib/commonjs/shared/configs/specs.js.map +1 -1
- package/lib/commonjs/shared/hooks/gestures/use-build-gestures.js +36 -188
- package/lib/commonjs/shared/hooks/gestures/use-build-gestures.js.map +1 -1
- package/lib/commonjs/shared/hooks/gestures/use-screen-gesture-handlers.js +334 -0
- package/lib/commonjs/shared/hooks/gestures/use-screen-gesture-handlers.js.map +1 -0
- package/lib/commonjs/shared/hooks/gestures/use-scroll-registry.js +47 -4
- package/lib/commonjs/shared/hooks/gestures/use-scroll-registry.js.map +1 -1
- package/lib/commonjs/shared/hooks/lifecycle/use-close-transition.js +3 -3
- package/lib/commonjs/shared/hooks/lifecycle/use-close-transition.js.map +1 -1
- package/lib/commonjs/shared/hooks/lifecycle/use-open-transition.js +25 -3
- package/lib/commonjs/shared/hooks/lifecycle/use-open-transition.js.map +1 -1
- package/lib/commonjs/shared/hooks/navigation/use-screen-state.js +61 -2
- package/lib/commonjs/shared/hooks/navigation/use-screen-state.js.map +1 -1
- package/lib/commonjs/shared/hooks/use-backdrop-pointer-events.js +32 -0
- package/lib/commonjs/shared/hooks/use-backdrop-pointer-events.js.map +1 -0
- package/lib/commonjs/shared/providers/gestures.provider.js +4 -2
- package/lib/commonjs/shared/providers/gestures.provider.js.map +1 -1
- package/lib/commonjs/shared/providers/screen/screen-composer.js +2 -2
- package/lib/commonjs/shared/providers/screen/screen-composer.js.map +1 -1
- package/lib/commonjs/shared/providers/screen/styles.provider.js +41 -32
- package/lib/commonjs/shared/providers/screen/styles.provider.js.map +1 -1
- package/lib/commonjs/shared/utils/animation/{start-screen-transition.js → animate-to-progress.js} +11 -7
- package/lib/commonjs/shared/utils/animation/animate-to-progress.js.map +1 -0
- package/lib/commonjs/shared/utils/gesture/check-gesture-activation.js +71 -0
- package/lib/commonjs/shared/utils/gesture/check-gesture-activation.js.map +1 -1
- package/lib/commonjs/shared/utils/gesture/determine-snap-target.js +56 -0
- package/lib/commonjs/shared/utils/gesture/determine-snap-target.js.map +1 -0
- package/lib/commonjs/shared/utils/gesture/validate-snap-points.js +31 -0
- package/lib/commonjs/shared/utils/gesture/validate-snap-points.js.map +1 -0
- package/lib/commonjs/shared/utils/gesture/velocity.js +11 -0
- package/lib/commonjs/shared/utils/gesture/velocity.js.map +1 -1
- package/lib/module/shared/components/create-transition-aware-component.js +8 -2
- package/lib/module/shared/components/create-transition-aware-component.js.map +1 -1
- package/lib/module/shared/components/screen-container.js +64 -0
- package/lib/module/shared/components/screen-container.js.map +1 -0
- package/lib/module/shared/configs/presets.js +3 -3
- package/lib/module/shared/configs/presets.js.map +1 -1
- package/lib/module/shared/configs/specs.js +5 -0
- package/lib/module/shared/configs/specs.js.map +1 -1
- package/lib/module/shared/hooks/gestures/use-build-gestures.js +36 -187
- package/lib/module/shared/hooks/gestures/use-build-gestures.js.map +1 -1
- package/lib/module/shared/hooks/gestures/use-screen-gesture-handlers.js +328 -0
- package/lib/module/shared/hooks/gestures/use-screen-gesture-handlers.js.map +1 -0
- package/lib/module/shared/hooks/gestures/use-scroll-registry.js +47 -4
- package/lib/module/shared/hooks/gestures/use-scroll-registry.js.map +1 -1
- package/lib/module/shared/hooks/lifecycle/use-close-transition.js +3 -3
- package/lib/module/shared/hooks/lifecycle/use-close-transition.js.map +1 -1
- package/lib/module/shared/hooks/lifecycle/use-open-transition.js +25 -3
- package/lib/module/shared/hooks/lifecycle/use-open-transition.js.map +1 -1
- package/lib/module/shared/hooks/navigation/use-screen-state.js +63 -4
- package/lib/module/shared/hooks/navigation/use-screen-state.js.map +1 -1
- package/lib/module/shared/hooks/use-backdrop-pointer-events.js +28 -0
- package/lib/module/shared/hooks/use-backdrop-pointer-events.js.map +1 -0
- package/lib/module/shared/providers/gestures.provider.js +4 -2
- package/lib/module/shared/providers/gestures.provider.js.map +1 -1
- package/lib/module/shared/providers/screen/screen-composer.js +2 -2
- package/lib/module/shared/providers/screen/screen-composer.js.map +1 -1
- package/lib/module/shared/providers/screen/styles.provider.js +41 -32
- package/lib/module/shared/providers/screen/styles.provider.js.map +1 -1
- package/lib/module/shared/utils/animation/{start-screen-transition.js → animate-to-progress.js} +9 -5
- package/lib/module/shared/utils/animation/animate-to-progress.js.map +1 -0
- package/lib/module/shared/utils/gesture/check-gesture-activation.js +70 -0
- package/lib/module/shared/utils/gesture/check-gesture-activation.js.map +1 -1
- package/lib/module/shared/utils/gesture/determine-snap-target.js +52 -0
- package/lib/module/shared/utils/gesture/determine-snap-target.js.map +1 -0
- package/lib/module/shared/utils/gesture/validate-snap-points.js +26 -0
- package/lib/module/shared/utils/gesture/validate-snap-points.js.map +1 -0
- package/lib/module/shared/utils/gesture/velocity.js +11 -0
- package/lib/module/shared/utils/gesture/velocity.js.map +1 -1
- package/lib/typescript/shared/components/create-transition-aware-component.d.ts.map +1 -1
- package/lib/typescript/shared/components/screen-container.d.ts +6 -0
- package/lib/typescript/shared/components/screen-container.d.ts.map +1 -0
- package/lib/typescript/shared/configs/specs.d.ts +1 -0
- package/lib/typescript/shared/configs/specs.d.ts.map +1 -1
- package/lib/typescript/shared/hooks/gestures/use-build-gestures.d.ts +1 -1
- package/lib/typescript/shared/hooks/gestures/use-build-gestures.d.ts.map +1 -1
- package/lib/typescript/shared/hooks/gestures/use-screen-gesture-handlers.d.ts +34 -0
- package/lib/typescript/shared/hooks/gestures/use-screen-gesture-handlers.d.ts.map +1 -0
- package/lib/typescript/shared/hooks/gestures/use-scroll-registry.d.ts +5 -1
- package/lib/typescript/shared/hooks/gestures/use-scroll-registry.d.ts.map +1 -1
- package/lib/typescript/shared/hooks/lifecycle/use-open-transition.d.ts.map +1 -1
- package/lib/typescript/shared/hooks/navigation/use-screen-state.d.ts +14 -0
- package/lib/typescript/shared/hooks/navigation/use-screen-state.d.ts.map +1 -1
- package/lib/typescript/shared/hooks/use-backdrop-pointer-events.d.ts +15 -0
- package/lib/typescript/shared/hooks/use-backdrop-pointer-events.d.ts.map +1 -0
- package/lib/typescript/shared/providers/gestures.provider.d.ts +1 -0
- package/lib/typescript/shared/providers/gestures.provider.d.ts.map +1 -1
- package/lib/typescript/shared/providers/screen/styles.provider.d.ts.map +1 -1
- package/lib/typescript/shared/types/animation.types.d.ts +28 -2
- package/lib/typescript/shared/types/animation.types.d.ts.map +1 -1
- package/lib/typescript/shared/types/screen.types.d.ts +26 -0
- package/lib/typescript/shared/types/screen.types.d.ts.map +1 -1
- package/lib/typescript/shared/utils/animation/animate-to-progress.d.ts +19 -0
- package/lib/typescript/shared/utils/animation/animate-to-progress.d.ts.map +1 -0
- package/lib/typescript/shared/utils/gesture/check-gesture-activation.d.ts +24 -0
- package/lib/typescript/shared/utils/gesture/check-gesture-activation.d.ts.map +1 -1
- package/lib/typescript/shared/utils/gesture/determine-snap-target.d.ts +26 -0
- package/lib/typescript/shared/utils/gesture/determine-snap-target.d.ts.map +1 -0
- package/lib/typescript/shared/utils/gesture/validate-snap-points.d.ts +13 -0
- package/lib/typescript/shared/utils/gesture/validate-snap-points.d.ts.map +1 -0
- package/lib/typescript/shared/utils/gesture/velocity.d.ts +1 -0
- package/lib/typescript/shared/utils/gesture/velocity.d.ts.map +1 -1
- package/package.json +29 -2
- package/src/shared/__tests__/determine-snap-target.test.ts +268 -0
- package/src/shared/__tests__/gesture-activation.test.ts +247 -0
- package/src/shared/__tests__/validate-snap-points.test.ts +125 -0
- package/src/shared/components/create-transition-aware-component.tsx +11 -1
- package/src/shared/components/screen-container.tsx +65 -0
- package/src/shared/configs/presets.ts +3 -3
- package/src/shared/configs/specs.ts +6 -0
- package/src/shared/hooks/gestures/use-build-gestures.tsx +33 -253
- package/src/shared/hooks/gestures/use-screen-gesture-handlers.ts +436 -0
- package/src/shared/hooks/gestures/use-scroll-registry.tsx +52 -1
- package/src/shared/hooks/lifecycle/use-close-transition.ts +3 -3
- package/src/shared/hooks/lifecycle/use-open-transition.ts +27 -3
- package/src/shared/hooks/navigation/use-screen-state.tsx +106 -2
- package/src/shared/hooks/use-backdrop-pointer-events.ts +32 -0
- package/src/shared/providers/gestures.provider.tsx +3 -2
- package/src/shared/providers/screen/screen-composer.tsx +2 -2
- package/src/shared/providers/screen/styles.provider.tsx +40 -34
- package/src/shared/types/animation.types.ts +29 -2
- package/src/shared/types/screen.types.ts +29 -0
- package/src/shared/utils/animation/{start-screen-transition.ts → animate-to-progress.ts} +19 -7
- package/src/shared/utils/gesture/check-gesture-activation.ts +78 -0
- package/src/shared/utils/gesture/determine-snap-target.ts +75 -0
- package/src/shared/utils/gesture/validate-snap-points.ts +37 -0
- package/src/shared/utils/gesture/velocity.ts +10 -0
- package/lib/commonjs/shared/components/root-transition-aware.js.map +0 -1
- package/lib/commonjs/shared/hooks/use-stack-pointer-events.js +0 -23
- package/lib/commonjs/shared/hooks/use-stack-pointer-events.js.map +0 -1
- package/lib/commonjs/shared/utils/animation/start-screen-transition.js.map +0 -1
- package/lib/module/shared/components/root-transition-aware.js +0 -48
- package/lib/module/shared/components/root-transition-aware.js.map +0 -1
- package/lib/module/shared/hooks/use-stack-pointer-events.js +0 -20
- package/lib/module/shared/hooks/use-stack-pointer-events.js.map +0 -1
- package/lib/module/shared/utils/animation/start-screen-transition.js.map +0 -1
- package/lib/typescript/shared/components/root-transition-aware.d.ts +0 -6
- package/lib/typescript/shared/components/root-transition-aware.d.ts.map +0 -1
- package/lib/typescript/shared/hooks/use-stack-pointer-events.d.ts +0 -10
- package/lib/typescript/shared/hooks/use-stack-pointer-events.d.ts.map +0 -1
- package/lib/typescript/shared/utils/animation/start-screen-transition.d.ts +0 -13
- package/lib/typescript/shared/utils/animation/start-screen-transition.d.ts.map +0 -1
- package/src/shared/components/root-transition-aware.tsx +0 -49
- package/src/shared/hooks/use-stack-pointer-events.ts +0 -15
|
@@ -0,0 +1,334 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports.useScreenGestureHandlers = void 0;
|
|
7
|
+
var _react = require("react");
|
|
8
|
+
var _reactNativeReanimated = require("react-native-reanimated");
|
|
9
|
+
var _specs = require("../../configs/specs");
|
|
10
|
+
var _constants = require("../../constants");
|
|
11
|
+
var _gesture = require("../../types/gesture.types");
|
|
12
|
+
var _animateToProgress = require("../../utils/animation/animate-to-progress");
|
|
13
|
+
var _checkGestureActivation = require("../../utils/gesture/check-gesture-activation");
|
|
14
|
+
var _determineDismissal = require("../../utils/gesture/determine-dismissal");
|
|
15
|
+
var _determineSnapTarget = require("../../utils/gesture/determine-snap-target");
|
|
16
|
+
var _mapGestureToProgress = require("../../utils/gesture/map-gesture-to-progress");
|
|
17
|
+
var _resetGestureValues = require("../../utils/gesture/reset-gesture-values");
|
|
18
|
+
var _validateSnapPoints = require("../../utils/gesture/validate-snap-points");
|
|
19
|
+
var _velocity = require("../../utils/gesture/velocity");
|
|
20
|
+
var _useStableCallbackValue = _interopRequireDefault(require("../use-stable-callback-value"));
|
|
21
|
+
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
|
22
|
+
const useScreenGestureHandlers = ({
|
|
23
|
+
dimensions,
|
|
24
|
+
animations,
|
|
25
|
+
gestureAnimationValues,
|
|
26
|
+
gestureDirection,
|
|
27
|
+
gestureDrivesProgress,
|
|
28
|
+
gestureVelocityImpact,
|
|
29
|
+
scrollConfig,
|
|
30
|
+
gestureActivationArea,
|
|
31
|
+
gestureResponseDistance,
|
|
32
|
+
ancestorIsDismissing,
|
|
33
|
+
snapPoints: rawSnapPoints,
|
|
34
|
+
canDismiss,
|
|
35
|
+
transitionSpec,
|
|
36
|
+
handleDismiss
|
|
37
|
+
}) => {
|
|
38
|
+
const {
|
|
39
|
+
hasSnapPoints,
|
|
40
|
+
snapPoints,
|
|
41
|
+
minSnapPoint,
|
|
42
|
+
maxSnapPoint
|
|
43
|
+
} = (0, _react.useMemo)(() => (0, _validateSnapPoints.validateSnapPoints)({
|
|
44
|
+
snapPoints: rawSnapPoints,
|
|
45
|
+
canDismiss
|
|
46
|
+
}), [rawSnapPoints, canDismiss]);
|
|
47
|
+
const directions = (0, _react.useMemo)(() => {
|
|
48
|
+
const directionsArray = Array.isArray(gestureDirection) ? gestureDirection : [gestureDirection];
|
|
49
|
+
const isBidirectional = directionsArray.includes("bidirectional");
|
|
50
|
+
const hasHorizontalDirection = directionsArray.includes("horizontal") || directionsArray.includes("horizontal-inverted");
|
|
51
|
+
const isSnapAxisInverted = hasHorizontalDirection ? directionsArray.includes("horizontal-inverted") && !directionsArray.includes("horizontal") : directionsArray.includes("vertical-inverted") && !directionsArray.includes("vertical");
|
|
52
|
+
const enableBothVertical = isBidirectional || hasSnapPoints && !hasHorizontalDirection;
|
|
53
|
+
const enableBothHorizontal = isBidirectional || hasSnapPoints && hasHorizontalDirection;
|
|
54
|
+
return {
|
|
55
|
+
vertical: directionsArray.includes("vertical") || enableBothVertical,
|
|
56
|
+
verticalInverted: directionsArray.includes("vertical-inverted") || enableBothVertical,
|
|
57
|
+
horizontal: directionsArray.includes("horizontal") || enableBothHorizontal,
|
|
58
|
+
horizontalInverted: directionsArray.includes("horizontal-inverted") || enableBothHorizontal,
|
|
59
|
+
snapAxisInverted: hasSnapPoints && isSnapAxisInverted
|
|
60
|
+
};
|
|
61
|
+
}, [gestureDirection, hasSnapPoints]);
|
|
62
|
+
const snapAxis = directions.horizontal || directions.horizontalInverted ? "horizontal" : "vertical";
|
|
63
|
+
const initialTouch = (0, _reactNativeReanimated.useSharedValue)({
|
|
64
|
+
x: 0,
|
|
65
|
+
y: 0
|
|
66
|
+
});
|
|
67
|
+
const gestureOffsetState = (0, _reactNativeReanimated.useSharedValue)(_gesture.GestureOffsetState.PENDING);
|
|
68
|
+
const gestureStartProgress = (0, _reactNativeReanimated.useSharedValue)(1);
|
|
69
|
+
const onTouchesDown = (0, _useStableCallbackValue.default)(e => {
|
|
70
|
+
"worklet";
|
|
71
|
+
|
|
72
|
+
const firstTouch = e.changedTouches[0];
|
|
73
|
+
initialTouch.value = {
|
|
74
|
+
x: firstTouch.x,
|
|
75
|
+
y: firstTouch.y
|
|
76
|
+
};
|
|
77
|
+
gestureOffsetState.value = _gesture.GestureOffsetState.PENDING;
|
|
78
|
+
});
|
|
79
|
+
const onTouchesMove = (0, _useStableCallbackValue.default)((e, manager) => {
|
|
80
|
+
"worklet";
|
|
81
|
+
|
|
82
|
+
// If an ancestor navigator is already dismissing via gesture, block new gestures here.
|
|
83
|
+
if (ancestorIsDismissing?.value) {
|
|
84
|
+
gestureOffsetState.set(_gesture.GestureOffsetState.FAILED);
|
|
85
|
+
manager.fail();
|
|
86
|
+
return;
|
|
87
|
+
}
|
|
88
|
+
const touch = e.changedTouches[0];
|
|
89
|
+
const {
|
|
90
|
+
isSwipingDown,
|
|
91
|
+
isSwipingUp,
|
|
92
|
+
isSwipingRight,
|
|
93
|
+
isSwipingLeft
|
|
94
|
+
} = (0, _checkGestureActivation.applyOffsetRules)({
|
|
95
|
+
touch,
|
|
96
|
+
directions,
|
|
97
|
+
manager,
|
|
98
|
+
dimensions,
|
|
99
|
+
gestureOffsetState,
|
|
100
|
+
initialTouch: initialTouch.value,
|
|
101
|
+
activationArea: gestureActivationArea,
|
|
102
|
+
responseDistance: gestureResponseDistance
|
|
103
|
+
});
|
|
104
|
+
if (gestureOffsetState.value === _gesture.GestureOffsetState.FAILED) {
|
|
105
|
+
manager.fail();
|
|
106
|
+
return;
|
|
107
|
+
}
|
|
108
|
+
|
|
109
|
+
// Keep pending until thresholds are met; no eager activation.
|
|
110
|
+
if (gestureAnimationValues.isDragging?.value) {
|
|
111
|
+
manager.activate();
|
|
112
|
+
return;
|
|
113
|
+
}
|
|
114
|
+
const recognizedDirection = isSwipingDown || isSwipingUp || isSwipingRight || isSwipingLeft;
|
|
115
|
+
const scrollCfg = scrollConfig.value;
|
|
116
|
+
const isTouchingScrollView = scrollCfg?.isTouched ?? false;
|
|
117
|
+
if (!isTouchingScrollView) {
|
|
118
|
+
// Early return if gesture hasn't met activation criteria
|
|
119
|
+
const canActivate = recognizedDirection && gestureOffsetState.value === _gesture.GestureOffsetState.PASSED && !gestureAnimationValues.isDismissing?.value;
|
|
120
|
+
if (!canActivate) {
|
|
121
|
+
return;
|
|
122
|
+
}
|
|
123
|
+
if (isSwipingDown) {
|
|
124
|
+
gestureAnimationValues.direction.set("vertical");
|
|
125
|
+
} else if (isSwipingUp) {
|
|
126
|
+
gestureAnimationValues.direction.set("vertical-inverted");
|
|
127
|
+
} else if (isSwipingRight) {
|
|
128
|
+
gestureAnimationValues.direction.set("horizontal");
|
|
129
|
+
} else if (isSwipingLeft) {
|
|
130
|
+
gestureAnimationValues.direction.set("horizontal-inverted");
|
|
131
|
+
}
|
|
132
|
+
manager.activate();
|
|
133
|
+
return;
|
|
134
|
+
}
|
|
135
|
+
|
|
136
|
+
// Touch IS on ScrollView - apply scroll-aware rules
|
|
137
|
+
const scrollX = scrollCfg?.x ?? 0;
|
|
138
|
+
const scrollY = scrollCfg?.y ?? 0;
|
|
139
|
+
const maxScrollX = scrollCfg?.contentWidth ? scrollCfg.contentWidth - scrollCfg.layoutWidth : 0;
|
|
140
|
+
const maxScrollY = scrollCfg?.contentHeight ? scrollCfg.contentHeight - scrollCfg.layoutHeight : 0;
|
|
141
|
+
|
|
142
|
+
// Snap mode: determine if sheet can still expand
|
|
143
|
+
const canExpandMore = hasSnapPoints && animations.progress.value < maxSnapPoint - 0.01;
|
|
144
|
+
const {
|
|
145
|
+
shouldActivate,
|
|
146
|
+
direction: activatedDirection
|
|
147
|
+
} = (0, _checkGestureActivation.checkScrollAwareActivation)({
|
|
148
|
+
swipeInfo: {
|
|
149
|
+
isSwipingDown,
|
|
150
|
+
isSwipingUp,
|
|
151
|
+
isSwipingRight,
|
|
152
|
+
isSwipingLeft
|
|
153
|
+
},
|
|
154
|
+
directions,
|
|
155
|
+
scrollX,
|
|
156
|
+
scrollY,
|
|
157
|
+
maxScrollX,
|
|
158
|
+
maxScrollY,
|
|
159
|
+
hasSnapPoints,
|
|
160
|
+
canExpandMore
|
|
161
|
+
});
|
|
162
|
+
if (recognizedDirection && !shouldActivate) {
|
|
163
|
+
manager.fail();
|
|
164
|
+
return;
|
|
165
|
+
}
|
|
166
|
+
if (shouldActivate && gestureOffsetState.value === _gesture.GestureOffsetState.PASSED && !gestureAnimationValues.isDismissing?.value) {
|
|
167
|
+
gestureAnimationValues.direction.value = activatedDirection;
|
|
168
|
+
manager.activate();
|
|
169
|
+
return;
|
|
170
|
+
}
|
|
171
|
+
});
|
|
172
|
+
const onStart = (0, _useStableCallbackValue.default)(() => {
|
|
173
|
+
"worklet";
|
|
174
|
+
|
|
175
|
+
gestureAnimationValues.isDragging.value = _constants.TRUE;
|
|
176
|
+
gestureAnimationValues.isDismissing.value = _constants.FALSE;
|
|
177
|
+
gestureStartProgress.value = animations.progress.value;
|
|
178
|
+
});
|
|
179
|
+
const onUpdate = (0, _useStableCallbackValue.default)(event => {
|
|
180
|
+
"worklet";
|
|
181
|
+
|
|
182
|
+
const {
|
|
183
|
+
translationX,
|
|
184
|
+
translationY
|
|
185
|
+
} = event;
|
|
186
|
+
const {
|
|
187
|
+
width,
|
|
188
|
+
height
|
|
189
|
+
} = dimensions;
|
|
190
|
+
|
|
191
|
+
// Update gesture values (shared across all modes)
|
|
192
|
+
gestureAnimationValues.x.value = translationX;
|
|
193
|
+
gestureAnimationValues.y.value = translationY;
|
|
194
|
+
gestureAnimationValues.normalizedX.value = _velocity.velocity.normalizeTranslation(translationX, width);
|
|
195
|
+
gestureAnimationValues.normalizedY.value = _velocity.velocity.normalizeTranslation(translationY, height);
|
|
196
|
+
if (hasSnapPoints && gestureDrivesProgress) {
|
|
197
|
+
// Snap mode: bidirectional tracking on snap axis
|
|
198
|
+
const isHorizontal = snapAxis === "horizontal";
|
|
199
|
+
const translation = isHorizontal ? translationX : translationY;
|
|
200
|
+
const dimension = isHorizontal ? width : height;
|
|
201
|
+
|
|
202
|
+
// Map translation to progress delta:
|
|
203
|
+
// - Positive translation (down/right) = decrease progress (dismiss)
|
|
204
|
+
// - Negative translation (up/left) = increase progress (expand)
|
|
205
|
+
// Inverted directions flip this behavior
|
|
206
|
+
const baseSign = -1;
|
|
207
|
+
const sign = directions.snapAxisInverted ? -baseSign : baseSign;
|
|
208
|
+
const progressDelta = sign * translation / dimension;
|
|
209
|
+
|
|
210
|
+
// Use pre-computed bounds (minSnapPoint already accounts for canDismiss)
|
|
211
|
+
animations.progress.value = Math.max(minSnapPoint, Math.min(maxSnapPoint, gestureStartProgress.value + progressDelta));
|
|
212
|
+
} else if (gestureDrivesProgress) {
|
|
213
|
+
// Standard mode: find max progress across allowed directions
|
|
214
|
+
const axes = [{
|
|
215
|
+
enabled: directions.horizontal,
|
|
216
|
+
translation: translationX,
|
|
217
|
+
dimension: width,
|
|
218
|
+
sign: 1
|
|
219
|
+
}, {
|
|
220
|
+
enabled: directions.horizontalInverted,
|
|
221
|
+
translation: translationX,
|
|
222
|
+
dimension: width,
|
|
223
|
+
sign: -1
|
|
224
|
+
}, {
|
|
225
|
+
enabled: directions.vertical,
|
|
226
|
+
translation: translationY,
|
|
227
|
+
dimension: height,
|
|
228
|
+
sign: 1
|
|
229
|
+
}, {
|
|
230
|
+
enabled: directions.verticalInverted,
|
|
231
|
+
translation: translationY,
|
|
232
|
+
dimension: height,
|
|
233
|
+
sign: -1
|
|
234
|
+
}];
|
|
235
|
+
let maxProgress = 0;
|
|
236
|
+
for (const axis of axes) {
|
|
237
|
+
if (axis.enabled && axis.translation * axis.sign > 0) {
|
|
238
|
+
const progress = (0, _mapGestureToProgress.mapGestureToProgress)(Math.abs(axis.translation), axis.dimension);
|
|
239
|
+
maxProgress = Math.max(maxProgress, progress);
|
|
240
|
+
}
|
|
241
|
+
}
|
|
242
|
+
animations.progress.value = Math.max(0, Math.min(1, gestureStartProgress.value - maxProgress));
|
|
243
|
+
}
|
|
244
|
+
});
|
|
245
|
+
const onEnd = (0, _useStableCallbackValue.default)(event => {
|
|
246
|
+
"worklet";
|
|
247
|
+
|
|
248
|
+
if (hasSnapPoints) {
|
|
249
|
+
const isHorizontal = snapAxis === "horizontal";
|
|
250
|
+
const axisVelocity = isHorizontal ? event.velocityX : event.velocityY;
|
|
251
|
+
const axisDimension = isHorizontal ? dimensions.width : dimensions.height;
|
|
252
|
+
|
|
253
|
+
// determineSnapTarget expects positive velocity = toward dismiss (decreasing progress)
|
|
254
|
+
// Positive velocity (down/right) = dismiss for non-inverted
|
|
255
|
+
// Inverted directions need velocity flipped
|
|
256
|
+
const snapVelocity = directions.snapAxisInverted ? -axisVelocity : axisVelocity;
|
|
257
|
+
const result = (0, _determineSnapTarget.determineSnapTarget)({
|
|
258
|
+
currentProgress: animations.progress.value,
|
|
259
|
+
snapPoints,
|
|
260
|
+
velocity: snapVelocity,
|
|
261
|
+
dimension: axisDimension,
|
|
262
|
+
canDismiss: canDismiss
|
|
263
|
+
});
|
|
264
|
+
const shouldDismiss = result.shouldDismiss;
|
|
265
|
+
const targetProgress = result.targetProgress;
|
|
266
|
+
const isSnapping = !shouldDismiss;
|
|
267
|
+
const spec = shouldDismiss ? transitionSpec?.close : transitionSpec?.open;
|
|
268
|
+
const effectiveSpec = isSnapping ? {
|
|
269
|
+
open: transitionSpec?.expand ?? _specs.DefaultSnapSpec,
|
|
270
|
+
close: transitionSpec?.collapse ?? _specs.DefaultSnapSpec
|
|
271
|
+
} : transitionSpec;
|
|
272
|
+
(0, _resetGestureValues.resetGestureValues)({
|
|
273
|
+
spec,
|
|
274
|
+
gestures: gestureAnimationValues,
|
|
275
|
+
shouldDismiss,
|
|
276
|
+
event,
|
|
277
|
+
dimensions
|
|
278
|
+
});
|
|
279
|
+
|
|
280
|
+
// For snap transitions, velocity should match gesture direction
|
|
281
|
+
// Positive gesture velocity (down/right) = collapsing (negative progress velocity)
|
|
282
|
+
// Inverted directions flip this
|
|
283
|
+
const velocitySign = directions.snapAxisInverted ? 1 : -1;
|
|
284
|
+
const initialVelocity = velocitySign * _velocity.velocity.normalize(axisVelocity, axisDimension);
|
|
285
|
+
(0, _animateToProgress.animateToProgress)({
|
|
286
|
+
target: targetProgress,
|
|
287
|
+
onAnimationFinish: shouldDismiss ? handleDismiss : undefined,
|
|
288
|
+
spec: effectiveSpec,
|
|
289
|
+
animations,
|
|
290
|
+
initialVelocity
|
|
291
|
+
});
|
|
292
|
+
} else {
|
|
293
|
+
// Standard mode: use determineDismissal
|
|
294
|
+
const result = (0, _determineDismissal.determineDismissal)({
|
|
295
|
+
event,
|
|
296
|
+
directions,
|
|
297
|
+
dimensions,
|
|
298
|
+
gestureVelocityImpact
|
|
299
|
+
});
|
|
300
|
+
const shouldDismiss = result.shouldDismiss;
|
|
301
|
+
const targetProgress = shouldDismiss ? 0 : gestureStartProgress.value;
|
|
302
|
+
(0, _resetGestureValues.resetGestureValues)({
|
|
303
|
+
spec: shouldDismiss ? transitionSpec?.close : transitionSpec?.open,
|
|
304
|
+
gestures: gestureAnimationValues,
|
|
305
|
+
shouldDismiss,
|
|
306
|
+
event,
|
|
307
|
+
dimensions
|
|
308
|
+
});
|
|
309
|
+
const initialVelocity = _velocity.velocity.calculateProgressVelocity({
|
|
310
|
+
animations,
|
|
311
|
+
shouldDismiss,
|
|
312
|
+
event,
|
|
313
|
+
dimensions,
|
|
314
|
+
directions
|
|
315
|
+
});
|
|
316
|
+
(0, _animateToProgress.animateToProgress)({
|
|
317
|
+
target: targetProgress,
|
|
318
|
+
onAnimationFinish: shouldDismiss ? handleDismiss : undefined,
|
|
319
|
+
spec: transitionSpec,
|
|
320
|
+
animations,
|
|
321
|
+
initialVelocity
|
|
322
|
+
});
|
|
323
|
+
}
|
|
324
|
+
});
|
|
325
|
+
return {
|
|
326
|
+
onTouchesDown,
|
|
327
|
+
onTouchesMove,
|
|
328
|
+
onStart,
|
|
329
|
+
onUpdate,
|
|
330
|
+
onEnd
|
|
331
|
+
};
|
|
332
|
+
};
|
|
333
|
+
exports.useScreenGestureHandlers = useScreenGestureHandlers;
|
|
334
|
+
//# sourceMappingURL=use-screen-gesture-handlers.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"names":["_react","require","_reactNativeReanimated","_specs","_constants","_gesture","_animateToProgress","_checkGestureActivation","_determineDismissal","_determineSnapTarget","_mapGestureToProgress","_resetGestureValues","_validateSnapPoints","_velocity","_useStableCallbackValue","_interopRequireDefault","e","__esModule","default","useScreenGestureHandlers","dimensions","animations","gestureAnimationValues","gestureDirection","gestureDrivesProgress","gestureVelocityImpact","scrollConfig","gestureActivationArea","gestureResponseDistance","ancestorIsDismissing","snapPoints","rawSnapPoints","canDismiss","transitionSpec","handleDismiss","hasSnapPoints","minSnapPoint","maxSnapPoint","useMemo","validateSnapPoints","directions","directionsArray","Array","isArray","isBidirectional","includes","hasHorizontalDirection","isSnapAxisInverted","enableBothVertical","enableBothHorizontal","vertical","verticalInverted","horizontal","horizontalInverted","snapAxisInverted","snapAxis","initialTouch","useSharedValue","x","y","gestureOffsetState","GestureOffsetState","PENDING","gestureStartProgress","onTouchesDown","useStableCallbackValue","firstTouch","changedTouches","value","onTouchesMove","manager","set","FAILED","fail","touch","isSwipingDown","isSwipingUp","isSwipingRight","isSwipingLeft","applyOffsetRules","activationArea","responseDistance","isDragging","activate","recognizedDirection","scrollCfg","isTouchingScrollView","isTouched","canActivate","PASSED","isDismissing","direction","scrollX","scrollY","maxScrollX","contentWidth","layoutWidth","maxScrollY","contentHeight","layoutHeight","canExpandMore","progress","shouldActivate","activatedDirection","checkScrollAwareActivation","swipeInfo","onStart","TRUE","FALSE","onUpdate","event","translationX","translationY","width","height","normalizedX","velocity","normalizeTranslation","normalizedY","isHorizontal","translation","dimension","baseSign","sign","progressDelta","Math","max","min","axes","enabled","maxProgress","axis","mapGestureToProgress","abs","onEnd","axisVelocity","velocityX","velocityY","axisDimension","snapVelocity","result","determineSnapTarget","currentProgress","shouldDismiss","targetProgress","isSnapping","spec","close","open","effectiveSpec","expand","DefaultSnapSpec","collapse","resetGestureValues","gestures","velocitySign","initialVelocity","normalize","animateToProgress","target","onAnimationFinish","undefined","determineDismissal","calculateProgressVelocity","exports"],"sourceRoot":"../../../../../src","sources":["shared/hooks/gestures/use-screen-gesture-handlers.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -41,7 +41,8 @@ const useScrollRegistry = props => {
|
|
|
41
41
|
contentHeight: 0,
|
|
42
42
|
contentWidth: 0,
|
|
43
43
|
layoutHeight: 0,
|
|
44
|
-
layoutWidth: 0
|
|
44
|
+
layoutWidth: 0,
|
|
45
|
+
isTouched: true
|
|
45
46
|
};
|
|
46
47
|
}
|
|
47
48
|
v.x = event.contentOffset.x;
|
|
@@ -68,7 +69,8 @@ const useScrollRegistry = props => {
|
|
|
68
69
|
layoutHeight: 0,
|
|
69
70
|
layoutWidth: 0,
|
|
70
71
|
contentWidth: width,
|
|
71
|
-
contentHeight: height
|
|
72
|
+
contentHeight: height,
|
|
73
|
+
isTouched: false
|
|
72
74
|
};
|
|
73
75
|
}
|
|
74
76
|
v.contentWidth = width;
|
|
@@ -96,7 +98,8 @@ const useScrollRegistry = props => {
|
|
|
96
98
|
contentHeight: 0,
|
|
97
99
|
contentWidth: 0,
|
|
98
100
|
layoutHeight: height,
|
|
99
|
-
layoutWidth: width
|
|
101
|
+
layoutWidth: width,
|
|
102
|
+
isTouched: false
|
|
100
103
|
};
|
|
101
104
|
}
|
|
102
105
|
v.layoutHeight = height;
|
|
@@ -108,10 +111,50 @@ const useScrollRegistry = props => {
|
|
|
108
111
|
ancestorConfig.modify(updateLayout);
|
|
109
112
|
}
|
|
110
113
|
});
|
|
114
|
+
const onTouchStart = (0, _useStableCallback.default)(event => {
|
|
115
|
+
props.onTouchStart?.(event);
|
|
116
|
+
const setTouched = v => {
|
|
117
|
+
"worklet";
|
|
118
|
+
|
|
119
|
+
if (v === null) {
|
|
120
|
+
return {
|
|
121
|
+
x: 0,
|
|
122
|
+
y: 0,
|
|
123
|
+
contentHeight: 0,
|
|
124
|
+
contentWidth: 0,
|
|
125
|
+
layoutHeight: 0,
|
|
126
|
+
layoutWidth: 0,
|
|
127
|
+
isTouched: true
|
|
128
|
+
};
|
|
129
|
+
}
|
|
130
|
+
v.isTouched = true;
|
|
131
|
+
return v;
|
|
132
|
+
};
|
|
133
|
+
scrollConfig.modify(setTouched);
|
|
134
|
+
for (const ancestorConfig of ancestorScrollConfigs) {
|
|
135
|
+
ancestorConfig.modify(setTouched);
|
|
136
|
+
}
|
|
137
|
+
});
|
|
138
|
+
const onTouchEnd = (0, _useStableCallback.default)(event => {
|
|
139
|
+
props.onTouchEnd?.(event);
|
|
140
|
+
const clearTouched = v => {
|
|
141
|
+
"worklet";
|
|
142
|
+
|
|
143
|
+
if (v === null) return v;
|
|
144
|
+
v.isTouched = false;
|
|
145
|
+
return v;
|
|
146
|
+
};
|
|
147
|
+
scrollConfig.modify(clearTouched);
|
|
148
|
+
for (const ancestorConfig of ancestorScrollConfigs) {
|
|
149
|
+
ancestorConfig.modify(clearTouched);
|
|
150
|
+
}
|
|
151
|
+
});
|
|
111
152
|
return {
|
|
112
153
|
scrollHandler,
|
|
113
154
|
onContentSizeChange,
|
|
114
|
-
onLayout
|
|
155
|
+
onLayout,
|
|
156
|
+
onTouchStart,
|
|
157
|
+
onTouchEnd
|
|
115
158
|
};
|
|
116
159
|
};
|
|
117
160
|
exports.useScrollRegistry = useScrollRegistry;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_react","require","_reactNativeReanimated","_gestures","_useStableCallback","_interopRequireDefault","e","__esModule","default","useScrollRegistry","props","context","useGestureContext","scrollConfig","ancestorContext","ancestorScrollConfigs","useMemo","configs","current","push","scrollHandler","useAnimatedScrollHandler","onScroll","event","updateScrollPosition","v","x","contentOffset","y","contentHeight","contentWidth","layoutHeight","layoutWidth","modify","ancestorConfig","onContentSizeChange","useStableCallback","width","height","updateContentSize","onLayout","nativeEvent","layout","updateLayout","exports"],"sourceRoot":"../../../../../src","sources":["shared/hooks/gestures/use-scroll-registry.tsx"],"mappings":";;;;;;AAEA,IAAAA,MAAA,GAAAC,OAAA;AAEA,IAAAC,sBAAA,GAAAD,OAAA;AAEA,IAAAE,SAAA,GAAAF,OAAA;AACA,IAAAG,kBAAA,GAAAC,sBAAA,CAAAJ,OAAA;AAAuD,SAAAI,uBAAAC,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAPvD;;
|
|
1
|
+
{"version":3,"names":["_react","require","_reactNativeReanimated","_gestures","_useStableCallback","_interopRequireDefault","e","__esModule","default","useScrollRegistry","props","context","useGestureContext","scrollConfig","ancestorContext","ancestorScrollConfigs","useMemo","configs","current","push","scrollHandler","useAnimatedScrollHandler","onScroll","event","updateScrollPosition","v","x","contentOffset","y","contentHeight","contentWidth","layoutHeight","layoutWidth","isTouched","modify","ancestorConfig","onContentSizeChange","useStableCallback","width","height","updateContentSize","onLayout","nativeEvent","layout","updateLayout","onTouchStart","setTouched","onTouchEnd","clearTouched","exports"],"sourceRoot":"../../../../../src","sources":["shared/hooks/gestures/use-scroll-registry.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -10,7 +10,7 @@ var _gestures = require("../../providers/gestures.provider");
|
|
|
10
10
|
var _core = require("../../providers/stack/core.provider");
|
|
11
11
|
var _managed = require("../../providers/stack/managed.provider");
|
|
12
12
|
var _stack = require("../../types/stack.types");
|
|
13
|
-
var
|
|
13
|
+
var _animateToProgress = require("../../utils/animation/animate-to-progress");
|
|
14
14
|
var _resetStoresForScreen = require("../../utils/reset-stores-for-screen");
|
|
15
15
|
var _useSharedValueState = require("../reanimated/use-shared-value-state");
|
|
16
16
|
var _useStableCallback = _interopRequireDefault(require("../use-stable-callback"));
|
|
@@ -42,7 +42,7 @@ const useManagedClose = ({
|
|
|
42
42
|
(0, _reactNativeReanimated.useAnimatedReaction)(() => closingRouteKeysShared.value, keys => {
|
|
43
43
|
if (!keys?.includes(current.route.key)) return;
|
|
44
44
|
(0, _reactNativeReanimated.runOnJS)(activate)();
|
|
45
|
-
(0,
|
|
45
|
+
(0, _animateToProgress.animateToProgress)({
|
|
46
46
|
target: "close",
|
|
47
47
|
spec: current.options.transitionSpec,
|
|
48
48
|
animations,
|
|
@@ -80,7 +80,7 @@ const useNativeStackClose = ({
|
|
|
80
80
|
}
|
|
81
81
|
e.preventDefault();
|
|
82
82
|
activate();
|
|
83
|
-
(0,
|
|
83
|
+
(0, _animateToProgress.animateToProgress)({
|
|
84
84
|
target: "close",
|
|
85
85
|
spec: current.options.transitionSpec,
|
|
86
86
|
animations,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_react","require","_reactNativeReanimated","_gestures","_core","_managed","_stack","
|
|
1
|
+
{"version":3,"names":["_react","require","_reactNativeReanimated","_gestures","_core","_managed","_stack","_animateToProgress","_resetStoresForScreen","_useSharedValueState","_useStableCallback","_interopRequireDefault","e","__esModule","default","useManagedClose","current","animations","activate","deactivate","handleCloseRoute","closingRouteKeysShared","useManagedStackContext","handleCloseEnd","useStableCallback","finished","route","requestAnimationFrame","resetStoresForScreen","useAnimatedReaction","value","keys","includes","key","runOnJS","animateToProgress","target","spec","options","transitionSpec","onAnimationFinish","useNativeStackClose","gestureCtx","useGestureContext","isAncestorDismissingViaGesture","useSharedValueState","useDerivedValue","ancestorContext","gestureAnimationValues","isDismissing","handleBeforeRemove","isEnabled","enableTransitions","navigation","isFirstScreen","getState","index","closing","set","preventDefault","dispatch","data","action","useLayoutEffect","addListener","useCloseTransition","flags","useStackCoreContext","isNativeStack","STACK_TYPE","StackType","NATIVE","closeParams"],"sourceRoot":"../../../../../src","sources":["shared/hooks/lifecycle/use-close-transition.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -5,8 +5,22 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
});
|
|
6
6
|
exports.useOpenTransition = useOpenTransition;
|
|
7
7
|
var _react = require("react");
|
|
8
|
-
var
|
|
8
|
+
var _animateToProgress = require("../../utils/animation/animate-to-progress");
|
|
9
9
|
var _useHighRefreshRate = require("../animation/use-high-refresh-rate");
|
|
10
|
+
/**
|
|
11
|
+
* Calculates the initial progress value based on snap points configuration.
|
|
12
|
+
*/
|
|
13
|
+
function getInitialProgress({
|
|
14
|
+
snapPoints,
|
|
15
|
+
initialSnapIndex
|
|
16
|
+
}) {
|
|
17
|
+
if (!snapPoints) {
|
|
18
|
+
return undefined;
|
|
19
|
+
}
|
|
20
|
+
const clampedIndex = Math.min(Math.max(0, initialSnapIndex), snapPoints.length - 1);
|
|
21
|
+
return snapPoints[clampedIndex];
|
|
22
|
+
}
|
|
23
|
+
|
|
10
24
|
/**
|
|
11
25
|
* Handles opening animation on mount.
|
|
12
26
|
* Returns activate/deactivate functions for high refresh rate.
|
|
@@ -19,9 +33,17 @@ function useOpenTransition(current, animations) {
|
|
|
19
33
|
|
|
20
34
|
// biome-ignore lint/correctness/useExhaustiveDependencies: Must only run once on mount
|
|
21
35
|
(0, _react.useLayoutEffect)(() => {
|
|
36
|
+
const {
|
|
37
|
+
snapPoints,
|
|
38
|
+
initialSnapIndex = 0
|
|
39
|
+
} = current.options;
|
|
40
|
+
const targetProgress = getInitialProgress({
|
|
41
|
+
snapPoints,
|
|
42
|
+
initialSnapIndex
|
|
43
|
+
});
|
|
22
44
|
activateHighRefreshRate();
|
|
23
|
-
(0,
|
|
24
|
-
target: "open",
|
|
45
|
+
(0, _animateToProgress.animateToProgress)({
|
|
46
|
+
target: targetProgress ?? "open",
|
|
25
47
|
spec: current.options.transitionSpec,
|
|
26
48
|
animations,
|
|
27
49
|
onAnimationFinish: deactivateHighRefreshRate
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_react","require","
|
|
1
|
+
{"version":3,"names":["_react","require","_animateToProgress","_useHighRefreshRate","getInitialProgress","snapPoints","initialSnapIndex","undefined","clampedIndex","Math","min","max","length","useOpenTransition","current","animations","activateHighRefreshRate","deactivateHighRefreshRate","useHighRefreshRate","useLayoutEffect","options","targetProgress","animateToProgress","target","spec","transitionSpec","onAnimationFinish"],"sourceRoot":"../../../../../src","sources":["shared/hooks/lifecycle/use-open-transition.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AAGA,IAAAC,kBAAA,GAAAD,OAAA;AACA,IAAAE,mBAAA,GAAAF,OAAA;AAEA;AACA;AACA;AACA,SAASG,kBAAkBA,CAAC;EAC3BC,UAAU;EACVC;AAID,CAAC,EAAsB;EACtB,IAAI,CAACD,UAAU,EAAE;IAChB,OAAOE,SAAS;EACjB;EAEA,MAAMC,YAAY,GAAGC,IAAI,CAACC,GAAG,CAC5BD,IAAI,CAACE,GAAG,CAAC,CAAC,EAAEL,gBAAgB,CAAC,EAC7BD,UAAU,CAACO,MAAM,GAAG,CACrB,CAAC;EACD,OAAOP,UAAU,CAACG,YAAY,CAAC;AAChC;;AAEA;AACA;AACA;AACA;AACO,SAASK,iBAAiBA,CAChCC,OAAuB,EACvBC,UAA6B,EAC5B;EACD,MAAM;IAAEC,uBAAuB;IAAEC;EAA0B,CAAC,GAC3D,IAAAC,sCAAkB,EAACJ,OAAO,CAAC;;EAE5B;EACA,IAAAK,sBAAe,EAAC,MAAM;IACrB,MAAM;MAAEd,UAAU;MAAEC,gBAAgB,GAAG;IAAE,CAAC,GAAGQ,OAAO,CAACM,OAAO;IAC5D,MAAMC,cAAc,GAAGjB,kBAAkB,CAAC;MAAEC,UAAU;MAAEC;IAAiB,CAAC,CAAC;IAE3EU,uBAAuB,CAAC,CAAC;IACzB,IAAAM,oCAAiB,EAAC;MACjBC,MAAM,EAAEF,cAAc,IAAI,MAAM;MAChCG,IAAI,EAAEV,OAAO,CAACM,OAAO,CAACK,cAAc;MACpCV,UAAU;MACVW,iBAAiB,EAAET;IACpB,CAAC,CAAC;EACH,CAAC,EAAE,EAAE,CAAC;EAEN,OAAO;IAAED,uBAAuB;IAAEC;EAA0B,CAAC;AAC9D","ignoreList":[]}
|
|
@@ -6,7 +6,10 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
exports.useScreenState = useScreenState;
|
|
7
7
|
var _react = require("react");
|
|
8
8
|
var _reactNativeReanimated = require("react-native-reanimated");
|
|
9
|
+
var _specs = require("../../configs/specs");
|
|
9
10
|
var _keys = require("../../providers/screen/keys.provider");
|
|
11
|
+
var _animation = require("../../stores/animation.store");
|
|
12
|
+
var _animateToProgress = require("../../utils/animation/animate-to-progress");
|
|
10
13
|
var _useSharedValueState = require("../reanimated/use-shared-value-state");
|
|
11
14
|
var _useStack = require("./use-stack");
|
|
12
15
|
/**
|
|
@@ -32,6 +35,60 @@ function useScreenState() {
|
|
|
32
35
|
const focusedScene = (0, _react.useMemo)(() => {
|
|
33
36
|
return scenes[focusedIndex] ?? scenes[scenes.length - 1];
|
|
34
37
|
}, [scenes, focusedIndex]);
|
|
38
|
+
const currentOptions = current.options;
|
|
39
|
+
const snapPoints = currentOptions?.snapPoints;
|
|
40
|
+
const animations = (0, _react.useMemo)(() => _animation.AnimationStore.getAll(current.route.key), [current.route.key]);
|
|
41
|
+
|
|
42
|
+
// Pre-sort snap points for the derived value (avoids sorting in worklet)
|
|
43
|
+
const sortedSnapPoints = (0, _react.useMemo)(() => snapPoints ? [...snapPoints].sort((a, b) => a - b) : [], [snapPoints]);
|
|
44
|
+
const animatedSnapIndex = (0, _reactNativeReanimated.useDerivedValue)(() => {
|
|
45
|
+
if (sortedSnapPoints.length === 0) {
|
|
46
|
+
return -1;
|
|
47
|
+
}
|
|
48
|
+
const progress = animations.progress.value;
|
|
49
|
+
|
|
50
|
+
// Below first snap point
|
|
51
|
+
if (progress <= sortedSnapPoints[0]) {
|
|
52
|
+
return 0;
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
// Above last snap point
|
|
56
|
+
if (progress >= sortedSnapPoints[sortedSnapPoints.length - 1]) {
|
|
57
|
+
return sortedSnapPoints.length - 1;
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
// Find segment and interpolate
|
|
61
|
+
for (let i = 0; i < sortedSnapPoints.length - 1; i++) {
|
|
62
|
+
if (progress <= sortedSnapPoints[i + 1]) {
|
|
63
|
+
const t = (progress - sortedSnapPoints[i]) / (sortedSnapPoints[i + 1] - sortedSnapPoints[i]);
|
|
64
|
+
return i + t;
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
return sortedSnapPoints.length - 1;
|
|
68
|
+
});
|
|
69
|
+
const snapTo = (0, _react.useCallback)(targetIndex => {
|
|
70
|
+
if (!sortedSnapPoints || sortedSnapPoints.length === 0) {
|
|
71
|
+
console.warn("snapTo called but no snapPoints defined");
|
|
72
|
+
return;
|
|
73
|
+
}
|
|
74
|
+
if (targetIndex < 0 || targetIndex >= sortedSnapPoints.length) {
|
|
75
|
+
console.warn(`snapTo index ${targetIndex} out of bounds (0-${sortedSnapPoints.length - 1})`);
|
|
76
|
+
return;
|
|
77
|
+
}
|
|
78
|
+
const targetProgress = sortedSnapPoints[targetIndex];
|
|
79
|
+
(0, _reactNativeReanimated.runOnUI)(() => {
|
|
80
|
+
"worklet";
|
|
81
|
+
|
|
82
|
+
(0, _animateToProgress.animateToProgress)({
|
|
83
|
+
target: targetProgress,
|
|
84
|
+
animations,
|
|
85
|
+
spec: {
|
|
86
|
+
open: focusedScene.descriptor.options.transitionSpec?.expand ?? _specs.DefaultSnapSpec,
|
|
87
|
+
close: focusedScene.descriptor.options.transitionSpec?.collapse ?? _specs.DefaultSnapSpec
|
|
88
|
+
}
|
|
89
|
+
});
|
|
90
|
+
})();
|
|
91
|
+
}, [sortedSnapPoints, animations, focusedScene]);
|
|
35
92
|
return (0, _react.useMemo)(() => ({
|
|
36
93
|
index,
|
|
37
94
|
options: focusedScene?.descriptor?.options ?? {},
|
|
@@ -39,7 +96,9 @@ function useScreenState() {
|
|
|
39
96
|
focusedRoute: focusedScene?.route ?? current.route,
|
|
40
97
|
focusedIndex,
|
|
41
98
|
meta: focusedScene?.descriptor?.options?.meta,
|
|
42
|
-
navigation: current.navigation
|
|
43
|
-
|
|
99
|
+
navigation: current.navigation,
|
|
100
|
+
snapTo,
|
|
101
|
+
animatedSnapIndex
|
|
102
|
+
}), [index, focusedScene, routes, focusedIndex, current.navigation, current.route, snapTo, animatedSnapIndex]);
|
|
44
103
|
}
|
|
45
104
|
//# sourceMappingURL=use-screen-state.js.map
|