@depup/react-native 0.85.0-depup.1 → 0.86.2-depup.0

package/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java

@@ -10,15 +10,11 @@ package com.facebook.react;
 import static com.facebook.infer.annotation.ThreadConfined.UI;
 import static com.facebook.react.bridge.ReactMarkerConstants.ATTACH_MEASURED_ROOT_VIEWS_END;
 import static com.facebook.react.bridge.ReactMarkerConstants.ATTACH_MEASURED_ROOT_VIEWS_START;
-import static com.facebook.react.bridge.ReactMarkerConstants.BUILD_NATIVE_MODULE_REGISTRY_END;
-import static com.facebook.react.bridge.ReactMarkerConstants.BUILD_NATIVE_MODULE_REGISTRY_START;
 import static com.facebook.react.bridge.ReactMarkerConstants.CHANGE_THREAD_PRIORITY;
 import static com.facebook.react.bridge.ReactMarkerConstants.CREATE_VIEW_MANAGERS_END;
 import static com.facebook.react.bridge.ReactMarkerConstants.CREATE_VIEW_MANAGERS_START;
 import static com.facebook.react.bridge.ReactMarkerConstants.PRE_SETUP_REACT_CONTEXT_END;
 import static com.facebook.react.bridge.ReactMarkerConstants.PRE_SETUP_REACT_CONTEXT_START;
-import static com.facebook.react.bridge.ReactMarkerConstants.PROCESS_PACKAGES_END;
-import static com.facebook.react.bridge.ReactMarkerConstants.PROCESS_PACKAGES_START;
 import static com.facebook.react.bridge.ReactMarkerConstants.REACT_CONTEXT_THREAD_END;
 import static com.facebook.react.bridge.ReactMarkerConstants.REACT_CONTEXT_THREAD_START;
 import static com.facebook.react.bridge.ReactMarkerConstants.SETUP_REACT_CONTEXT_END;
@@ -27,6 +23,7 @@ import static com.facebook.react.bridge.ReactMarkerConstants.VM_INIT;
 import static com.facebook.react.uimanager.common.UIManagerType.FABRIC;
 import static com.facebook.systrace.Systrace.TRACE_TAG_REACT;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -51,7 +48,6 @@ import com.facebook.react.bridge.JSBundleLoader;
 import com.facebook.react.bridge.JSExceptionHandler;
 import com.facebook.react.bridge.JavaScriptExecutor;
 import com.facebook.react.bridge.JavaScriptExecutorFactory;
-import com.facebook.react.bridge.NativeModuleRegistry;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReactMarker;
@@ -81,7 +77,6 @@ import com.facebook.react.internal.AndroidChoreographerProvider;
 import com.facebook.react.internal.ChoreographerProvider;
 import com.facebook.react.internal.featureflags.ReactNativeNewArchitectureFeatureFlags;
 import com.facebook.react.modules.appearance.AppearanceModule;
-import com.facebook.react.modules.appregistry.AppRegistry;
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.facebook.react.modules.core.ReactChoreographer;
@@ -91,7 +86,6 @@ import com.facebook.react.uimanager.ReactRoot;
 import com.facebook.react.uimanager.ReactStage;
 import com.facebook.react.uimanager.UIManagerHelper;
 import com.facebook.react.uimanager.ViewManager;
-import com.facebook.react.uimanager.common.UIManagerType;
 import com.facebook.react.views.imagehelper.ResourceDrawableIdHelper;
 import com.facebook.soloader.SoLoader;
 import com.facebook.systrace.Systrace;
