@momo-kits/foundation 0.153.1-test.11 → 0.153.2-beta.2

package/Input/InputSearch.tsx

@@ -138,9 +138,10 @@ const InputSearch: ForwardRefRenderFunction<InputRef, InputSearchProps> = (
   ref,
 ) => {
   const { theme } = useContext(ApplicationContext);
-
   const [focused, setFocused] = useState(false);
-  const haveValue = !!value || !!defaultValue;
+  const [internalText, setInternalText] = useState(defaultValue || '');
+  const currentValue = value !== undefined ? value : internalText;
+  const haveValue = !!currentValue;
   const inputRef = useRef<TextInput | null>(null);
 
   const componentName = 'InputSearch';
@@ -167,6 +168,9 @@ const InputSearch: ForwardRefRenderFunction<InputRef, InputSearchProps> = (
   };
 
   const _onChangeText = (text: string) => {
+    if (value === undefined) {
+      setInternalText(text);
+    }
     onChangeText?.(text);
   };
 

package/Layout/Screen.tsx

@@ -9,9 +9,7 @@ import React, {
   useContext,
   useEffect,
   useImperativeHandle,
-  useMemo,
   useRef,
-  useState,
 } from 'react';
 import {
   Animated,
@@ -202,7 +200,6 @@ const Screen = forwardRef(
     );
     const currentTint = useRef<string | undefined>(undefined);
     const isTab = navigation?.instance?.getState?.()?.type === 'tab';
-    const [footerHeight, setFooterHeight] = useState(0)
 
     let handleScroll;
     let Component: any = View;
@@ -212,14 +209,6 @@ const Screen = forwardRef(
       keyboardOffset = -Math.min(insets.bottom, 21);
     }
 
-    // It is used to normalize the header transparent for Android
-    const normalizeHeaderTransparent = useCallback((expectedValue: boolean) => {
-      if(Platform.OS === 'android') {
-        return false;
-      }
-      return expectedValue
-    }, [])
-
     /**
      * inject params for screen tracking
      */
@@ -244,14 +233,14 @@ const Screen = forwardRef(
           case 'extended':
             options = {
               headerShown: true,
-              headerTransparent: normalizeHeaderTransparent(true),
+              headerTransparent: true,
               headerBackground: () => null,
               headerTitle: (props: any) => <HeaderTitle {...props} />,
             };
             if (inputSearchProps) {
               options = {
                 headerShown: true,
-                headerTransparent: normalizeHeaderTransparent(true),
+                headerTransparent: true,
                 headerBackground: () => null,
                 headerTitle: (props: any) => (
                   <HeaderTitle
@@ -287,7 +276,7 @@ const Screen = forwardRef(
             if (inputSearchProps) {
               options = {
                 headerShown: true,
-                headerTransparent: normalizeHeaderTransparent(true),
+                headerTransparent: true,
                 headerBackground: () => null,
                 headerTitle: (props: any) => (
                   <HeaderTitle
@@ -312,7 +301,6 @@ const Screen = forwardRef(
         inputSearchProps,
         navigation?.instance,
         useShadowHeader,
-        normalizeHeaderTransparent
       ],
     );
 
@@ -329,7 +317,7 @@ const Screen = forwardRef(
 
         options = {
           headerTintColor: currentTint.current ?? Colors.black_17,
-          headerTransparent: normalizeHeaderTransparent(true),
+          headerTransparent: true,
           headerBackground: (props: any) => (
             <HeaderBackground
               {...props}
@@ -354,7 +342,7 @@ const Screen = forwardRef(
 
         navigation?.instance?.setOptions(options);
       },
-      [normalizeHeaderTransparent, gradientColor, headerBackground, navigation?.instance, useShadowHeader],
+      [gradientColor, headerBackground, navigation?.instance, useShadowHeader],
     );
 
     /**
@@ -363,7 +351,7 @@ const Screen = forwardRef(
     const setAnimatedSearch = useCallback(() => {
       const options: StackNavigationOptions = {
         headerShown: true,
-        headerTransparent: normalizeHeaderTransparent(true),
+        headerTransparent: true,
         headerBackground: () => null,
         headerTitle: (props: any) => (
           <HeaderTitle
@@ -379,7 +367,7 @@ const Screen = forwardRef(
       };
 
       navigation?.instance?.setOptions(options);
-    }, [normalizeHeaderTransparent, navigation?.instance]);
+    }, [navigation?.instance]);
 
     /**
      * export search header
@@ -575,21 +563,12 @@ const Screen = forwardRef(
       }
     };
 
-    // marginTop is used to support the header transparent on Android
-    const marginTop = useMemo(() => {
-      if (Platform.OS === 'android' && (animatedHeader || inputSearchProps || headerType === "extended")) {
-        return -heightHeader;
-      }
-      return undefined;
-    }, [animatedHeader, headerType, heightHeader, inputSearchProps])
-
     return (
       <View
         style={[
           Styles.flex,
           {
             backgroundColor: backgroundColor ?? theme.colors.background.default,
-            marginTop,
           },
         ]}
       >
@@ -632,13 +611,15 @@ const Screen = forwardRef(
           </Component>
 
           {floatingButtonProps && (
-            <FloatingButton
-              {...floatingButtonProps}
-              animatedValue={animatedValue.current}
-              bottom={
-                (Footer || isTab ? 12 : Math.min(insets.bottom, 21)) + Spacing.S + footerHeight
-              }
-            />
+            <View>
+              <FloatingButton
+                {...floatingButtonProps}
+                animatedValue={animatedValue.current}
+                bottom={
+                  Footer || isTab ? 12 : Math.min(insets.bottom, 21) + Spacing.S
+                }
+              />
+            </View>
           )}
 
           {Footer && (
@@ -650,9 +631,6 @@ const Screen = forwardRef(
                   backgroundColor: theme.colors.background.surface,
                 },
               ]}
-              onLayout={(e) => {
-                setFooterHeight(e.nativeEvent.layout.height)
-              }}
             >
               <Section>{Footer}</Section>
             </View>

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@momo-kits/foundation",
-    "version": "0.153.1-test.11",
+    "version": "0.153.2-beta.2",
     "description": "React Native Component Kits",
     "main": "index.ts",
     "scripts": {},
@@ -26,7 +26,6 @@
         "react-native": "*"
     },
     "devDependencies": {
-        "@momo-platform/versions": "4.1.11",
         "@types/color": "3.0.6"
     },
     "publishConfig": {