@momo-kits/foundation 0.165.1-beta.3 → 0.165.1-beta.4

package/Application/BottomTab/index.tsx

@@ -8,6 +8,7 @@ import { createStackNavigator } from '@react-navigation/stack';
 import React, { useContext, useEffect, useLayoutEffect } from 'react';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import {
+  NativeModules,
   Platform,
   StatusBar,
   StyleSheet,
@@ -24,12 +25,7 @@ import { Icon } from '../../Icon';
 import { exportFontFamily, Text } from '../../Text';
 import StackScreen from '../StackScreen';
 import { BottomTabProps } from '../types';
-import {
-  getOptions,
-  getStackOptions,
-  useAppState,
-  useFloatingArrowBack,
-} from '../utils';
+import { getOptions, getStackOptions, useAppState } from '../utils';
 import BottomTabBar from './BottomTabBar';
 import { ApplicationContext, MiniAppContext } from '../../Context';
 
@@ -217,7 +213,6 @@ const BottomTab: React.FC<BottomTabProps> = ({
   const indicatorAnimated = useSharedValue(0);
   const activeIndex = React.useRef(initialIndex > 0 ? initialIndex : 0);
   const itemWidth = dimensions.width / tabs.length;
-  const reportFloatingArrowBack = useFloatingArrowBack();
 
   const indicatorStyle = useAnimatedStyle(() => ({
     width: itemWidth,
@@ -238,33 +233,18 @@ const BottomTab: React.FC<BottomTabProps> = ({
     });
   }, [itemWidth, indicatorAnimated]);
 
-  // Tied to focus, not mount: a screen pushed from a tab leaves BottomTab mounted but blurred,
-  // and the flag has to be off there. Also covers `initialRouteName` starting on a later tab.
-  useFocusEffect(
-    React.useCallback(() => {
-      reportFloatingArrowBack(activeIndex.current !== 0);
-      return () => reportFloatingArrowBack(false);
-    }, [reportFloatingArrowBack]),
-  );
-
-  /**
-   * Two halves of one decision, so they are set together.
-   *
-   * On the first tab the stack card owns the swipe and runs the usual transition. On any other
-   * tab it must not: every tab lives inside that single card, and the gesture pops it with
-   * `StackActions.pop()` aimed at the stack rather than a back the tab router could claim — so
-   * the swipe would take all the tabs with it instead of returning to the first one. Turning the
-   * card gesture off there would leave the swipe doing nothing, so hand it to the host's
-   * floating-arrow interaction instead.
-   */
-  const syncBackOwnership = (index: number) => {
-    const isFirstTab = index === 0;
-
-    navigation?.setOptions({
-      gestureEnabled: Platform.OS === 'ios' && isFirstTab,
-    });
-    reportFloatingArrowBack(!isFirstTab);
-  };
+  // TEMP: commented out to test whether the blur reset is needed on a real host.
+  // Without it, pushing a screen from a tab other than the first leaves the flag true, so that
+  // pushed screen gets the host floating-arrow instead of its own card swipe-back.
+  // useFocusEffect(
+  //   React.useCallback(() => {
+  //     NativeModules?.MiniAppModule?.setShouldUseFloatingArrowBack?.(
+  //       activeIndex.current !== 0,
+  //     );
+  //     return () =>
+  //       NativeModules?.MiniAppModule?.setShouldUseFloatingArrowBack?.(false);
+  //   }, []),
+  // );
 
   const onFocus = (e: any) => {
     activeIndex.current = tabs.findIndex(i => e.target.includes(i.name));
@@ -272,7 +252,11 @@ const BottomTab: React.FC<BottomTabProps> = ({
       duration: 200,
     });
 
-    syncBackOwnership(activeIndex.current);
+    const isFirstTab = activeIndex.current === 0;
+    navigation?.setOptions({
+      gestureEnabled: Platform.OS === 'ios' && isFirstTab,
+    });
+    NativeModules?.MiniAppModule?.setShouldUseFloatingArrowBack?.(!isFirstTab);
   };
 
   const handler: {

package/Application/utils.tsx

@@ -334,45 +334,6 @@ const useNativeCanGoBack = () => {
   );
 };
 
-/**
- * Hands the swipe back to the host's floating-arrow interaction while a bottom tab other than
- * the first one is showing.
- *
- * The whole tab navigator lives inside a single stack card, and the card gesture pops that card
- * through `StackActions.pop()` aimed at the stack — it never dispatches a back the tab router
- * could claim. So on tab 2 a swipe would take all four tabs with it instead of returning to tab
- * 1. The host already owns an interaction for exactly this, so report the state and let it run.
- *
- * Reports `false` on unmount: the flag lives on the host and would otherwise outlive the tabs
- * that asked for it.
- */
-const useFloatingArrowBack = () => {
-  const lastValue = useRef<boolean | undefined>(undefined);
-
-  const report = useCallback((shouldUse: boolean) => {
-    if (lastValue.current === shouldUse) {
-      return;
-    }
-
-    const setShouldUseFloatingArrowBack =
-      NativeModules?.MiniAppModule?.setShouldUseFloatingArrowBack;
-    if (typeof setShouldUseFloatingArrowBack !== 'function') {
-      return;
-    }
-
-    lastValue.current = shouldUse;
-    try {
-      setShouldUseFloatingArrowBack(shouldUse);
-    } catch (error) {
-      console.warn('[BottomTab] setShouldUseFloatingArrowBack failed:', error);
-    }
-  }, []);
-
-  useEffect(() => () => report(false), [report]);
-
-  return report;
-};
-
 /**
  * Union of the two animation runtimes an internal foundation component might
  * receive. Public Screen props still accept React Native Animated.Value only;
@@ -524,7 +485,6 @@ export {
   useComponentId,
   useAppState,
   useNativeCanGoBack,
-  useFloatingArrowBack,
   useNormalizedSharedValue,
   SwipeBackHaptic,
 };

package/package.json

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