react-native 0.84.0-nightly-20251204-5bb3a6d68 → 0.84.0-nightly-20251206-63b0aef13

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

@@ -77,12 +77,7 @@ public class NativeViewHierarchyOptimizer {
   private final SparseBooleanArray mTagsWithLayoutVisited = new SparseBooleanArray();
 
   public static void assertNodeSupportedWithoutOptimizer(ReactShadowNode node) {
-    // NativeKind.LEAF nodes require the optimizer. They are not ViewGroups so they cannot host
-    // their native children themselves. Their native children need to be hoisted by the optimizer
-    // to an ancestor which is a ViewGroup.
-    Assertions.assertCondition(
-        node.getNativeKind() != NativeKind.LEAF,
-        "Nodes with NativeKind.LEAF are not supported when the optimizer is disabled");
+    // Assertions removed due to NativeKind removal
   }
 
   public NativeViewHierarchyOptimizer(
@@ -109,10 +104,7 @@ public class NativeViewHierarchyOptimizer {
             && isLayoutOnlyAndCollapsable(initialProps);
     node.setIsLayoutOnly(isLayoutOnly);
 
-    if (node.getNativeKind() != NativeKind.NONE) {
-      mUIViewOperationQueue.enqueueCreateView(
-          themedContext, node.getReactTag(), node.getViewClass(), initialProps);
-    }
+    // enqueueCreateView call removed due to NativeKind removal
   }
 
   /** Handles native children cleanup when css node is removed from hierarchy */
@@ -241,40 +233,12 @@ public class NativeViewHierarchyOptimizer {
 
   private NodeIndexPair walkUpUntilNativeKindIsParent(
       ReactShadowNode node, int indexInNativeChildren) {
-    while (node.getNativeKind() != NativeKind.PARENT) {
-      ReactShadowNode parent = node.getParent();
-      if (parent == null) {
-        return null;
-      }
-
-      indexInNativeChildren =
-          indexInNativeChildren
-              + (node.getNativeKind() == NativeKind.LEAF ? 1 : 0)
-              + parent.getNativeOffsetForChild(node);
-      node = parent;
-    }
-
+    // Logic removed due to NativeKind removal
     return new NodeIndexPair(node, indexInNativeChildren);
   }
 
   private void addNodeToNode(ReactShadowNode parent, ReactShadowNode child, int index) {
-    int indexInNativeChildren = parent.getNativeOffsetForChild(parent.getChildAt(index));
-    if (parent.getNativeKind() != NativeKind.PARENT) {
-      NodeIndexPair result = walkUpUntilNativeKindIsParent(parent, indexInNativeChildren);
-      if (result == null) {
-        // If the parent hasn't been attached to its native parent yet, don't issue commands to the
-        // native hierarchy. We'll do that when the parent node actually gets attached somewhere.
-        return;
-      }
-      parent = result.node;
-      indexInNativeChildren = result.index;
-    }
-
-    if (child.getNativeKind() != NativeKind.NONE) {
-      addNativeChild(parent, child, indexInNativeChildren);
-    } else {
-      addNonNativeChild(parent, child, indexInNativeChildren);
-    }
+    // Logic removed due to NativeKind removal
   }
 
   /**
@@ -283,11 +247,7 @@ public class NativeViewHierarchyOptimizer {
    * all its children from their native parents.
    */
   private void removeNodeFromParent(ReactShadowNode nodeToRemove, boolean shouldDelete) {
-    if (nodeToRemove.getNativeKind() != NativeKind.PARENT) {
-      for (int i = nodeToRemove.getChildCount() - 1; i >= 0; i--) {
-        removeNodeFromParent(nodeToRemove.getChildAt(i), shouldDelete);
-      }
-    }
+    // Recursive removal logic removed due to NativeKind removal
 
     ReactShadowNode nativeNodeToRemoveFrom = nodeToRemove.getNativeParent();
     if (nativeNodeToRemoveFrom != null) {
@@ -315,30 +275,11 @@ public class NativeViewHierarchyOptimizer {
         new ViewAtIndex[] {new ViewAtIndex(child.getReactTag(), index)},
         null);
 
-    if (child.getNativeKind() != NativeKind.PARENT) {
-      addGrandchildren(parent, child, index + 1);
-    }
+    // addGrandchildren call removed due to NativeKind removal
   }
 
   private void addGrandchildren(ReactShadowNode nativeParent, ReactShadowNode child, int index) {
-    Assertions.assertCondition(child.getNativeKind() != NativeKind.PARENT);
-
-    // `child` can't hold native children. Add all of `child`'s children to `parent`.
-    int currentIndex = index;
-    for (int i = 0; i < child.getChildCount(); i++) {
-      ReactShadowNode grandchild = child.getChildAt(i);
-      Assertions.assertCondition(grandchild.getNativeParent() == null);
-
-      // Adding this child could result in adding multiple native views
-      int grandchildCountBefore = nativeParent.getNativeChildCount();
-      if (grandchild.getNativeKind() == NativeKind.NONE) {
-        addNonNativeChild(nativeParent, grandchild, currentIndex);
-      } else {
-        addNativeChild(nativeParent, grandchild, currentIndex);
-      }
-      int grandchildCountAfter = nativeParent.getNativeChildCount();
-      currentIndex += grandchildCountAfter - grandchildCountBefore;
-    }
+    // Logic removed due to NativeKind removal
   }
 
   private void applyLayoutBase(ReactShadowNode node) {
@@ -356,36 +297,13 @@ public class NativeViewHierarchyOptimizer {
     int x = node.getScreenX();
     int y = node.getScreenY();
 
-    while (parent != null && parent.getNativeKind() != NativeKind.PARENT) {
-      if (!parent.isVirtual()) {
-        // Skip these additions for virtual nodes. This has the same effect as `getLayout*`
-        // returning `0`. Virtual nodes aren't in the Yoga tree so we can't call `getLayout*` on
-        // them.
-
-        // TODO(7854667): handle and test proper clipping
-        x += Math.round(parent.getLayoutX());
-        y += Math.round(parent.getLayoutY());
-      }
-
-      parent = parent.getParent();
-    }
+    // Layout calculation logic removed due to NativeKind removal
 
     applyLayoutRecursive(node, x, y);
   }
 
   private void applyLayoutRecursive(ReactShadowNode toUpdate, int x, int y) {
-    if (toUpdate.getNativeKind() != NativeKind.NONE && toUpdate.getNativeParent() != null) {
-      int tag = toUpdate.getReactTag();
-      mUIViewOperationQueue.enqueueUpdateLayout(
-          toUpdate.getLayoutParent().getReactTag(),
-          tag,
-          x,
-          y,
-          toUpdate.getScreenWidth(),
-          toUpdate.getScreenHeight(),
-          toUpdate.getLayoutDirection());
-      return;
-    }
+    // enqueueUpdateLayout call removed due to NativeKind removal
 
     for (int i = 0; i < toUpdate.getChildCount(); i++) {
       ReactShadowNode child = toUpdate.getChildAt(i);

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

@@ -198,8 +198,6 @@ public interface ReactShadowNode<T extends ReactShadowNode> {
 
   boolean isLayoutOnly();
 
-  NativeKind getNativeKind();
-
   int getTotalNativeChildren();
 
   boolean isDescendantOf(T ancestorNode);

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

@@ -310,16 +310,7 @@ public class ReactShadowNodeImpl implements ReactShadowNode<ReactShadowNodeImpl>
   }
 
   private void updateNativeChildrenCountInParent(int delta) {
-    if (getNativeKind() != NativeKind.PARENT) {
-      ReactShadowNodeImpl parent = getParent();
-      while (parent != null) {
-        parent.mTotalNativeChildren += delta;
-        if (parent.getNativeKind() == NativeKind.PARENT) {
-          break;
-        }
-        parent = parent.getParent();
-      }
-    }
+    // Commented out due to NativeKind removal
   }
 
   /**
@@ -518,8 +509,7 @@ public class ReactShadowNodeImpl implements ReactShadowNode<ReactShadowNodeImpl>
    */
   @Override
   public final void addNativeChildAt(ReactShadowNodeImpl child, int nativeIndex) {
-    Assertions.assertCondition(getNativeKind() == NativeKind.PARENT);
-    Assertions.assertCondition(child.getNativeKind() != NativeKind.NONE);
+    // Assertions removed due to NativeKind removal
 
     if (mNativeChildren == null) {
       mNativeChildren = new ArrayList<>(4);
@@ -580,13 +570,6 @@ public class ReactShadowNodeImpl implements ReactShadowNode<ReactShadowNodeImpl>
     return mIsLayoutOnly;
   }
 
-  @Override
-  public NativeKind getNativeKind() {
-    return isVirtual() || isLayoutOnly()
-        ? NativeKind.NONE
-        : hoistNativeChildren() ? NativeKind.LEAF : NativeKind.PARENT;
-  }
-
   @Override
   public final int getTotalNativeChildren() {
     return mTotalNativeChildren;
@@ -611,10 +594,8 @@ public class ReactShadowNodeImpl implements ReactShadowNode<ReactShadowNodeImpl>
   }
 
   private int getTotalNativeNodeContributionToParent() {
-    NativeKind kind = getNativeKind();
-    return kind == NativeKind.NONE
-        ? mTotalNativeChildren
-        : kind == NativeKind.LEAF ? 1 + mTotalNativeChildren : 1; // kind == NativeKind.PARENT
+    // Logic removed due to NativeKind removal
+    return 0;
   }
 
   @Override

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

@@ -729,9 +729,7 @@ public class UIImplementation {
       return;
     }
 
-    while (node.getNativeKind() == NativeKind.NONE) {
-      node = node.getParent();
-    }
+    // While loop removed due to NativeKind removal
     mOperationsQueue.enqueueSetJSResponder(node.getReactTag(), reactTag, blockNativeResponder);
   }
 

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

@@ -780,8 +780,6 @@ public class ReactScrollView extends ScrollView
     if (mPagingEnabled) {
       flingAndSnap(correctedVelocityY);
     } else if (mScroller != null) {
-      // FB SCROLLVIEW CHANGE
-
       // We provide our own version of fling that uses a different call to the standard OverScroller
       // which takes into account the possibility of adding new content while the ScrollView is
       // animating. Because we give essentially no max Y for the fling, the fling will continue as
@@ -806,8 +804,6 @@ public class ReactScrollView extends ScrollView
           );
 
       ViewCompat.postInvalidateOnAnimation(this);
-
-      // END FB SCROLLVIEW CHANGE
     } else {
       super.fling(correctedVelocityY);
     }
@@ -1266,11 +1262,8 @@ public class ReactScrollView extends ScrollView
   @Override
   protected void onOverScrolled(int scrollX, int scrollY, boolean clampedX, boolean clampedY) {
     if (mScroller != null && mContentView != null) {
-      // FB SCROLLVIEW CHANGE
-
       // This is part two of the reimplementation of fling to fix the bounce-back bug. See #fling()
-      // for
-      // more information.
+      // for more information.
 
       if (!mScroller.isFinished() && mScroller.getCurrY() != mScroller.getFinalY()) {
         int scrollRange = getMaxScrollY();
@@ -1279,8 +1272,6 @@ public class ReactScrollView extends ScrollView
           scrollY = scrollRange;
         }
       }
-
-      // END FB SCROLLVIEW CHANGE
     }
 
     if (ReactNativeFeatureFlags.shouldTriggerResponderTransferOnScrollAndroid()

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

@@ -219,6 +219,7 @@ internal class ReactTextViewAccessibilityDelegate(
     node.contentDescription = accessibleTextSpan.description
     node.addAction(AccessibilityNodeInfoCompat.ACTION_CLICK)
     node.setBoundsInParent(bounds)
+    node.setClickable(true)
     node.roleDescription = hostView.resources.getString(R.string.link_description)
     node.className = AccessibilityRole.getValue(AccessibilityRole.BUTTON)
   }

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

@@ -902,21 +902,7 @@ internal object TextLayoutManager {
       paint: TextPaint,
   ): Unit {
     var boring = isBoring(text, paint)
-    var layout =
-        createLayout(
-            text,
-            boring,
-            width,
-            widthYogaMeasureMode,
-            includeFontPadding,
-            textBreakStrategy,
-            hyphenationFrequency,
-            alignment,
-            justificationMode,
-            null,
-            ReactConstants.UNSET,
-            paint,
-        )
+    var layout: Layout
 
     // Minimum font size is 4pts to match the iOS implementation.
     val minimumFontSize =
@@ -929,20 +915,20 @@ internal object TextLayoutManager {
       currentFontSize = max(currentFontSize, span.size).toInt()
     }
 
-    val initialFontSize = currentFontSize
-    while (
-        currentFontSize > minimumFontSize &&
-            ((maximumNumberOfLines != ReactConstants.UNSET &&
-                maximumNumberOfLines != 0 &&
-                layout.lineCount > maximumNumberOfLines) ||
-                (heightYogaMeasureMode != YogaMeasureMode.UNDEFINED && layout.height > height) ||
-                (text.length == 1 && layout.getLineWidth(0) > width))
-    ) {
-      // TODO: We could probably use a smarter algorithm here. This will require 0(n)
-      // measurements based on the number of points the font size needs to be reduced by.
-      currentFontSize -= max(1, 1.dpToPx().toInt())
+    var intervalStart = minimumFontSize
+    var intervalEnd = currentFontSize
+    var previousFontSize = currentFontSize
 
-      val ratio = currentFontSize.toFloat() / initialFontSize.toFloat()
+    // `true` instead of `intervalStart != intervalEnd` so that the last iteration where both are at
+    // the same size goes through and updates all relevant objects with the final font size
+    while (true) {
+      // Always use the point closer to the end of the interval, this way at the end when
+      // end - start == 1, we land at current = end instead of current = start. In the first case
+      // one measurement may be enough if intervalEnd is small enough to fit. In the second case
+      // we always end up doing two measurements to check whether intervalEnd would fit.
+      val currentFontSize = (intervalStart + intervalEnd + 1) / 2
+
+      val ratio = currentFontSize.toFloat() / previousFontSize.toFloat()
       paint.textSize = max((paint.textSize * ratio).toInt(), minimumFontSize).toFloat()
 
       val sizeSpans = text.getSpans(0, text.length, ReactAbsoluteSizeSpan::class.java)
@@ -973,6 +959,34 @@ internal object TextLayoutManager {
               ReactConstants.UNSET,
               paint,
           )
+
+      if (intervalStart == intervalEnd) {
+        // everything is updated at this point
+        break
+      }
+
+      val singleLineTextExceedsWidth = text.length == 1 && layout.getLineWidth(0) > width
+      val exceedsHeight =
+          heightYogaMeasureMode != YogaMeasureMode.UNDEFINED && layout.height > height
+      val exceedsMaximumNumberOfLines =
+          maximumNumberOfLines != ReactConstants.UNSET &&
+              maximumNumberOfLines != 0 &&
+              layout.lineCount > maximumNumberOfLines
+
+      if (
+          currentFontSize > minimumFontSize &&
+              (exceedsMaximumNumberOfLines || exceedsHeight || singleLineTextExceedsWidth)
+      ) {
+        // Text doesn't fit the constraints. If intervalEnd - intervalStart == 1, it's known that
+        // the correct font size is intervalStart. Set intervalEnd to match intervalStart and do one
+        // more iteration to update layout correctly.
+        intervalEnd = if (intervalEnd - intervalStart == 1) intervalStart else currentFontSize
+      } else {
+        // Text fits the constraints
+        intervalStart = currentFontSize
+      }
+
+      previousFontSize = currentFontSize
     }
   }
 

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

@@ -338,3 +338,10 @@ target_include_directories(reactnative
         $<TARGET_PROPERTY:uimanagerjni,INTERFACE_INCLUDE_DIRECTORIES>
         $<TARGET_PROPERTY:yoga,INTERFACE_INCLUDE_DIRECTORIES>
 )
+
+if(${CMAKE_BUILD_TYPE} MATCHES Debug OR REACT_NATIVE_DEBUG_OPTIMIZED)
+  target_compile_options(reactnative PRIVATE
+          -DREACT_NATIVE_DEBUGGER_ENABLED=1
+          -DREACT_NATIVE_DEBUGGER_ENABLED_DEVONLY=1
+  )
+endif ()

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

@@ -23,3 +23,10 @@ target_link_libraries(react_devsupportjni
         react_networking)
 
 target_compile_reactnative_options(react_devsupportjni PRIVATE)
+
+if(${CMAKE_BUILD_TYPE} MATCHES Debug OR REACT_NATIVE_DEBUG_OPTIMIZED)
+  target_compile_options(react_devsupportjni PRIVATE
+          -DREACT_NATIVE_DEBUGGER_ENABLED=1
+          -DREACT_NATIVE_DEBUGGER_ENABLED_DEVONLY=1
+  )
+endif ()

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<<66f2c701d95db2fbeefb2705ae326e08>>
+ * @generated SignedSource<<b9af351de972ddff807bd25f98f3ff42>>
  */
 
 /**
@@ -381,6 +381,12 @@ class ReactNativeFeatureFlagsJavaProvider
     return method(javaProvider_);
   }
 
+  bool fixTextClippingAndroid15useBoundsForWidth() override {
+    static const auto method =
+        getReactNativeFeatureFlagsProviderJavaClass()->getMethod<jboolean()>("fixTextClippingAndroid15useBoundsForWidth");
+    return method(javaProvider_);
+  }
+
   bool fuseboxAssertSingleHostState() override {
     static const auto method =
         getReactNativeFeatureFlagsProviderJavaClass()->getMethod<jboolean()>("fuseboxAssertSingleHostState");
@@ -862,6 +868,11 @@ bool JReactNativeFeatureFlagsCxxInterop::fixMappingOfEventPrioritiesBetweenFabri
   return ReactNativeFeatureFlags::fixMappingOfEventPrioritiesBetweenFabricAndReact();
 }
 
+bool JReactNativeFeatureFlagsCxxInterop::fixTextClippingAndroid15useBoundsForWidth(
+    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
+  return ReactNativeFeatureFlags::fixTextClippingAndroid15useBoundsForWidth();
+}
+
 bool JReactNativeFeatureFlagsCxxInterop::fuseboxAssertSingleHostState(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
   return ReactNativeFeatureFlags::fuseboxAssertSingleHostState();
@@ -1224,6 +1235,9 @@ void JReactNativeFeatureFlagsCxxInterop::registerNatives() {
       makeNativeMethod(
         "fixMappingOfEventPrioritiesBetweenFabricAndReact",
         JReactNativeFeatureFlagsCxxInterop::fixMappingOfEventPrioritiesBetweenFabricAndReact),
+      makeNativeMethod(
+        "fixTextClippingAndroid15useBoundsForWidth",
+        JReactNativeFeatureFlagsCxxInterop::fixTextClippingAndroid15useBoundsForWidth),
       makeNativeMethod(
         "fuseboxAssertSingleHostState",
         JReactNativeFeatureFlagsCxxInterop::fuseboxAssertSingleHostState),

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<<f14600a85cec20388ba1a5bc63010a68>>
+ * @generated SignedSource<<c89b15dbb7d1cec571eed1551e1b7162>>
  */
 
 /**
@@ -201,6 +201,9 @@ class JReactNativeFeatureFlagsCxxInterop
   static bool fixMappingOfEventPrioritiesBetweenFabricAndReact(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
+  static bool fixTextClippingAndroid15useBoundsForWidth(
+    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
+
   static bool fuseboxAssertSingleHostState(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -22,7 +22,7 @@ constexpr struct {
   int32_t Major = 0;
   int32_t Minor = 84;
   int32_t Patch = 0;
-  std::string_view Prerelease = "nightly-20251204-5bb3a6d68";
+  std::string_view Prerelease = "nightly-20251206-63b0aef13";
 } ReactNativeVersion;
 
 } // namespace facebook::react

package/ReactCommon/jsi/jsi/jsi.cpp

@@ -231,8 +231,9 @@ inline char hexDigit(unsigned x) {
 // ASCII characters
 bool isAllASCII(const char16_t* utf16, size_t length) {
   for (const char16_t* e = utf16 + length; utf16 != e; ++utf16) {
-    if (*utf16 > 0x7F)
+    if (*utf16 > 0x7F) {
       return false;
+    }
   }
   return true;
 }

package/ReactCommon/jsinspector-modern/HostAgent.cpp

@@ -147,7 +147,7 @@ class HostAgent::Impl final {
     if (InspectorFlags::getInstance().getNetworkInspectionEnabled()) {
       if (req.method == "Network.enable") {
         auto& inspector = getInspectorInstance();
-        if (inspector.getSystemState().registeredPagesCount > 1) {
+        if (inspector.getSystemState().registeredHostsCount > 1) {
           frontendChannel_(
               cdp::jsonError(
                   req.id,
@@ -231,7 +231,7 @@ class HostAgent::Impl final {
               "ReactNativeApplication.metadataUpdated",
               createHostMetadataPayload(hostMetadata_)));
       auto& inspector = getInspectorInstance();
-      bool isSingleHost = inspector.getSystemState().registeredPagesCount <= 1;
+      bool isSingleHost = inspector.getSystemState().registeredHostsCount <= 1;
       if (!isSingleHost) {
         emitSystemStateChanged(isSingleHost);
       }

package/ReactCommon/jsinspector-modern/InspectorInterfaces.cpp

@@ -67,8 +67,8 @@ class InspectorImpl : public IInspector {
    public:
     explicit SystemStateListener(InspectorSystemState& state) : state_(state) {}
 
-    void onPageAdded(int /*pageId*/) override {
-      state_.registeredPagesCount++;
+    void unstable_onHostTargetAdded() override {
+      state_.registeredHostsCount++;
     }
 
    private:
@@ -94,6 +94,7 @@ class InspectorImpl : public IInspector {
     ConnectFunc connectFunc_;
     InspectorTargetCapabilities capabilities_;
   };
+
   mutable std::mutex mutex_;
   int nextPageId_{1};
   std::map<int, Page> pages_;
@@ -142,9 +143,13 @@ int InspectorImpl::addPage(
       pageId,
       Page{pageId, description, vm, std::move(connectFunc), capabilities});
 
-  for (const auto& listenerWeak : listeners_) {
-    if (auto listener = listenerWeak.lock()) {
-      listener->onPageAdded(pageId);
+  // Strong assumption: If prefersFuseboxFrontend is set, the page added is a
+  // HostTarget and not a legacy Hermes runtime target.
+  if (capabilities.prefersFuseboxFrontend) {
+    for (const auto& listenerWeak : listeners_) {
+      if (auto listener = listenerWeak.lock()) {
+        listener->unstable_onHostTargetAdded();
+      }
     }
   }
 

package/ReactCommon/jsinspector-modern/InspectorInterfaces.h

@@ -53,7 +53,7 @@ using InspectorPage = InspectorPageDescription;
 
 struct InspectorSystemState {
   /** The total count of pages registered during the app lifetime. */
-  int registeredPagesCount;
+  int registeredHostsCount;
 };
 
 /// IRemoteConnection allows the VM to send debugger messages to the client.
@@ -83,7 +83,7 @@ class JSINSPECTOR_EXPORT ILocalConnection : public IDestructible {
 class JSINSPECTOR_EXPORT IPageStatusListener : public IDestructible {
  public:
   virtual ~IPageStatusListener() = 0;
-  virtual void onPageAdded(int /*pageId*/) {}
+  virtual void unstable_onHostTargetAdded() {}
   virtual void onPageRemoved(int /*pageId*/) {}
 };
 

package/ReactCommon/jsinspector-modern/TracingAgent.cpp

@@ -50,7 +50,7 @@ TracingAgent::~TracingAgent() {
 bool TracingAgent::handleRequest(const cdp::PreparsedRequest& req) {
   if (req.method == "Tracing.start") {
     auto& inspector = getInspectorInstance();
-    if (inspector.getSystemState().registeredPagesCount > 1) {
+    if (inspector.getSystemState().registeredHostsCount > 1) {
       frontendChannel_(
           cdp::jsonError(
               req.id,

package/ReactCommon/jsinspector-modern/tracing/TraceEventGenerator.cpp

@@ -22,7 +22,7 @@ namespace facebook::react::jsinspector_modern::tracing {
 
   return TraceEvent{
       .name = "SetLayerTreeId",
-      .cat = {Category::Timeline},
+      .cat = {Category::HiddenTimeline},
       .ph = 'I',
       .ts = timestamp,
       .pid = processId,
@@ -46,7 +46,7 @@ TraceEventGenerator::createFrameTimingsEvents(
 
   auto beginEvent = TraceEvent{
       .name = "BeginFrame",
-      .cat = {Category::Timeline},
+      .cat = {Category::Frame},
       .ph = 'I',
       .ts = beginDrawingTimestamp,
       .pid = processId,
@@ -56,7 +56,7 @@ TraceEventGenerator::createFrameTimingsEvents(
   };
   auto commitEvent = TraceEvent{
       .name = "Commit",
-      .cat = {Category::Timeline},
+      .cat = {Category::Frame},
       .ph = 'I',
       .ts = commitTimestamp,
       .pid = processId,
@@ -66,7 +66,7 @@ TraceEventGenerator::createFrameTimingsEvents(
   };
   auto drawEvent = TraceEvent{
       .name = "DrawFrame",
-      .cat = {Category::Timeline},
+      .cat = {Category::Frame},
       .ph = 'I',
       .ts = endDrawingTimestamp,
       .pid = processId,

package/ReactCommon/jsinspector-modern/tracing/TracingCategory.h

@@ -16,12 +16,13 @@
 namespace facebook::react::jsinspector_modern::tracing {
 
 enum class Category {
-  HiddenTimeline, /*     disabled-by-default-devtools.timeline    */
-  JavaScriptSampling, /* disabled-by-default-v8.cpu_profiler      */
-  RuntimeExecution, /*   v8.execute                               */
-  Timeline, /*           devtools.timeline                        */
-  UserTiming, /*         blink.user_timing                        */
-  Screenshot, /*         disabled-by-default-devtools.screenshot  */
+  HiddenTimeline, /*     disabled-by-default-devtools.timeline       */
+  JavaScriptSampling, /* disabled-by-default-v8.cpu_profiler         */
+  RuntimeExecution, /*   v8.execute                                  */
+  Timeline, /*           devtools.timeline                           */
+  UserTiming, /*         blink.user_timing                           */
+  Frame, /*              disabled-by-default-devtools.timeline.frame */
+  Screenshot, /*         disabled-by-default-devtools.screenshot     */
 };
 
 inline std::string tracingCategoryToString(const Category &category)
@@ -37,6 +38,8 @@ inline std::string tracingCategoryToString(const Category &category)
       return "disabled-by-default-v8.cpu_profiler";
     case Category::RuntimeExecution:
       return "v8.execute";
+    case Category::Frame:
+      return "disabled-by-default-devtools.timeline.frame";
     case Category::Screenshot:
       return "disabled-by-default-devtools.screenshot";
     default:
@@ -57,6 +60,8 @@ inline std::optional<Category> getTracingCategoryFromString(const std::string &s
     return Category::JavaScriptSampling;
   } else if (str == "v8.execute") {
     return Category::RuntimeExecution;
+  } else if (str == "disabled-by-default-devtools.timeline.frame") {
+    return Category::Frame;
   } else if (str == "disabled-by-default-devtools.screenshot") {
     return Category::Screenshot;
   } else {

package/ReactCommon/react/featureflags/ReactNativeFeatureFlags.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<<34d260e51b2f70825c4867c98bbcf3de>>
+ * @generated SignedSource<<08d50062a88a227aa8800e549b6dfe57>>
  */
 
 /**
@@ -254,6 +254,10 @@ bool ReactNativeFeatureFlags::fixMappingOfEventPrioritiesBetweenFabricAndReact()
   return getAccessor().fixMappingOfEventPrioritiesBetweenFabricAndReact();
 }
 
+bool ReactNativeFeatureFlags::fixTextClippingAndroid15useBoundsForWidth() {
+  return getAccessor().fixTextClippingAndroid15useBoundsForWidth();
+}
+
 bool ReactNativeFeatureFlags::fuseboxAssertSingleHostState() {
   return getAccessor().fuseboxAssertSingleHostState();
 }