@onekeyfe/react-native-tab-view 3.0.139 → 3.0.141

package/android/src/main/java/com/rcttabview/RCTTabView.kt

@@ -20,6 +20,8 @@ import android.view.ViewGroup
 import android.widget.FrameLayout
 import android.widget.LinearLayout
 import android.widget.TextView
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.forEachIndexed
 import coil3.ImageLoader
 import coil3.asDrawable
@@ -45,15 +47,54 @@ private fun getMaterialContext(context: Context): Context {
 }
 
 class ExtendedBottomNavigationView(context: Context) : BottomNavigationView(getMaterialContext(context)) {
+  private val basePaddingStart = paddingStart
+  private val basePaddingTop = paddingTop
+  private val basePaddingEnd = paddingEnd
+  private val basePaddingBottom = paddingBottom
+  private var ignoreBottomInsets = false
+  private var ignoreKeyboardInsets = true
+
+  init {
+    // OneKey patch: Material pads the bar with getSystemWindowInsetBottom(), which
+    // includes the IME height only while the window uses adjustResize (switched on by
+    // react-native-keyboard-controller hooks), so whether the bar rose above the
+    // keyboard depended on the screen. Pad for system bars, and add the IME only when
+    // ignoreKeyboardInsets is turned off.
+    ViewCompat.setOnApplyWindowInsetsListener(this) { view, insets ->
+      val barInsets = insets.getInsets(
+        WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout()
+      )
+      val navigationBarBottom = if (ignoreBottomInsets) 0 else barInsets.bottom
+      val keyboardBottom = if (ignoreKeyboardInsets) {
+        0
+      } else {
+        insets.getInsets(WindowInsetsCompat.Type.ime()).bottom
+      }
+      val isRtl = view.layoutDirection == View.LAYOUT_DIRECTION_RTL
+      view.setPaddingRelative(
+        basePaddingStart + if (isRtl) barInsets.right else barInsets.left,
+        basePaddingTop,
+        basePaddingEnd + if (isRtl) barInsets.left else barInsets.right,
+        basePaddingBottom + maxOf(navigationBarBottom, keyboardBottom),
+      )
+      insets
+    }
+  }
 
   fun setIgnoreBottomInsets(ignore: Boolean) {
-    if (ignore) {
-      setOnApplyWindowInsetsListener { v, insets -> insets }
-      setPadding(paddingLeft, paddingTop, paddingRight, 0)
-    } else {
-      setOnApplyWindowInsetsListener(null)
-      requestApplyInsets()
+    if (ignoreBottomInsets == ignore) {
+      return
+    }
+    ignoreBottomInsets = ignore
+    requestApplyInsets()
+  }
+
+  fun setIgnoreKeyboardInsets(ignore: Boolean) {
+    if (ignoreKeyboardInsets == ignore) {
+      return
     }
+    ignoreKeyboardInsets = ignore
+    requestApplyInsets()
   }
 
   override fun getMaxItemCount(): Int {
@@ -106,6 +147,8 @@ class ReactBottomNavigationView(context: Context) : LinearLayout(context) {
   private var lastReportedSize: Size? = null
   private var hasCustomAppearance = false
   private var uiModeConfiguration: Int = Configuration.UI_MODE_NIGHT_UNDEFINED
+  private var ignoreBottomInsets = false
+  private var ignoreKeyboardInsets = true
 
   private val imageLoader = ImageLoader.Builder(context)
     .components {
@@ -289,9 +332,15 @@ class ReactBottomNavigationView(context: Context) : LinearLayout(context) {
   }
 
   fun setIgnoreBottomInsets(ignore: Boolean) {
+    ignoreBottomInsets = ignore
     bottomNavigation.setIgnoreBottomInsets(ignore)
   }
 
+  fun setIgnoreKeyboardInsets(ignore: Boolean) {
+    ignoreKeyboardInsets = ignore
+    bottomNavigation.setIgnoreKeyboardInsets(ignore)
+  }
+
   fun setTabBarHidden(isHidden: Boolean) {
     if (isHidden) {
       bottomNavigation.visibility = GONE
@@ -576,6 +625,8 @@ class ReactBottomNavigationView(context: Context) : LinearLayout(context) {
     // We also opt-out of this recreation when custom styles are used.
     removeView(bottomNavigation)
     bottomNavigation = ExtendedBottomNavigationView(context)
+    bottomNavigation.setIgnoreBottomInsets(ignoreBottomInsets)
+    bottomNavigation.setIgnoreKeyboardInsets(ignoreKeyboardInsets)
     addView(bottomNavigation)
     updateItems(items)
     setLabeled(this.labeled)

package/android/src/main/java/com/rcttabview/RCTTabViewManager.kt

@@ -193,6 +193,10 @@ class RCTTabViewManager(context: ReactApplicationContext) :
     view?.setIgnoreBottomInsets(value)
   }
 
+  override fun setIgnoreKeyboardInsets(view: ReactBottomNavigationView?, value: Boolean) {
+    view?.setIgnoreKeyboardInsets(value)
+  }
+
   // iOS-only props (no-ops on Android)
   // selectedIcons feeds UITabBarItem.selectedImage on iOS; Android keeps
   // swapping the icon in JS via the focusedKey-driven `icons` array.

package/lib/module/TabViewNativeComponent.ts

@@ -62,6 +62,7 @@ export interface TabViewProps extends ViewProps {
   fontWeight?: string;
   fontSize?: Int32;
   ignoreBottomInsets?: boolean;
+  ignoreKeyboardInsets?: WithDefault<boolean, true>;
 }
 
 export default codegenNativeComponent<TabViewProps>('RNCTabView');

package/lib/typescript/src/TabView.d.ts

@@ -178,6 +178,12 @@ interface Props<Route extends BaseRoute> {
      * Whether to ignore bottom system insets (navigation bar). Android only.
      */
     ignoreBottomInsets?: boolean;
+    /**
+     * Whether the tab bar ignores the soft keyboard. Defaults to true, so the
+     * keyboard covers the tab bar as on iOS. Set to false to pad the tab bar by
+     * the keyboard height so it rises above the keyboard. Android only.
+     */
+    ignoreKeyboardInsets?: boolean;
     /**
      * Whether to delay freeze/unfreeze by 200ms on tab switch.
      * Defaults to false (immediate freeze). Set to true to restore the

package/lib/typescript/src/TabViewNativeComponent.d.ts

@@ -50,6 +50,7 @@ export interface TabViewProps extends ViewProps {
     fontWeight?: string;
     fontSize?: Int32;
     ignoreBottomInsets?: boolean;
+    ignoreKeyboardInsets?: WithDefault<boolean, true>;
 }
 declare const _default: import("react-native").HostComponent<TabViewProps>;
 export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/react-native-tab-view",
-  "version": "3.0.139",
+  "version": "3.0.141",
   "description": "Native Bottom Tabs for React Native (UIKit implementation)",
   "source": "./src/index.tsx",
   "main": "./lib/module/index.js",

package/src/TabView.tsx

@@ -190,6 +190,12 @@ interface Props<Route extends BaseRoute> {
    * Whether to ignore bottom system insets (navigation bar). Android only.
    */
   ignoreBottomInsets?: boolean;
+  /**
+   * Whether the tab bar ignores the soft keyboard. Defaults to true, so the
+   * keyboard covers the tab bar as on iOS. Set to false to pad the tab bar by
+   * the keyboard height so it rises above the keyboard. Android only.
+   */
+  ignoreKeyboardInsets?: boolean;
   /**
    * Whether to delay freeze/unfreeze by 200ms on tab switch.
    * Defaults to false (immediate freeze). Set to true to restore the

package/src/TabViewNativeComponent.ts

@@ -62,6 +62,7 @@ export interface TabViewProps extends ViewProps {
   fontWeight?: string;
   fontSize?: Int32;
   ignoreBottomInsets?: boolean;
+  ignoreKeyboardInsets?: WithDefault<boolean, true>;
 }
 
 export default codegenNativeComponent<TabViewProps>('RNCTabView');