@momo-kits/foundation 0.164.1-beta.4 → 0.164.1-beta.6

package/Application/utils.tsx

@@ -335,11 +335,20 @@ const useNativeCanGoBack = () => {
 };
 
 /**
- * finger travel that reads as "swipe back recognised". flat px on purpose:
- * scaling it by screen width would move the tick to a different physical
- * thumb distance on every device
+ * fraction of screen width at which releasing commits the pop. deliberately
+ * pinned to react-navigation's own rule: Card.tsx (GestureState.END,
+ * @react-navigation/stack 7.4.2) closes the card when
+ * `(translation + velocity * gestureVelocityImpact) * inverted > distance / 2`
+ * with `distance = layout.width` for a horizontal gesture, and exposes no
+ * option to override it. so the tick means "release now and you go back"
+ * instead of marking a distance of its own — keep the two in sync.
+ *
+ * mid drag only translation is known, velocity exists solely at release, so a
+ * short fast flick can commit without ever crossing this and pops with no
+ * tick. that asymmetry is intended: modelling velocity per frame would tick
+ * on swipes that then do not commit, which is the worse error
  */
-const SWIPE_BACK_HAPTIC_THRESHOLD = 100;
+const SWIPE_BACK_HAPTIC_COMMIT_RATIO = 0.5;
 
 const readAnimatedValue = (node: unknown, fallback: number): number => {
   const getValue = (node as { __getValue?: () => unknown } | undefined)
@@ -371,8 +380,8 @@ const getSwipeGestureValue = (
 };
 
 /**
- * one light tick once the swipe back has travelled far enough to read as
- * recognised. iOS only, mirroring `gestureEnabled` in getStackOptions.
+ * one light tick once the swipe back passes the point where releasing commits
+ * the pop. iOS only, mirroring `gestureEnabled` in getStackOptions.
  *
  * both listeners are installed on mount and never lazily inside the gesture:
  * on the New Architecture `addListener` queues `startListeningToAnimatedNodeValue`
@@ -401,7 +410,7 @@ const useSwipeBackHaptic = () => {
       return;
     }
 
-    const { swiping, inverted, current } = animation;
+    const { swiping, inverted, current, layouts } = animation;
     const gesture = getSwipeGestureValue(current?.progress);
     if (!gesture || typeof swiping?.addListener !== 'function') {
       return;
@@ -420,19 +429,52 @@ const useSwipeBackHaptic = () => {
      */
     const direction = readAnimatedValue(inverted, 1);
 
+    /**
+     * plain JS numbers, not animated nodes (`StackCardInterpolationProps`).
+     * screen layout can still be unmeasured on an early render, and a zero
+     * width would put the threshold at 0 and tick the moment the finger moves
+     */
+    const commitThreshold =
+      (layouts?.screen?.width ?? 0) * SWIPE_BACK_HAPTIC_COMMIT_RATIO;
+
+    /**
+     * TEMPORARY DIAGNOSTIC (DS-760) — remove once the swipe-back no-pop is understood.
+     *
+     * The test device cannot run Xcode, so this borrows the one channel proven to reach it.
+     * On release past the commit threshold react-navigation should pop; if this screen is
+     * still mounted shortly after, the pop was requested and then swallowed — `Card` clears
+     * its 32ms `pendingGestureCallback` from `animate()`, and `componentDidUpdate` re-enters
+     * `animate()` for any re-render in that window.
+     *
+     * A `heavy` tick after release therefore means "gesture completed, pop lost". Silence
+     * means the gesture never reached the threshold, or was cancelled before END.
+     */
+    let lastTravel = 0;
+    let pendingPopProbe: ReturnType<typeof setTimeout> | undefined;
+
     const swipingListener = swiping.addListener(({ value }) => {
+      const wasSwiping = isSwiping;
       isSwiping = value === 1;
-      if (!isSwiping) {
-        hasFired.current = false;
+      if (isSwiping) {
+        return;
       }
+      hasFired.current = false;
+      if (wasSwiping && commitThreshold > 0 && lastTravel >= commitThreshold) {
+        pendingPopProbe = setTimeout(() => {
+          navigator?.maxApi?.triggerEventVibration?.('heavy');
+        }, 500);
+      }
+      lastTravel = 0;
     });
 
     const gestureListener = gesture.addListener(({ value: translation }) => {
-      if (!isSwiping) {
+      if (!isSwiping || commitThreshold <= 0) {
         return;
       }
 
-      if (translation * direction < SWIPE_BACK_HAPTIC_THRESHOLD) {
+      lastTravel = translation * direction;
+
+      if (lastTravel < commitThreshold) {
         hasFired.current = false;
         return;
       }
@@ -444,6 +486,10 @@ const useSwipeBackHaptic = () => {
     });
 
     return () => {
+      // unmount cancels the probe: the screen popped, which is the success case
+      if (pendingPopProbe !== undefined) {
+        clearTimeout(pendingPopProbe);
+      }
       gesture.removeListener(gestureListener);
       swiping.removeListener(swipingListener);
     };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@momo-kits/foundation",
-    "version": "0.164.1-beta.4",
+    "version": "0.164.1-beta.6",
     "description": "React Native Component Kits",
     "main": "index.ts",
     "scripts": {},