react-native 0.70.4 → 0.71.0-rc.0

package/ReactCommon/react/renderer/mapbuffer/MapBufferBuilder.cpp

@@ -10,8 +10,7 @@
 
 using namespace facebook::react;
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 constexpr uint32_t INT_SIZE = sizeof(uint32_t);
 constexpr uint32_t DOUBLE_SIZE = sizeof(double);
@@ -114,6 +113,39 @@ void MapBufferBuilder::putMapBuffer(MapBuffer::Key key, MapBuffer const &map) {
       INT_SIZE);
 }
 
+void MapBufferBuilder::putMapBufferList(
+    MapBuffer::Key key,
+    const std::vector<MapBuffer> &mapBufferList) {
+  int32_t offset = dynamicData_.size();
+  int32_t dataSize = 0;
+  for (const MapBuffer &mapBuffer : mapBufferList) {
+    dataSize = dataSize + INT_SIZE + mapBuffer.size();
+  }
+
+  dynamicData_.resize(offset + INT_SIZE, 0);
+  memcpy(dynamicData_.data() + offset, &dataSize, INT_SIZE);
+
+  for (const MapBuffer &mapBuffer : mapBufferList) {
+    int32_t mapBufferSize = mapBuffer.size();
+    int32_t dynamicDataSize = dynamicData_.size();
+    dynamicData_.resize(dynamicDataSize + INT_SIZE + mapBufferSize, 0);
+    // format [length of buffer (int)] + [bytes of MapBuffer]
+    memcpy(dynamicData_.data() + dynamicDataSize, &mapBufferSize, INT_SIZE);
+    // Copy the content of the map into dynamicData_
+    memcpy(
+        dynamicData_.data() + dynamicDataSize + INT_SIZE,
+        mapBuffer.data(),
+        mapBufferSize);
+  }
+
+  // Store Key and pointer to the string
+  storeKeyValue(
+      key,
+      MapBuffer::DataType::Map,
+      reinterpret_cast<uint8_t const *>(&offset),
+      INT_SIZE);
+}
+
 static inline bool compareBuckets(
     MapBuffer::Bucket const &a,
     MapBuffer::Bucket const &b) {
@@ -145,5 +177,4 @@ MapBuffer MapBufferBuilder::build() {
   return MapBuffer(std::move(buffer));
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react

package/ReactCommon/react/renderer/mapbuffer/MapBufferBuilder.h

@@ -9,6 +9,7 @@
 
 #include <react/debug/react_native_assert.h>
 #include <react/renderer/mapbuffer/MapBuffer.h>
+#include <vector>
 
 namespace facebook {
 namespace react {
@@ -35,6 +36,10 @@ class MapBufferBuilder {
 
   void putMapBuffer(MapBuffer::Key key, MapBuffer const &map);
 
+  void putMapBufferList(
+      MapBuffer::Key key,
+      const std::vector<MapBuffer> &mapBufferList);
+
   MapBuffer build();
 
  private:

package/ReactCommon/react/renderer/mapbuffer/tests/MapBufferTest.cpp

@@ -6,6 +6,7 @@
  */
 
 #include <memory>
+#include <vector>
 
 #include <gtest/gtest.h>
 #include <react/renderer/mapbuffer/MapBuffer.h>
@@ -150,6 +151,30 @@ TEST(MapBufferTest, testMapEntries) {
   EXPECT_EQ(readMap2.getInt(1), 1234);
 }
 
+TEST(MapBufferTest, testMapListEntries) {
+  std::vector<MapBuffer> mapBufferList;
+  auto builder = MapBufferBuilder();
+  builder.putString(0, "This is a test");
+  builder.putInt(1, 1234);
+  mapBufferList.push_back(builder.build());
+
+  auto builder2 = MapBufferBuilder();
+  builder2.putInt(2, 4321);
+  builder2.putDouble(3, 908.1);
+  mapBufferList.push_back(builder2.build());
+
+  auto builder3 = MapBufferBuilder();
+  builder3.putMapBufferList(5, mapBufferList);
+  auto map = builder3.build();
+
+  std::vector<MapBuffer> mapBufferList2 = map.getMapBufferList(5);
+
+  EXPECT_EQ(mapBufferList2.size(), 2);
+  EXPECT_EQ(mapBufferList2[0].getString(0), "This is a test");
+  EXPECT_EQ(mapBufferList2[0].getInt(1), 1234);
+  EXPECT_EQ(mapBufferList2[1].getDouble(3), 908.1);
+}
+
 TEST(MapBufferTest, testMapRandomAccess) {
   auto builder = MapBufferBuilder();
   builder.putInt(1234, 4321);

package/ReactCommon/react/renderer/mounting/BUCK

@@ -32,12 +32,12 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/renderer/mounting",
     ),
+    compiler_flags_pedantic = True,
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX),
@@ -50,9 +50,7 @@ rn_xplat_cxx_library(
     deps = [
         "//third-party/glog:glog",
         "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:headers_only_do_not_use",
-        "//xplat/folly:memory",
-        "//xplat/folly:molly",
+        "//xplat/folly:hash",
         react_native_xplat_target("butter:butter"),
         react_native_xplat_target("react/debug:debug"),
         react_native_xplat_target("react/renderer/components/root:root"),
@@ -79,7 +77,6 @@ fb_xplat_cxx_test(
     platforms = (ANDROID, APPLE, CXX),
     deps = [
         ":mounting",
-        "//xplat/folly:molly",
         "//xplat/third-party/gmock:gtest",
         react_native_xplat_target("react/renderer/element:element"),
         react_native_xplat_target("react/renderer/components/root:root"),

package/ReactCommon/react/renderer/mounting/CMakeLists.txt

@@ -6,7 +6,14 @@
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-add_compile_options(-fexceptions -frtti -std=c++17 -Wall -DLOG_TAG=\"Fabric\")
+add_compile_options(
+        -fexceptions
+        -frtti
+        -std=c++17
+        -Wall
+        -Wpedantic
+        -Wno-gnu-zero-variadic-macro-arguments
+        -DLOG_TAG=\"Fabric\")
 
 file(GLOB react_render_mounting_SRC CONFIGURE_DEPENDS *.cpp)
 add_library(react_render_mounting SHARED ${react_render_mounting_SRC})

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

@@ -38,8 +38,7 @@ enum class NoBreadcrumb {};
   {}
 #endif
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 /*
  * Extremely simple and naive implementation of a map.
@@ -336,7 +335,6 @@ static_assert(
     "`ShadowViewNodePair::NonOwningList` must be `move assignable`.");
 
 static void calculateShadowViewMutationsV2(
-    BREADCRUMB_TYPE breadcrumb,
     ViewNodePairScope &scope,
     ShadowViewMutation::List &mutations,
     ShadowView const &parentShadowView,
@@ -355,18 +353,15 @@ struct OrderedMutationInstructionContainer {
 };
 
 static void updateMatchedPairSubtrees(
-    BREADCRUMB_TYPE breadcrumb,
     ViewNodePairScope &scope,
     OrderedMutationInstructionContainer &mutationContainer,
     TinyMap<Tag, ShadowViewNodePair *> &newRemainingPairs,
     ShadowViewNodePair::NonOwningList &oldChildPairs,
-    ShadowViewNodePair::NonOwningList &newChildPairs,
     ShadowView const &parentShadowView,
     ShadowViewNodePair const &oldPair,
     ShadowViewNodePair const &newPair);
 
 static void updateMatchedPair(
-    BREADCRUMB_TYPE breadcrumb,
     OrderedMutationInstructionContainer &mutationContainer,
     bool oldNodeFoundInOrder,
     bool newNodeFoundInOrder,
@@ -375,12 +370,11 @@ static void updateMatchedPair(
     ShadowViewNodePair const &newPair);
 
 static void calculateShadowViewMutationsFlattener(
-    BREADCRUMB_TYPE breadcrumb,
     ViewNodePairScope &scope,
     ReparentMode reparentMode,
     OrderedMutationInstructionContainer &mutationContainer,
     ShadowView const &parentShadowView,
-    TinyMap<Tag, ShadowViewNodePair *> &unvisitedFlattenedNodes,
+    TinyMap<Tag, ShadowViewNodePair *> &unvisitedOtherNodes,
     ShadowViewNodePair const &node,
     TinyMap<Tag, ShadowViewNodePair *> *parentSubVisitedOtherNewNodes = nullptr,
     TinyMap<Tag, ShadowViewNodePair *> *parentSubVisitedOtherOldNodes =
@@ -395,12 +389,10 @@ static void calculateShadowViewMutationsFlattener(
  * the ViewNodePairScope used within.
  */
 static void updateMatchedPairSubtrees(
-    BREADCRUMB_TYPE breadcrumb,
     ViewNodePairScope &scope,
     OrderedMutationInstructionContainer &mutationContainer,
     TinyMap<Tag, ShadowViewNodePair *> &newRemainingPairs,
     ShadowViewNodePair::NonOwningList &oldChildPairs,
-    ShadowViewNodePair::NonOwningList &newChildPairs,
     ShadowView const &parentShadowView,
     ShadowViewNodePair const &oldPair,
     ShadowViewNodePair const &newPair) {
@@ -427,9 +419,6 @@ static void updateMatchedPairSubtrees(
       // children are visited, so we reuse the `newRemainingPairs`
       // map.
       calculateShadowViewMutationsFlattener(
-          DIFF_BREADCRUMB(
-              "Flatten tree " + std::to_string(parentShadowView.tag) +
-              " into list " + std::to_string(oldPair.shadowView.tag)),
           scope,
           ReparentMode::Flatten,
           mutationContainer,
@@ -460,9 +449,6 @@ static void updateMatchedPairSubtrees(
 
       // Unflatten old list into new tree
       calculateShadowViewMutationsFlattener(
-          DIFF_BREADCRUMB(
-              "Unflatten old list " + std::to_string(parentShadowView.tag) +
-              " into new tree " + std::to_string(newPair.shadowView.tag)),
           scope,
           ReparentMode::Unflatten,
           mutationContainer,
@@ -502,8 +488,6 @@ static void updateMatchedPairSubtrees(
     auto newGrandChildPairs =
         sliceChildShadowNodeViewPairsFromViewNodePair(newPair, innerScope);
     calculateShadowViewMutationsV2(
-        DIFF_BREADCRUMB(
-            "Non-trivial update " + std::to_string(oldPair.shadowView.tag)),
         innerScope,
         *(newGrandChildPairs.size()
               ? &mutationContainer.downwardMutations
@@ -523,7 +507,6 @@ static void updateMatchedPairSubtrees(
  * correct ordering of INSERT and REMOVE mutations.
  */
 static void updateMatchedPair(
-    BREADCRUMB_TYPE breadcrumb,
     OrderedMutationInstructionContainer &mutationContainer,
     bool oldNodeFoundInOrder,
     bool newNodeFoundInOrder,
@@ -574,7 +557,7 @@ static void updateMatchedPair(
     if (oldPair.shadowView != newPair.shadowView) {
       mutationContainer.updateMutations.push_back(
           ShadowViewMutation::UpdateMutation(
-              oldPair.shadowView, newPair.shadowView));
+              oldPair.shadowView, newPair.shadowView, parentShadowView));
     }
   }
 }
@@ -618,7 +601,6 @@ static void updateMatchedPair(
  *    **after this function is called**, by the caller.
  */
 static void calculateShadowViewMutationsFlattener(
-    BREADCRUMB_TYPE breadcrumb,
     ViewNodePairScope &scope,
     ReparentMode reparentMode,
     OrderedMutationInstructionContainer &mutationContainer,
@@ -835,7 +817,9 @@ static void calculateShadowViewMutationsFlattener(
           newTreeNodePair.isConcreteView && oldTreeNodePair.isConcreteView) {
         mutationContainer.updateMutations.push_back(
             ShadowViewMutation::UpdateMutation(
-                oldTreeNodePair.shadowView, newTreeNodePair.shadowView));
+                oldTreeNodePair.shadowView,
+                newTreeNodePair.shadowView,
+                node.shadowView));
       }
 
       // Update children if appropriate.
@@ -843,9 +827,6 @@ static void calculateShadowViewMutationsFlattener(
         if (oldTreeNodePair.shadowNode != newTreeNodePair.shadowNode) {
           ViewNodePairScope innerScope{};
           calculateShadowViewMutationsV2(
-              DIFF_BREADCRUMB(
-                  "(Un)Flattener trivial update of " +
-                  std::to_string(newTreeNodePair.shadowView.tag)),
               innerScope,
               mutationContainer.downwardMutations,
               newTreeNodePair.shadowView,
@@ -865,17 +846,6 @@ static void calculateShadowViewMutationsFlattener(
         // This is a flatten-flatten, or unflatten-unflatten.
         if (childReparentMode == reparentMode) {
           calculateShadowViewMutationsFlattener(
-              DIFF_BREADCRUMB(
-                  std::string(
-                      reparentMode == ReparentMode::Flatten
-                          ? "Flatten-Flatten"
-                          : "Unflatten-Unflatten") +
-                  " new:" +
-                  std::to_string(
-                      reparentMode == ReparentMode::Flatten
-                          ? parentShadowView.tag
-                          : newTreeNodePair.shadowView.tag) +
-                  " old:" + std::to_string(treeChildPair.shadowView.tag)),
               scope,
               childReparentMode,
               mutationContainer,
@@ -917,13 +887,6 @@ static void calculateShadowViewMutationsFlattener(
             // At the end of this loop we still want to know which of these
             // children are visited, so we reuse the `newRemainingPairs` map.
             calculateShadowViewMutationsFlattener(
-                DIFF_BREADCRUMB(
-                    std::string("Flatten old tree into new list; new:") +
-                    std::to_string(
-                        reparentMode == ReparentMode::Flatten
-                            ? parentShadowView.tag
-                            : newTreeNodePair.shadowView.tag) +
-                    " old:" + std::to_string(oldTreeNodePair.shadowView.tag)),
                 scope,
                 ReparentMode::Flatten,
                 mutationContainer,
@@ -939,13 +902,6 @@ static void calculateShadowViewMutationsFlattener(
           else {
             // Unflatten old list into new tree
             calculateShadowViewMutationsFlattener(
-                DIFF_BREADCRUMB(
-                    "Unflatten old list into new tree; old:" +
-                    std::to_string(
-                        reparentMode == ReparentMode::Flatten
-                            ? parentShadowView.tag
-                            : newTreeNodePair.shadowView.tag) +
-                    " new:" + std::to_string(newTreeNodePair.shadowView.tag)),
                 scope,
                 ReparentMode::Unflatten,
                 mutationContainer,
@@ -1047,9 +1003,6 @@ static void calculateShadowViewMutationsFlattener(
       if (!treeChildPair.flattened) {
         ViewNodePairScope innerScope{};
         calculateShadowViewMutationsV2(
-            DIFF_BREADCRUMB(
-                "Recursively delete tree child pair (flatten case): " +
-                std::to_string(treeChildPair.shadowView.tag)),
             innerScope,
             mutationContainer.destructiveDownwardMutations,
             treeChildPair.shadowView,
@@ -1064,9 +1017,6 @@ static void calculateShadowViewMutationsFlattener(
       if (!treeChildPair.flattened) {
         ViewNodePairScope innerScope{};
         calculateShadowViewMutationsV2(
-            DIFF_BREADCRUMB(
-                "Recursively delete tree child pair (unflatten case): " +
-                std::to_string(treeChildPair.shadowView.tag)),
             innerScope,
             mutationContainer.downwardMutations,
             treeChildPair.shadowView,
@@ -1079,7 +1029,6 @@ static void calculateShadowViewMutationsFlattener(
 }
 
 static void calculateShadowViewMutationsV2(
-    BREADCRUMB_TYPE breadcrumb,
     ViewNodePairScope &scope,
     ShadowViewMutation::List &mutations,
     ShadowView const &parentShadowView,
@@ -1161,7 +1110,9 @@ static void calculateShadowViewMutationsV2(
         oldChildPair.shadowView != newChildPair.shadowView) {
       mutationContainer.updateMutations.push_back(
           ShadowViewMutation::UpdateMutation(
-              oldChildPair.shadowView, newChildPair.shadowView));
+              oldChildPair.shadowView,
+              newChildPair.shadowView,
+              parentShadowView));
     }
 
     // Recursively update tree if ShadowNode pointers are not equal
@@ -1173,9 +1124,6 @@ static void calculateShadowViewMutationsV2(
       auto newGrandChildPairs = sliceChildShadowNodeViewPairsFromViewNodePair(
           newChildPair, innerScope);
       calculateShadowViewMutationsV2(
-          DIFF_BREADCRUMB(
-              "Stage 1: Recurse on " +
-              std::to_string(oldChildPair.shadowView.tag)),
           innerScope,
           *(newGrandChildPairs.size()
                 ? &mutationContainer.downwardMutations
@@ -1242,8 +1190,6 @@ static void calculateShadowViewMutationsV2(
       // subtree starting from the removed view.
       ViewNodePairScope innerScope{};
       calculateShadowViewMutationsV2(
-          DIFF_BREADCRUMB(
-              "Trivial delete " + std::to_string(oldChildPair.shadowView.tag)),
           innerScope,
           mutationContainer.destructiveDownwardMutations,
           oldChildPair.shadowView,
@@ -1278,8 +1224,6 @@ static void calculateShadowViewMutationsV2(
 
       ViewNodePairScope innerScope{};
       calculateShadowViewMutationsV2(
-          DIFF_BREADCRUMB(
-              "Trivial create " + std::to_string(newChildPair.shadowView.tag)),
           innerScope,
           mutationContainer.downwardMutations,
           newChildPair.shadowView,
@@ -1300,9 +1244,10 @@ static void calculateShadowViewMutationsV2(
     // Walk through both lists at the same time
     // We will perform updates, create+insert, remove+delete, remove+insert
     // (move) here.
-    size_t oldIndex = lastIndexAfterFirstStage,
-           newIndex = lastIndexAfterFirstStage, newSize = newChildPairs.size(),
-           oldSize = oldChildPairs.size();
+    size_t oldIndex = lastIndexAfterFirstStage;
+    size_t newIndex = lastIndexAfterFirstStage;
+    size_t newSize = newChildPairs.size();
+    size_t oldSize = oldChildPairs.size();
     while (newIndex < newSize || oldIndex < oldSize) {
       bool haveNewPair = newIndex < newSize;
       bool haveOldPair = oldIndex < oldSize;
@@ -1329,9 +1274,6 @@ static void calculateShadowViewMutationsV2(
           });
 
           updateMatchedPair(
-              DIFF_BREADCRUMB(
-                  "Update Matched Pairs (1): " +
-                  std::to_string(oldChildPair.shadowView.tag)),
               mutationContainer,
               true,
               true,
@@ -1340,14 +1282,10 @@ static void calculateShadowViewMutationsV2(
               newChildPair);
 
           updateMatchedPairSubtrees(
-              DIFF_BREADCRUMB(
-                  "Update Matched Pair Subtrees (1): " +
-                  std::to_string(oldChildPair.shadowView.tag)),
               scope,
               mutationContainer,
               newRemainingPairs,
               oldChildPairs,
-              newChildPairs,
               parentShadowView,
               oldChildPair,
               newChildPair);
@@ -1374,9 +1312,6 @@ static void calculateShadowViewMutationsV2(
           auto const &newChildPair = *insertedIt->second;
 
           updateMatchedPair(
-              DIFF_BREADCRUMB(
-                  "Update Matched Pairs (2): " +
-                  std::to_string(oldChildPair.shadowView.tag)),
               mutationContainer,
               true,
               false,
@@ -1385,14 +1320,10 @@ static void calculateShadowViewMutationsV2(
               newChildPair);
 
           updateMatchedPairSubtrees(
-              DIFF_BREADCRUMB(
-                  "Update Matched Pair Subtrees (2): " +
-                  std::to_string(oldChildPair.shadowView.tag)),
               scope,
               mutationContainer,
               newRemainingPairs,
               oldChildPairs,
-              newChildPairs,
               parentShadowView,
               oldChildPair,
               newChildPair);
@@ -1530,9 +1461,6 @@ static void calculateShadowViewMutationsV2(
         // entire subtree starting from the removed view.
         ViewNodePairScope innerScope{};
         calculateShadowViewMutationsV2(
-            DIFF_BREADCRUMB(
-                "Non-trivial delete " +
-                std::to_string(oldChildPair.shadowView.tag)),
             innerScope,
             mutationContainer.destructiveDownwardMutations,
             oldChildPair.shadowView,
@@ -1577,9 +1505,6 @@ static void calculateShadowViewMutationsV2(
 
       ViewNodePairScope innerScope{};
       calculateShadowViewMutationsV2(
-          DIFF_BREADCRUMB(
-              "Non-trivial create " +
-              std::to_string(newChildPair.shadowView.tag)),
           innerScope,
           mutationContainer.downwardMutations,
           newChildPair.shadowView,
@@ -1699,11 +1624,10 @@ ShadowViewMutation::List calculateShadowViewMutations(
 
   if (oldRootShadowView != newRootShadowView) {
     mutations.push_back(ShadowViewMutation::UpdateMutation(
-        oldRootShadowView, newRootShadowView));
+        oldRootShadowView, newRootShadowView, {}));
   }
 
   calculateShadowViewMutationsV2(
-      CREATE_DIFF_BREADCRUMB(oldRootShadowView.tag),
       innerViewNodePairScope,
       mutations,
       ShadowView(oldRootShadowNode),
@@ -1713,5 +1637,4 @@ ShadowViewMutation::List calculateShadowViewMutations(
   return mutations;
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react

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

@@ -17,10 +17,9 @@
 #include <react/debug/react_native_assert.h>
 #include <react/renderer/mounting/ShadowViewMutation.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
-MountingCoordinator::MountingCoordinator(ShadowTreeRevision baseRevision)
+MountingCoordinator::MountingCoordinator(const ShadowTreeRevision &baseRevision)
     : surfaceId_(baseRevision.rootShadowNode->getSurfaceId()),
       baseRevision_(baseRevision),
       telemetryController_(*this) {
@@ -68,7 +67,7 @@ bool MountingCoordinator::waitForTransaction(
 
 void MountingCoordinator::updateBaseRevision(
     ShadowTreeRevision const &baseRevision) const {
-  baseRevision_ = std::move(baseRevision);
+  baseRevision_ = baseRevision;
 }
 
 void MountingCoordinator::resetLatestRevision() const {
@@ -186,5 +185,4 @@ void MountingCoordinator::setMountingOverrideDelegate(
   mountingOverrideDelegate_ = std::move(delegate);
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react

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

@@ -40,7 +40,7 @@ class MountingCoordinator final {
    * The constructor is meant to be used only inside `ShadowTree`, and it's
    * `public` only to enable using with `std::make_shared<>`.
    */
-  MountingCoordinator(ShadowTreeRevision baseRevision);
+  MountingCoordinator(const ShadowTreeRevision &baseRevision);
 
   /*
    * Returns the id of the surface that the coordinator belongs to.

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

@@ -7,8 +7,7 @@
 
 #include "MountingTransaction.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 using Number = MountingTransaction::Number;
 
@@ -42,5 +41,4 @@ Number MountingTransaction::getNumber() const {
   return number_;
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react

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

@@ -19,8 +19,7 @@
 
 #include "ShadowTreeDelegate.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 using CommitStatus = ShadowTree::CommitStatus;
 using CommitMode = ShadowTree::CommitMode;
@@ -296,8 +295,8 @@ MountingCoordinator::Shared ShadowTree::getMountingCoordinator() const {
 }
 
 CommitStatus ShadowTree::commit(
-    ShadowTreeCommitTransaction transaction,
-    CommitOptions commitOptions) const {
+    const ShadowTreeCommitTransaction &transaction,
+    const CommitOptions &commitOptions) const {
   SystraceSection s("ShadowTree::commit");
 
   int attempts = 0;
@@ -317,8 +316,8 @@ CommitStatus ShadowTree::commit(
 }
 
 CommitStatus ShadowTree::tryCommit(
-    ShadowTreeCommitTransaction transaction,
-    CommitOptions commitOptions) const {
+    const ShadowTreeCommitTransaction &transaction,
+    const CommitOptions &commitOptions) const {
   SystraceSection s("ShadowTree::tryCommit");
 
   auto telemetry = TransactionTelemetry{};
@@ -461,5 +460,4 @@ void ShadowTree::notifyDelegatesOfUpdates() const {
   delegate_.shadowTreeDidFinishTransaction(*this, mountingCoordinator_);
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react

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

@@ -95,15 +95,15 @@ class ShadowTree final {
    * The `transaction` function can cancel commit returning `nullptr`.
    */
   CommitStatus tryCommit(
-      ShadowTreeCommitTransaction transaction,
-      CommitOptions commitOptions = {false}) const;
+      const ShadowTreeCommitTransaction &transaction,
+      const CommitOptions &commitOptions = {false}) const;
 
   /*
    * Calls `tryCommit` in a loop until it finishes successfully.
    */
   CommitStatus commit(
-      ShadowTreeCommitTransaction transaction,
-      CommitOptions commitOptions = {false}) const;
+      const ShadowTreeCommitTransaction &transaction,
+      const CommitOptions &commitOptions = {false}) const;
 
   /*
    * Returns a `ShadowTreeRevision` representing the momentary state of

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

@@ -9,8 +9,7 @@
 
 #include <react/debug/react_native_assert.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 ShadowTreeRegistry::~ShadowTreeRegistry() {
   react_native_assert(
@@ -60,5 +59,4 @@ void ShadowTreeRegistry::enumerate(
   }
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react

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

@@ -10,14 +10,14 @@
 #include <react/renderer/core/LayoutMetrics.h>
 #include <react/renderer/core/LayoutableShadowNode.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 static LayoutMetrics layoutMetricsFromShadowNode(ShadowNode const &shadowNode) {
   auto layoutableShadowNode =
       traitCast<LayoutableShadowNode const *>(&shadowNode);
-  return layoutableShadowNode ? layoutableShadowNode->getLayoutMetrics()
-                              : EmptyLayoutMetrics;
+  return layoutableShadowNode != nullptr
+      ? layoutableShadowNode->getLayoutMetrics()
+      : EmptyLayoutMetrics;
 }
 
 ShadowView::ShadowView(const ShadowNode &shadowNode)
@@ -95,5 +95,4 @@ bool ShadowViewNodePairLegacy::operator!=(
   return !(*this == rhs);
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react