@momo-kits/foundation 0.161.2-beta.14 → 0.161.2-beta.16

package/Application/BottomSheet.tsx

@@ -37,7 +37,8 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
   const action = useRef<undefined | string>(undefined);
   const insets = useSafeAreaInsets();
   const heightHeader = useHeaderHeight();
-  const keyboardOffset = heightHeader - Math.min(insets.bottom, 21);
+  const bottomInset = Platform.OS === 'ios' ? Math.min(insets.bottom, 21) : insets.bottom;
+  const keyboardOffset = heightHeader - bottomInset;
 
   const showBaseLineDebug = context?.features?.showBaseLineDebug ?? false;
 
@@ -311,7 +312,7 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
           {useBottomInset && (
             <View
               style={{
-                height: Math.min(insets.bottom, 21),
+                height: bottomInset,
                 backgroundColor: backgroundColor,
               }}
             />

package/Application/BottomTab/index.tsx

@@ -320,7 +320,7 @@ const BottomTab: React.FC<BottomTabProps> = ({
           activeTintColor={theme.colors.primary}
           style={[
             {
-              height: 64 + Math.min(insets.bottom, 21),
+              height: 64 + (Platform.OS === 'ios' ? Math.min(insets.bottom, 21) : insets.bottom),
             },
           ]}
         />

package/Layout/Screen.tsx

@@ -10,9 +10,11 @@ import React, {
   useEffect,
   useImperativeHandle,
   useRef,
+  useState,
 } from 'react';
 import {
   Animated,
+  Keyboard,
   KeyboardAvoidingView,
   NativeScrollEvent,
   NativeSyntheticEvent,
@@ -201,12 +203,38 @@ const Screen = forwardRef(
     const currentTint = useRef<string | undefined>(undefined);
     const isTab = navigation?.instance?.getState?.()?.type === 'tab';
 
+    // AI-GENERATED START: track keyboard height (Android tự đẩy; footer bỏ safe-area khi hiện)
+    const [keyboardHeight, setKeyboardHeight] = useState(0);
+    const isKeyboardVisible = keyboardHeight > 0;
+    // Chỉ can thiệp trên Android 15+ (API 35): edge-to-edge -> window KHÔNG resize cho bàn phím.
+    // Android <15 (window tự resize) và iOS giữ NGUYÊN behavior cũ -> không impact.
+    const useManualKeyboardAvoid =
+      Platform.OS === 'android' &&
+      Number(Platform.Version) >= 35 &&
+      enableKeyboardAvoidingView;
+    useEffect(() => {
+      const showEvent =
+        Platform.OS === 'ios' ? 'keyboardWillShow' : 'keyboardDidShow';
+      const hideEvent =
+        Platform.OS === 'ios' ? 'keyboardWillHide' : 'keyboardDidHide';
+      const showSub = Keyboard.addListener(showEvent, e =>
+        setKeyboardHeight(e.endCoordinates?.height ?? 0),
+      );
+      const hideSub = Keyboard.addListener(hideEvent, () => setKeyboardHeight(0));
+      return () => {
+        showSub.remove();
+        hideSub.remove();
+      };
+    }, []);
+    // AI-GENERATED END: track keyboard height
+
     let handleScroll;
     let Component: any = View;
 
-    let keyboardOffset = heightHeader - Math.min(insets.bottom, 21);
+    const bottomInset = Platform.OS === 'ios' ? Math.min(insets.bottom, 21) : insets.bottom;
+    let keyboardOffset = heightHeader - bottomInset;
     if (headerType === 'extended' || animatedHeader || inputSearchProps) {
-      keyboardOffset = -Math.min(insets.bottom, 21);
+      keyboardOffset = -bottomInset;
     }
 
     /**
@@ -586,13 +614,25 @@ const Screen = forwardRef(
         />
 
         <KeyboardAvoidingView
-          style={Styles.flex}
+          // AI-GENERATED START: Android tự đẩy bằng keyboardHeight (KAV behavior để lại padding dư)
+          style={[
+            Styles.flex,
+            // height (Android) chưa gồm nav bar -> cộng insets.bottom để đẩy đủ qua bàn phím
+            useManualKeyboardAvoid
+              ? {
+                  paddingBottom: isKeyboardVisible
+                    ? keyboardHeight + insets.bottom
+                    : 0,
+                }
+              : null,
+          ]}
           enabled={enableKeyboardAvoidingView}
           keyboardVerticalOffset={keyboardVerticalOffset ?? keyboardOffset}
           behavior={Platform.select({
             ios: 'padding',
             android: undefined,
           })}
+          // AI-GENERATED END: Android tự đẩy bằng keyboardHeight
         >
           {Header}
 
@@ -616,7 +656,7 @@ const Screen = forwardRef(
                 {...floatingButtonProps}
                 animatedValue={animatedValue.current}
                 bottom={
-                  Footer || isTab ? 12 : Math.min(insets.bottom, 21) + Spacing.S
+                  Footer || isTab ? 12 : bottomInset + Spacing.S
                 }
               />
             </View>
@@ -627,7 +667,12 @@ const Screen = forwardRef(
               style={[
                 styles.shadow,
                 {
-                  paddingBottom: Math.min(insets.bottom, 21) + Spacing.S,
+                  // AI-GENERATED START: bàn phím hiện -> bỏ safe-area, chỉ chừa Spacing.S (như StackScreen)
+                  paddingBottom:
+                    (isKeyboardVisible && useManualKeyboardAvoid
+                      ? 0
+                      : bottomInset) + Spacing.S,
+                  // AI-GENERATED END: bàn phím hiện -> bỏ safe-area, chỉ chừa Spacing.S
                   backgroundColor: theme.colors.background.surface,
                 },
               ]}

package/package.json

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