From 90d6a1936dba86fb181d7a61fe28c894561248fd Mon Sep 17 00:00:00 2001
From: d4vidi <amit.d4vidi@gmail.com>
Date: Wed, 13 Aug 2025 19:12:04 +0300
Subject: [PATCH 1/4] fix(kbd): Allow for kbd-awareness / further inset compute

---
 e2e/Keyboard.test.js                          | 14 ++++-
 .../bottomtabs/BottomTabsController.java      |  8 ++-
 playground/src/screens/KeyboardScreen.tsx     | 62 ++++++++++++++-----
 playground/src/testIDs.ts                     |  1 +
 4 files changed, 62 insertions(+), 23 deletions(-)

diff --git a/e2e/Keyboard.test.js b/e2e/Keyboard.test.js
index 94b2ea08e3d..1dbb32b8139 100644
--- a/e2e/Keyboard.test.js
+++ b/e2e/Keyboard.test.js
@@ -1,9 +1,10 @@
 import { default as TestIDs, default as testIDs } from '../playground/src/testIDs';
-import Android from './AndroidUtils';
 import Utils from './Utils';
 
 const { elementByLabel, elementById } = Utils;
 
+const KBD_OBSCURED_TEXT = 'Keyboard Demo';
+
 describe.e2e('Keyboard', () => {
   beforeEach(async () => {
     await device.launchApp({ newInstance: true });
@@ -11,8 +12,9 @@ describe.e2e('Keyboard', () => {
   });
 
   it('Push - should close keyboard when Back clicked', async () => {
+    await expect(elementByLabel(KBD_OBSCURED_TEXT)).toBeVisible();
     await elementById(TestIDs.TEXT_INPUT1).tap();
-    await expect(elementByLabel('Keyboard Demo')).not.toBeVisible();
+    await expect(elementByLabel(KBD_OBSCURED_TEXT)).not.toBeVisible();
     await elementById(TestIDs.BACK_BUTTON).tap();
     await expect(elementById(testIDs.MAIN_BOTTOM_TABS)).toBeVisible();
   });
@@ -20,7 +22,7 @@ describe.e2e('Keyboard', () => {
   it('Modal - should close keyboard when close clicked', async () => {
     await elementById(TestIDs.MODAL_BTN).tap();
     await elementById(TestIDs.TEXT_INPUT1).tap();
-    await expect(elementByLabel('Keyboard Demo')).not.toBeVisible();
+    await expect(elementByLabel(KBD_OBSCURED_TEXT)).not.toBeVisible();
     await elementById(TestIDs.DISMISS_MODAL_TOPBAR_BTN).tap();
     await expect(elementById(testIDs.MAIN_BOTTOM_TABS)).toBeVisible();
   });
@@ -46,4 +48,10 @@ describe.e2e('Keyboard', () => {
     await elementById(TestIDs.MODAL_BTN).tap();
     await expect(elementById(TestIDs.TEXT_INPUT1)).not.toBeFocused();
   });
+
+  it(':android should respect UI with keyboard awareness', async () => {
+    await elementById(TestIDs.PUSH_KEYBOARD_SCREEN_STICKY_FOOTER).tap();
+    await elementById(TestIDs.TEXT_INPUT2).tap();
+    await expect(elementByLabel(KBD_OBSCURED_TEXT)).toBeVisible();
+  });
 });
diff --git a/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/bottomtabs/BottomTabsController.java b/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/bottomtabs/BottomTabsController.java
index 78be5f656c2..b3deb2cd87f 100644
--- a/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/bottomtabs/BottomTabsController.java
+++ b/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/bottomtabs/BottomTabsController.java
@@ -316,10 +316,12 @@ public Animator getPopAnimation(Options appearingOptions, Options disappearingOp
     @Override
     protected WindowInsetsCompat onApplyWindowInsets(View view, WindowInsetsCompat insets) {
         Insets sysInsets = insets.getInsets(WindowInsetsCompat.Type.systemBars());
-        view.setPaddingRelative(0, 0, 0, sysInsets.bottom);
-        return WindowInsetsCompat.CONSUMED;
-    }
+        Insets imeInsets = insets.getInsets(WindowInsetsCompat.Type.ime());
 
+        int bottomInset = (imeInsets.bottom > 0) ? 0 : sysInsets.bottom;
+        view.setPaddingRelative(0, 0, 0, bottomInset);
+        return insets;
+    }
 
     @RestrictTo(RestrictTo.Scope.TESTS)
     public BottomTabs getBottomTabs() {
diff --git a/playground/src/screens/KeyboardScreen.tsx b/playground/src/screens/KeyboardScreen.tsx
index d439e72ef43..a199efaacf9 100644
--- a/playground/src/screens/KeyboardScreen.tsx
+++ b/playground/src/screens/KeyboardScreen.tsx
@@ -1,5 +1,15 @@
 import React from 'react';
-import { View, ScrollView, Dimensions, StyleSheet, Image, TextInput, Text } from 'react-native';
+import {
+  SafeAreaView,
+  View,
+  ScrollView,
+  Dimensions,
+  StyleSheet,
+  Image,
+  TextInput,
+  Text,
+  KeyboardAvoidingView,
+} from 'react-native';
 import {
   NavigationProps,
   NavigationComponent,
@@ -15,6 +25,7 @@ const KEYBOARD_LABEL = 'Keyboard Demo';
 interface Props extends NavigationProps {
   title?: string;
   autoFocus?: boolean;
+  stickyFooter?: boolean;
 }
 
 export default class KeyboardScreen extends NavigationComponent<Props> {
@@ -34,6 +45,7 @@ export default class KeyboardScreen extends NavigationComponent<Props> {
       },
     };
   }
+
   constructor(props: Props) {
     super(props);
     Navigation.events().bindComponent(this);
@@ -50,30 +62,41 @@ export default class KeyboardScreen extends NavigationComponent<Props> {
   }
 
   render() {
+    const FooterRoot = this.props.stickyFooter === true ? KeyboardAvoidingView : View;
     return (
-      <View style={styles.root}>
+      <SafeAreaView style={styles.root}>
         <ScrollView>
           <Image style={styles.image} source={require('../../img/2048.jpeg')} />
           <View style={{ alignItems: 'center' }}>
             <Button
               style={styles.button}
-              label={'Modal Keyboard Screen'}
+              label={'Modal screen'}
               testID={testIDs.MODAL_BTN}
               onPress={async () => {
                 await this.openModalKeyboard(undefined);
               }}
             />
+            <View style={styles.row}>
+              <Button
+                style={styles.button}
+                label={'Push screen w/ focus'}
+                testID={testIDs.PUSH_FOCUSED_KEYBOARD_SCREEN}
+                onPress={async () => {
+                  await this.openPushedKeyboard(undefined, true);
+                }}
+              />
+              <Button
+                style={styles.button}
+                label={'w/ sticky-footer'}
+                testID={testIDs.PUSH_KEYBOARD_SCREEN_STICKY_FOOTER}
+                onPress={async () => {
+                  await this.openPushedKeyboard(undefined, undefined, true);
+                }}
+              />
+            </View>
             <Button
               style={styles.button}
-              label={'Push Focused Keyboard Screen'}
-              testID={testIDs.PUSH_FOCUSED_KEYBOARD_SCREEN}
-              onPress={async () => {
-                await this.openPushedKeyboard(undefined, true);
-              }}
-            />
-            <Button
-              style={styles.button}
-              label={'Show Focused Keyboard Screen Modal'}
+              label={'Modal screen w/ focus'}
               testID={testIDs.MODAL_FOCUSED_KEYBOARD_SCREEN}
               onPress={async () => {
                 await this.openModalKeyboard(undefined, true);
@@ -104,20 +127,21 @@ export default class KeyboardScreen extends NavigationComponent<Props> {
             />
           </View>
         </ScrollView>
-        <View style={styles.footer}>
-          <Text style={styles.input}> {KEYBOARD_LABEL}</Text>
-        </View>
-      </View>
+        <FooterRoot behavior="height" style={styles.footer}>
+          <Text style={styles.input}>{KEYBOARD_LABEL}</Text>
+        </FooterRoot>
+      </SafeAreaView>
     );
   }
 
-  openPushedKeyboard = async (text?: string, autoFocus?: boolean) => {
+  openPushedKeyboard = async (text?: string, autoFocus?: boolean, stickyFooter?: boolean) => {
     await Navigation.push(this.props.componentId, {
       component: {
         name: Screens.KeyboardScreen,
         passProps: {
           title: text,
           autoFocus,
+          stickyFooter,
         },
       },
     });
@@ -169,4 +193,8 @@ const styles = StyleSheet.create({
     width: screenWidth,
     resizeMode: 'cover',
   },
+  row: {
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+  },
 });
diff --git a/playground/src/testIDs.ts b/playground/src/testIDs.ts
index dacbde5af35..b5355cd4100 100644
--- a/playground/src/testIDs.ts
+++ b/playground/src/testIDs.ts
@@ -28,6 +28,7 @@ const testIDs = {
   MODAL_DISABLED_BACK_BTN: 'SHOW_MODAL_DISABLED_BACK_BTN',
   PUSH_FOCUSED_KEYBOARD_SCREEN: 'PUSH_FOCUSED_KEYBOARD_SCREEN',
   MODAL_FOCUSED_KEYBOARD_SCREEN: 'MODAL_FOCUSED_KEYBOARD_SCREEN',
+  PUSH_KEYBOARD_SCREEN_STICKY_FOOTER: 'PUSH_KEYBOARD_SCREEN_STICKY_FOOTER',
   PAGE_SHEET_MODAL_BTN: 'SHOW_PAGE_SHEET_MODAL_BUTTON',
   DISMISS_MODAL_BTN: 'DISMISS_MODAL_BUTTON',
   DISMISS_REACT_MODAL_BTN: 'DISMISS_REACT_MODAL_BUTTON',

From 5147abfb75b9a56e4721795df6b0e33bed42c4f9 Mon Sep 17 00:00:00 2001
From: d4vidi <amit.d4vidi@gmail.com>
Date: Thu, 14 Aug 2025 14:20:43 +0300
Subject: [PATCH 2/4] e2e(kbd): fill-in ancient test gaps

---
 e2e/Keyboard.test.js | 50 +++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 49 insertions(+), 1 deletion(-)

diff --git a/e2e/Keyboard.test.js b/e2e/Keyboard.test.js
index 1dbb32b8139..6e465f65e96 100644
--- a/e2e/Keyboard.test.js
+++ b/e2e/Keyboard.test.js
@@ -1,11 +1,59 @@
 import { default as TestIDs, default as testIDs } from '../playground/src/testIDs';
+import { device } from 'detox';
 import Utils from './Utils';
 
 const { elementByLabel, elementById } = Utils;
 
 const KBD_OBSCURED_TEXT = 'Keyboard Demo';
 
+const enableOnScreenKeyboard = async (adb, adbName) =>
+  adb.shell(adbName, 'settings put Secure show_ime_with_hard_keyboard 1');
+
+const disableOnScreenKeyboard = async (adb, adbName) =>
+  adb.shell(adbName, 'settings put Secure show_ime_with_hard_keyboard 0');
+
+const driver = {
+  async init() {
+    const { id: adbName } = device;
+    const { adb } = device.deviceDriver;
+
+    if (!adb || !adbName) {
+      throw new Error(`Keyboard driver init failed (id=${adbName}, hasADB=${!!adb})`);
+    }
+
+    this.adb = adb;
+    this.adbName = adbName;
+    this.kbdEnabled = await adb.shell(adbName, 'settings get Secure show_ime_with_hard_keyboard');
+
+    if (!(this.kbdEnabled === '0') || !(this.kbdEnabled === '1')) {
+      console.warn('[KeyboardDriver] Unable to get on-screen KBD setting, defaulting to false');
+      this.kbdEnabled = '0'
+    }
+  },
+
+  async enableOnScreenKeyboard() {
+    await this.adb.shell(this.adbName, 'settings put Secure show_ime_with_hard_keyboard 1');
+  },
+  async restoreOnScreenKeyboard() {
+    if (!this.adb) {
+      // Not initialized
+      return;
+    }
+
+    await this.adb.shell(this.adbName, `settings put Secure show_ime_with_hard_keyboard ${this.kbdEnabled}`);
+  },
+}
+
 describe.e2e('Keyboard', () => {
+  beforeAll(async () => {
+    await driver.init();
+    await driver.enableOnScreenKeyboard();
+  });
+
+  afterAll(async () => {
+    await driver.restoreOnScreenKeyboard();
+  });
+
   beforeEach(async () => {
     await device.launchApp({ newInstance: true });
     await elementById(TestIDs.KEYBOARD_SCREEN_BTN).tap();
@@ -49,7 +97,7 @@ describe.e2e('Keyboard', () => {
     await expect(elementById(TestIDs.TEXT_INPUT1)).not.toBeFocused();
   });
 
-  it(':android should respect UI with keyboard awareness', async () => {
+  it(':android: should respect UI with keyboard awareness', async () => {
     await elementById(TestIDs.PUSH_KEYBOARD_SCREEN_STICKY_FOOTER).tap();
     await elementById(TestIDs.TEXT_INPUT2).tap();
     await expect(elementByLabel(KBD_OBSCURED_TEXT)).toBeVisible();

From 4252313b81536db9bf8fb05f9e0b92ec4d08c92b Mon Sep 17 00:00:00 2001
From: d4vidi <amit.d4vidi@gmail.com>
Date: Thu, 14 Aug 2025 14:43:33 +0300
Subject: [PATCH 3/4] Fix test for iOS

---
 e2e/Keyboard.test.js | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/e2e/Keyboard.test.js b/e2e/Keyboard.test.js
index 6e465f65e96..346e023935d 100644
--- a/e2e/Keyboard.test.js
+++ b/e2e/Keyboard.test.js
@@ -12,8 +12,12 @@ const enableOnScreenKeyboard = async (adb, adbName) =>
 const disableOnScreenKeyboard = async (adb, adbName) =>
   adb.shell(adbName, 'settings put Secure show_ime_with_hard_keyboard 0');
 
-const driver = {
+const androidDriver = {
   async init() {
+    if (device.getPlatform() !== 'android') {
+      return;
+    }
+
     const { id: adbName } = device;
     const { adb } = device.deviceDriver;
 
@@ -32,8 +36,13 @@ const driver = {
   },
 
   async enableOnScreenKeyboard() {
+    if (!this.adb) {
+      // Not initialized
+      return;
+    }
     await this.adb.shell(this.adbName, 'settings put Secure show_ime_with_hard_keyboard 1');
   },
+
   async restoreOnScreenKeyboard() {
     if (!this.adb) {
       // Not initialized
@@ -46,12 +55,12 @@ const driver = {
 
 describe.e2e('Keyboard', () => {
   beforeAll(async () => {
-    await driver.init();
-    await driver.enableOnScreenKeyboard();
+    await androidDriver.init();
+    await androidDriver.enableOnScreenKeyboard();
   });
 
   afterAll(async () => {
-    await driver.restoreOnScreenKeyboard();
+    await androidDriver.restoreOnScreenKeyboard();
   });
 
   beforeEach(async () => {

From 836c746e66e2c0d1005156345db6b55976715ead Mon Sep 17 00:00:00 2001
From: d4vidi <amit.d4vidi@gmail.com>
Date: Thu, 14 Aug 2025 14:48:16 +0300
Subject: [PATCH 4/4] e2e(kbd): Fix driver init (get kbdEnabled)

---
 e2e/Keyboard.test.js | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/e2e/Keyboard.test.js b/e2e/Keyboard.test.js
index 346e023935d..0a0ba954204 100644
--- a/e2e/Keyboard.test.js
+++ b/e2e/Keyboard.test.js
@@ -6,12 +6,6 @@ const { elementByLabel, elementById } = Utils;
 
 const KBD_OBSCURED_TEXT = 'Keyboard Demo';
 
-const enableOnScreenKeyboard = async (adb, adbName) =>
-  adb.shell(adbName, 'settings put Secure show_ime_with_hard_keyboard 1');
-
-const disableOnScreenKeyboard = async (adb, adbName) =>
-  adb.shell(adbName, 'settings put Secure show_ime_with_hard_keyboard 0');
-
 const androidDriver = {
   async init() {
     if (device.getPlatform() !== 'android') {
@@ -29,9 +23,9 @@ const androidDriver = {
     this.adbName = adbName;
     this.kbdEnabled = await adb.shell(adbName, 'settings get Secure show_ime_with_hard_keyboard');
 
-    if (!(this.kbdEnabled === '0') || !(this.kbdEnabled === '1')) {
-      console.warn('[KeyboardDriver] Unable to get on-screen KBD setting, defaulting to false');
-      this.kbdEnabled = '0'
+    if (!(this.kbdEnabled === '0' || this.kbdEnabled === '1')) {
+      console.warn('[KbdDriver] Unable to get on-screen KBD setting, defaulting to false');
+      this.kbdEnabled = '0';
     }
   },
 
@@ -48,7 +42,6 @@ const androidDriver = {
       // Not initialized
       return;
     }
-
     await this.adb.shell(this.adbName, `settings put Secure show_ime_with_hard_keyboard ${this.kbdEnabled}`);
   },
 }