react-native 0.74.0-nightly-20240129-39cb02f6f → 1000.0.0

package/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultNewArchitectureEntryPoint.kt

@@ -5,6 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+@file:Suppress("DEPRECATION") // We want to use ReactFeatureFlags here specifically
+
 package com.facebook.react.defaults
 
 import com.facebook.react.common.annotations.VisibleForTesting
@@ -19,7 +21,8 @@ import com.facebook.react.config.ReactFeatureFlags
  * By default it loads a library called `appmodules`. `appmodules` is a convention used to refer to
  * the application dynamic library. If changed here should be updated also inside the template.
  *
- * By default it also enables both TurboModules, Fabric and Concurrent React (aka React 18)
+ * By default it also enables both TurboModules, Fabric and Concurrent React (aka React 18), and
+ * Bridgeless
  */
 object DefaultNewArchitectureEntryPoint {
   @JvmStatic
@@ -27,7 +30,7 @@ object DefaultNewArchitectureEntryPoint {
   fun load(
       turboModulesEnabled: Boolean = true,
       fabricEnabled: Boolean = true,
-      bridgelessEnabled: Boolean = false
+      bridgelessEnabled: Boolean = true
   ) {
     val (isValid, errorMessage) =
         isConfigurationValid(turboModulesEnabled, fabricEnabled, bridgelessEnabled)

package/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlags.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<<52367278b4d0fdf7f436bd8c511d4ffe>>
+ * @generated SignedSource<<82a7973a820b75c46977931a8b178493>>
  */
 
 /**
@@ -31,23 +31,33 @@ object ReactNativeFeatureFlags {
   /**
    * Common flag for testing. Do NOT modify.
    */
+  @JvmStatic
   fun commonTestFlag() = accessor.commonTestFlag()
 
   /**
    * When enabled, it uses the modern fork of RuntimeScheduler that allows scheduling tasks with priorities from any thread.
    */
+  @JvmStatic
   fun useModernRuntimeScheduler() = accessor.useModernRuntimeScheduler()
 
   /**
    * Enables the use of microtasks in Hermes (scheduling) and RuntimeScheduler (execution).
    */
+  @JvmStatic
   fun enableMicrotasks() = accessor.enableMicrotasks()
 
   /**
    * When enabled, the RuntimeScheduler processing the event loop will batch all rendering updates and dispatch them together at the end of each iteration of the loop.
    */
+  @JvmStatic
   fun batchRenderingUpdatesInEventLoop() = accessor.batchRenderingUpdatesInEventLoop()
 
+  /**
+   * Uses new, deduplicated logic for constructing Android Spannables from text fragments
+   */
+  @JvmStatic
+  fun enableSpannableBuildingUnification() = accessor.enableSpannableBuildingUnification()
+
   /**
    * Overrides the feature flags with the ones provided by the given provider
    * (generally one that extends `ReactNativeFeatureFlagsDefaults`).

package/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxAccessor.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<<920bb26d238f935f63a77943df7ef6e2>>
+ * @generated SignedSource<<881b7f9eb6b1765764b70719155a457c>>
  */
 
 /**
@@ -24,6 +24,7 @@ class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAccessor {
   private var useModernRuntimeSchedulerCache: Boolean? = null
   private var enableMicrotasksCache: Boolean? = null
   private var batchRenderingUpdatesInEventLoopCache: Boolean? = null
+  private var enableSpannableBuildingUnificationCache: Boolean? = null
 
   override fun commonTestFlag(): Boolean {
     var cached = commonTestFlagCache
@@ -61,6 +62,15 @@ class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAccessor {
     return cached
   }
 
+  override fun enableSpannableBuildingUnification(): Boolean {
+    var cached = enableSpannableBuildingUnificationCache
+    if (cached == null) {
+      cached = ReactNativeFeatureFlagsCxxInterop.enableSpannableBuildingUnification()
+      enableSpannableBuildingUnificationCache = cached
+    }
+    return cached
+  }
+
   override fun override(provider: ReactNativeFeatureFlagsProvider) =
       ReactNativeFeatureFlagsCxxInterop.override(provider as Any)
 

package/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxInterop.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<<19d0606854e3e34efe67acf9dc1d26b4>>
+ * @generated SignedSource<<c4908662a6c752ef8dc85f7eb86d1df4>>
  */
 
 /**
@@ -36,6 +36,8 @@ object ReactNativeFeatureFlagsCxxInterop {
 
   @DoNotStrip @JvmStatic external fun batchRenderingUpdatesInEventLoop(): Boolean
 
+  @DoNotStrip @JvmStatic external fun enableSpannableBuildingUnification(): Boolean
+
   @DoNotStrip @JvmStatic external fun override(provider: Any)
 
   @DoNotStrip @JvmStatic external fun dangerouslyReset()

package/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsDefaults.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<<932fd2768c81d5a5f49929c89d6659ff>>
+ * @generated SignedSource<<44159bbcf15dc403e40656c71d84516a>>
  */
 
 /**
@@ -30,4 +30,6 @@ open class ReactNativeFeatureFlagsDefaults : ReactNativeFeatureFlagsProvider {
   override fun enableMicrotasks(): Boolean = false
 
   override fun batchRenderingUpdatesInEventLoop(): Boolean = false
+
+  override fun enableSpannableBuildingUnification(): Boolean = false
 }

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<<6254686d99a8bfd0531ed629655cf673>>
+ * @generated SignedSource<<85d0ebc43b7c390be7dd89c58f1b7a7a>>
  */
 
 /**
@@ -28,6 +28,7 @@ class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAccessor {
   private var useModernRuntimeSchedulerCache: Boolean? = null
   private var enableMicrotasksCache: Boolean? = null
   private var batchRenderingUpdatesInEventLoopCache: Boolean? = null
+  private var enableSpannableBuildingUnificationCache: Boolean? = null
 
   override fun commonTestFlag(): Boolean {
     var cached = commonTestFlagCache
@@ -69,6 +70,16 @@ class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAccessor {
     return cached
   }
 
+  override fun enableSpannableBuildingUnification(): Boolean {
+    var cached = enableSpannableBuildingUnificationCache
+    if (cached == null) {
+      cached = currentProvider.enableSpannableBuildingUnification()
+      accessedFeatureFlags.add("enableSpannableBuildingUnification")
+      enableSpannableBuildingUnificationCache = cached
+    }
+    return cached
+  }
+
   override fun override(provider: ReactNativeFeatureFlagsProvider) {
     if (accessedFeatureFlags.isNotEmpty()) {
       val accessedFeatureFlagsStr = accessedFeatureFlags.joinToString(separator = ", ") { it }

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<<c5c87368aae4df966b4b7971aadb79f2>>
+ * @generated SignedSource<<d5db40f4f25503513c4128892fd12e3f>>
  */
 
 /**
@@ -30,4 +30,6 @@ interface ReactNativeFeatureFlagsProvider {
   @DoNotStrip fun enableMicrotasks(): Boolean
 
   @DoNotStrip fun batchRenderingUpdatesInEventLoop(): Boolean
+
+  @DoNotStrip fun enableSpannableBuildingUnification(): Boolean
 }

package/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/JSCExecutor.kt

@@ -31,6 +31,6 @@ class JSCExecutor internal constructor(jscConfig: ReadableNativeMap) :
       SoLoader.loadLibrary("jscexecutor")
     }
 
-    @JvmStatic private external fun initHybrid(jscConfig: ReadableNativeMap): HybridData?
+    @JvmStatic private external fun initHybrid(jscConfig: ReadableNativeMap): HybridData
   }
 }

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

@@ -1,10 +1,10 @@
 /**
- * @generated by scripts/set-rn-version.js
- *
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
+ *
+ * @generated by scripts/releases/set-rn-version.js
  */
 
 package com.facebook.react.modules.systeminfo;
@@ -18,5 +18,5 @@ public class ReactNativeVersion {
       "major", 0,
       "minor", 74,
       "patch", 0,
-      "prerelease", "nightly-20240129-39cb02f6f");
+      "prerelease", "nightly-20240131-82e9a5e4f");
 }

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

@@ -47,6 +47,7 @@ import com.facebook.react.uimanager.ViewManager;
 import com.facebook.react.views.drawer.ReactDrawerLayoutManager;
 import com.facebook.react.views.image.ReactImageManager;
 import com.facebook.react.views.modal.ReactModalHostManager;
+import com.facebook.react.views.popupmenu.ReactPopupMenuManager;
 import com.facebook.react.views.progressbar.ReactProgressBarViewManager;
 import com.facebook.react.views.scroll.ReactHorizontalScrollContainerViewManager;
 import com.facebook.react.views.scroll.ReactHorizontalScrollViewManager;
@@ -170,6 +171,7 @@ public class MainReactPackage extends TurboReactPackage implements ViewManagerOn
     viewManagers.add(new ReactScrollViewManager());
     viewManagers.add(new ReactSwitchManager());
     viewManagers.add(new SwipeRefreshLayoutManager());
+    viewManagers.add(new ReactPopupMenuManager());
 
     // Native equivalents
     viewManagers.add(new FrescoBasedReactTextInlineImageViewManager());
@@ -211,6 +213,7 @@ public class MainReactPackage extends TurboReactPackage implements ViewManagerOn
       appendMap(viewManagers, ReactSwitchManager.REACT_CLASS, ReactSwitchManager::new);
       appendMap(
           viewManagers, SwipeRefreshLayoutManager.REACT_CLASS, SwipeRefreshLayoutManager::new);
+      appendMap(viewManagers, ReactPopupMenuManager.REACT_CLASS, ReactPopupMenuManager::new);
       appendMap(
           viewManagers,
           FrescoBasedReactTextInlineImageViewManager.REACT_CLASS,

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

@@ -866,12 +866,17 @@ public class NativeViewHierarchyManager {
   /**
    * Show a {@link PopupMenu}.
    *
+   * <p>This is deprecated, please use the <PopupMenuAndroid /> component instead.
+   *
+   * <p>TODO(T175424986): Remove UIManager.showPopupMenu() in React Native v0.75.
+   *
    * @param reactTag the tag of the anchor view (the PopupMenu is displayed next to this view); this
    *     needs to be the tag of a native view (shadow views can not be anchors)
    * @param items the menu items as an array of strings
    * @param success will be called with the position of the selected item as the first argument, or
    *     no arguments if the menu is dismissed
    */
+  @Deprecated
   public synchronized void showPopupMenu(
       int reactTag, ReadableArray items, Callback success, Callback error) {
     UiThreadUtil.assertOnUiThread();
@@ -894,7 +899,14 @@ public class NativeViewHierarchyManager {
     mPopupMenu.show();
   }
 
-  /** Dismiss the last opened PopupMenu {@link PopupMenu}. */
+  /**
+   * This is deprecated, please use the <PopupMenuAndroid /> component instead.
+   *
+   * <p>TODO(T175424986): Remove UIManager.dismissPopupMenu() in React Native v0.75.
+   *
+   * <p>Dismiss the last opened PopupMenu {@link PopupMenu}.
+   */
+  @Deprecated
   public void dismissPopupMenu() {
     if (mPopupMenu != null) {
       mPopupMenu.dismiss();

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

@@ -750,6 +750,10 @@ public class UIImplementation {
   /**
    * Show a PopupMenu.
    *
+   * <p>This is deprecated, please use the <PopupMenuAndroid /> component instead.
+   *
+   * <p>TODO(T175424986): Remove UIManager.showPopupMenu() in React Native v0.75.
+   *
    * @param reactTag the tag of the anchor view (the PopupMenu is displayed next to this view); this
    *     needs to be the tag of a native view (shadow views can not be anchors)
    * @param items the menu items as an array of strings
@@ -757,6 +761,7 @@ public class UIImplementation {
    * @param success will be called with the position of the selected item as the first argument, or
    *     no arguments if the menu is dismissed
    */
+  @Deprecated
   public void showPopupMenu(int reactTag, ReadableArray items, Callback error, Callback success) {
     boolean viewExists = checkOrAssertViewExists(reactTag, "showPopupMenu");
     if (!viewExists) {
@@ -766,6 +771,8 @@ public class UIImplementation {
     mOperationsQueue.enqueueShowPopupMenu(reactTag, items, error, success);
   }
 
+  /** TODO(T175424986): Remove UIManager.dismissPopupMenu() in React Native v0.75. */
+  @Deprecated
   public void dismissPopupMenu() {
     mOperationsQueue.enqueueDismissPopupMenu();
   }

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

@@ -618,6 +618,10 @@ public class UIManagerModule extends ReactContextBaseJavaModule
   /**
    * Show a PopupMenu.
    *
+   * <p>This is deprecated, please use the <PopupMenuAndroid /> component instead.
+   *
+   * <p>TODO(T175424986): Remove UIManager.showPopupMenu() in React Native v0.75.
+   *
    * @param reactTag the tag of the anchor view (the PopupMenu is displayed next to this view); this
    *     needs to be the tag of a native view (shadow views can not be anchors)
    * @param items the menu items as an array of strings
@@ -626,11 +630,18 @@ public class UIManagerModule extends ReactContextBaseJavaModule
    *     no arguments if the menu is dismissed
    */
   @ReactMethod
+  @Deprecated
   public void showPopupMenu(int reactTag, ReadableArray items, Callback error, Callback success) {
     mUIImplementation.showPopupMenu(reactTag, items, error, success);
   }
 
+  /**
+   * This is deprecated, please use the <PopupMenuAndroid /> component instead.
+   *
+   * <p>TODO(T175424986): Remove UIManager.dismissPopupMenu() in React Native v0.75.
+   */
   @ReactMethod
+  @Deprecated
   public void dismissPopupMenu() {
     mUIImplementation.dismissPopupMenu();
   }

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

@@ -343,6 +343,12 @@ public class UIViewOperationQueue {
     }
   }
 
+  /**
+   * This is deprecated, please use the <PopupMenuAndroid /> component instead.
+   *
+   * <p>TODO(T175424986): Remove UIManager.showPopupMenu() in React Native v0.75.
+   */
+  @Deprecated
   private final class ShowPopupMenuOperation extends ViewOperation {
 
     private final ReadableArray mItems;
@@ -362,6 +368,12 @@ public class UIViewOperationQueue {
     }
   }
 
+  /**
+   * This is deprecated, please use the <PopupMenuAndroid /> component instead.
+   *
+   * <p>TODO(T175424986): Remove UIManager.dismissPopupMenu() in React Native v0.75.
+   */
+  @Deprecated
   private final class DismissPopupMenuOperation implements UIOperation {
     @Override
     public void execute() {
@@ -703,11 +715,23 @@ public class UIViewOperationQueue {
     mOperations.add(new UpdateViewExtraData(reactTag, extraData));
   }
 
+  /**
+   * This is deprecated, please use the <PopupMenuAndroid /> component instead.
+   *
+   * <p>TODO(T175424986): Remove UIManager.showPopupMenu() in React Native v0.75.
+   */
+  @Deprecated
   public void enqueueShowPopupMenu(
       int reactTag, ReadableArray items, Callback error, Callback success) {
     mOperations.add(new ShowPopupMenuOperation(reactTag, items, error, success));
   }
 
+  /**
+   * This is deprecated, please use the <PopupMenuAndroid /> component instead.
+   *
+   * <p>TODO(T175424986): Remove UIManager.dismissPopupMenu() in React Native v0.75.
+   */
+  @Deprecated
   public void enqueueDismissPopupMenu() {
     mOperations.add(new DismissPopupMenuOperation());
   }

package/ReactAndroid/src/main/java/com/facebook/react/views/image/ScaleTypeStartInside.java

@@ -28,7 +28,7 @@ class ScaleTypeStartInside extends ScalingUtils.AbstractScaleType {
     float dx = parentRect.left;
     float dy = parentRect.top;
     outTransform.setScale(scale, scale);
-    outTransform.postTranslate((dx + 0.5f), (dy + 0.5f));
+    outTransform.postTranslate(Math.round(dx), Math.round(dy));
   }
 
   @Override

package/ReactAndroid/src/main/java/com/facebook/react/views/popupmenu/PopupMenuSelectionEvent.kt

@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+@file:Suppress("DEPRECATION") // We want to use RCTEventEmitter for interop purposes
+
+package com.facebook.react.views.popupmenu
+
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.WritableMap
+import com.facebook.react.uimanager.events.Event
+import com.facebook.react.uimanager.events.RCTEventEmitter
+
+class PopupMenuSelectionEvent(surfaceId: Int, viewId: Int, val item: Int) :
+    Event<PopupMenuSelectionEvent>(surfaceId, viewId) {
+
+  override fun getEventName(): String {
+    return EVENT_NAME
+  }
+
+  override fun getEventData(): WritableMap {
+    val eventData: WritableMap = Arguments.createMap()
+    eventData.putInt("target", viewTag)
+    eventData.putDouble("item", item.toDouble())
+    return eventData
+  }
+
+  override fun dispatch(rctEventEmitter: RCTEventEmitter) {
+    rctEventEmitter.receiveEvent(viewTag, eventName, eventData)
+  }
+
+  companion object {
+    const val EVENT_NAME: String = "topSelectionChange"
+  }
+}

package/ReactAndroid/src/main/java/com/facebook/react/views/popupmenu/ReactPopupMenuContainer.kt

@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.views.popupmenu
+
+import android.content.Context
+import android.os.Build
+import android.view.Menu
+import android.widget.FrameLayout
+import android.widget.PopupMenu
+import com.facebook.react.bridge.ReactContext
+import com.facebook.react.bridge.ReadableArray
+import com.facebook.react.uimanager.UIManagerHelper
+
+class ReactPopupMenuContainer(context: Context) : FrameLayout(context) {
+  private var menuItems: ReadableArray? = null
+
+  fun setMenuItems(items: ReadableArray?) {
+    menuItems = items
+  }
+
+  fun showPopupMenu() {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
+      val view = getChildAt(0)
+      val popupMenu = PopupMenu(context, view)
+      var menu = popupMenu.menu
+      val items = menuItems
+      if (items != null) {
+        for (i in 0 until items.size()) {
+          menu.add(Menu.NONE, Menu.NONE, i, items.getString(i))
+        }
+      }
+      popupMenu.setOnMenuItemClickListener { menuItem ->
+        val reactContext = context as ReactContext
+        val eventDispatcher = UIManagerHelper.getEventDispatcherForReactTag(reactContext, id)
+        if (eventDispatcher != null) {
+          val surfaceId = UIManagerHelper.getSurfaceId(reactContext)
+          eventDispatcher.dispatchEvent(PopupMenuSelectionEvent(surfaceId, id, menuItem.order))
+        }
+        true
+      }
+      popupMenu.show()
+    }
+  }
+}

package/ReactAndroid/src/main/java/com/facebook/react/views/popupmenu/ReactPopupMenuManager.kt

@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.views.popupmenu
+
+import com.facebook.react.bridge.ReadableArray
+import com.facebook.react.module.annotations.ReactModule
+import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.uimanager.ViewGroupManager
+import com.facebook.react.uimanager.annotations.ReactProp
+import com.facebook.react.viewmanagers.AndroidPopupMenuManagerInterface
+
+@ReactModule(name = ReactPopupMenuManager.REACT_CLASS)
+class ReactPopupMenuManager() :
+    ViewGroupManager<ReactPopupMenuContainer>(),
+    AndroidPopupMenuManagerInterface<ReactPopupMenuContainer> {
+  override fun createViewInstance(reactContext: ThemedReactContext): ReactPopupMenuContainer {
+    return ReactPopupMenuContainer(reactContext)
+  }
+
+  @ReactProp(name = "menuItems")
+  override fun setMenuItems(view: ReactPopupMenuContainer, menuItems: ReadableArray?) {
+    view.setMenuItems(menuItems)
+  }
+
+  override fun getName(): String {
+    return REACT_CLASS
+  }
+
+  override fun receiveCommand(
+      view: ReactPopupMenuContainer,
+      commandId: String,
+      items: ReadableArray?
+  ) {
+    when (commandId) {
+      "show" -> show(view)
+      else -> {
+        // no-op
+      }
+    }
+  }
+
+  override fun show(popupMenu: ReactPopupMenuContainer) {
+    popupMenu.showPopupMenu()
+  }
+
+  companion object {
+    const val REACT_CLASS: String = "AndroidPopupMenu"
+  }
+}

package/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.java

@@ -21,7 +21,7 @@ import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.common.ReactConstants;
-import com.facebook.react.config.ReactFeatureFlags;
+import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
 import com.facebook.react.uimanager.IllegalViewOperationException;
 import com.facebook.react.uimanager.LayoutShadowNode;
 import com.facebook.react.uimanager.NativeViewHierarchyOptimizer;
@@ -93,7 +93,7 @@ public abstract class ReactBaseTextShadowNode extends LayoutShadowNode
       boolean supportsInlineViews,
       @Nullable Map<Integer, ReactShadowNode> inlineViews,
       int start) {
-    if (ReactFeatureFlags.enableSpannableBuildingUnification) {
+    if (ReactNativeFeatureFlags.enableSpannableBuildingUnification()) {
       buildSpannedFromShadowNodeUnified(
           textShadowNode, sb, ops, parentTextAttributes, supportsInlineViews, inlineViews, start);
     } else {

package/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java

@@ -31,7 +31,7 @@ import com.facebook.react.bridge.ReadableNativeMap;
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.common.ReactConstants;
 import com.facebook.react.common.build.ReactBuildConfig;
-import com.facebook.react.config.ReactFeatureFlags;
+import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
 import com.facebook.react.uimanager.PixelUtil;
 import com.facebook.react.uimanager.ReactAccessibilityDelegate.AccessibilityRole;
 import com.facebook.react.uimanager.ReactAccessibilityDelegate.Role;
@@ -118,7 +118,7 @@ public class TextLayoutManager {
       ReadableArray fragments,
       SpannableStringBuilder sb,
       List<SetSpanOperation> ops) {
-    if (ReactFeatureFlags.enableSpannableBuildingUnification) {
+    if (ReactNativeFeatureFlags.enableSpannableBuildingUnification()) {
       buildSpannableFromFragmentsUnified(context, fragments, sb, ops);
     } else {
       buildSpannableFromFragmentsDuplicated(context, fragments, sb, ops);

package/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManagerMapBuffer.java

@@ -32,7 +32,7 @@ import com.facebook.react.common.ReactConstants;
 import com.facebook.react.common.build.ReactBuildConfig;
 import com.facebook.react.common.mapbuffer.MapBuffer;
 import com.facebook.react.common.mapbuffer.ReadableMapBuffer;
-import com.facebook.react.config.ReactFeatureFlags;
+import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
 import com.facebook.react.uimanager.PixelUtil;
 import com.facebook.react.uimanager.ReactAccessibilityDelegate.AccessibilityRole;
 import com.facebook.react.uimanager.ReactAccessibilityDelegate.Role;
@@ -140,7 +140,7 @@ public class TextLayoutManagerMapBuffer {
 
   private static void buildSpannableFromFragments(
       Context context, MapBuffer fragments, SpannableStringBuilder sb, List<SetSpanOperation> ops) {
-    if (ReactFeatureFlags.enableSpannableBuildingUnification) {
+    if (ReactNativeFeatureFlags.enableSpannableBuildingUnification()) {
       buildSpannableFromFragmentsUnified(context, fragments, sb, ops);
     } else {
       buildSpannableFromFragmentsDuplicated(context, fragments, sb, ops);

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

@@ -67,6 +67,8 @@ CoreComponentsRegistry::sharedProviderRegistry() {
                           AndroidDrawerLayoutComponentDescriptor>());
     providerRegistry->add(concreteComponentDescriptorProvider<
                           DebuggingOverlayComponentDescriptor>());
+    providerRegistry->add(concreteComponentDescriptorProvider<
+                          AndroidPopupMenuComponentDescriptor>());
 
     return providerRegistry;
   }();

package/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.cpp

@@ -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<<bd4482119f1c4963aa4ad1e354f9107d>>
+ * @generated SignedSource<<36acddfcb6c038dbf523ad669bcedeba>>
  */
 
 /**
@@ -43,6 +43,11 @@ bool JReactNativeFeatureFlagsCxxInterop::batchRenderingUpdatesInEventLoop(
   return ReactNativeFeatureFlags::batchRenderingUpdatesInEventLoop();
 }
 
+bool JReactNativeFeatureFlagsCxxInterop::enableSpannableBuildingUnification(
+    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
+  return ReactNativeFeatureFlags::enableSpannableBuildingUnification();
+}
+
 void JReactNativeFeatureFlagsCxxInterop::override(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/,
     jni::alias_ref<jobject> provider) {
@@ -72,6 +77,9 @@ void JReactNativeFeatureFlagsCxxInterop::registerNatives() {
       makeNativeMethod(
         "batchRenderingUpdatesInEventLoop",
         JReactNativeFeatureFlagsCxxInterop::batchRenderingUpdatesInEventLoop),
+      makeNativeMethod(
+        "enableSpannableBuildingUnification",
+        JReactNativeFeatureFlagsCxxInterop::enableSpannableBuildingUnification),
   });
 }
 

package/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.h

@@ -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<<b7304c29a002ce5a8a612d7a08d798ff>>
+ * @generated SignedSource<<b903dab48f817589883d7f41cc5674f0>>
  */
 
 /**
@@ -42,6 +42,9 @@ class JReactNativeFeatureFlagsCxxInterop
   static bool batchRenderingUpdatesInEventLoop(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
+  static bool enableSpannableBuildingUnification(
+    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
+
   static void override(
       facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>,
       jni::alias_ref<jobject> provider);