react-native-tvos 0.80.1-0 → 0.81.0-0

package/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostImplDevHelper.kt

@@ -13,6 +13,8 @@ import android.view.View
 import com.facebook.react.bridge.JSBundleLoader
 import com.facebook.react.bridge.JavaScriptExecutorFactory
 import com.facebook.react.bridge.ReactContext
+import com.facebook.react.common.annotations.FrameworkAPI
+import com.facebook.react.common.annotations.UnstableReactNativeAPI
 import com.facebook.react.devsupport.ReactInstanceDevHelper
 import com.facebook.react.interfaces.TaskInterface
 import com.facebook.react.modules.core.DeviceEventManagerModule
@@ -23,6 +25,8 @@ import com.facebook.react.modules.core.DeviceEventManagerModule
  * This allows [BridgelessDevSupportHelper] and other classes inside the .devsupport package to
  * communicate with the Bridgeless infrastructure without exposing public APIs.
  */
+@UnstableReactNativeAPI
+@OptIn(FrameworkAPI::class)
 internal class ReactHostImplDevHelper(private val delegate: ReactHostImpl) :
     ReactInstanceDevHelper {
 

package/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostInspectorTarget.kt

@@ -10,11 +10,15 @@ package com.facebook.react.runtime
 import com.facebook.jni.HybridData
 import com.facebook.proguard.annotations.DoNotStripAny
 import com.facebook.react.bridge.UiThreadUtil
+import com.facebook.react.common.annotations.FrameworkAPI
+import com.facebook.react.common.annotations.UnstableReactNativeAPI
 import com.facebook.soloader.SoLoader
 import java.io.Closeable
 import java.util.concurrent.Executor
 
 @DoNotStripAny
+@UnstableReactNativeAPI
+@OptIn(FrameworkAPI::class)
 internal class ReactHostInspectorTarget(reactHostImpl: ReactHostImpl) : Closeable {
   // fbjni looks for the exact name "mHybridData":
   // https://github.com/facebookincubator/fbjni/blob/5587a7fd2b191656be9391a3832ce04c034009a5/cxx/fbjni/detail/Hybrid.h#L310

package/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactInstance.kt

@@ -40,6 +40,7 @@ import com.facebook.react.bridge.queue.ReactQueueConfigurationImpl
 import com.facebook.react.bridge.queue.ReactQueueConfigurationSpec
 import com.facebook.react.common.annotations.FrameworkAPI
 import com.facebook.react.common.annotations.UnstableReactNativeAPI
+import com.facebook.react.devsupport.InspectorFlags.getIsProfilingBuild
 import com.facebook.react.devsupport.StackTraceHelper
 import com.facebook.react.devsupport.interfaces.DevSupportManager
 import com.facebook.react.fabric.ComponentFactory
@@ -62,8 +63,6 @@ import com.facebook.react.uimanager.DisplayMetricsHolder
 import com.facebook.react.uimanager.IllegalViewOperationException
 import com.facebook.react.uimanager.UIConstantsProviderBinding
 import com.facebook.react.uimanager.UIConstantsProviderBinding.ConstantsForViewManagerProvider
-import com.facebook.react.uimanager.UIConstantsProviderBinding.ConstantsProvider
-import com.facebook.react.uimanager.UIConstantsProviderBinding.DefaultEventTypesProvider
 import com.facebook.react.uimanager.UIManagerModuleConstantsHelper
 import com.facebook.react.uimanager.ViewManager
 import com.facebook.react.uimanager.ViewManagerRegistry
@@ -80,8 +79,8 @@ import kotlin.collections.Collection
 import kotlin.jvm.JvmStatic
 
 /**
- * A replacement for [com.facebook.react.CatalystInstance] responsible for creating and managing a
- * React Native instance
+ * A replacement for [com.facebook.react.bridge.CatalystInstance] responsible for creating and
+ * managing a React Native instance
  */
 @ThreadSafe
 @DoNotStrip
@@ -132,7 +131,10 @@ internal class ReactInstance(
             context, jsTimerExecutor, ReactChoreographer.getInstance(), devSupportManager)
 
     // Notify JS if profiling is enabled
-    val isProfiling = BuildConfig.ENABLE_PERFETTO || Systrace.isTracing(Systrace.TRACE_TAG_REACT)
+    val isProfiling =
+        BuildConfig.ENABLE_PERFETTO ||
+            Systrace.isTracing(Systrace.TRACE_TAG_REACT) ||
+            getIsProfilingBuild()
 
     mHybridData =
         initHybrid(
@@ -201,7 +203,7 @@ internal class ReactInstance(
     // initialized.
     // This happens inside getTurboModuleManagerDelegate getter.
     if (ReactNativeFeatureFlags.useNativeViewConfigsInBridgelessMode()) {
-      val customDirectEvents: Map<String, Any> = HashMap()
+      val customDirectEvents: MutableMap<String, Any> = HashMap()
 
       UIConstantsProviderBinding.install(
           // Use unbuffered RuntimeExecutor to install binding
@@ -212,16 +214,14 @@ internal class ReactInstance(
           // 2. genericBubblingEventTypes.
           // 3. genericDirectEventTypes.
           // We want to match this beahavior.
-          DefaultEventTypesProvider {
-            Arguments.makeNativeMap(UIManagerModuleConstantsHelper.getDefaultExportableEventTypes())
-          },
+          { Arguments.makeNativeMap(UIManagerModuleConstantsHelper.defaultExportableEventTypes) },
           ConstantsForViewManagerProvider { viewManagerName: String ->
             val viewManager =
                 viewManagerResolver.getViewManager(viewManagerName)
                     ?: return@ConstantsForViewManagerProvider null
             getConstantsForViewManager(viewManager, customDirectEvents)
           },
-          ConstantsProvider {
+          {
             val viewManagers: List<ViewManager<*, *>> =
                 ArrayList(viewManagerResolver.eagerViewManagerMap.values)
             val constants = createConstants(viewManagers, customDirectEvents)
@@ -358,7 +358,7 @@ internal class ReactInstance(
   /**
    * Renders a React Native surface.
    *
-   * @param surface The [ReactSurface] to render.
+   * @param surface The [com.facebook.react.interfaces.fabric.ReactSurface] to render.
    */
   @ThreadConfined("ReactHost")
   fun startSurface(surface: ReactSurfaceImpl) {
@@ -571,8 +571,8 @@ internal class ReactInstance(
     }
 
     private fun createConstants(
-        viewManagers: List<ViewManager<*, *>>,
-        customDirectEvents: Map<String, Any>?
+        viewManagers: List<ViewManager<in Nothing, in Nothing>>,
+        customDirectEvents: MutableMap<String, Any>?
     ): MutableMap<String, Any> {
       ReactMarker.logMarker(ReactMarkerConstants.CREATE_UI_MANAGER_MODULE_CONSTANTS_START)
       SystraceMessage.beginSection(Systrace.TRACE_TAG_REACT, "CreateUIManagerConstants")
@@ -589,7 +589,7 @@ internal class ReactInstance(
 
     private fun getConstantsForViewManager(
         viewManager: ViewManager<*, *>,
-        customDirectEvents: Map<String, Any>
+        customDirectEvents: MutableMap<String, Any>
     ): NativeMap {
       SystraceMessage.beginSection(
               Systrace.TRACE_TAG_REACT, "ReactInstance.getConstantsForViewManager")

package/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactSurfaceImpl.kt

@@ -18,6 +18,8 @@ import com.facebook.react.ReactHost
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.NativeMap
 import com.facebook.react.bridge.UiThreadUtil
+import com.facebook.react.common.annotations.FrameworkAPI
+import com.facebook.react.common.annotations.UnstableReactNativeAPI
 import com.facebook.react.common.annotations.VisibleForTesting
 import com.facebook.react.fabric.SurfaceHandlerBinding
 import com.facebook.react.interfaces.TaskInterface
@@ -30,6 +32,7 @@ import java.util.concurrent.atomic.AtomicReference
 
 /** A class responsible for creating and rendering a full-screen React surface. */
 @ThreadSafe
+@OptIn(FrameworkAPI::class, UnstableReactNativeAPI::class)
 public class ReactSurfaceImpl
 @VisibleForTesting
 internal constructor(
@@ -185,7 +188,6 @@ internal constructor(
   internal val eventDispatcher: EventDispatcher?
     get() = reactHost?.eventDispatcher
 
-  @get:VisibleForTesting
   internal val isAttached: Boolean
     get() = reactHost != null
 

package/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactSurfaceView.kt

@@ -17,6 +17,8 @@ import android.view.View
 import com.facebook.common.logging.FLog
 import com.facebook.react.ReactRootView
 import com.facebook.react.bridge.ReactContext
+import com.facebook.react.common.annotations.FrameworkAPI
+import com.facebook.react.common.annotations.UnstableReactNativeAPI
 import com.facebook.react.config.ReactFeatureFlags
 import com.facebook.react.uimanager.IllegalViewOperationException
 import com.facebook.react.uimanager.JSPointerDispatcher
@@ -24,11 +26,13 @@ import com.facebook.react.uimanager.JSTouchDispatcher
 import com.facebook.react.uimanager.common.UIManagerType
 import com.facebook.systrace.Systrace
 import java.util.Objects
+import kotlin.math.max
 
 /**
  * A view created by [com.facebook.react.interfaces.fabric.ReactSurface] that's responsible for
  * rendering a React component.
  */
+@OptIn(FrameworkAPI::class, UnstableReactNativeAPI::class)
 public class ReactSurfaceView(context: Context?, private val surface: ReactSurfaceImpl) :
     ReactRootView(context) {
   private val jsTouchDispatcher: JSTouchDispatcher = JSTouchDispatcher(this)
@@ -52,7 +56,7 @@ public class ReactSurfaceView(context: Context?, private val surface: ReactSurfa
       for (i in 0 until childCount) {
         val child = getChildAt(i)
         val childSize = (child.left + child.measuredWidth + child.paddingLeft + child.paddingRight)
-        width = Math.max(width, childSize)
+        width = max(width, childSize)
       }
     } else {
       width = MeasureSpec.getSize(widthMeasureSpec)
@@ -62,7 +66,7 @@ public class ReactSurfaceView(context: Context?, private val surface: ReactSurfa
       for (i in 0 until childCount) {
         val child = getChildAt(i)
         val childSize = (child.top + child.measuredHeight + child.paddingTop + child.paddingBottom)
-        height = Math.max(height, childSize)
+        height = max(height, childSize)
       }
     } else {
       height = MeasureSpec.getSize(heightMeasureSpec)

package/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/ExecutorException.kt

@@ -12,4 +12,4 @@ package com.facebook.react.runtime.internal.bolts
  * the continuation block it self.
  */
 internal class ExecutorException(e: Exception?) :
-    RuntimeException("An exception was thrown by an Executor", e) {}
+    RuntimeException("An exception was thrown by an Executor", e)

package/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/Task.kt

@@ -260,7 +260,7 @@ public class Task<TResult> : TaskInterface<TResult> {
 
     @JvmStatic
     internal fun <TResult> create(): TaskCompletionSource<TResult> {
-      return TaskCompletionSource<TResult>()
+      return TaskCompletionSource()
     }
 
     /** Creates a completed task with the given value. */

package/ReactAndroid/src/main/java/com/facebook/react/shell/MainReactPackage.kt

@@ -55,6 +55,7 @@ import com.facebook.react.views.scroll.ReactHorizontalScrollViewManager
 import com.facebook.react.views.scroll.ReactScrollViewManager
 import com.facebook.react.views.swiperefresh.SwipeRefreshLayoutManager
 import com.facebook.react.views.switchview.ReactSwitchManager
+import com.facebook.react.views.text.PreparedLayoutTextViewManager
 import com.facebook.react.views.text.ReactRawTextManager
 import com.facebook.react.views.text.ReactTextViewManager
 import com.facebook.react.views.text.ReactVirtualTextViewManager
@@ -148,7 +149,8 @@ constructor(private val config: MainPackageConfig? = null) :
           ReactModalHostManager(),
           ReactRawTextManager(),
           ReactTextInputManager(),
-          ReactTextViewManager(),
+          if (ReactNativeFeatureFlags.enablePreparedTextLayout()) PreparedLayoutTextViewManager()
+          else ReactTextViewManager(),
           ReactViewManager(),
           ReactVirtualTextViewManager(),
           ReactUnimplementedViewManager())
@@ -183,7 +185,12 @@ constructor(private val config: MainPackageConfig? = null) :
           ReactRawTextManager.REACT_CLASS to ModuleSpec.viewManagerSpec { ReactRawTextManager() },
           ReactTextInputManager.REACT_CLASS to
               ModuleSpec.viewManagerSpec { ReactTextInputManager() },
-          ReactTextViewManager.REACT_CLASS to ModuleSpec.viewManagerSpec { ReactTextViewManager() },
+          ReactTextViewManager.REACT_CLASS to
+              ModuleSpec.viewManagerSpec {
+                if (ReactNativeFeatureFlags.enablePreparedTextLayout())
+                    PreparedLayoutTextViewManager()
+                else ReactTextViewManager()
+              },
           ReactViewManager.REACT_CLASS to ModuleSpec.viewManagerSpec { ReactViewManager() },
           ReactVirtualTextViewManager.REACT_CLASS to
               ModuleSpec.viewManagerSpec { ReactVirtualTextViewManager() },

package/ReactAndroid/src/main/java/com/facebook/react/soloader/OpenSourceMergedSoMapping.kt

@@ -42,11 +42,6 @@ public object OpenSourceMergedSoMapping : ExternalSoMapping {
         "jsijniprofiler" -> {
           "hermestooling"
         }
-        "jscexecutor",
-        "jscruntime",
-        "jscinstance" -> {
-          "jsctooling"
-        }
         else -> input
       }
 
@@ -56,10 +51,6 @@ public object OpenSourceMergedSoMapping : ExternalSoMapping {
       "hermes_executor" -> libhermes_executor_so()
       "hermesinstancejni" -> libhermesinstancejni_so()
       "hermestooling" -> libhermestooling_so()
-      "jscexecutor" -> libjscexecutor_so()
-      "jscinstance" -> libjscinstance_so()
-      "jscruntime" -> libjscruntime_so()
-      "jsctooling" -> libjsctooling_so()
       "jsijniprofiler" -> libjsijniprofiler_so()
       "jsinspector" -> libjsinspector_so()
       "mapbufferjni" -> libmapbufferjni_so()
@@ -85,14 +76,6 @@ public object OpenSourceMergedSoMapping : ExternalSoMapping {
 
   public external fun libhermestooling_so(): Int
 
-  public external fun libjscexecutor_so(): Int
-
-  public external fun libjscinstance_so(): Int
-
-  public external fun libjscruntime_so(): Int
-
-  public external fun libjsctooling_so(): Int
-
   public external fun libjsijniprofiler_so(): Int
 
   public external fun libjsinspector_so(): Int

package/ReactAndroid/src/main/java/com/facebook/react/touch/OnInterceptTouchEventListener.kt

@@ -14,7 +14,7 @@ import android.view.ViewGroup
  * Interface definition for a callback to be invoked when a onInterceptTouch is called on a
  * [ViewGroup].
  */
-internal fun interface OnInterceptTouchEventListener {
+public fun interface OnInterceptTouchEventListener {
 
   /**
    * Called when a onInterceptTouch is invoked on a view group.
@@ -24,5 +24,5 @@ internal fun interface OnInterceptTouchEventListener {
    * @return Return true to steal motion event from the children and have the dispatched to this
    *   view, or return false to allow motion event to be delivered to children view
    */
-  fun onInterceptTouchEvent(view: ViewGroup, event: MotionEvent): Boolean
+  public fun onInterceptTouchEvent(view: ViewGroup, event: MotionEvent): Boolean
 }

package/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/CallInvokerHolderImpl.kt

@@ -17,4 +17,4 @@ import com.facebook.react.turbomodule.core.interfaces.CallInvokerHolder
  * pass it from CatalystInstance, through Java, to TurboModuleManager::initHybrid.
  */
 @FrameworkAPI
-public class CallInvokerHolderImpl private constructor() : HybridClassBase(), CallInvokerHolder {}
+public class CallInvokerHolderImpl private constructor() : HybridClassBase(), CallInvokerHolder

package/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/NativeMethodCallInvokerHolderImpl.kt

@@ -19,4 +19,4 @@ import com.facebook.react.turbomodule.core.interfaces.NativeMethodCallInvokerHol
  */
 @FrameworkAPI
 public class NativeMethodCallInvokerHolderImpl private constructor() :
-    HybridClassBase(), NativeMethodCallInvokerHolder {}
+    HybridClassBase(), NativeMethodCallInvokerHolder

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java

@@ -12,6 +12,7 @@ import android.graphics.Paint;
 import android.os.Build;
 import android.text.TextUtils;
 import android.view.View;
+import android.view.View.OnFocusChangeListener;
 import android.view.ViewGroup;
 import android.view.ViewParent;
 import android.view.accessibility.AccessibilityEvent;
@@ -29,12 +30,14 @@ import com.facebook.react.bridge.ReadableMapKeySetIterator;
 import com.facebook.react.bridge.ReadableType;
 import com.facebook.react.common.MapBuilder;
 import com.facebook.react.common.ReactConstants;
-import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
 import com.facebook.react.uimanager.ReactAccessibilityDelegate.AccessibilityRole;
 import com.facebook.react.uimanager.ReactAccessibilityDelegate.Role;
 import com.facebook.react.uimanager.annotations.ReactProp;
 import com.facebook.react.uimanager.common.UIManagerType;
 import com.facebook.react.uimanager.common.ViewUtil;
+import com.facebook.react.uimanager.events.BlurEvent;
+import com.facebook.react.uimanager.events.EventDispatcher;
+import com.facebook.react.uimanager.events.FocusEvent;
 import com.facebook.react.uimanager.events.PointerEventHelper;
 import com.facebook.react.uimanager.style.OutlineStyle;
 import com.facebook.react.uimanager.util.ReactFindViewUtil;
@@ -165,6 +168,29 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
     return view;
   }
 
+  @Override
+  protected void addEventEmitters(@NonNull ThemedReactContext reactContext, @NonNull T view) {
+    super.addEventEmitters(reactContext, view);
+
+    BaseVMFocusChangeListener focusChangeListener =
+        new BaseVMFocusChangeListener(view.getOnFocusChangeListener());
+    focusChangeListener.attach(view);
+  }
+
+  @Override
+  public void onDropViewInstance(@NonNull T view) {
+    super.onDropViewInstance(view);
+
+    @Nullable OnFocusChangeListener focusChangeListener = view.getOnFocusChangeListener();
+    if (focusChangeListener instanceof BaseVMFocusChangeListener) {
+      ((BaseVMFocusChangeListener) focusChangeListener).detach(view);
+    }
+
+    if (view instanceof ViewGroup) {
+      ((ViewGroup) view).setOnHierarchyChangeListener(null);
+    }
+  }
+
   // Currently, layout listener is only attached when transform or transformOrigin is set.
   @Override
   public void onLayoutChange(
@@ -285,63 +311,9 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
   public void setNativeId(@NonNull T view, @Nullable String nativeId) {
     view.setTag(R.id.view_tag_native_id, nativeId);
 
-    /*
-     * If we change the nativeId we need to notify the relevant accessibility parent to update the
-     * focusing order.
-     */
-    if (view.getTag(R.id.accessibility_order_parent) != null) {
-      ViewGroup accessibilityParent = (ViewGroup) view.getTag(R.id.accessibility_order_parent);
-
-      ReactAxOrderHelper.unsetAccessibilityOrder(accessibilityParent);
-      accessibilityParent.setTag(R.id.accessibility_order_dirty, true);
-
-      accessibilityParent.notifySubtreeAccessibilityStateChanged(
-          accessibilityParent, accessibilityParent, AccessibilityEvent.CONTENT_CHANGE_TYPE_SUBTREE);
-    }
-
     ReactFindViewUtil.notifyViewRendered(view);
   }
 
-  @ReactProp(name = ViewProps.ACCESSIBILITY_ORDER)
-  public void setAccessibilityOrder(@NonNull T view, @Nullable ReadableArray nativeIds) {
-    if (!ReactNativeFeatureFlags.enableAccessibilityOrder()) {
-      return;
-    }
-
-    view.setTag(R.id.accessibility_order, nativeIds);
-    view.setTag(R.id.accessibility_order_dirty, true);
-
-    if (view instanceof ViewGroup) {
-      ((ViewGroup) view)
-          .setOnHierarchyChangeListener(
-              new ViewGroup.OnHierarchyChangeListener() {
-                @Override
-                public void onChildViewAdded(View parent, View child) {
-                  view.setTag(R.id.accessibility_order_dirty, true);
-
-                  // We also want to listen to changes on the hierarchy of nested ViewGroups
-                  if (child instanceof ViewGroup) {
-                    ViewGroup childGroup = (ViewGroup) child;
-                    childGroup.setOnHierarchyChangeListener(this);
-                    for (int i = 0; i < childGroup.getChildCount(); i++) {
-                      onChildViewAdded(childGroup, childGroup.getChildAt(i));
-                    }
-                  }
-                }
-
-                @Override
-                public void onChildViewRemoved(View parent, View child) {
-                  view.setTag(R.id.accessibility_order_dirty, true);
-                }
-              });
-    }
-
-    ReactAxOrderHelper.unsetAccessibilityOrder(view);
-    ((ViewGroup) view)
-        .notifySubtreeAccessibilityStateChanged(
-            view, view, AccessibilityEvent.CONTENT_CHANGE_TYPE_SUBTREE);
-  }
-
   @ReactProp(name = ViewProps.ACCESSIBILITY_LABELLED_BY)
   public void setAccessibilityLabelledBy(@NonNull T view, @Nullable Dynamic nativeId) {
     if (nativeId.isNull()) {
@@ -781,15 +753,15 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
                     "phasedRegistrationNames",
                     MapBuilder.of("bubbled", "onClick", "captured", "onClickCapture")))
             .put(
-              "topFocus",
-              MapBuilder.of(
-                "phasedRegistrationNames",
-                MapBuilder.of("bubbled", "onFocus", "captured", "onFocusCapture")))
+                "topBlur",
+                MapBuilder.of(
+                    "phasedRegistrationNames",
+                    MapBuilder.of("bubbled", "onBlur", "captured", "onBlurCapture")))
             .put(
-              "topBlur",
-              MapBuilder.of(
-                "phasedRegistrationNames",
-                MapBuilder.of("bubbled", "onBlur", "captured", "onBlurCapture")))
+                "topFocus",
+                MapBuilder.of(
+                    "phasedRegistrationNames",
+                    MapBuilder.of("bubbled", "onFocus", "captured", "onFocusCapture")))
             .build());
     return eventTypeConstants;
   }
@@ -1026,4 +998,49 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
   }
 
   // Please add new props to BaseViewManagerDelegate as well!
+
+  /**
+   * A helper class to keep track of the original focus change listener if one is set. This is
+   * especially helpful for views that are recycled so we can retain and restore the original
+   * listener upon recycling (onDropViewInstance).
+   */
+  private class BaseVMFocusChangeListener<V extends View> implements OnFocusChangeListener {
+    private @Nullable OnFocusChangeListener mOriginalFocusChangeListener;
+
+    public BaseVMFocusChangeListener(@Nullable OnFocusChangeListener originalFocusChangeListener) {
+      mOriginalFocusChangeListener = originalFocusChangeListener;
+    }
+
+    public void attach(T view) {
+      view.setOnFocusChangeListener(this);
+    }
+
+    public void detach(T view) {
+      view.setOnFocusChangeListener(mOriginalFocusChangeListener);
+    }
+
+    @Override
+    public void onFocusChange(View view, boolean hasFocus) {
+      if (mOriginalFocusChangeListener != null) {
+        mOriginalFocusChangeListener.onFocusChange(view, hasFocus);
+      }
+      int surfaceId = UIManagerHelper.getSurfaceId(view.getContext());
+      if (surfaceId == View.NO_ID) {
+        return;
+      }
+      if (view.getContext() instanceof ThemedReactContext) {
+        ThemedReactContext themedReactContext = (ThemedReactContext) view.getContext();
+        @Nullable
+        EventDispatcher eventDispatcher =
+            UIManagerHelper.getEventDispatcherForReactTag(themedReactContext, view.getId());
+        if (eventDispatcher != null) {
+          if (hasFocus) {
+            eventDispatcher.dispatchEvent(new FocusEvent(surfaceId, view.getId()));
+          } else {
+            eventDispatcher.dispatchEvent(new BlurEvent(surfaceId, view.getId()));
+          }
+        }
+      }
+    }
+  }
 }

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManagerDelegate.kt

@@ -91,10 +91,7 @@ public abstract class BaseViewManagerDelegate<
         val dynamicFromObject: Dynamic = DynamicFromObject(value)
         mViewManager.setAccessibilityLabelledBy(view, dynamicFromObject)
       }
-      ViewProps.ACCESSIBILITY_ORDER ->
-          mViewManager.setAccessibilityOrder(view, value as ReadableArray?)
       ViewProps.OPACITY -> mViewManager.setOpacity(view, (value as Double?)?.toFloat() ?: 1.0f)
-
       ViewProps.OUTLINE_COLOR -> mViewManager.setOutlineColor(view, value as Int?)
 
       ViewProps.OUTLINE_OFFSET ->
@@ -149,6 +146,5 @@ public abstract class BaseViewManagerDelegate<
   }
 
   @Suppress("ACCIDENTAL_OVERRIDE")
-  public override fun receiveCommand(view: T, commandName: String, args: ReadableArray?): Unit =
-      Unit
+  public override fun receiveCommand(view: T, commandName: String, args: ReadableArray): Unit = Unit
 }

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/DisplayMetricsHolder.kt

@@ -7,9 +7,12 @@
 
 package com.facebook.react.uimanager
 
+import android.app.Activity
 import android.content.Context
 import android.util.DisplayMetrics
 import android.view.WindowManager
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.bridge.WritableNativeMap
 
@@ -27,7 +30,7 @@ public object DisplayMetricsHolder {
   /** The metrics of the window associated to the Context used to initialize ReactNative */
   @JvmStatic
   public fun getWindowDisplayMetrics(): DisplayMetrics {
-    checkNotNull(windowDisplayMetrics) { DisplayMetricsHolder.INITIALIZATION_MISSING_MESSAGE }
+    checkNotNull(windowDisplayMetrics) { INITIALIZATION_MISSING_MESSAGE }
     return windowDisplayMetrics as DisplayMetrics
   }
 
@@ -39,7 +42,7 @@ public object DisplayMetricsHolder {
   /** Screen metrics returns the metrics of the default screen on the device. */
   @JvmStatic
   public fun getScreenDisplayMetrics(): DisplayMetrics {
-    checkNotNull(screenDisplayMetrics) { DisplayMetricsHolder.INITIALIZATION_MISSING_MESSAGE }
+    checkNotNull(screenDisplayMetrics) { INITIALIZATION_MISSING_MESSAGE }
     return screenDisplayMetrics as DisplayMetrics
   }
 
@@ -63,7 +66,6 @@ public object DisplayMetricsHolder {
     val screenDisplayMetrics = DisplayMetrics()
     screenDisplayMetrics.setTo(displayMetrics)
     val wm = context.getSystemService(Context.WINDOW_SERVICE) as WindowManager
-    checkNotNull(wm) { "WindowManager is null!" }
     // Get the real display metrics if we are using API level 17 or higher.
     // The real metrics include system decor elements (e.g. soft menu bar).
     //
@@ -75,8 +77,8 @@ public object DisplayMetricsHolder {
 
   @JvmStatic
   public fun getDisplayMetricsWritableMap(fontScale: Double): WritableMap {
-    checkNotNull(windowDisplayMetrics) { DisplayMetricsHolder.INITIALIZATION_MISSING_MESSAGE }
-    checkNotNull(screenDisplayMetrics) { DisplayMetricsHolder.INITIALIZATION_MISSING_MESSAGE }
+    checkNotNull(windowDisplayMetrics) { INITIALIZATION_MISSING_MESSAGE }
+    checkNotNull(screenDisplayMetrics) { INITIALIZATION_MISSING_MESSAGE }
 
     return WritableNativeMap().apply {
       putMap(
@@ -99,4 +101,14 @@ public object DisplayMetricsHolder {
         putDouble("fontScale", fontScale)
         putDouble("densityDpi", displayMetrics.densityDpi.toDouble())
       }
+
+  internal fun getStatusBarHeightPx(activity: Activity?): Int {
+    val windowInsets = activity?.window?.decorView?.let(ViewCompat::getRootWindowInsets) ?: return 0
+    return windowInsets
+        .getInsets(
+            WindowInsetsCompat.Type.statusBars() or
+                WindowInsetsCompat.Type.navigationBars() or
+                WindowInsetsCompat.Type.displayCutout())
+        .top
+  }
 }

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/FloatUtil.kt

@@ -14,8 +14,8 @@ public object FloatUtil {
 
   @JvmStatic
   public fun floatsEqual(f1: Float, f2: Float): Boolean {
-    return if (java.lang.Float.isNaN(f1) || java.lang.Float.isNaN(f2)) {
-      java.lang.Float.isNaN(f1) && java.lang.Float.isNaN(f2)
+    return if (f1.isNaN() || f2.isNaN()) {
+      f1.isNaN() && f2.isNaN()
     } else abs(f2 - f1) < EPSILON
   }