react-native 0.84.0-nightly-20251203-a5e6addc6 → 0.84.0-nightly-20251205-95cc1e767

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<<6645323047d21e58469de0d385954eab>>
+ * @generated SignedSource<<3ebb3c265193b4f61e5bf43082c5be54>>
  */
 
 /**
@@ -77,6 +77,7 @@ internal class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAcces
   private var enableVirtualViewWindowFocusDetectionCache: Boolean? = null
   private var enableWebPerformanceAPIsByDefaultCache: Boolean? = null
   private var fixMappingOfEventPrioritiesBetweenFabricAndReactCache: Boolean? = null
+  private var fixTextClippingAndroid15useBoundsForWidthCache: Boolean? = null
   private var fuseboxAssertSingleHostStateCache: Boolean? = null
   private var fuseboxEnabledReleaseCache: Boolean? = null
   private var fuseboxNetworkInspectionEnabledCache: Boolean? = null
@@ -623,6 +624,15 @@ internal class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAcces
     return cached
   }
 
+  override fun fixTextClippingAndroid15useBoundsForWidth(): Boolean {
+    var cached = fixTextClippingAndroid15useBoundsForWidthCache
+    if (cached == null) {
+      cached = ReactNativeFeatureFlagsCxxInterop.fixTextClippingAndroid15useBoundsForWidth()
+      fixTextClippingAndroid15useBoundsForWidthCache = cached
+    }
+    return cached
+  }
+
   override fun fuseboxAssertSingleHostState(): Boolean {
     var cached = fuseboxAssertSingleHostStateCache
     if (cached == null) {

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<<3da42d9ffdbba52e9e1d11a4e4dac8c4>>
+ * @generated SignedSource<<eb11cf643c4e94eddc5d7985a8a7a03a>>
  */
 
 /**
@@ -142,6 +142,8 @@ public object ReactNativeFeatureFlagsCxxInterop {
 
   @DoNotStrip @JvmStatic public external fun fixMappingOfEventPrioritiesBetweenFabricAndReact(): Boolean
 
+  @DoNotStrip @JvmStatic public external fun fixTextClippingAndroid15useBoundsForWidth(): Boolean
+
   @DoNotStrip @JvmStatic public external fun fuseboxAssertSingleHostState(): Boolean
 
   @DoNotStrip @JvmStatic public external fun fuseboxEnabledRelease(): Boolean

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<<46e1f708d91d5ec45c866b8192192e72>>
+ * @generated SignedSource<<58cb08dbd188ec64d3738f548567bcde>>
  */
 
 /**
@@ -137,6 +137,8 @@ public open class ReactNativeFeatureFlagsDefaults : ReactNativeFeatureFlagsProvi
 
   override fun fixMappingOfEventPrioritiesBetweenFabricAndReact(): Boolean = false
 
+  override fun fixTextClippingAndroid15useBoundsForWidth(): Boolean = false
+
   override fun fuseboxAssertSingleHostState(): Boolean = true
 
   override fun fuseboxEnabledRelease(): 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<<c19ea5e9ad6435b1f8587287cacf020b>>
+ * @generated SignedSource<<f9ee0d1f23024b026d065ffc3d48cfcf>>
  */
 
 /**
@@ -81,6 +81,7 @@ internal class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcc
   private var enableVirtualViewWindowFocusDetectionCache: Boolean? = null
   private var enableWebPerformanceAPIsByDefaultCache: Boolean? = null
   private var fixMappingOfEventPrioritiesBetweenFabricAndReactCache: Boolean? = null
+  private var fixTextClippingAndroid15useBoundsForWidthCache: Boolean? = null
   private var fuseboxAssertSingleHostStateCache: Boolean? = null
   private var fuseboxEnabledReleaseCache: Boolean? = null
   private var fuseboxNetworkInspectionEnabledCache: Boolean? = null
@@ -684,6 +685,16 @@ internal class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcc
     return cached
   }
 
+  override fun fixTextClippingAndroid15useBoundsForWidth(): Boolean {
+    var cached = fixTextClippingAndroid15useBoundsForWidthCache
+    if (cached == null) {
+      cached = currentProvider.fixTextClippingAndroid15useBoundsForWidth()
+      accessedFeatureFlags.add("fixTextClippingAndroid15useBoundsForWidth")
+      fixTextClippingAndroid15useBoundsForWidthCache = cached
+    }
+    return cached
+  }
+
   override fun fuseboxAssertSingleHostState(): Boolean {
     var cached = fuseboxAssertSingleHostStateCache
     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<<17400be6ee20befd9eafb094455dfb63>>
+ * @generated SignedSource<<09cef8cedd515f477a32c2ed77d86fc4>>
  */
 
 /**
@@ -137,6 +137,8 @@ public interface ReactNativeFeatureFlagsProvider {
 
   @DoNotStrip public fun fixMappingOfEventPrioritiesBetweenFabricAndReact(): Boolean
 
+  @DoNotStrip public fun fixTextClippingAndroid15useBoundsForWidth(): Boolean
+
   @DoNotStrip public fun fuseboxAssertSingleHostState(): Boolean
 
   @DoNotStrip public fun fuseboxEnabledRelease(): Boolean

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

@@ -15,6 +15,6 @@ public object ReactNativeVersion {
     "major" to 0,
     "minor" to 84,
     "patch" to 0,
-    "prerelease" to "nightly-20251203-a5e6addc6"
+    "prerelease" to "nightly-20251205-95cc1e767"
   )
 }

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

@@ -1565,9 +1565,13 @@ public class ReactHostImpl(
             TracingState.ENABLED_IN_CDP_MODE -> {
               currentActivity?.window?.let { window ->
                 val observer =
-                    FrameTimingsObserver(window) { frameTimingsSequence ->
-                      inspectorTarget.recordFrameTimings(frameTimingsSequence)
-                    }
+                    FrameTimingsObserver(
+                        window,
+                        _screenshotsEnabled,
+                        { frameTimingsSequence ->
+                          inspectorTarget.recordFrameTimings(frameTimingsSequence)
+                        },
+                    )
                 observer.start()
                 frameTimingsObserver = observer
               }

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/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-20251203-a5e6addc6";
+  std::string_view Prerelease = "nightly-20251205-95cc1e767";
 } ReactNativeVersion;
 
 } // namespace facebook::react

package/ReactCommon/jsinspector-modern/tests/TracingTest.cpp

@@ -95,4 +95,22 @@ TEST_F(TracingTest, EmitsRecordedFrameTimingSequences) {
   EXPECT_THAT(allTraceEvents, Contains(AtJsonPtr("/name", "DrawFrame")));
 }
 
+TEST_F(TracingTest, EmitsScreenshotEventWhenScreenshotValuePassed) {
+  InSequence s;
+
+  startTracing({tracing::Category::Screenshot});
+  auto now = HighResTimeStamp::now();
+  page_->recordFrameTimings(
+      tracing::FrameTimingSequence(
+          1, // id
+          11, // threadId
+          now,
+          now + HighResDuration::fromNanoseconds(10),
+          now + HighResDuration::fromNanoseconds(50),
+          "base64EncodedScreenshotData"));
+
+  auto allTraceEvents = endTracingAndCollectEvents();
+  EXPECT_THAT(allTraceEvents, Contains(AtJsonPtr("/name", "Screenshot")));
+}
+
 } // namespace facebook::react::jsinspector_modern

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

@@ -13,6 +13,8 @@
 
 namespace facebook::react::jsinspector_modern::tracing {
 
+using FrameSequenceId = uint64_t;
+
 /**
  * A struct representing a sequence of frame timings that happened on the Host side.
  */