@@ -177,6 +171,7 @@ public class ReactInstanceManager {
   // Identifies whether the instance manager destroy function is in process,
   // while true any spawned create thread should wait for proper clean up before initializing
   private volatile Boolean mHasStartedDestroying = false;
+  private final Object mHasStartedDestroyingLock = new Object();
   private final MemoryPressureRouter mMemoryPressureRouter;
   private final @Nullable JSExceptionHandler mJSExceptionHandler;
   private final @Nullable UIManagerProvider mUIManagerProvider;
@@ -593,12 +588,14 @@ public class ReactInstanceManager {
 
   /**
    * Call this from {@link Activity#onPause()}. This notifies any listening modules so they can do
-   * any necessary cleanup. The passed Activity is the current Activity being paused. This will
-   * always be the foreground activity that would be returned by {@link
-   * ReactContext#getCurrentActivity()}.
+   * any necessary cleanup. The passed Activity is the current Activity being paused. This is
+   * expected to be the foreground activity that would be returned by {@link
+   * ReactContext#getCurrentActivity()}. If the passed activity does not match the current activity,
+   * a warning will be logged instead of crashing.
    *
    * @param activity the activity being paused
    */
+  @SuppressLint("ReflectionMethodUse")
   @ThreadConfined(UI)
   public void onHostPause(@Nullable Activity activity) {
     if (mRequireActivity) {
@@ -612,15 +609,15 @@ public class ReactInstanceManager {
       }
       Assertions.assertCondition(mCurrentActivity != null);
     }
-    if (mCurrentActivity != null) {
-      Assertions.assertCondition(
-          activity == mCurrentActivity,
+    if (mCurrentActivity != null && activity != mCurrentActivity) {
+      FLog.w(
+          TAG,
           "Pausing an activity that is not the current activity, this is incorrect! "
               + "Current activity: "
               + mCurrentActivity.getClass().getSimpleName()
               + " "
               + "Paused activity: "
-              + activity.getClass().getSimpleName());
+              + (activity == null ? "null" : activity.getClass().getSimpleName()));
     }
     onHostPause();
   }
@@ -769,10 +766,7 @@ public class ReactInstanceManager {
       synchronized (mReactContextLock) {
         if (mCurrentReactContext != null) {
           for (ReactRoot reactRoot : mAttachedReactRoots) {
-            // Fabric surfaces must be cleaned up when React Native is destroyed.
-            if (reactRoot.getUIManagerType() == UIManagerType.FABRIC) {
-              detachRootViewFromInstance(reactRoot, mCurrentReactContext);
-            }
+            detachRootViewFromInstance(reactRoot, mCurrentReactContext);
           }
 
           mCurrentReactContext.destroy();
@@ -789,8 +783,8 @@ public class ReactInstanceManager {
     ResourceDrawableIdHelper.getInstance().clear();
 
     mHasStartedDestroying = false;
-    synchronized (mHasStartedDestroying) {
-      mHasStartedDestroying.notifyAll();
+    synchronized (mHasStartedDestroyingLock) {
+      mHasStartedDestroyingLock.notifyAll();
     }
     synchronized (mPackages) {
       mViewManagerNames = null;
@@ -1146,10 +1140,10 @@ public class ReactInstanceManager {
             null,
             () -> {
               ReactMarker.logMarker(REACT_CONTEXT_THREAD_END);
-              synchronized (ReactInstanceManager.this.mHasStartedDestroying) {
+              synchronized (ReactInstanceManager.this.mHasStartedDestroyingLock) {
                 while (ReactInstanceManager.this.mHasStartedDestroying) {
                   try {
-                    ReactInstanceManager.this.mHasStartedDestroying.wait();
+                    ReactInstanceManager.this.mHasStartedDestroyingLock.wait();
                   } catch (InterruptedException e) {
                     // Interrupted while waiting for destruction to complete, just retry
                     continue;
@@ -1273,9 +1267,7 @@ public class ReactInstanceManager {
 
     Systrace.beginSection(TRACE_TAG_REACT, "attachRootViewToInstance");
 
-    @Nullable
-    UIManager uiManager =
-        UIManagerHelper.getUIManager(mCurrentReactContext, reactRoot.getUIManagerType());
+    @Nullable UIManager uiManager = UIManagerHelper.getUIManager(mCurrentReactContext, FABRIC);
 
     // If we can't get a UIManager something has probably gone horribly wrong
     if (uiManager == null) {
@@ -1286,28 +1278,16 @@ public class ReactInstanceManager {
 
     @Nullable Bundle initialProperties = reactRoot.getAppProperties();
 
-    final int rootTag;
-    if (reactRoot.getUIManagerType() == FABRIC) {
-      rootTag =
-          uiManager.startSurface(
-              reactRoot.getRootViewGroup(),
-              reactRoot.getJSModuleName(),
-              initialProperties == null
-                  ? new WritableNativeMap()
-                  : Arguments.fromBundle(initialProperties),
-              reactRoot.getWidthMeasureSpec(),
-              reactRoot.getHeightMeasureSpec());
-      reactRoot.setShouldLogContentAppeared(true);
-    } else {
-      rootTag =
-          uiManager.addRootView(
-              reactRoot.getRootViewGroup(),
-              initialProperties == null
-                  ? new WritableNativeMap()
-                  : Arguments.fromBundle(initialProperties));
-      reactRoot.setRootViewTag(rootTag);
-      reactRoot.runApplication();
-    }
+    final int rootTag =
+        uiManager.startSurface(
+            reactRoot.getRootViewGroup(),
+            reactRoot.getJSModuleName(),
+            initialProperties == null
+                ? new WritableNativeMap()
+                : Arguments.fromBundle(initialProperties),
+            reactRoot.getWidthMeasureSpec(),
+            reactRoot.getHeightMeasureSpec());
+    reactRoot.setShouldLogContentAppeared(true);
 
     Systrace.beginAsyncSection(TRACE_TAG_REACT, "pre_rootView.onAttachedToReactInstance", rootTag);
     UiThreadUtil.runOnUiThread(
@@ -1328,36 +1308,28 @@ public class ReactInstanceManager {
       return;
     }
 
-    @UIManagerType int uiManagerType = reactRoot.getUIManagerType();
-    if (uiManagerType == UIManagerType.FABRIC) {
-      // Stop surface in Fabric.
-      // Calling FabricUIManager.stopSurface causes the C++ Binding.stopSurface
-      // to be called synchronously over the JNI, which causes an empty tree
-      // to be committed via the Scheduler, which will cause mounting instructions
-      // to be queued up and synchronously executed to delete and remove
-      // all the views in the hierarchy.
-      final int surfaceId = reactRoot.getRootViewTag();
-      if (surfaceId != View.NO_ID) {
-        UIManager uiManager = UIManagerHelper.getUIManager(reactContext, uiManagerType);
-        if (uiManager != null) {
-          uiManager.stopSurface(surfaceId);
-        } else {
-          FLog.w(ReactConstants.TAG, "Failed to stop surface, UIManager has already gone away");
-        }
+    // Stop surface in Fabric.
+    // Calling FabricUIManager.stopSurface causes the C++ Binding.stopSurface
+    // to be called synchronously over the JNI, which causes an empty tree
+    // to be committed via the Scheduler, which will cause mounting instructions
+    // to be queued up and synchronously executed to delete and remove
+    // all the views in the hierarchy.
+    final int surfaceId = reactRoot.getRootViewTag();
+    if (surfaceId != View.NO_ID) {
+      UIManager uiManager = UIManagerHelper.getUIManager(reactContext, FABRIC);
+      if (uiManager != null) {
+        uiManager.stopSurface(surfaceId);
       } else {
-        ReactSoftExceptionLogger.logSoftException(
-            TAG,
-            new RuntimeException(
-                "detachRootViewFromInstance called with ReactRootView with invalid id"));
+        FLog.w(ReactConstants.TAG, "Failed to stop surface, UIManager has already gone away");
       }
-
-      clearReactRoot(reactRoot);
     } else {
-      reactContext
-          .getCatalystInstance()
-          .getJSModule(AppRegistry.class)
-          .unmountApplicationComponentAtRootTag(reactRoot.getRootViewTag());
+      ReactSoftExceptionLogger.logSoftException(
+          TAG,
+          new RuntimeException(
+              "detachRootViewFromInstance called with ReactRootView with invalid id"));
     }
+
+    clearReactRoot(reactRoot);
   }
 
   @ThreadConfined(UI)
@@ -1392,45 +1364,4 @@ public class ReactInstanceManager {
         "ReactInstanceManager.createReactContext is unsupported. CatalystInstanceImpl has been"
             + " removed.");
   }
-
-  private NativeModuleRegistry processPackages(
-      ReactApplicationContext reactContext, List<ReactPackage> packages) {
-    NativeModuleRegistryBuilder nativeModuleRegistryBuilder =
-        new NativeModuleRegistryBuilder(reactContext);
-
-    ReactMarker.logMarker(PROCESS_PACKAGES_START);
-
-    synchronized (mPackages) {
-      for (ReactPackage reactPackage : packages) {
-        Systrace.beginSection(TRACE_TAG_REACT, "createAndProcessCustomReactPackage");
-        try {
-          processPackage(reactPackage, nativeModuleRegistryBuilder);
-        } finally {
-          Systrace.endSection(TRACE_TAG_REACT);
-        }
-      }
-    }
-    ReactMarker.logMarker(PROCESS_PACKAGES_END);
-
-    ReactMarker.logMarker(BUILD_NATIVE_MODULE_REGISTRY_START);
-    Systrace.beginSection(TRACE_TAG_REACT, "buildNativeModuleRegistry");
-    NativeModuleRegistry nativeModuleRegistry;
-    try {
-      nativeModuleRegistry = nativeModuleRegistryBuilder.build();
-    } finally {
-      Systrace.endSection(TRACE_TAG_REACT);
-      ReactMarker.logMarker(BUILD_NATIVE_MODULE_REGISTRY_END);
-    }
-
-    return nativeModuleRegistry;
-  }
-
-  private void processPackage(
-      ReactPackage reactPackage, NativeModuleRegistryBuilder nativeModuleRegistryBuilder) {
-    SystraceMessage.beginSection(TRACE_TAG_REACT, "processPackage")
-        .arg("className", reactPackage.getClass().getSimpleName())
-        .flush();
-    nativeModuleRegistryBuilder.processPackage(reactPackage);
-    SystraceMessage.endSection(TRACE_TAG_REACT).flush();
-  }
 }

package/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java

@@ -10,14 +10,12 @@ package com.facebook.react;
 import static com.facebook.infer.annotation.ThreadConfined.UI;
 import static com.facebook.react.uimanager.BlendModeHelper.needsIsolatedLayer;
 import static com.facebook.react.uimanager.common.UIManagerType.FABRIC;
-import static com.facebook.react.uimanager.common.UIManagerType.LEGACY;
 import static com.facebook.systrace.Systrace.TRACE_TAG_REACT;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.graphics.BlendMode;
 import android.graphics.Canvas;
-import android.graphics.Insets;
 import android.graphics.Paint;
 import android.graphics.Point;
 import android.graphics.Rect;
@@ -25,18 +23,18 @@ import android.os.Build;
 import android.os.Bundle;
 import android.util.AttributeSet;
 import android.util.DisplayMetrics;
-import android.view.DisplayCutout;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.Surface;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
-import android.view.WindowInsets;
 import android.view.WindowManager;
 import android.widget.FrameLayout;
 import androidx.annotation.Nullable;
-import androidx.annotation.RequiresApi;
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
 import com.facebook.common.logging.FLog;
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.infer.annotation.ThreadConfined;
@@ -52,6 +50,7 @@ import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeMap;
 import com.facebook.react.common.annotations.VisibleForTesting;
+import com.facebook.react.common.annotations.internal.LegacyArchitecture;
 import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
 import com.facebook.react.modules.appregistry.AppRegistry;
@@ -70,7 +69,6 @@ import com.facebook.react.uimanager.RootView;
 import com.facebook.react.uimanager.RootViewUtil;
 import com.facebook.react.uimanager.UIManagerHelper;
 import com.facebook.react.uimanager.common.UIManagerType;
-import com.facebook.react.uimanager.common.ViewUtil;
 import com.facebook.react.uimanager.events.EventDispatcher;
 import com.facebook.systrace.Systrace;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -117,7 +115,6 @@ public class ReactRootView extends FrameLayout implements RootView, ReactRoot {
   private int mLastHeight = 0;
   private int mLastOffsetX = Integer.MIN_VALUE;
   private int mLastOffsetY = Integer.MIN_VALUE;
-  private @UIManagerType int mUIManagerType = LEGACY;
   private final AtomicInteger mState = new AtomicInteger(STATE_STOPPED);
 
   public ReactRootView(Context context) {
@@ -308,9 +305,7 @@ public class ReactRootView extends FrameLayout implements RootView, ReactRoot {
   protected boolean drawChild(Canvas canvas, View child, long drawingTime) {
 
     BlendMode mixBlendMode = null;
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q
-        && ViewUtil.getUIManagerType(this) == UIManagerType.FABRIC
-        && needsIsolatedLayer(this)) {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && needsIsolatedLayer(this)) {
       mixBlendMode = (BlendMode) child.getTag(R.id.mix_blend_mode);
       if (mixBlendMode != null) {
         Paint p = new Paint();
@@ -475,7 +470,7 @@ public class ReactRootView extends FrameLayout implements RootView, ReactRoot {
   }
 
   private boolean isFabric() {
-    return getUIManagerType() == FABRIC;
+    return true;
   }
 
   @Override
@@ -647,9 +642,7 @@ public class ReactRootView extends FrameLayout implements RootView, ReactRoot {
     final ReactContext reactApplicationContext = getCurrentReactContext();
 
     if (reactApplicationContext != null) {
-      @Nullable
-      UIManager uiManager =
-          UIManagerHelper.getUIManager(reactApplicationContext, getUIManagerType());
+      @Nullable UIManager uiManager = UIManagerHelper.getUIManager(reactApplicationContext, FABRIC);
       // Ignore calling updateRootLayoutSpecs if UIManager is not properly initialized.
       if (uiManager != null) {
         // In Fabric only, get position of view within screen
@@ -801,11 +794,7 @@ public class ReactRootView extends FrameLayout implements RootView, ReactRoot {
 
   @VisibleForTesting
   /* package */ void simulateCheckForKeyboardForTesting() {
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-      getCustomGlobalLayoutListener().checkForKeyboardEvents();
-    } else {
-      getCustomGlobalLayoutListener().checkForKeyboardEventsLegacy();
-    }
+    getCustomGlobalLayoutListener().checkForKeyboardEvents();
   }
 
   private CustomGlobalLayoutListener getCustomGlobalLayoutListener() {
@@ -868,6 +857,7 @@ public class ReactRootView extends FrameLayout implements RootView, ReactRoot {
             + " or in the onDestroyView() of your hosting Fragment.");
   }
 
+  @Override
   public int getRootViewTag() {
     return mRootViewTag;
   }
@@ -876,6 +866,7 @@ public class ReactRootView extends FrameLayout implements RootView, ReactRoot {
     return mRootViewTag != 0 && mRootViewTag != NO_ID;
   }
 
+  @Override
   public void setRootViewTag(int rootViewTag) {
     mRootViewTag = rootViewTag;
   }
@@ -890,15 +881,18 @@ public class ReactRootView extends FrameLayout implements RootView, ReactRoot {
     getCurrentReactContext().handleException(e);
   }
 
+  @LegacyArchitecture
+  @Deprecated
   public void setIsFabric(boolean isFabric) {
-    mUIManagerType = isFabric ? FABRIC : LEGACY;
+    /* noop */
   }
 
   @Override
   public @UIManagerType int getUIManagerType() {
-    return mUIManagerType;
+    return FABRIC;
   }
 
+  @LegacyArchitecture
   @Nullable
   public ReactInstanceManager getReactInstanceManager() {
     return mReactInstanceManager;
@@ -932,16 +926,14 @@ public class ReactRootView extends FrameLayout implements RootView, ReactRoot {
 
   private class CustomGlobalLayoutListener implements ViewTreeObserver.OnGlobalLayoutListener {
     private final Rect mVisibleViewArea;
-    private final int mMinKeyboardHeightDetected;
 
     private boolean mKeyboardIsVisible = false;
-    private int mKeyboardHeight = 0; // Only used in checkForKeyboardEventsLegacy path
+    private int mKeyboardHeight = 0;
     private int mDeviceRotation = 0;
 
     /* package */ CustomGlobalLayoutListener() {
       DisplayMetricsHolder.initDisplayMetricsIfNotInitialized(getContext().getApplicationContext());
       mVisibleViewArea = new Rect();
-      mMinKeyboardHeightDetected = (int) PixelUtil.toPixelFromDIP(60);
     }
 
     @Override
@@ -950,32 +942,30 @@ public class ReactRootView extends FrameLayout implements RootView, ReactRoot {
         return;
       }
 
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-        checkForKeyboardEvents();
-      } else {
-        checkForKeyboardEventsLegacy();
-      }
-
+      checkForKeyboardEvents();
       checkForDeviceOrientationChanges();
       checkForDeviceDimensionsChanges();
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.R)
     private void checkForKeyboardEvents() {
       getRootView().getWindowVisibleDisplayFrame(mVisibleViewArea);
-      WindowInsets rootInsets = getRootView().getRootWindowInsets();
+      WindowInsetsCompat rootInsets = ViewCompat.getRootWindowInsets(getRootView());
       if (rootInsets == null) {
         return;
       }
 
-      boolean keyboardIsVisible = rootInsets.isVisible(WindowInsets.Type.ime());
-      if (keyboardIsVisible != mKeyboardIsVisible) {
-        mKeyboardIsVisible = keyboardIsVisible;
+      boolean keyboardIsVisible = rootInsets.isVisible(WindowInsetsCompat.Type.ime());
+      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(WindowInsets.Type.ime());
-          Insets barInsets = rootInsets.getInsets(WindowInsets.Type.systemBars());
-          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);
@@ -993,60 +983,15 @@ public class ReactRootView extends FrameLayout implements RootView, ReactRoot {
                   PixelUtil.toDIPFromPixel(mVisibleViewArea.left),
                   PixelUtil.toDIPFromPixel(mVisibleViewArea.width()),
                   PixelUtil.toDIPFromPixel(height)));
-        } else {
-          sendEvent(
-              "keyboardDidHide",
-              createKeyboardEventPayload(
-                  PixelUtil.toDIPFromPixel(mVisibleViewArea.height()),
-                  0,
-                  PixelUtil.toDIPFromPixel(mVisibleViewArea.width()),
-                  0));
         }
-      }
-    }
-
-    private void checkForKeyboardEventsLegacy() {
-      getRootView().getWindowVisibleDisplayFrame(mVisibleViewArea);
-
-      int notchHeight = 0;
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-        WindowInsets insets = getRootView().getRootWindowInsets();
-        if (insets != null) {
-          DisplayCutout displayCutout = insets.getDisplayCutout();
-          if (displayCutout != null) {
-            notchHeight = displayCutout.getSafeInsetTop();
-          }
-        }
-      }
-      final int heightDiff =
-          DisplayMetricsHolder.getWindowDisplayMetrics().heightPixels
-              - mVisibleViewArea.bottom
-              + notchHeight;
-
-      boolean isKeyboardShowingOrKeyboardHeightChanged =
-          mKeyboardHeight != heightDiff && heightDiff > mMinKeyboardHeightDetected;
-
-      if (isKeyboardShowingOrKeyboardHeightChanged) {
-        mKeyboardHeight = heightDiff;
-        mKeyboardIsVisible = true;
-        sendEvent(
-            "keyboardDidShow",
-            createKeyboardEventPayload(
-                PixelUtil.toDIPFromPixel(mVisibleViewArea.bottom),
-                PixelUtil.toDIPFromPixel(mVisibleViewArea.left),
-                PixelUtil.toDIPFromPixel(mVisibleViewArea.width()),
-                PixelUtil.toDIPFromPixel(mKeyboardHeight)));
-        return;
-      }
-
-      boolean isKeyboardHidden = mKeyboardHeight != 0 && heightDiff <= mMinKeyboardHeightDetected;
-      if (isKeyboardHidden) {
-        mKeyboardHeight = 0;
+      } else if (mKeyboardIsVisible) {
         mKeyboardIsVisible = false;
+        mKeyboardHeight = 0;
+
         sendEvent(
             "keyboardDidHide",
             createKeyboardEventPayload(
-                PixelUtil.toDIPFromPixel(mVisibleViewArea.height()),
+                PixelUtil.toDIPFromPixel(mVisibleViewArea.bottom + barInsets.bottom),
                 0,
                 PixelUtil.toDIPFromPixel(mVisibleViewArea.width()),
                 0));

package/ReactAndroid/src/main/java/com/facebook/react/animated/EventAnimationDriver.kt

@@ -22,6 +22,7 @@ internal class EventAnimationDriver(
     private val eventPath: List<String>,
     @JvmField internal var valueNode: ValueAnimatedNode,
 ) : RCTModernEventEmitter {
+  @Deprecated("Use the overload with eventTimestamp parameter instead.")
   override fun receiveEvent(
       surfaceId: Int,
       targetTag: Int,