react-native-tvos 0.77.1-0 → 0.78.0-0

package/ReactCommon/react/renderer/mounting/MountingCoordinator.cpp

@@ -7,7 +7,7 @@
 
 #include "MountingCoordinator.h"
 
-#include <cxxreact/SystraceSection.h>
+#include <cxxreact/TraceSection.h>
 #include <react/debug/react_native_assert.h>
 #include <react/renderer/mounting/ShadowViewMutation.h>
 #include <condition_variable>
@@ -79,7 +79,7 @@ void MountingCoordinator::resetLatestRevision() const {
 
 std::optional<MountingTransaction> MountingCoordinator::pullTransaction(
     bool willPerformAsynchronously) const {
-  SystraceSection section("MountingCoordinator::pullTransaction");
+  TraceSection section("MountingCoordinator::pullTransaction");
 
   std::scoped_lock lock(mutex_);
 
@@ -112,7 +112,7 @@ std::optional<MountingTransaction> MountingCoordinator::pullTransaction(
         mountingOverrideDelegate->shouldOverridePullTransaction();
 
     if (shouldOverridePullTransaction) {
-      SystraceSection section2("MountingCoordinator::overridePullTransaction");
+      TraceSection section2("MountingCoordinator::overridePullTransaction");
 
       auto mutations = ShadowViewMutation::List{};
       auto telemetry = TransactionTelemetry{};
@@ -140,8 +140,7 @@ std::optional<MountingTransaction> MountingCoordinator::pullTransaction(
 
 #ifdef RN_SHADOW_TREE_INTROSPECTION
   if (transaction.has_value()) {
-    SystraceSection section2(
-        "MountingCoordinator::verifyMutationsForDebugging");
+    TraceSection section2("MountingCoordinator::verifyMutationsForDebugging");
 
     // We have something to validate.
     auto mutations = transaction->getMutations();

package/ReactCommon/react/renderer/mounting/ShadowTree.cpp

@@ -7,7 +7,7 @@
 
 #include "ShadowTree.h"
 
-#include <cxxreact/SystraceSection.h>
+#include <cxxreact/TraceSection.h>
 #include <react/debug/react_native_assert.h>
 #include <react/featureflags/ReactNativeFeatureFlags.h>
 #include <react/renderer/components/root/RootComponentDescriptor.h>
@@ -258,7 +258,7 @@ CommitStatus ShadowTree::commit(
 CommitStatus ShadowTree::tryCommit(
     const ShadowTreeCommitTransaction& transaction,
     const CommitOptions& commitOptions) const {
-  SystraceSection s("ShadowTree::commit");
+  TraceSection s("ShadowTree::commit");
 
   auto telemetry = TransactionTelemetry{};
   telemetry.willCommit();
@@ -390,26 +390,20 @@ void ShadowTree::commitEmptyTree() const {
 
 void ShadowTree::emitLayoutEvents(
     std::vector<const LayoutableShadowNode*>& affectedLayoutableNodes) const {
-  SystraceSection s(
+  TraceSection s(
       "ShadowTree::emitLayoutEvents",
       "affectedLayoutableNodes",
       affectedLayoutableNodes.size());
 
   for (const auto* layoutableNode : affectedLayoutableNodes) {
-    // Only instances of `ViewShadowNode` (and subclasses) are supported.
-
-    const auto& viewEventEmitter = static_cast<const BaseViewEventEmitter&>(
-        *layoutableNode->getEventEmitter());
-
-    // Checking if the `onLayout` event was requested for the particular Shadow
-    // Node.
-    const auto& viewProps =
-        static_cast<const BaseViewProps&>(*layoutableNode->getProps());
-    if (!viewProps.onLayout) {
-      continue;
+    if (auto viewProps =
+            dynamic_cast<const ViewProps*>(layoutableNode->getProps().get())) {
+      if (viewProps->onLayout) {
+        static_cast<const BaseViewEventEmitter&>(
+            *layoutableNode->getEventEmitter())
+            .onLayout(layoutableNode->getLayoutMetrics());
+      }
     }
-
-    viewEventEmitter.onLayout(layoutableNode->getLayoutMetrics());
   }
 }
 

package/ReactCommon/react/renderer/mounting/ShadowViewMutation.cpp

@@ -14,7 +14,7 @@ namespace facebook::react {
 ShadowViewMutation ShadowViewMutation::CreateMutation(ShadowView shadowView) {
   return {
       /* .type = */ Create,
-      /* .parentShadowView = */ {},
+      /* .parentTag = */ -1,
       /* .oldChildShadowView = */ {},
       /* .newChildShadowView = */ std::move(shadowView),
       /* .index = */ -1,
@@ -24,7 +24,7 @@ ShadowViewMutation ShadowViewMutation::CreateMutation(ShadowView shadowView) {
 ShadowViewMutation ShadowViewMutation::DeleteMutation(ShadowView shadowView) {
   return {
       /* .type = */ Delete,
-      /* .parentShadowView = */ {},
+      /* .parentTag = */ -1,
       /* .oldChildShadowView = */ std::move(shadowView),
       /* .newChildShadowView = */ {},
       /* .index = */ -1,
@@ -32,12 +32,12 @@ ShadowViewMutation ShadowViewMutation::DeleteMutation(ShadowView shadowView) {
 }
 
 ShadowViewMutation ShadowViewMutation::InsertMutation(
-    ShadowView parentShadowView,
+    Tag parentTag,
     ShadowView childShadowView,
     int index) {
   return {
       /* .type = */ Insert,
-      /* .parentShadowView = */ std::move(parentShadowView),
+      /* .parentTag = */ parentTag,
       /* .oldChildShadowView = */ {},
       /* .newChildShadowView = */ std::move(childShadowView),
       /* .index = */ index,
@@ -45,12 +45,12 @@ ShadowViewMutation ShadowViewMutation::InsertMutation(
 }
 
 ShadowViewMutation ShadowViewMutation::RemoveMutation(
-    ShadowView parentShadowView,
+    Tag parentTag,
     ShadowView childShadowView,
     int index) {
   return {
       /* .type = */ Remove,
-      /* .parentShadowView = */ std::move(parentShadowView),
+      /* .parentTag = */ parentTag,
       /* .oldChildShadowView = */ std::move(childShadowView),
       /* .newChildShadowView = */ {},
       /* .index = */ index,
@@ -60,10 +60,10 @@ ShadowViewMutation ShadowViewMutation::RemoveMutation(
 ShadowViewMutation ShadowViewMutation::UpdateMutation(
     ShadowView oldChildShadowView,
     ShadowView newChildShadowView,
-    ShadowView parentShadowView) {
+    Tag parentTag) {
   return {
       /* .type = */ Update,
-      /* .parentShadowView = */ std::move(parentShadowView),
+      /* .parentTag = */ parentTag,
       /* .oldChildShadowView = */ std::move(oldChildShadowView),
       /* .newChildShadowView = */ std::move(newChildShadowView),
       /* .index = */ -1,
@@ -88,12 +88,12 @@ bool ShadowViewMutation::mutatedViewIsVirtual() const {
 
 ShadowViewMutation::ShadowViewMutation(
     Type type,
-    ShadowView parentShadowView,
+    Tag parentTag,
     ShadowView oldChildShadowView,
     ShadowView newChildShadowView,
     int index)
     : type(type),
-      parentShadowView(std::move(parentShadowView)),
+      parentTag(parentTag),
       oldChildShadowView(std::move(oldChildShadowView)),
       newChildShadowView(std::move(newChildShadowView)),
       index(index) {}
@@ -131,10 +131,10 @@ std::vector<DebugStringConvertibleObject> getDebugProps(
                                              mutation.newChildShadowView,
                                              options)}
           : DebugStringConvertibleObject{},
-      mutation.parentShadowView.componentHandle != 0
+      mutation.parentTag != -1
           ? DebugStringConvertibleObject{"parent",
                                          getDebugDescription(
-                                             mutation.parentShadowView,
+                                             mutation.parentTag,
                                              options)}
           : DebugStringConvertibleObject{},
       mutation.index != -1

package/ReactCommon/react/renderer/mounting/ShadowViewMutation.h

@@ -13,7 +13,7 @@
 
 namespace facebook::react {
 
-/*
+/**
  * Describes a single native view tree mutation which may contain
  * pointers to an old shadow view, a new shadow view, a parent shadow view and
  * final index of inserted or updated view.
@@ -26,43 +26,73 @@ struct ShadowViewMutation final {
 
 #pragma mark - Designated Initializers
 
-  /*
+  /**
    * Creates and returns an `Create` mutation.
    */
   static ShadowViewMutation CreateMutation(ShadowView shadowView);
 
-  /*
+  /**
    * Creates and returns an `Delete` mutation.
    */
   static ShadowViewMutation DeleteMutation(ShadowView shadowView);
 
-  /*
+  /**
+   * Creates and returns an `Insert` mutation.
+   */
+  static ShadowViewMutation
+  InsertMutation(Tag parentTag, ShadowView childShadowView, int index);
+
+  /**
    * Creates and returns an `Insert` mutation.
+   * @deprecated Pass parentTag instead of parentShadowView.
    */
   static ShadowViewMutation InsertMutation(
-      ShadowView parentShadowView,
+      const ShadowView& parentShadowView,
       ShadowView childShadowView,
-      int index);
+      int index) {
+    return InsertMutation(parentShadowView.tag, childShadowView, index);
+  }
+
+  /**
+   * Creates and returns a `Remove` mutation.
+   */
+  static ShadowViewMutation
+  RemoveMutation(Tag parentTag, ShadowView childShadowView, int index);
 
-  /*
+  /**
    * Creates and returns a `Remove` mutation.
+   * @deprecated Pass parentTag instead of parentShadowView.
    */
   static ShadowViewMutation RemoveMutation(
-      ShadowView parentShadowView,
+      const ShadowView& parentShadowView,
       ShadowView childShadowView,
-      int index);
+      int index) {
+    return RemoveMutation(parentShadowView.tag, childShadowView, index);
+  }
+
+  /**
+   * Creates and returns an `Update` mutation.
+   */
+  static ShadowViewMutation UpdateMutation(
+      ShadowView oldChildShadowView,
+      ShadowView newChildShadowView,
+      Tag parentTag);
 
-  /*
+  /**
    * Creates and returns an `Update` mutation.
+   * @deprecated Pass parentTag instead of parentShadowView.
    */
   static ShadowViewMutation UpdateMutation(
       ShadowView oldChildShadowView,
       ShadowView newChildShadowView,
-      ShadowView parentShadowView);
+      const ShadowView& parentShadowView) {
+    return UpdateMutation(
+        oldChildShadowView, newChildShadowView, parentShadowView.tag);
+  }
 
 #pragma mark - Type
 
-  enum Type {
+  enum Type : std::uint8_t {
     Create = 1,
     Delete = 2,
     Insert = 4,
@@ -73,7 +103,7 @@ struct ShadowViewMutation final {
 #pragma mark - Fields
 
   Type type = {Create};
-  ShadowView parentShadowView = {};
+  Tag parentTag = -1;
   ShadowView oldChildShadowView = {};
   ShadowView newChildShadowView = {};
   int index = -1;
@@ -88,7 +118,7 @@ struct ShadowViewMutation final {
  private:
   ShadowViewMutation(
       Type type,
-      ShadowView parentShadowView,
+      Tag parentTag,
       ShadowView oldChildShadowView,
       ShadowView newChildShadowView,
       int index);

package/ReactCommon/react/renderer/mounting/stubs/StubViewTree.cpp

@@ -42,7 +42,7 @@ void StubViewTree::mutate(const ShadowViewMutationList& mutations) {
   for (const auto& mutation : mutations) {
     switch (mutation.type) {
       case ShadowViewMutation::Create: {
-        react_native_assert(mutation.parentShadowView == ShadowView{});
+        react_native_assert(mutation.parentTag == -1);
         react_native_assert(mutation.oldChildShadowView == ShadowView{});
         react_native_assert(mutation.newChildShadowView.props);
         auto stubView = std::make_shared<StubView>();
@@ -69,7 +69,7 @@ void StubViewTree::mutate(const ShadowViewMutationList& mutations) {
                      << "] ##"
                      << std::hash<ShadowView>{}(mutation.oldChildShadowView);
         });
-        react_native_assert(mutation.parentShadowView == ShadowView{});
+        react_native_assert(mutation.parentTag == -1);
         react_native_assert(mutation.newChildShadowView == ShadowView{});
         auto tag = mutation.oldChildShadowView.tag;
         react_native_assert(hasTag(tag));
@@ -98,7 +98,7 @@ void StubViewTree::mutate(const ShadowViewMutationList& mutations) {
       case ShadowViewMutation::Insert: {
         if (!mutation.mutatedViewIsVirtual()) {
           react_native_assert(mutation.oldChildShadowView == ShadowView{});
-          auto parentTag = mutation.parentShadowView.tag;
+          auto parentTag = mutation.parentTag;
           auto childTag = mutation.newChildShadowView.tag;
           if (!hasTag(parentTag)) {
             LOG(ERROR)
@@ -140,7 +140,7 @@ void StubViewTree::mutate(const ShadowViewMutationList& mutations) {
       case ShadowViewMutation::Remove: {
         if (!mutation.mutatedViewIsVirtual()) {
           react_native_assert(mutation.newChildShadowView == ShadowView{});
-          auto parentTag = mutation.parentShadowView.tag;
+          auto parentTag = mutation.parentTag;
           auto childTag = mutation.oldChildShadowView.tag;
           if (!hasTag(parentTag)) {
             LOG(ERROR)
@@ -221,6 +221,10 @@ void StubViewTree::mutate(const ShadowViewMutationList& mutations) {
         react_native_assert(hasTag(mutation.newChildShadowView.tag));
         auto oldStubView = registry_[mutation.newChildShadowView.tag];
         react_native_assert(oldStubView->tag != 0);
+        if (mutation.parentTag != 0) {
+          react_native_assert(hasTag(mutation.parentTag));
+          react_native_assert(oldStubView->parentTag == mutation.parentTag);
+        }
         if ((ShadowView)(*oldStubView) != mutation.oldChildShadowView) {
           LOG(ERROR)
               << "StubView: ASSERT FAILURE: UPDATE mutation assertion failure: oldChildShadowView does not match oldStubView: ["

package/ReactCommon/react/renderer/mounting/stubs/stubs.cpp

@@ -55,7 +55,7 @@ static void calculateShadowViewMutationsForNewTree(
     mutations.push_back(
         ShadowViewMutation::CreateMutation(newChildPair->shadowView));
     mutations.push_back(ShadowViewMutation::InsertMutation(
-        parentShadowView,
+        parentShadowView.tag,
         newChildPair->shadowView,
         static_cast<int>(newChildPair->mountIndex)));