diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java index 2577fdf57d0..8fcd2812a28 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java @@ -931,6 +931,7 @@ private class CustomGlobalLayoutListener implements ViewTreeObserver.OnGlobalLay private final Rect mVisibleViewArea; private boolean mKeyboardIsVisible = false; + private int mKeyboardHeight = 0; private int mDeviceRotation = 0; /* package */ CustomGlobalLayoutListener() { @@ -957,13 +958,17 @@ private void checkForKeyboardEvents() { } boolean keyboardIsVisible = rootInsets.isVisible(WindowInsetsCompat.Type.ime()); - if (keyboardIsVisible != mKeyboardIsVisible) { - mKeyboardIsVisible = keyboardIsVisible; - Insets barInsets = rootInsets.getInsets(WindowInsetsCompat.Type.systemBars()); + Insets barInsets = rootInsets.getInsets(WindowInsetsCompat.Type.systemBars()); - if (keyboardIsVisible) { - Insets imeInsets = rootInsets.getInsets(WindowInsetsCompat.Type.ime()); - int height = imeInsets.bottom - barInsets.bottom; + if (keyboardIsVisible) { + Insets imeInsets = rootInsets.getInsets(WindowInsetsCompat.Type.ime()); + int height = imeInsets.bottom - barInsets.bottom; + + // Re-emit on height change while keyboard stays visible (e.g., emoji + // panel toggle); JS consumers cache endCoordinates from keyboardDidShow. + if (!mKeyboardIsVisible || height != mKeyboardHeight) { + mKeyboardIsVisible = true; + mKeyboardHeight = height; ViewGroup.LayoutParams rootLayoutParams = getRootView().getLayoutParams(); Assertions.assertCondition(rootLayoutParams instanceof WindowManager.LayoutParams); @@ -981,15 +986,18 @@ private void checkForKeyboardEvents() { PixelUtil.toDIPFromPixel(mVisibleViewArea.left), PixelUtil.toDIPFromPixel(mVisibleViewArea.width()), PixelUtil.toDIPFromPixel(height))); - } else { - sendEvent( - "keyboardDidHide", - createKeyboardEventPayload( - PixelUtil.toDIPFromPixel(mVisibleViewArea.bottom + barInsets.bottom), - 0, - PixelUtil.toDIPFromPixel(mVisibleViewArea.width()), - 0)); } + } else if (mKeyboardIsVisible) { + mKeyboardIsVisible = false; + mKeyboardHeight = 0; + + sendEvent( + "keyboardDidHide", + createKeyboardEventPayload( + PixelUtil.toDIPFromPixel(mVisibleViewArea.bottom + barInsets.bottom), + 0, + PixelUtil.toDIPFromPixel(mVisibleViewArea.width()), + 0)); } }