@momo-kits/foundation 0.163.1-beta.3 → 0.163.1-sp.2

package/Application/StackScreen.tsx

@@ -315,6 +315,7 @@ const StackScreen: React.FC<any> = props => {
     <ScreenContext.Provider
       value={{
         screenName,
+        bottomTab: !!bottomTab,
         onElementLoad: (item: any) => {
           /**
            * widget handle

package/Layout/Screen.tsx

@@ -25,10 +25,7 @@ import {
   View,
   ViewProps,
 } from 'react-native';
-import {
-  useSharedValue,
-  withTiming,
-} from 'react-native-reanimated';
+import { useSharedValue, withTiming } from 'react-native-reanimated';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import { ApplicationContext, ScreenContext } from '../Context';
 import Navigation from '../Application/Navigation';
@@ -166,13 +163,6 @@ export interface ScreenProps extends ViewProps {
   trackingParams?: ScreenTrackingParams;
 }
 
-/**
- * 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;
-
 const Screen = forwardRef(
   (
     {
@@ -202,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();
@@ -242,7 +232,8 @@ const Screen = forwardRef(
     }, [customAnimatedValue, internalShared]);
 
     const currentTint = useRef<string | undefined>(undefined);
-    const isTab = navigation?.instance?.getState?.()?.type === 'tab';
+    
+    const isTab = !!screen?.bottomTab;
 
     let handleScroll;
     let Component: any = View;
@@ -657,23 +648,9 @@ const Screen = forwardRef(
             onScroll={handleScroll}
             onScrollEndDrag={handleScrollEnd}
             scrollEventThrottle={16}
-            style={[
-              Styles.flex,
-              !scrollable && !Footer && !isTab && { paddingBottom: bottomInset },
-            ]}
+            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,
             ]}
           >
@@ -687,9 +664,7 @@ const Screen = forwardRef(
               <FloatingButton
                 {...floatingButtonProps}
                 animatedValue={sharedValue}
-                bottom={
-                  Footer || isTab ? 12 : bottomInset + Spacing.S
-                }
+                bottom={Footer || isTab ? 12 : bottomInset + Spacing.S}
               />
             </View>
           )}

package/package.json

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