@@ -20,7 +22,7 @@ struct FrameTimingSequence {
   FrameTimingSequence() = delete;
 
   FrameTimingSequence(
-      uint64_t id,
+      FrameSequenceId id,
       ThreadId threadId,
       HighResTimeStamp beginDrawingTimestamp,
       HighResTimeStamp commitTimestamp,
@@ -38,7 +40,7 @@ struct FrameTimingSequence {
   /**
    * Unique ID of the sequence, used by Chrome DevTools Frontend to identify the events that form one sequence.
    */
-  uint64_t id;
+  FrameSequenceId id;
 
   /**
    * The ID of the native thread that is associated with the frame.

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

@@ -100,7 +100,7 @@ constexpr int FALLBACK_LAYER_TREE_ID = 1;
   chunk.push_back(
       TraceEventSerializer::serialize(std::move(setLayerTreeIdEvent)));
 
-  for (const auto& frameTimingSequence : frameTimings) {
+  for (auto&& frameTimingSequence : frameTimings) {
     if (chunk.size() >= chunkSize) {
       chunkCallback(std::move(chunk));
       chunk = generateNewChunk(chunkSize);
@@ -121,6 +121,19 @@ constexpr int FALLBACK_LAYER_TREE_ID = 1;
     chunk.push_back(TraceEventSerializer::serialize(std::move(commitEvent)));
     chunk.push_back(
         TraceEventSerializer::serialize(std::move(endDrawingEvent)));
+
+    if (frameTimingSequence.screenshot.has_value()) {
+      auto screenshotEvent = TraceEventGenerator::createScreenshotEvent(
+          frameTimingSequence.id,
+          FALLBACK_LAYER_TREE_ID,
+          std::move(frameTimingSequence.screenshot.value()),
+          frameTimingSequence.endDrawingTimestamp,
+          processId,
+          frameTimingSequence.threadId);
+
+      chunk.push_back(
+          TraceEventSerializer::serialize(std::move(screenshotEvent)));
+    }
   }
 
   if (!chunk.empty()) {

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

@@ -6,6 +6,7 @@
  */
 
 #include "TraceEventGenerator.h"
+#include "Timing.h"
 #include "TracingCategory.h"
 
 namespace facebook::react::jsinspector_modern::tracing {
@@ -21,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,
@@ -45,7 +46,7 @@ TraceEventGenerator::createFrameTimingsEvents(
 
   auto beginEvent = TraceEvent{
       .name = "BeginFrame",
-      .cat = {Category::Timeline},
+      .cat = {Category::Frame},
       .ph = 'I',
       .ts = beginDrawingTimestamp,
       .pid = processId,
@@ -55,7 +56,7 @@ TraceEventGenerator::createFrameTimingsEvents(
   };
   auto commitEvent = TraceEvent{
       .name = "Commit",
-      .cat = {Category::Timeline},
+      .cat = {Category::Frame},
       .ph = 'I',
       .ts = commitTimestamp,
       .pid = processId,
@@ -65,7 +66,7 @@ TraceEventGenerator::createFrameTimingsEvents(
   };
   auto drawEvent = TraceEvent{
       .name = "DrawFrame",
-      .cat = {Category::Timeline},
+      .cat = {Category::Frame},
       .ph = 'I',
       .ts = endDrawingTimestamp,
       .pid = processId,
@@ -77,4 +78,27 @@ TraceEventGenerator::createFrameTimingsEvents(
   return {std::move(beginEvent), std::move(commitEvent), std::move(drawEvent)};
 }
 
+/* static */ TraceEvent TraceEventGenerator::createScreenshotEvent(
+    FrameSequenceId frameSequenceId,
+    int sourceId,
+    std::string&& snapshot,
+    HighResTimeStamp expectedDisplayTime,
+    ProcessId processId,
+    ThreadId threadId) {
+  folly::dynamic args = folly::dynamic::object("snapshot", std::move(snapshot))(
+      "source_id", sourceId)("frame_sequence", frameSequenceId)(
+      "expected_display_time",
+      highResTimeStampToTracingClockTimeStamp(expectedDisplayTime));
+
+  return TraceEvent{
+      .name = "Screenshot",
+      .cat = {Category::Screenshot},
+      .ph = 'O',
+      .ts = expectedDisplayTime,
+      .pid = processId,
+      .tid = threadId,
+      .args = std::move(args),
+  };
+}
+
 }; // namespace facebook::react::jsinspector_modern::tracing

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

@@ -9,6 +9,7 @@
 
 #include "TraceEvent.h"
 
+#include <jsinspector-modern/tracing/FrameTimingSequence.h>
 #include <react/timing/primitives.h>
 
 #include <tuple>
@@ -35,13 +36,24 @@ class TraceEventGenerator {
    * Creates canonical "BeginFrame", "Commit", "DrawFrame" trace events.
    */
   static std::tuple<TraceEvent, TraceEvent, TraceEvent> createFrameTimingsEvents(
-      uint64_t sequenceId,
+      FrameSequenceId sequenceId,
       int layerTreeId,
       HighResTimeStamp beginDrawingTimestamp,
       HighResTimeStamp commitTimestamp,
       HighResTimeStamp endDrawingTimestamp,
       ProcessId processId,
       ThreadId threadId);
+
+  /**
+   * Creates canonical "Screenshot" trace event.
+   */
+  static TraceEvent createScreenshotEvent(
+      FrameSequenceId frameSequenceId,
+      int sourceId,
+      std::string &&snapshot,
+      HighResTimeStamp expectedDisplayTime,
+      ProcessId processId,
+      ThreadId threadId);
 };
 
 }; // namespace facebook::react::jsinspector_modern::tracing