react-native 0.83.0-rc.0 → 0.84.0-nightly-20251106-de5141a3d

package/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsLocalAccessor.kt

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<6f6b5abe79764b88cf3ed62fe0230786>>
+ * @generated SignedSource<<9bb9a7cf89c92f5a397b2328fa983dc6>>
  */
 
 /**
@@ -32,6 +32,7 @@ internal class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcc
   private var disableFabricCommitInCXXAnimatedCache: Boolean? = null
   private var disableMountItemReorderingAndroidCache: Boolean? = null
   private var disableOldAndroidAttachmentMetricsWorkaroundsCache: Boolean? = null
+  private var disableSubviewClippingAndroidCache: Boolean? = null
   private var disableTextLayoutManagerCacheAndroidCache: Boolean? = null
   private var enableAccessibilityOrderCache: Boolean? = null
   private var enableAccumulatedUpdatesInRawPropsAndroidCache: Boolean? = null
@@ -89,7 +90,6 @@ internal class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcc
   private var shouldPressibilityUseW3CPointerEventsForHoverCache: Boolean? = null
   private var shouldTriggerResponderTransferOnScrollAndroidCache: Boolean? = null
   private var skipActivityIdentityAssertionOnHostPauseCache: Boolean? = null
-  private var sweepActiveTouchOnChildNativeGesturesAndroidCache: Boolean? = null
   private var traceTurboModulePromiseRejectionsOnAndroidCache: Boolean? = null
   private var updateRuntimeShadowNodeReferencesOnCommitCache: Boolean? = null
   private var useAlwaysAvailableJSErrorHandlingCache: Boolean? = null
@@ -97,7 +97,6 @@ internal class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcc
   private var useNativeEqualsInNativeReadableArrayAndroidCache: Boolean? = null
   private var useNativeTransformHelperAndroidCache: Boolean? = null
   private var useNativeViewConfigsInBridgelessModeCache: Boolean? = null
-  private var useOptimizedEventBatchingOnAndroidCache: Boolean? = null
   private var useRawPropsJsiValueCache: Boolean? = null
   private var useShadowNodeStateOnCloneCache: Boolean? = null
   private var useSharedAnimatedBackendCache: Boolean? = null
@@ -188,6 +187,16 @@ internal class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcc
     return cached
   }
 
+  override fun disableSubviewClippingAndroid(): Boolean {
+    var cached = disableSubviewClippingAndroidCache
+    if (cached == null) {
+      cached = currentProvider.disableSubviewClippingAndroid()
+      accessedFeatureFlags.add("disableSubviewClippingAndroid")
+      disableSubviewClippingAndroidCache = cached
+    }
+    return cached
+  }
+
   override fun disableTextLayoutManagerCacheAndroid(): Boolean {
     var cached = disableTextLayoutManagerCacheAndroidCache
     if (cached == null) {
@@ -758,16 +767,6 @@ internal class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcc
     return cached
   }
 
-  override fun sweepActiveTouchOnChildNativeGesturesAndroid(): Boolean {
-    var cached = sweepActiveTouchOnChildNativeGesturesAndroidCache
-    if (cached == null) {
-      cached = currentProvider.sweepActiveTouchOnChildNativeGesturesAndroid()
-      accessedFeatureFlags.add("sweepActiveTouchOnChildNativeGesturesAndroid")
-      sweepActiveTouchOnChildNativeGesturesAndroidCache = cached
-    }
-    return cached
-  }
-
   override fun traceTurboModulePromiseRejectionsOnAndroid(): Boolean {
     var cached = traceTurboModulePromiseRejectionsOnAndroidCache
     if (cached == null) {
@@ -838,16 +837,6 @@ internal class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcc
     return cached
   }
 
-  override fun useOptimizedEventBatchingOnAndroid(): Boolean {
-    var cached = useOptimizedEventBatchingOnAndroidCache
-    if (cached == null) {
-      cached = currentProvider.useOptimizedEventBatchingOnAndroid()
-      accessedFeatureFlags.add("useOptimizedEventBatchingOnAndroid")
-      useOptimizedEventBatchingOnAndroidCache = cached
-    }
-    return cached
-  }
-
   override fun useRawPropsJsiValue(): Boolean {
     var cached = useRawPropsJsiValueCache
     if (cached == null) {

package/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsProvider.kt

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<6b61490a8d6b1df1d6264016455382f8>>
+ * @generated SignedSource<<eeb5d70e45eecdef0d9307cbe8ff17c2>>
  */
 
 /**
@@ -39,6 +39,8 @@ public interface ReactNativeFeatureFlagsProvider {
 
   @DoNotStrip public fun disableOldAndroidAttachmentMetricsWorkarounds(): Boolean
 
+  @DoNotStrip public fun disableSubviewClippingAndroid(): Boolean
+
   @DoNotStrip public fun disableTextLayoutManagerCacheAndroid(): Boolean
 
   @DoNotStrip public fun enableAccessibilityOrder(): Boolean
@@ -153,8 +155,6 @@ public interface ReactNativeFeatureFlagsProvider {
 
   @DoNotStrip public fun skipActivityIdentityAssertionOnHostPause(): Boolean
 
-  @DoNotStrip public fun sweepActiveTouchOnChildNativeGesturesAndroid(): Boolean
-
   @DoNotStrip public fun traceTurboModulePromiseRejectionsOnAndroid(): Boolean
 
   @DoNotStrip public fun updateRuntimeShadowNodeReferencesOnCommit(): Boolean
@@ -169,8 +169,6 @@ public interface ReactNativeFeatureFlagsProvider {
 
   @DoNotStrip public fun useNativeViewConfigsInBridgelessMode(): Boolean
 
-  @DoNotStrip public fun useOptimizedEventBatchingOnAndroid(): Boolean
-
   @DoNotStrip public fun useRawPropsJsiValue(): Boolean
 
   @DoNotStrip public fun useShadowNodeStateOnClone(): Boolean

package/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.kt

@@ -13,8 +13,8 @@ public object ReactNativeVersion {
   @JvmField
   public val VERSION: Map<String, Any?> = mapOf(
     "major" to 0,
-    "minor" to 83,
+    "minor" to 84,
     "patch" to 0,
-    "prerelease" to "rc.0"
+    "prerelease" to "nightly-20251106-de5141a3d"
   )
 }

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

@@ -14,7 +14,6 @@ import com.facebook.infer.annotation.Assertions
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.common.ReactConstants
 import com.facebook.react.common.annotations.UnstableReactNativeAPI
-import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags
 import com.facebook.react.uimanager.common.UIManagerType
 import com.facebook.react.uimanager.events.EventDispatcher
 import com.facebook.react.uimanager.events.TouchEvent
@@ -59,7 +58,7 @@ public class JSTouchDispatcher(private val viewGroup: ViewGroup) {
     dispatchCancelEvent(androidEvent, eventDispatcher)
     childIsHandlingNativeGesture = true
 
-    if (targetTag != -1 && ReactNativeFeatureFlags.sweepActiveTouchOnChildNativeGesturesAndroid()) {
+    if (targetTag != -1) {
       val surfaceId = UIManagerHelper.getSurfaceId(viewGroup)
       sweepActiveTouchForTag(surfaceId, targetTag, reactContext)
     }

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

@@ -11,7 +11,22 @@ import android.view.View
 import android.view.ViewGroup
 import com.facebook.react.R
 
+/**
+ * Helper object for managing accessibility order in React Native views.
+ *
+ * This object provides utilities to manage the accessibility focus order of views by storing and
+ * restoring focusability states, and building ordered lists of views based on accessibility order
+ * preferences.
+ */
 public object ReactAxOrderHelper {
+  /**
+   * Cleans up accessibility order state from a view and its children.
+   *
+   * This method removes stored focusability states and accessibility order parent references from
+   * the view hierarchy. It recursively processes all children of ViewGroup instances.
+   *
+   * @param view The view from which to clean up accessibility order state
+   */
   @JvmStatic
   public fun cleanUpAxOrder(view: View) {
     val originalFocusability = view.getTag(R.id.original_focusability) as Boolean?
@@ -31,6 +46,15 @@ public object ReactAxOrderHelper {
     }
   }
 
+  /**
+   * Restores the original focusability state of a view and its children.
+   *
+   * This method traverses the view hierarchy and restores the focusability state that was
+   * previously saved with the `R.id.original_focusability` tag. This is typically used after
+   * accessibility order operations are complete to return views to their original state.
+   *
+   * @param view The view whose focusability state should be restored
+   */
   @JvmStatic
   public fun restoreFocusability(view: View) {
     val originalFocusability = view.getTag(R.id.original_focusability) as Boolean?
@@ -45,6 +69,16 @@ public object ReactAxOrderHelper {
     }
   }
 
+  /**
+   * Disables focus for all views in the subtree that are not in the accessibility order list.
+   *
+   * This method recursively traverses the view hierarchy and disables focusability for views that
+   * are not included in the provided accessibility order list. It stores the original focusability
+   * state before modifying it, allowing for later restoration.
+   *
+   * @param view The root view of the subtree to process
+   * @param axOrderList The list of native IDs that should maintain their focusability
+   */
   public fun disableFocusForSubtree(view: View, axOrderList: MutableList<*>) {
     if (!axOrderList.contains(view.getTag(R.id.view_tag_native_id))) {
       if (view.getTag(R.id.original_focusability) == null) {
@@ -60,6 +94,19 @@ public object ReactAxOrderHelper {
     }
   }
 
+  /**
+   * Builds an ordered list of views based on accessibility order preferences.
+   *
+   * This method recursively traverses the view hierarchy starting from the given view, looking for
+   * views whose native IDs match entries in the accessibility order list. When matches are found,
+   * views are placed in the result array at positions corresponding to their position in the
+   * accessibility order list. This method also tags each view with its accessibility order parent.
+   *
+   * @param view The current view being processed in the hierarchy traversal
+   * @param parent The parent view that defines the accessibility order context
+   * @param axOrderList The list of native IDs defining the desired accessibility order
+   * @param result The output array where views are placed according to their order in axOrderList
+   */
   public fun buildAxOrderList(
       view: View,
       parent: View,

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

@@ -7,14 +7,12 @@
 
 package com.facebook.react.uimanager.events
 
-import android.os.Handler
 import android.view.Choreographer
 import com.facebook.react.bridge.LifecycleEventListener
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactSoftExceptionLogger
 import com.facebook.react.bridge.UiThreadUtil
 import com.facebook.react.common.annotations.UnstableReactNativeAPI
-import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags
 import com.facebook.react.modules.core.ReactChoreographer
 import com.facebook.react.uimanager.UIManagerHelper
 import com.facebook.react.uimanager.common.UIManagerType
@@ -41,19 +39,6 @@ internal class FabricEventDispatcher(
   private val postEventDispatchListeners = CopyOnWriteArrayList<BatchEventDispatchedListener>()
   private val currentFrameCallback = ScheduleDispatchFrameCallback()
 
-  private var isDispatchScheduled = false
-  private val dispatchEventsRunnable = Runnable {
-    isDispatchScheduled = false
-    Systrace.beginSection(Systrace.TRACE_TAG_REACT, "BatchEventDispatchedListeners")
-    try {
-      for (listener in postEventDispatchListeners) {
-        listener.onBatchEventDispatched()
-      }
-    } finally {
-      Systrace.endSection(Systrace.TRACE_TAG_REACT)
-    }
-  }
-
   init {
     reactContext.addLifecycleEventListener(this)
     eventEmitter.registerFabricEventEmitter(fabricEventEmitter)
@@ -109,14 +94,7 @@ internal class FabricEventDispatcher(
   }
 
   private fun scheduleDispatchOfBatchedEvents() {
-    if (ReactNativeFeatureFlags.useOptimizedEventBatchingOnAndroid()) {
-      if (!isDispatchScheduled) {
-        isDispatchScheduled = true
-        uiThreadHandler.postAtFrontOfQueue(dispatchEventsRunnable)
-      }
-    } else {
-      currentFrameCallback.maybeScheduleDispatchOfBatchedEvents()
-    }
+    currentFrameCallback.maybeScheduleDispatchOfBatchedEvents()
   }
 
   /** Add a listener to this EventDispatcher. */
@@ -139,9 +117,7 @@ internal class FabricEventDispatcher(
 
   override fun onHostResume() {
     scheduleDispatchOfBatchedEvents()
-    if (!ReactNativeFeatureFlags.useOptimizedEventBatchingOnAndroid()) {
-      currentFrameCallback.resume()
-    }
+    currentFrameCallback.resume()
   }
 
   override fun onHostPause() {
@@ -165,12 +141,7 @@ internal class FabricEventDispatcher(
 
   private fun cancelDispatchOfBatchedEvents() {
     UiThreadUtil.assertOnUiThread()
-    if (ReactNativeFeatureFlags.useOptimizedEventBatchingOnAndroid()) {
-      isDispatchScheduled = false
-      uiThreadHandler.removeCallbacks(dispatchEventsRunnable)
-    } else {
-      currentFrameCallback.stop()
-    }
+    currentFrameCallback.stop()
   }
 
   private inner class ScheduleDispatchFrameCallback : Choreographer.FrameCallback {
@@ -229,8 +200,4 @@ internal class FabricEventDispatcher(
       }
     }
   }
-
-  private companion object {
-    private val uiThreadHandler: Handler = UiThreadUtil.getUiThreadHandler()
-  }
 }

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

@@ -29,7 +29,7 @@ internal class PointerEvent private constructor() : Event<PointerEvent>() {
   private lateinit var _eventName: String
   private var coalescingKey = UNSET_COALESCING_KEY
   private var pointersEventData: List<WritableMap>? = null
-  private lateinit var eventState: PointerEventState
+  private var eventState: PointerEventState? = null
 
   private fun init(
       eventName: String,
@@ -84,7 +84,7 @@ internal class PointerEvent private constructor() : Event<PointerEvent>() {
             return@EventAnimationDriverMatchSpec false
           }
           if (isBubblingEvent(eventName)) {
-            for (viewTarget in eventState.hitPathForActivePointer) {
+            for (viewTarget in checkNotNull(eventState).hitPathForActivePointer) {
               if (viewTarget.getViewId() == viewTag) {
                 return@EventAnimationDriverMatchSpec true
               }
@@ -97,10 +97,10 @@ internal class PointerEvent private constructor() : Event<PointerEvent>() {
       }
 
   override fun onDispose() {
+    eventState = null
     pointersEventData = null
-    val motionEvent = motionEvent
-    this.motionEvent = null
     motionEvent?.recycle()
+    motionEvent = null
 
     // Either `this` is in the event pool, or motionEvent
     // is null. It is in theory not possible for a PointerEvent to
@@ -137,6 +137,7 @@ internal class PointerEvent private constructor() : Event<PointerEvent>() {
     val pointerEvent = Arguments.createMap()
     val motionEvent = checkNotNull(motionEvent)
     val pointerId = motionEvent.getPointerId(index)
+    val eventState = checkNotNull(eventState)
 
     // https://www.w3.org/TR/pointerevents/#pointerevent-interface
     pointerEvent.putDouble("pointerId", pointerId.toDouble())

package/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java

@@ -28,6 +28,7 @@ import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.ViewParent;
 import android.view.accessibility.AccessibilityNodeInfo;
 import android.widget.HorizontalScrollView;
 import android.widget.OverScroller;
@@ -290,6 +291,10 @@ public class ReactHorizontalScrollView extends HorizontalScrollView
 
   @Override
   public void setRemoveClippedSubviews(boolean removeClippedSubviews) {
+    if (ReactNativeFeatureFlags.disableSubviewClippingAndroid()) {
+      return;
+    }
+
     if (removeClippedSubviews && mClippingRect == null) {
       mClippingRect = new Rect();
     }
@@ -740,6 +745,20 @@ public class ReactHorizontalScrollView extends HorizontalScrollView
     return handled;
   }
 
+  private boolean isDescendantOf(View parent, View view) {
+    if (view == null || parent == null) {
+      return false;
+    }
+    ViewParent p = view.getParent();
+    while (p != null && p.getParent() != null) {
+      if (p == parent) {
+        return true;
+      }
+      p = p.getParent();
+    }
+    return false;
+  }
+
   @Override
   public boolean arrowScroll(int direction) {
     boolean handled = false;
@@ -751,7 +770,7 @@ public class ReactHorizontalScrollView extends HorizontalScrollView
         View currentFocused = findFocus();
         View nextFocused = FocusFinder.getInstance().findNextFocus(this, currentFocused, direction);
         View rootChild = getContentView();
-        if (rootChild != null && nextFocused != null && nextFocused.getParent() == rootChild) {
+        if (isDescendantOf(rootChild, nextFocused)) {
           if (!isScrolledInView(nextFocused) && !isMostlyScrolledInView(nextFocused)) {
             smoothScrollToNextPage(direction);
           }
@@ -834,8 +853,13 @@ public class ReactHorizontalScrollView extends HorizontalScrollView
                 @Override
                 public void run() {
                   mPostTouchRunnable = null;
-                  // Trigger snap alignment now that scrolling has stopped
-                  handlePostTouchScrolling(0, 0);
+                  // +1/-1 velocity if scrolling right or left. This is to ensure that the
+                  // next/previous page is picked rather than sliding backwards to the current page
+                  int velocityX = (int) Math.signum(hScroll);
+                  if (mDisableIntervalMomentum) {
+                    velocityX = 0;
+                  }
+                  flingAndSnap(velocityX);
                 }
               };
           postOnAnimationDelayed(mPostTouchRunnable, ReactScrollViewHelper.MOMENTUM_DELAY);

package/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java

@@ -688,8 +688,13 @@ public class ReactScrollView extends ScrollView
                 @Override
                 public void run() {
                   mPostTouchRunnable = null;
-                  // Trigger snap alignment now that scrolling has stopped
-                  handlePostTouchScrolling(0, 0);
+                  // +1/-1 velocity if scrolling down or up. This is to ensure that the
+                  // next/previous page is picked rather than sliding backwards to the current page
+                  int velocityY = (int) -Math.signum(vScroll);
+                  if (mDisableIntervalMomentum) {
+                    velocityY = 0;
+                  }
+                  flingAndSnap(velocityY);
                 }
               };
           postOnAnimationDelayed(mPostTouchRunnable, ReactScrollViewHelper.MOMENTUM_DELAY);
@@ -714,6 +719,10 @@ public class ReactScrollView extends ScrollView
 
   @Override
   public void setRemoveClippedSubviews(boolean removeClippedSubviews) {
+    if (ReactNativeFeatureFlags.disableSubviewClippingAndroid()) {
+      return;
+    }
+
     if (removeClippedSubviews && mClippingRect == null) {
       mClippingRect = new Rect();
     }

package/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.kt

@@ -32,6 +32,7 @@ import com.facebook.react.bridge.UiThreadUtil.assertOnUiThread
 import com.facebook.react.bridge.UiThreadUtil.runOnUiThread
 import com.facebook.react.common.ReactConstants.TAG
 import com.facebook.react.config.ReactFeatureFlags
+import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags
 import com.facebook.react.touch.OnInterceptTouchEventListener
 import com.facebook.react.touch.ReactHitSlopView
 import com.facebook.react.touch.ReactInterceptingViewGroup
@@ -362,8 +363,17 @@ public open class ReactViewGroup public constructor(context: Context?) :
   }
 
   override var removeClippedSubviews: Boolean
-    get() = _removeClippedSubviews
+    get() {
+      if (ReactNativeFeatureFlags.disableSubviewClippingAndroid()) {
+        return false
+      }
+      return _removeClippedSubviews
+    }
     set(newValue) {
+      if (ReactNativeFeatureFlags.disableSubviewClippingAndroid()) {
+        return
+      }
+
       if (newValue == _removeClippedSubviews) {
         return
       }

package/ReactAndroid/src/main/jni/react/devsupport/JCxxInspectorPackagerConnectionWebSocket.cpp

@@ -5,6 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+#include <fbjni/ByteBuffer.h>
+
 #include "JCxxInspectorPackagerConnectionWebSocket.h"
 
 using namespace facebook::jni;
@@ -12,10 +14,35 @@ using namespace facebook::react::jsinspector_modern;
 
 namespace facebook::react::jsinspector_modern {
 
+namespace {
+
+local_ref<JByteBuffer::javaobject> getReadOnlyByteBufferFromStringView(
+    std::string_view sv) {
+  auto buffer = JByteBuffer::wrapBytes(
+      const_cast<uint8_t*>(reinterpret_cast<const uint8_t*>(sv.data())),
+      sv.size());
+
+  /**
+   * Return a read-only buffer that shares the underlying contents.
+   * This guards from accidential mutations on the Java side, since we did
+   * casting above.
+   *
+   * https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html#asReadOnlyBuffer--
+   */
+  static auto method =
+      buffer->javaClassStatic()->getMethod<JByteBuffer::javaobject()>(
+          "asReadOnlyBuffer");
+  return method(buffer);
+}
+
+} // namespace
+
 void JCxxInspectorPackagerConnectionWebSocket::send(std::string_view message) {
   static auto method =
-      javaClassStatic()->getMethod<void(const std::string&)>("send");
-  method(self(), std::string(message));
+      javaClassStatic()->getMethod<void(local_ref<JByteBuffer::javaobject>)>(
+          "send");
+  auto byteBuffer = getReadOnlyByteBufferFromStringView(message);
+  method(self(), byteBuffer);
 }
 
 void JCxxInspectorPackagerConnectionWebSocket::close() {

package/ReactAndroid/src/main/jni/react/fabric/FabricUIManagerBinding.cpp

@@ -166,34 +166,39 @@ void FabricUIManagerBinding::startSurface(
     return;
   }
 
-  auto layoutContext = LayoutContext{};
-  layoutContext.pointScaleFactor = pointScaleFactor_;
+  SurfaceHandler* surfaceHandler = nullptr;
+  {
+    std::unique_lock lock(surfaceHandlerRegistryMutex_);
+    auto [it, _] = surfaceHandlerRegistry_.try_emplace(
+        surfaceId,
+        std::in_place_index<0>,
+        moduleName->toStdString(),
+        surfaceId);
+    surfaceHandler = &std::get<SurfaceHandler>(it->second);
+  }
 
-  auto surfaceHandler = SurfaceHandler{moduleName->toStdString(), surfaceId};
-  surfaceHandler.setContextContainer(scheduler->getContextContainer());
+  surfaceHandler->setContextContainer(scheduler->getContextContainer());
   if (initialProps != nullptr) {
-    surfaceHandler.setProps(initialProps->consume());
+    surfaceHandler->setProps(initialProps->consume());
   }
-  surfaceHandler.constraintLayout({}, layoutContext);
 
-  scheduler->registerSurface(surfaceHandler);
+  auto layoutContext = LayoutContext{};
+  layoutContext.pointScaleFactor = pointScaleFactor_;
+  surfaceHandler->constraintLayout({}, layoutContext);
+
+  scheduler->registerSurface(*surfaceHandler);
 
   auto mountingManager = getMountingManager("startSurface");
   if (mountingManager != nullptr) {
     mountingManager->onSurfaceStart(surfaceId);
   }
 
-  surfaceHandler.start();
+  surfaceHandler->start();
 
   if (ReactNativeFeatureFlags::enableLayoutAnimationsOnAndroid()) {
-    surfaceHandler.getMountingCoordinator()->setMountingOverrideDelegate(
+    surfaceHandler->getMountingCoordinator()->setMountingOverrideDelegate(
         animationDriver_);
   }
-
-  {
-    std::unique_lock lock(surfaceHandlerRegistryMutex_);
-    surfaceHandlerRegistry_.emplace(surfaceId, std::move(surfaceHandler));
-  }
 }
 
 jint FabricUIManagerBinding::findNextFocusableElement(
@@ -338,31 +343,36 @@ void FabricUIManagerBinding::startSurfaceWithConstraints(
   constraints.layoutDirection =
       isRTL != 0 ? LayoutDirection::RightToLeft : LayoutDirection::LeftToRight;
 
-  auto surfaceHandler = SurfaceHandler{moduleName->toStdString(), surfaceId};
-  surfaceHandler.setContextContainer(scheduler->getContextContainer());
+  SurfaceHandler* surfaceHandler = nullptr;
+  {
+    std::unique_lock lock(surfaceHandlerRegistryMutex_);
+    auto [it, _] = surfaceHandlerRegistry_.try_emplace(
+        surfaceId,
+        std::in_place_index<0>,
+        moduleName->toStdString(),
+        surfaceId);
+    surfaceHandler = &std::get<SurfaceHandler>(it->second);
+  }
+
+  surfaceHandler->setContextContainer(scheduler->getContextContainer());
   if (initialProps != nullptr) {
-    surfaceHandler.setProps(initialProps->consume());
+    surfaceHandler->setProps(initialProps->consume());
   }
-  surfaceHandler.constraintLayout(constraints, context);
+  surfaceHandler->constraintLayout(constraints, context);
 
-  scheduler->registerSurface(surfaceHandler);
+  scheduler->registerSurface(*surfaceHandler);
 
   auto mountingManager = getMountingManager("startSurfaceWithConstraints");
   if (mountingManager != nullptr) {
     mountingManager->onSurfaceStart(surfaceId);
   }
 
-  surfaceHandler.start();
+  surfaceHandler->start();
 
   if (ReactNativeFeatureFlags::enableLayoutAnimationsOnAndroid()) {
-    surfaceHandler.getMountingCoordinator()->setMountingOverrideDelegate(
+    surfaceHandler->getMountingCoordinator()->setMountingOverrideDelegate(
         animationDriver_);
   }
-
-  {
-    std::unique_lock lock(surfaceHandlerRegistryMutex_);
-    surfaceHandlerRegistry_.emplace(surfaceId, std::move(surfaceHandler));
-  }
 }
 
 // Used by non-bridgeless+Fabric