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

package/Application/NavigationContainer.tsx

@@ -26,6 +26,7 @@ import { HeaderLeft } from './Components/HeaderLeft';
 import { HeaderRight } from './Components/HeaderRight';
 import { HeaderTitle } from './Components/HeaderTitle';
 import { HeaderBackground } from './Components/HeaderBackground';
+import { KeyboardProvider } from 'react-native-keyboard-controller';
 
 const Stack = createStackNavigator();
 
@@ -56,21 +57,23 @@ const NavigationContainer: React.FC<NavigationContainerProps> = ({
   };
 
   return (
-    <SafeAreaProvider>
-      <MiniAppContext.Provider value={mergedContext}>
-        <ScaleSizeProvider scaleSizeMaxRate={mergedContext?.scaleSizeMaxRate}>
-          <Navigation
-            screen={screen}
-            theme={theme}
-            options={options}
-            maxApi={maxApi}
-            setCurrentContext={setCurrentContext}
-            initialParams={initialParams}
-            localize={localize}
-          />
-        </ScaleSizeProvider>
-      </MiniAppContext.Provider>
-    </SafeAreaProvider>
+    <KeyboardProvider>
+      <SafeAreaProvider>
+        <MiniAppContext.Provider value={mergedContext}>
+          <ScaleSizeProvider scaleSizeMaxRate={mergedContext?.scaleSizeMaxRate}>
+            <Navigation
+              screen={screen}
+              theme={theme}
+              options={options}
+              maxApi={maxApi}
+              setCurrentContext={setCurrentContext}
+              initialParams={initialParams}
+              localize={localize}
+            />
+          </ScaleSizeProvider>
+        </MiniAppContext.Provider>
+      </SafeAreaProvider>
+    </KeyboardProvider>
   );
 };
 

package/Layout/Screen.tsx

@@ -10,12 +10,9 @@ import React, {
   useEffect,
   useImperativeHandle,
   useRef,
-  useState,
 } from 'react';
 import {
   Animated,
-  Keyboard,
-  KeyboardAvoidingView,
   NativeScrollEvent,
   NativeSyntheticEvent,
   Platform,
@@ -27,6 +24,7 @@ import {
   View,
   ViewProps,
 } from 'react-native';
+import { KeyboardAvoidingView } from "react-native-keyboard-controller";
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import { ApplicationContext, ScreenContext } from '../Context';
 import Navigation from '../Application/Navigation';
@@ -203,38 +201,12 @@ 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;
 
-    const bottomInset = Platform.OS === 'ios' ? Math.min(insets.bottom, 21) : insets.bottom;
-    let keyboardOffset = heightHeader - bottomInset;
+    let keyboardOffset = heightHeader - Math.min(insets.bottom, 21);
     if (headerType === 'extended' || animatedHeader || inputSearchProps) {
-      keyboardOffset = -bottomInset;
+      keyboardOffset = -Math.min(insets.bottom, 21);
     }
 
     /**
@@ -614,25 +586,13 @@ const Screen = forwardRef(
         />
 
         <KeyboardAvoidingView
-          // 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,
-          ]}
+          style={Styles.flex}
           enabled={enableKeyboardAvoidingView}
           keyboardVerticalOffset={keyboardVerticalOffset ?? keyboardOffset}
           behavior={Platform.select({
             ios: 'padding',
-            android: undefined,
+            android: 'padding',
           })}
-          // AI-GENERATED END: Android tự đẩy bằng keyboardHeight
         >
           {Header}
 
@@ -656,7 +616,7 @@ const Screen = forwardRef(
                 {...floatingButtonProps}
                 animatedValue={animatedValue.current}
                 bottom={
-                  Footer || isTab ? 12 : bottomInset + Spacing.S
+                  Footer || isTab ? 12 : Math.min(insets.bottom, 21) + Spacing.S
                 }
               />
             </View>
@@ -667,12 +627,7 @@ const Screen = forwardRef(
               style={[
                 styles.shadow,
                 {
-                  // 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
+                  paddingBottom: Math.min(insets.bottom, 21) + Spacing.S,
                   backgroundColor: theme.colors.background.surface,
                 },
               ]}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@momo-kits/foundation",
-    "version": "0.161.2-beta.16",
+    "version": "0.161.2-beta.18",
     "description": "React Native Component Kits",
     "main": "index.ts",
     "scripts": {},
@@ -16,6 +16,7 @@
         "@react-navigation/routers": "7.4.1",
         "@react-navigation/stack": "7.4.2",
         "react-native-gesture-handler": "2.27.1",
+        "react-native-keyboard-controller": "1.21.11",
         "react-native-linear-gradient": "git+https://oauth2:TGi6oBj-LdzsKpLXQSoH@gitlab.mservice.com.vn/momo-platform/public/react-native-linear-gradient#v3.0.0",
         "react-native-reanimated": "4.2.2",
         "react-native-safe-area-context": "5.5.2",