react-native-tvos 0.78.0-0rc3 → 0.79.0-0

package/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java

@@ -55,6 +55,7 @@ import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReactSoftExceptionLogger;
 import com.facebook.react.common.ReactConstants;
 import com.facebook.react.common.build.ReactBuildConfig;
+import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
 import com.facebook.react.uimanager.BackgroundStyleApplicator;
 import com.facebook.react.uimanager.LengthPercentage;
 import com.facebook.react.uimanager.LengthPercentageType;
@@ -84,8 +85,8 @@ import com.facebook.react.views.text.internal.span.ReactStrikethroughSpan;
 import com.facebook.react.views.text.internal.span.ReactTextPaintHolderSpan;
 import com.facebook.react.views.text.internal.span.ReactUnderlineSpan;
 import com.facebook.react.views.text.internal.span.TextInlineImageSpan;
-import java.util.ArrayList;
 import java.util.Objects;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 /**
  * A wrapper around the EditText that lets us better control what happens when an EditText gets
@@ -115,7 +116,7 @@ public class ReactEditText extends AppCompatEditText {
   /** A count of events sent to JS or C++. */
   protected int mNativeEventCount;
 
-  private @Nullable ArrayList<TextWatcher> mListeners;
+  private @Nullable CopyOnWriteArrayList<TextWatcher> mListeners;
   private @Nullable TextWatcherDelegator mTextWatcherDelegator;
   private int mStagedInputType;
   protected boolean mContainsImages;
@@ -152,7 +153,9 @@ public class ReactEditText extends AppCompatEditText {
 
   public ReactEditText(Context context) {
     super(context);
-    setFocusableInTouchMode(false);
+    if (!ReactNativeFeatureFlags.useEditTextStockAndroidFocusBehavior()) {
+      setFocusableInTouchMode(false);
+    }
 
     mInputMethodManager =
         (InputMethodManager)
@@ -195,7 +198,9 @@ public class ReactEditText extends AppCompatEditText {
                 // selection on accessibility click to undo that.
                 setSelection(length);
               }
-              return requestFocusInternal();
+              return ReactNativeFeatureFlags.useEditTextStockAndroidFocusBehavior()
+                  ? requestFocusProgramatically()
+                  : requestFocusInternal();
             }
             return super.performAccessibilityAction(host, action, args);
           }
