@momo-kits/foundation 0.163.1-beta.13 → 0.163.1-beta.15

package/Application/utils.tsx

@@ -38,7 +38,10 @@ const getStackOptions = (): StackNavigationOptions => {
     headerLeft: (props: any) => <HeaderLeft {...props} />,
     headerRight: (props: any) => <HeaderRight {...props} />,
     headerTintColor: Colors.black_17,
-    gestureEnabled: false,
+    /**
+     * swipe back for iOS only, Android keeps the hardware back button
+     */
+    gestureEnabled: Platform.OS === 'ios',
     ...TransitionPresets.SlideFromRightIOS,
   };
 };
@@ -54,9 +57,23 @@ const getModalOptions = (): StackNavigationOptions => {
     cardOverlayEnabled: true,
     animation: 'none',
     presentation: 'transparentModal',
+    /**
+     * modal & bottom sheet dismiss through their own overlay/pan gesture
+     */
+    gestureEnabled: false,
   };
 };
 
+/**
+ * screen owns its back flow (guard popup, custom handler or no back button),
+ * so swipe back must not bypass it
+ */
+const hasCustomBackHandling = (params: NavigationOptions) =>
+  params.preventBack !== undefined ||
+  params.hiddenBack === true ||
+  typeof params.onBackHandler === 'function' ||
+  typeof params.onPressLeftHeader === 'function';
+
 /**
  * build react-navigation options
  */
@@ -125,6 +142,13 @@ const getOptions = (
     };
   }
 
+  /**
+   * only ever turns swipe back off, screens opt in via gestureEnabled
+   */
+  if (params.gestureEnabled === undefined && hasCustomBackHandling(params)) {
+    options.gestureEnabled = false;
+  }
+
   return {
     ...params,
     ...options,

package/Layout/Screen.tsx

@@ -51,13 +51,6 @@ import {
   SearchHeader,
 } from '../Application';
 
-/**
- * Scroll distance (px) over which the animated search header collapses from its
- * expanded to its docked state — the input range consumed by `HeaderExtendHeader`
- * and the settle threshold in `handleScrollEnd`.
- */
-const SEARCH_HEADER_COLLAPSE_DISTANCE = 100;
-
 export interface ScreenProps extends ViewProps {
   /**
    * ReactNode representing the content of the screen.
@@ -199,8 +192,8 @@ const Screen = forwardRef(
     ref: any,
   ) => {
     const screenRef = useRef<View | ScrollView>(null);
-    const { width: widthDevice, height: heightDevice } = useWindowDimensions();
-    const { theme } = useContext(ApplicationContext);
+    const { width: widthDevice } = useWindowDimensions();
+    const { theme, navigator } = useContext(ApplicationContext);
     const screen: any = useContext(ScreenContext);
     const insets = useSafeAreaInsets();
     const heightHeader = useHeaderHeight();
@@ -239,7 +232,7 @@ const Screen = forwardRef(
     }, [customAnimatedValue, internalShared]);
 
     const currentTint = useRef<string | undefined>(undefined);
-
+    
     const isTab = !!screen?.bottomTab;
 
     let handleScroll;
@@ -658,17 +651,6 @@ const Screen = forwardRef(
             style={[Styles.flex]}
             contentContainerStyle={[
               scrollable && !Footer && !isTab && { paddingBottom: bottomInset },
-              // The animated search header collapses as the body scrolls. When the
-              // body is short (e.g. no search history) the ScrollView is barely
-              // scrollable, so overscroll bounce feeds the scroll-driven animation
-              // and the input jitters on its way up to the header. A ScrollView
-              // frame can never exceed the window, so forcing the content to be at
-              // least one screen plus the collapse distance guarantees the animation
-              // always has room to complete smoothly, independent of body content.
-              scrollable &&
-                inputSearchProps && {
-                  minHeight: heightDevice + SEARCH_HEADER_COLLAPSE_DISTANCE,
-                },
               scrollViewProps?.contentContainerStyle,
             ]}
           >

package/package.json

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