[Mobile] - Android - Bring the Keyboard back when closing modals

packages/components/src/mobile/bottom-sheet/index.native.js

@@ -19,7 +19,10 @@ import SafeArea from 'react-native-safe-area';
 /**
  * WordPress dependencies
  */
-import { subscribeAndroidModalClosed } from '@wordpress/react-native-bridge';
+import {
+	subscribeAndroidModalClosed,
+	showAndroidSoftKeyboard,
+} from '@wordpress/react-native-bridge';
 import { Component } from '@wordpress/element';
 import { withPreferredColorScheme } from '@wordpress/compose';
 
@@ -209,6 +212,9 @@ class BottomSheet extends Component {
 	}
 
 	componentWillUnmount() {
+		// Restore Keyboard Visibility
+		showAndroidSoftKeyboard();
+
 		this.dimensionsChangeSubscription.remove();
 		this.keyboardShowListener.remove();
 		this.keyboardHideListener.remove();
@@ -353,6 +359,9 @@ class BottomSheet extends Component {
 			onClose();
 		}
 		this.onShouldSetBottomSheetMaxHeight( true );
+
+		// Restore Keyboard Visibility
+		showAndroidSoftKeyboard();
 	}
 
 	setIsFullScreen( isFullScreen ) {
@@ -368,6 +377,10 @@ class BottomSheet extends Component {
 	onHardwareButtonPress() {
 		const { onClose } = this.props;
 		const { handleHardwareButtonPress } = this.state;
+
+		// Restore Keyboard Visibility
+		showAndroidSoftKeyboard();
+
 		if ( handleHardwareButtonPress && handleHardwareButtonPress() ) {
 			return;
 		}

packages/react-native-bridge/android/react-native-bridge/src/main/java/org/wordpress/mobile/ReactNativeGutenbergBridge/RNReactNativeGutenbergBridgeModule.java

@@ -44,6 +44,7 @@ public class RNReactNativeGutenbergBridgeModule extends ReactContextBaseJavaModu
         DeferredEventEmitter.JSEventEmitter {
     private final ReactApplicationContext mReactContext;
     private final GutenbergBridgeJS2Parent mGutenbergBridgeJS2Parent;
+    private Runnable mKeyboardRunnable;
 
     private static final String EVENT_NAME_REQUEST_GET_HTML = "requestGetHtml";
     private static final String EVENT_NAME_UPDATE_HTML = "updateHtml";
@@ -554,14 +555,44 @@ private ConnectionStatusCallback requestConnectionStatusCallback(final Callback
         };
     }
 
+    @ReactMethod
+    public void showAndroidSoftKeyboard() {
+        Activity currentActivity = mReactContext.getCurrentActivity();
+        if (currentActivity != null) {
+            // Define the delay in milliseconds to prevent trying to show the keyboard right when a UI change happened.
+            int delayMillis = 500;
+
+            // Cancel any previously scheduled Runnable
+            if (mKeyboardRunnable != null) {
+                currentActivity.getWindow().getDecorView().removeCallbacks(mKeyboardRunnable);
+            }
+
+            // Create a new Runnable
+            mKeyboardRunnable = new Runnable() {
+                @Override
+                public void run() {
+                    View currentFocusedView = currentActivity.getCurrentFocus();
+                    if (currentFocusedView != null) {
+                        InputMethodManager imm =
+                            (InputMethodManager) mReactContext.getSystemService(Context.INPUT_METHOD_SERVICE);
+                        imm.showSoftInput(currentFocusedView, InputMethodManager.SHOW_IMPLICIT);
+                    }
+                }
+            };
+
+            // Schedule the new Runnable
+            currentActivity.getWindow().getDecorView().postDelayed(mKeyboardRunnable, delayMillis);
+        }
+    }
+
     @ReactMethod
     public void hideAndroidSoftKeyboard() {
         Activity currentActivity = mReactContext.getCurrentActivity();
         if (currentActivity != null) {
             View currentFocusedView = currentActivity.getCurrentFocus();
             if (currentFocusedView != null) {
                 InputMethodManager imm =
-                        (InputMethodManager) mReactContext.getSystemService(Context.INPUT_METHOD_SERVICE);
+                    (InputMethodManager) mReactContext.getSystemService(Context.INPUT_METHOD_SERVICE);
                 imm.hideSoftInputFromWindow(currentFocusedView.getWindowToken(), 0);
             }
         }

packages/react-native-bridge/index.js

@@ -515,6 +515,20 @@ export function sendEventToHost( eventName, properties ) {
 	);
 }
 
+/**
+ * Shows Android's soft keyboard if there's a TextInput focused and
+ * the keyboard is hidden.
+ *
+ * @return {void}
+ */
+export function showAndroidSoftKeyboard() {
+	if ( isIOS ) {
+		return;
+	}
+
+	RNReactNativeGutenbergBridge.showAndroidSoftKeyboard();
+}
+
 /**
  * Hides Android's soft keyboard.
  *

test/native/setup.js

@@ -109,6 +109,7 @@ jest.mock( '@wordpress/react-native-bridge', () => {
 		subscribeOnRedoPressed: jest.fn(),
 		useIsConnected: jest.fn( () => ( { isConnected: true } ) ),
 		editorDidMount: jest.fn(),
+		showAndroidSoftKeyboard: jest.fn(),
 		hideAndroidSoftKeyboard: jest.fn(),
 		editorDidAutosave: jest.fn(),
 		subscribeMediaUpload: jest.fn(),