@@ -366,7 +371,10 @@ public class ReactEditText extends AppCompatEditText {
 
   @Override
   public void clearFocus() {
-    setFocusableInTouchMode(false);
+    boolean useStockFocusBehavior = ReactNativeFeatureFlags.useEditTextStockAndroidFocusBehavior();
+    if (!useStockFocusBehavior) {
+      setFocusableInTouchMode(false);
+    }
     super.clearFocus();
     isKeyboardOpened = false;
     hideSoftKeyboard();
@@ -378,9 +386,9 @@ public class ReactEditText extends AppCompatEditText {
     // is a controlled component, which means its focus is controlled by JS, with two exceptions:
     // autofocus when it's attached to the window, and responding to accessibility events. In both
     // of these cases, we call requestFocusInternal() directly.
-    // Always return true if we are already focused. This is used by android in certain places,
-    // such as text selection.
-    return isFocused();
+    return ReactNativeFeatureFlags.useEditTextStockAndroidFocusBehavior()
+        ? super.requestFocus(direction, previouslyFocusedRect)
+        : isFocused();
   }
 
   private boolean requestFocusInternal() {
@@ -395,13 +403,27 @@ public class ReactEditText extends AppCompatEditText {
         hideSoftKeyboard();
       }
     }
+
+    return focused;
+  }
+
+  // For cases like autoFocus, or ref.focus() where we request focus programatically and not through
+  // interacting with the EditText directly (like clicking on it). We cannot use stock
+  // requestFocus() because it will not pop up the soft keyboard, only clicking the input will do
+  // that. This method will eventually replace requestFocusInternal()
+  private boolean requestFocusProgramatically() {
+    boolean focused = super.requestFocus(View.FOCUS_DOWN, null);
+    if (isInTouchMode() && getShowSoftInputOnFocus()) {
+      showSoftKeyboard();
+    }
+
     return focused;
   }
 
   @Override
   public void addTextChangedListener(TextWatcher watcher) {
     if (mListeners == null) {
-      mListeners = new ArrayList<>();
+      mListeners = new CopyOnWriteArrayList<>();
       super.addTextChangedListener(getTextWatcherDelegator());
     }
 
@@ -671,7 +693,11 @@ public class ReactEditText extends AppCompatEditText {
 
   // VisibleForTesting from {@link TextInputEventsTestCase}.
   public void requestFocusFromJS() {
-    requestFocusInternal();
+    if (ReactNativeFeatureFlags.useEditTextStockAndroidFocusBehavior()) {
+      requestFocusProgramatically();
+    } else {
+      requestFocusInternal();
+    }
   }
 
   /* package */ void clearFocusFromJS() {
@@ -1140,7 +1166,11 @@ public class ReactEditText extends AppCompatEditText {
     }
 
     if (mAutoFocus && !mDidAttachToWindow) {
-      requestFocusInternal();
+      if (ReactNativeFeatureFlags.useEditTextStockAndroidFocusBehavior()) {
+        requestFocusProgramatically();
+      } else {
+        requestFocusInternal();
+      }
     }
 
     mDidAttachToWindow = true;

package/ReactAndroid/src/main/java/com/facebook/react/views/textinput/{ScrollWatcher.java → ScrollWatcher.kt}

@@ -5,8 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react.views.textinput;
+package com.facebook.react.views.textinput
 
 public interface ScrollWatcher {
-  void onScrollChanged(int horiz, int vert, int oldHoriz, int oldVert);
+  public fun onScrollChanged(horiz: Int, vert: Int, oldHoriz: Int, oldVert: Int): Unit
 }

package/ReactAndroid/src/main/java/com/facebook/react/views/textinput/{SelectionWatcher.java → SelectionWatcher.kt}

@@ -5,12 +5,12 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react.views.textinput;
+package com.facebook.react.views.textinput
 
 /**
  * Implement this interface to be informed of selection changes in the ReactTextEdit This is used by
  * the ReactTextInputManager to forward events from the EditText to JS
  */
-interface SelectionWatcher {
-  void onSelectionChanged(int start, int end);
+internal interface SelectionWatcher {
+  fun onSelectionChanged(start: Int, end: Int): Unit
 }

package/ReactAndroid/src/main/java/com/facebook/react/views/unimplementedview/ReactUnimplementedViewManager.kt

@@ -26,18 +26,17 @@ internal class ReactUnimplementedViewManager :
 
   public override fun getDelegate(): ViewManagerDelegate<ReactUnimplementedView> = delegate
 
-  protected override fun createViewInstance(
-      reactContext: ThemedReactContext
-  ): ReactUnimplementedView = ReactUnimplementedView(reactContext)
+  override fun createViewInstance(reactContext: ThemedReactContext): ReactUnimplementedView =
+      ReactUnimplementedView(reactContext)
 
-  public override fun getName(): String = REACT_CLASS
+  override fun getName(): String = REACT_CLASS
 
   @ReactProp(name = "name")
-  public override fun setName(view: ReactUnimplementedView, name: String?): Unit {
+  override fun setName(view: ReactUnimplementedView, name: String?): Unit {
     view.setName(name ?: "<null component name>")
   }
 
   internal companion object {
-    public const val REACT_CLASS: String = "UnimplementedNativeView"
+    const val REACT_CLASS: String = "UnimplementedNativeView"
   }
 }

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

@@ -110,6 +110,7 @@ public class ReactViewGroup extends ViewGroup
   private boolean trapFocusDown = false;
   private boolean trapFocusLeft = false;
   private boolean trapFocusRight = false;
+  public boolean hasTVPreferredFocus = false;
 
 
   /**

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

@@ -23,6 +23,7 @@ import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.ReadableType
 import com.facebook.react.common.ReactConstants
+import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags
 import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.uimanager.BackgroundStyleApplicator
 import com.facebook.react.uimanager.LengthPercentage
@@ -69,7 +70,9 @@ public open class ReactViewManager : ReactClippingViewManager<ReactViewGroup>()
   }
 
   init {
-    setupViewRecycling()
+    if (ReactNativeFeatureFlags.enableViewRecyclingForView()) {
+      setupViewRecycling()
+    }
   }
 
   override fun prepareToRecycleView(
@@ -82,6 +85,7 @@ public open class ReactViewManager : ReactClippingViewManager<ReactViewGroup>()
     return view
   }
 
+
   @ReactProp(name = "accessible")
   public open fun setAccessible(view: ReactViewGroup, accessible: Boolean) {
     view.isFocusable = accessible
@@ -109,6 +113,17 @@ public open class ReactViewManager : ReactClippingViewManager<ReactViewGroup>()
 
   @ReactProp(name = "hasTVPreferredFocus")
   public open fun setTVPreferredFocus(view: ReactViewGroup, hasTVPreferredFocus: Boolean) {
+    /*
+     * React prop functions like this one gets called repeatedly on the New Architecture
+     * no matter the prop has changed or not. Contrary to others, `hasTVPreferredFocus` has
+     * a side effect, calling `requestFocus` function on the view which disrupts the user flow
+     * and should only called once when the property changes to `true.
+     * We keep a special state in the View class and run a comparison here to mitigate
+     * that problem.
+     */
+    if (view.hasTVPreferredFocus == hasTVPreferredFocus) return;
+    view.hasTVPreferredFocus = hasTVPreferredFocus;
+
     if (hasTVPreferredFocus) {
       view.isFocusable = true
       view.isFocusableInTouchMode = true

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

@@ -19,11 +19,11 @@ public class ViewGroupClickEvent(surfaceId: Int, viewId: Int) :
   @Deprecated("Use the constructor with surfaceId and viewId parameters.")
   public constructor(viewId: Int) : this(ViewUtil.NO_SURFACE_ID, viewId)
 
-  override public fun getEventName(): String = EVENT_NAME
+  public override fun getEventName(): String = EVENT_NAME
 
-  override public fun canCoalesce(): Boolean = false
+  public override fun canCoalesce(): Boolean = false
 
-  override protected fun getEventData(): WritableMap = Arguments.createMap()
+  protected override fun getEventData(): WritableMap = Arguments.createMap()
 
   private companion object {
     private const val EVENT_NAME: String = "topClick"

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

@@ -17,7 +17,7 @@ import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsControllerCompat
 
 @Suppress("DEPRECATION")
-public fun Window.setStatusBarTranslucency(isTranslucent: Boolean) {
+internal fun Window.setStatusBarTranslucency(isTranslucent: Boolean) {
   // If the status bar is translucent hook into the window insets calculations
   // and consume all the top insets so no padding will be added under the status bar.
   if (isTranslucent) {
@@ -35,7 +35,7 @@ public fun Window.setStatusBarTranslucency(isTranslucent: Boolean) {
   ViewCompat.requestApplyInsets(decorView)
 }
 
-public fun Window.setStatusBarVisibility(isHidden: Boolean) {
+internal fun Window.setStatusBarVisibility(isHidden: Boolean) {
   if (isHidden) {
     this.statusBarHide()
   } else {
@@ -67,7 +67,7 @@ private fun Window.statusBarShow() {
 }
 
 @Suppress("DEPRECATION")
-public fun Window.setSystemBarsTranslucency(isTranslucent: Boolean) {
+internal fun Window.setSystemBarsTranslucency(isTranslucent: Boolean) {
   WindowCompat.setDecorFitsSystemWindows(this, !isTranslucent)
 
   if (isTranslucent) {

package/ReactAndroid/src/main/java/com/facebook/systrace/SystraceMessage.kt

@@ -12,7 +12,7 @@ import kotlin.jvm.JvmField
 
 public object SystraceMessage {
 
-  public @JvmField var INCLUDE_ARGS: Boolean = false
+  @JvmField public var INCLUDE_ARGS: Boolean = false
 
   @JvmStatic
   public fun beginSection(tag: Long, sectionName: String): Builder =

package/ReactAndroid/src/main/jni/CMakeLists.txt

@@ -62,10 +62,12 @@ add_react_common_subdir(runtimeexecutor)
 add_react_common_subdir(reactperflogger)
 add_react_common_subdir(logger)
 add_react_common_subdir(jsiexecutor)
+add_react_common_subdir(jsitooling)
 add_react_common_subdir(cxxreact)
 add_react_common_subdir(jsc)
 add_react_common_subdir(jsi)
 add_react_common_subdir(callinvoker)
+add_react_common_subdir(oscompat)
 add_react_common_subdir(jsinspector-modern)
 add_react_common_subdir(jsinspector-modern/tracing)
 add_react_common_subdir(hermes/executor)
@@ -83,6 +85,7 @@ add_react_common_subdir(react/renderer/telemetry)
 add_react_common_subdir(react/renderer/uimanager)
 add_react_common_subdir(react/renderer/core)
 add_react_common_subdir(react/renderer/consistency)
+add_react_common_subdir(react/renderer/css)
 add_react_common_subdir(react/renderer/uimanager/consistency)
 add_react_common_subdir(react/renderer/dom)
 add_react_common_subdir(react/renderer/element)
@@ -162,10 +165,12 @@ add_library(reactnative
           $<TARGET_OBJECTS:jni_lib_merge_glue>
           $<TARGET_OBJECTS:jserrorhandler>
           $<TARGET_OBJECTS:jsinspector>
+          $<TARGET_OBJECTS:jsitooling>
           $<TARGET_OBJECTS:jsinspector_tracing>
           $<TARGET_OBJECTS:jsireact>
           $<TARGET_OBJECTS:logger>
           $<TARGET_OBJECTS:mapbufferjni>
+          $<TARGET_OBJECTS:oscompat>
           $<TARGET_OBJECTS:react_bridging>
           $<TARGET_OBJECTS:react_codegen_rncore>
           $<TARGET_OBJECTS:react_cxxreact>
@@ -181,26 +186,26 @@ add_library(reactnative
           $<TARGET_OBJECTS:react_nativemodule_microtasks>
           $<TARGET_OBJECTS:react_newarchdefaults>
           $<TARGET_OBJECTS:react_performance_timeline>
-          $<TARGET_OBJECTS:react_render_animations>
-          $<TARGET_OBJECTS:react_render_attributedstring>
-          $<TARGET_OBJECTS:react_render_componentregistry>
-          $<TARGET_OBJECTS:react_render_consistency>
-          $<TARGET_OBJECTS:react_render_core>
-          $<TARGET_OBJECTS:react_render_debug>
-          $<TARGET_OBJECTS:react_render_dom>
-          $<TARGET_OBJECTS:react_render_element>
-          $<TARGET_OBJECTS:react_render_graphics>
-          $<TARGET_OBJECTS:react_render_imagemanager>
-          $<TARGET_OBJECTS:react_render_leakchecker>
-          $<TARGET_OBJECTS:react_render_mapbuffer>
-          $<TARGET_OBJECTS:react_render_mounting>
-          $<TARGET_OBJECTS:react_render_observers_events>
-          $<TARGET_OBJECTS:react_render_runtimescheduler>
-          $<TARGET_OBJECTS:react_render_scheduler>
-          $<TARGET_OBJECTS:react_render_telemetry>
-          $<TARGET_OBJECTS:react_render_textlayoutmanager>
-          $<TARGET_OBJECTS:react_render_uimanager>
-          $<TARGET_OBJECTS:react_render_uimanager_consistency>
+          $<TARGET_OBJECTS:react_renderer_animations>
+          $<TARGET_OBJECTS:react_renderer_attributedstring>
+          $<TARGET_OBJECTS:react_renderer_componentregistry>
+          $<TARGET_OBJECTS:react_renderer_consistency>
+          $<TARGET_OBJECTS:react_renderer_core>
+          $<TARGET_OBJECTS:react_renderer_debug>
+          $<TARGET_OBJECTS:react_renderer_dom>
+          $<TARGET_OBJECTS:react_renderer_element>
+          $<TARGET_OBJECTS:react_renderer_graphics>
+          $<TARGET_OBJECTS:react_renderer_imagemanager>
+          $<TARGET_OBJECTS:react_renderer_leakchecker>
+          $<TARGET_OBJECTS:react_renderer_mapbuffer>
+          $<TARGET_OBJECTS:react_renderer_mounting>
+          $<TARGET_OBJECTS:react_renderer_observers_events>
+          $<TARGET_OBJECTS:react_renderer_runtimescheduler>
+          $<TARGET_OBJECTS:react_renderer_scheduler>
+          $<TARGET_OBJECTS:react_renderer_telemetry>
+          $<TARGET_OBJECTS:react_renderer_textlayoutmanager>
+          $<TARGET_OBJECTS:react_renderer_uimanager>
+          $<TARGET_OBJECTS:react_renderer_uimanager_consistency>
           $<TARGET_OBJECTS:react_utils>
           $<TARGET_OBJECTS:reactnativeblob>
           $<TARGET_OBJECTS:reactnativejni>
@@ -264,27 +269,28 @@ target_include_directories(reactnative
         $<TARGET_PROPERTY:react_nativemodule_microtasks,INTERFACE_INCLUDE_DIRECTORIES>
         $<TARGET_PROPERTY:react_newarchdefaults,INTERFACE_INCLUDE_DIRECTORIES>
         $<TARGET_PROPERTY:react_performance_timeline,INTERFACE_INCLUDE_DIRECTORIES>
-        $<TARGET_PROPERTY:react_render_animations,INTERFACE_INCLUDE_DIRECTORIES>
-        $<TARGET_PROPERTY:react_render_attributedstring,INTERFACE_INCLUDE_DIRECTORIES>
-        $<TARGET_PROPERTY:react_render_componentregistry,INTERFACE_INCLUDE_DIRECTORIES>
-        $<TARGET_PROPERTY:react_render_componentregistry,INTERFACE_INCLUDE_DIRECTORIES>
-        $<TARGET_PROPERTY:react_render_consistency,INTERFACE_INCLUDE_DIRECTORIES>
-        $<TARGET_PROPERTY:react_render_core,INTERFACE_INCLUDE_DIRECTORIES>
-        $<TARGET_PROPERTY:react_render_debug,INTERFACE_INCLUDE_DIRECTORIES>
-        $<TARGET_PROPERTY:react_render_dom,INTERFACE_INCLUDE_DIRECTORIES>
-        $<TARGET_PROPERTY:react_render_element,INTERFACE_INCLUDE_DIRECTORIES>
-        $<TARGET_PROPERTY:react_render_graphics,INTERFACE_INCLUDE_DIRECTORIES>
-        $<TARGET_PROPERTY:react_render_imagemanager,INTERFACE_INCLUDE_DIRECTORIES>
-        $<TARGET_PROPERTY:react_render_leakchecker,INTERFACE_INCLUDE_DIRECTORIES>
-        $<TARGET_PROPERTY:react_render_mapbuffer,INTERFACE_INCLUDE_DIRECTORIES>
-        $<TARGET_PROPERTY:react_render_mounting,INTERFACE_INCLUDE_DIRECTORIES>
-        $<TARGET_PROPERTY:react_render_observers_events,INTERFACE_INCLUDE_DIRECTORIES>
-        $<TARGET_PROPERTY:react_render_runtimescheduler,INTERFACE_INCLUDE_DIRECTORIES>
-        $<TARGET_PROPERTY:react_render_scheduler,INTERFACE_INCLUDE_DIRECTORIES>
-        $<TARGET_PROPERTY:react_render_telemetry,INTERFACE_INCLUDE_DIRECTORIES>
-        $<TARGET_PROPERTY:react_render_textlayoutmanager,INTERFACE_INCLUDE_DIRECTORIES>
-        $<TARGET_PROPERTY:react_render_uimanager,INTERFACE_INCLUDE_DIRECTORIES>
-        $<TARGET_PROPERTY:react_render_uimanager_consistency,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_renderer_animations,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_renderer_attributedstring,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_renderer_componentregistry,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_renderer_componentregistry,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_renderer_consistency,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_renderer_core,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_renderer_css,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_renderer_debug,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_renderer_dom,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_renderer_element,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_renderer_graphics,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_renderer_imagemanager,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_renderer_leakchecker,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_renderer_mapbuffer,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_renderer_mounting,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_renderer_observers_events,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_renderer_runtimescheduler,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_renderer_scheduler,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_renderer_telemetry,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_renderer_textlayoutmanager,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_renderer_uimanager,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_renderer_uimanager_consistency,INTERFACE_INCLUDE_DIRECTORIES>
         $<TARGET_PROPERTY:react_utils,INTERFACE_INCLUDE_DIRECTORIES>
         $<TARGET_PROPERTY:reactnativeblob,INTERFACE_INCLUDE_DIRECTORIES>
         $<TARGET_PROPERTY:reactnativejni,INTERFACE_INCLUDE_DIRECTORIES>
@@ -378,19 +384,20 @@ target_link_libraries(reactnative_unittest
   react_codegen_rncore
   react_cxxreact
   react_debug
-  react_render_animations
-  react_render_attributedstring
-  react_render_core
-  react_render_debug
-  react_render_dom
-  react_render_element
-  react_render_graphics
-  react_render_mapbuffer
-  react_render_mounting
-  react_render_telemetry
-  react_render_textlayoutmanager
-  react_render_uimanager
-  react_render_uimanager_consistency
+  react_renderer_animations
+  react_renderer_attributedstring
+  react_renderer_core
+  react_renderer_css
+  react_renderer_debug
+  react_renderer_dom
+  react_renderer_element
+  react_renderer_graphics
+  react_renderer_mapbuffer
+  react_renderer_mounting
+  react_renderer_telemetry
+  react_renderer_textlayoutmanager
+  react_renderer_uimanager
+  react_renderer_uimanager_consistency
   react_utils
   reactnative
   rrc_legacyviewmanagerinterop

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

@@ -40,6 +40,12 @@ void JCxxInspectorPackagerConnectionWebSocketDelegate::didReceiveMessage(
   }
 }
 
+void JCxxInspectorPackagerConnectionWebSocketDelegate::didOpen() {
+  if (auto delegate = cxxDelegate_.lock()) {
+    delegate->didOpen();
+  }
+}
+
 void JCxxInspectorPackagerConnectionWebSocketDelegate::didClose() {
   if (auto delegate = cxxDelegate_.lock()) {
     delegate->didClose();
@@ -56,7 +62,10 @@ void JCxxInspectorPackagerConnectionWebSocketDelegate::registerNatives() {
            JCxxInspectorPackagerConnectionWebSocketDelegate::didReceiveMessage),
        makeNativeMethod(
            "didClose",
-           JCxxInspectorPackagerConnectionWebSocketDelegate::didClose)});
+           JCxxInspectorPackagerConnectionWebSocketDelegate::didClose),
+       makeNativeMethod(
+           "didOpen",
+           JCxxInspectorPackagerConnectionWebSocketDelegate::didOpen)});
 }
 
 } // namespace facebook::react::jsinspector_modern

package/ReactAndroid/src/main/jni/react/devsupport/JCxxInspectorPackagerConnectionWebSocketDelegate.h

@@ -32,6 +32,8 @@ class JCxxInspectorPackagerConnectionWebSocketDelegate
 
   void didReceiveMessage(const std::string& message);
 
+  void didOpen();
+
   void didClose();
 
   static void registerNatives();

package/ReactAndroid/src/main/jni/react/fabric/CMakeLists.txt

@@ -29,22 +29,23 @@ target_link_libraries(
         react_codegen_rncore
         react_debug
         react_featureflags
-        react_render_animations
-        react_render_attributedstring
-        react_render_componentregistry
-        react_render_core
-        react_render_debug
-        react_render_dom
-        react_render_graphics
-        react_render_imagemanager
-        react_render_mapbuffer
-        react_render_mounting
-        react_render_runtimescheduler
-        react_render_scheduler
-        react_render_telemetry
-        react_render_textlayoutmanager
-        react_render_uimanager
-        react_render_uimanager_consistency
+        react_renderer_animations
+        react_renderer_attributedstring
+        react_renderer_componentregistry
+        react_renderer_core
+        react_renderer_css
+        react_renderer_debug
+        react_renderer_dom
+        react_renderer_graphics
+        react_renderer_imagemanager
+        react_renderer_mapbuffer
+        react_renderer_mounting
+        react_renderer_runtimescheduler
+        react_renderer_scheduler
+        react_renderer_telemetry
+        react_renderer_textlayoutmanager
+        react_renderer_uimanager
+        react_renderer_uimanager_consistency
         rrc_legacyviewmanagerinterop
         react_utils
         reactnativejni

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

@@ -925,15 +925,9 @@ void FabricMountingManager::maybePreallocateShadowNode(
 
   auto shadowView = ShadowView(shadowNode);
 
-  if (ReactNativeFeatureFlags::useOptimisedViewPreallocationOnAndroid()) {
-    // Optimised implementation where FabricUIManager.preallocateView is called
-    // from the main thread.
+  {
     std::lock_guard lock(preallocateMutex_);
     preallocatedViewsQueue_.push_back(std::move(shadowView));
-  } else {
-    // Old implementation where FabricUIManager.preallocateView is called
-    // immediately.
-    preallocateShadowView(shadowView);
   }
 }
 

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

@@ -565,8 +565,7 @@ void FabricUIManagerBinding::schedulerDidRequestPreliminaryViewAllocation(
   // Only the Views of ShadowNode that were pre-allocated (forms views) needs
   // to be destroyed if the ShadowNode is destroyed but it was never mounted
   // on the screen.
-  if (ReactNativeFeatureFlags::enableDeletionOfUnmountedViews() &&
-      shadowNode.getTraits().check(ShadowNodeTraits::Trait::FormsView)) {
+  if (shadowNode.getTraits().check(ShadowNodeTraits::Trait::FormsView)) {
     shadowNode.getFamily().onUnmountedFamilyDestroyed(
         [weakMountingManager =
              std::weak_ptr(mountingManager)](const ShadowNodeFamily& family) {

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

@@ -73,9 +73,9 @@ const SurfaceHandler& SurfaceHandlerBinding::getSurfaceHandler() {
 void SurfaceHandlerBinding::registerNatives() {
   registerHybrid({
       makeNativeMethod("initHybrid", SurfaceHandlerBinding::initHybrid),
-      makeNativeMethod("getSurfaceId", SurfaceHandlerBinding::getSurfaceId),
-      makeNativeMethod("isRunning", SurfaceHandlerBinding::isRunning),
-      makeNativeMethod("getModuleName", SurfaceHandlerBinding::getModuleName),
+      makeNativeMethod("_getSurfaceId", SurfaceHandlerBinding::getSurfaceId),
+      makeNativeMethod("_isRunning", SurfaceHandlerBinding::isRunning),
+      makeNativeMethod("_getModuleName", SurfaceHandlerBinding::getModuleName),
       makeNativeMethod(
           "setLayoutConstraintsNative",
           SurfaceHandlerBinding::setLayoutConstraints),