@momo-kits/foundation 0.164.1-beta.10 → 0.164.1-beta.11

package/Application/BottomTab/index.tsx

@@ -153,7 +153,7 @@ const TabScreen: React.FC<any> = ({ route, navigation }) => {
               initialParams,
               bottomTab: 'nested',
             }}
-            options={{ ...getStackOptions({ swipeBack: false }) }}
+            options={{ ...getStackOptions({ gestureEnabled: false }) }}
           />
         </Stack.Navigator>
       </Animated.View>
@@ -188,7 +188,7 @@ const TabScreen: React.FC<any> = ({ route, navigation }) => {
                 initialParams,
                 bottomTab: 'default',
               }}
-              options={{ ...getStackOptions({ swipeBack: false }), ...options }}
+              options={{ ...getStackOptions({ gestureEnabled: false }), ...options }}
             />
           </Stack.Navigator>
         </NavigationContainer>

package/Application/utils.tsx

@@ -59,9 +59,9 @@ const forStackTransitionWithOverlay = (
 /**
  * default options for stack screen
  */
-const getStackOptions = ({
-  swipeBack = true,
-}: { swipeBack?: boolean } = {}): StackNavigationOptions => {
+const getStackOptions = (
+  options: StackNavigationOptions,
+): StackNavigationOptions => {
   const base: StackNavigationOptions = {
     headerTitleAlign: 'left',
     headerTitle: props => <HeaderTitle {...props} />,
@@ -80,24 +80,9 @@ const getStackOptions = ({
     headerTintColor: Colors.black_17,
   };
 
-  /**
-   * A bottom tab stack holds a single route, so the card transition never runs and
-   * `CardContainer` pins `gestureEnabled` to false at index 0 regardless. What does bite is
-   * `cardOverlayEnabled`: `current.progress` rests at 1, so the overlay would sit at its full
-   * 0.6 forever instead of only during a push, tinting any tab screen that paints no
-   * background of its own. This branch is the option set from before swipe back, unchanged.
-   */
-  if (!swipeBack) {
-    return {
-      ...base,
-      gestureEnabled: false,
-      ...TransitionPresets.SlideFromRightIOS,
-    };
-  }
-
   return {
     ...base,
-    gestureEnabled: Platform.OS === 'ios',
+    ...options,
     ...TransitionPresets.SlideFromRightIOS,
     cardStyleInterpolator: forStackTransitionWithOverlay,
     cardOverlayEnabled: true,
@@ -332,36 +317,26 @@ const getStackDepth = (
 const useNativeCanGoBack = () => {
   const lastValue = useRef<boolean | undefined>(undefined);
 
-  const report = useCallback((canDismiss: boolean) => {
-    if (lastValue.current === canDismiss) {
-      return;
-    }
-
-    const setCanGoBack = NativeModules?.MiniAppModule?.setCanGoBack;
-    if (typeof setCanGoBack !== 'function') {
-      return;
-    }
-
-    lastValue.current = canDismiss;
-    try {
-      setCanGoBack(canDismiss);
-    } catch (error) {
-      console.warn('[NavigationContainer] setCanGoBack failed:', error);
-    }
-  }, []);
+  return useCallback(
+    (state?: NavigationState | PartialState<NavigationState>) => {
+      const canDismiss = getStackDepth(state) === 0;
+      if (lastValue.current === canDismiss) {
+        return;
+      }
 
-  /**
-   * The flag lives on the host, not in this tree, so leaving it at `false` on unmount
-   * strands every mini app opened afterwards: the host keeps believing react-navigation
-   * still has screens to pop, and goes on routing back into a container that is gone.
-   * Hand ownership back on the way out.
-   */
-  useEffect(() => () => report(true), [report]);
+      const setCanGoBack = NativeModules?.MiniAppModule?.setCanGoBack;
+      if (typeof setCanGoBack !== 'function') {
+        return;
+      }
 
-  return useCallback(
-    (state?: NavigationState | PartialState<NavigationState>) =>
-      report(getStackDepth(state) === 0),
-    [report],
+      lastValue.current = canDismiss;
+      try {
+        setCanGoBack(canDismiss);
+      } catch (error) {
+        console.warn('[NavigationContainer] setCanGoBack failed:', error);
+      }
+    },
+    [],
   );
 };
 

package/package.json

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