react-native 0.69.3 → 0.70.0-rc.2

package/ReactCommon/react/renderer/core/ShadowNode.h

@@ -28,15 +28,6 @@ static constexpr const int kShadowNodeChildrenSmallVectorSize = 8;
 
 class ComponentDescriptor;
 struct ShadowNodeFragment;
-class ShadowNode;
-
-// Deprecated: Use ShadowNode::Shared instead
-using SharedShadowNode = std::shared_ptr<const ShadowNode>;
-using WeakShadowNode = std::weak_ptr<const ShadowNode>;
-using SharedShadowNodeList =
-    butter::small_vector<SharedShadowNode, kShadowNodeChildrenSmallVectorSize>;
-using SharedShadowNodeSharedList = std::shared_ptr<const SharedShadowNodeList>;
-using SharedShadowNodeUnsharedList = std::shared_ptr<SharedShadowNodeList>;
 
 class ShadowNode : public Sealable, public DebugStringConvertible {
  public:
@@ -57,7 +48,7 @@ class ShadowNode : public Sealable, public DebugStringConvertible {
           int /* childIndex */>,
       64>;
 
-  static SharedShadowNodeSharedList emptySharedShadowNodeSharedList();
+  static SharedListOfShared emptySharedShadowNodeSharedList();
 
   /*
    * Returns `true` if nodes belong to the same family (they were cloned one
@@ -103,7 +94,7 @@ class ShadowNode : public Sealable, public DebugStringConvertible {
   /*
    * Clones the shadow node using stored `cloneFunction`.
    */
-  ShadowNode::Unshared clone(const ShadowNodeFragment &fragment) const;
+  Unshared clone(const ShadowNodeFragment &fragment) const;
 
   /*
    * Clones the node (and partially the tree starting from the node) by
@@ -112,10 +103,10 @@ class ShadowNode : public Sealable, public DebugStringConvertible {
    *
    * Returns `nullptr` if the operation cannot be performed successfully.
    */
-  ShadowNode::Unshared cloneTree(
+  Unshared cloneTree(
       ShadowNodeFamily const &shadowNodeFamily,
-      std::function<ShadowNode::Unshared(ShadowNode const &oldShadowNode)> const
-          &callback) const;
+      std::function<Unshared(ShadowNode const &oldShadowNode)> const &callback)
+      const;
 
 #pragma mark - Getters
 
@@ -127,8 +118,8 @@ class ShadowNode : public Sealable, public DebugStringConvertible {
    */
   ShadowNodeTraits getTraits() const;
 
-  SharedProps const &getProps() const;
-  SharedShadowNodeList const &getChildren() const;
+  Props::Shared const &getProps() const;
+  ListOfShared const &getChildren() const;
   SharedEventEmitter const &getEventEmitter() const;
   Tag getTag() const;
   SurfaceId getSurfaceId() const;
@@ -165,10 +156,10 @@ class ShadowNode : public Sealable, public DebugStringConvertible {
 
 #pragma mark - Mutating Methods
 
-  void appendChild(ShadowNode::Shared const &child);
+  void appendChild(Shared const &child);
   void replaceChild(
       ShadowNode const &oldChild,
-      ShadowNode::Shared const &newChild,
+      Shared const &newChild,
       int suggestedIndex = -1);
 
   /*
@@ -195,8 +186,8 @@ class ShadowNode : public Sealable, public DebugStringConvertible {
 #endif
 
  protected:
-  SharedProps props_;
-  SharedShadowNodeSharedList children_;
+  Props::Shared props_;
+  SharedListOfShared children_;
   State::Shared state_;
   int orderIndex_;
 
@@ -216,7 +207,7 @@ class ShadowNode : public Sealable, public DebugStringConvertible {
 
   mutable std::atomic<bool> hasBeenMounted_{false};
 
-  static SharedProps propsForClonedShadowNode(
+  static Props::Shared propsForClonedShadowNode(
       ShadowNode const &sourceShadowNode,
       Props::Shared const &props);
 

package/ReactCommon/react/renderer/core/propsConversions.h

@@ -20,6 +20,35 @@
 namespace facebook {
 namespace react {
 
+/**
+ * Use this only when a prop update has definitely been sent from JS;
+ * essentially, cases where rawValue is virtually guaranteed to not be a
+ * nullptr.
+ */
+template <typename T>
+void fromRawValue(
+    const PropsParserContext &context,
+    RawValue const &rawValue,
+    T &result,
+    T defaultValue) {
+  if (!rawValue.hasValue()) {
+    result = std::move(defaultValue);
+    return;
+  }
+
+  fromRawValue(context, rawValue, result);
+}
+
+template <typename T>
+void fromRawValue(
+    const PropsParserContext &context,
+    RawValue const &rawValue,
+    std::optional<T> &result) {
+  T res{};
+  fromRawValue(context, rawValue, res);
+  result = std::optional<T>(res);
+}
+
 template <typename T>
 void fromRawValue(
     const PropsParserContext &context,

package/ReactCommon/react/renderer/core/tests/ComponentDescriptorTest.cpp

@@ -27,7 +27,7 @@ TEST(ComponentDescriptorTest, createShadowNode) {
   PropsParserContext parserContext{-1, contextContainer};
 
   const auto &raw = RawProps(folly::dynamic::object("nativeID", "abc"));
-  SharedProps props = descriptor->cloneProps(parserContext, nullptr, raw);
+  Props::Shared props = descriptor->cloneProps(parserContext, nullptr, raw);
 
   auto family = descriptor->createFamily(
       ShadowNodeFamilyFragment{
@@ -37,7 +37,7 @@ TEST(ComponentDescriptorTest, createShadowNode) {
       },
       nullptr);
 
-  SharedShadowNode node = descriptor->createShadowNode(
+  ShadowNode::Shared node = descriptor->createShadowNode(
       ShadowNodeFragment{
           /* .props = */ props,
       },
@@ -61,7 +61,7 @@ TEST(ComponentDescriptorTest, cloneShadowNode) {
   PropsParserContext parserContext{-1, contextContainer};
 
   const auto &raw = RawProps(folly::dynamic::object("nativeID", "abc"));
-  SharedProps props = descriptor->cloneProps(parserContext, nullptr, raw);
+  Props::Shared props = descriptor->cloneProps(parserContext, nullptr, raw);
   auto family = descriptor->createFamily(
       ShadowNodeFamilyFragment{
           /* .tag = */ 9,
@@ -69,12 +69,12 @@ TEST(ComponentDescriptorTest, cloneShadowNode) {
           /* .eventEmitter = */ nullptr,
       },
       nullptr);
-  SharedShadowNode node = descriptor->createShadowNode(
+  ShadowNode::Shared node = descriptor->createShadowNode(
       ShadowNodeFragment{
           /* .props = */ props,
       },
       family);
-  SharedShadowNode cloned = descriptor->cloneShadowNode(*node, {});
+  ShadowNode::Shared cloned = descriptor->cloneShadowNode(*node, {});
 
   EXPECT_STREQ(cloned->getComponentName(), "Test");
   EXPECT_EQ(cloned->getTag(), 9);
@@ -96,7 +96,7 @@ TEST(ComponentDescriptorTest, appendChild) {
   PropsParserContext parserContext{-1, contextContainer};
 
   const auto &raw = RawProps(folly::dynamic::object("nativeID", "abc"));
-  SharedProps props = descriptor->cloneProps(parserContext, nullptr, raw);
+  Props::Shared props = descriptor->cloneProps(parserContext, nullptr, raw);
   auto family1 = descriptor->createFamily(
       ShadowNodeFamilyFragment{
           /* .tag = */ 1,
@@ -104,7 +104,7 @@ TEST(ComponentDescriptorTest, appendChild) {
           /* .eventEmitter = */ nullptr,
       },
       nullptr);
-  SharedShadowNode node1 = descriptor->createShadowNode(
+  ShadowNode::Shared node1 = descriptor->createShadowNode(
       ShadowNodeFragment{
           /* .props = */ props,
       },
@@ -116,7 +116,7 @@ TEST(ComponentDescriptorTest, appendChild) {
           /* .eventEmitter = */ nullptr,
       },
       nullptr);
-  SharedShadowNode node2 = descriptor->createShadowNode(
+  ShadowNode::Shared node2 = descriptor->createShadowNode(
       ShadowNodeFragment{
           /* .props = */ props,
       },
@@ -128,7 +128,7 @@ TEST(ComponentDescriptorTest, appendChild) {
           /* .eventEmitter = */ nullptr,
       },
       nullptr);
-  SharedShadowNode node3 = descriptor->createShadowNode(
+  ShadowNode::Shared node3 = descriptor->createShadowNode(
       ShadowNodeFragment{
           /* .props = */ props,
       },

package/ReactCommon/react/renderer/core/tests/ShadowNodeTest.cpp

@@ -85,8 +85,8 @@ class ShadowNodeTest : public ::testing::Test {
         familyABB,
         traits);
 
-    auto nodeABChildren = std::make_shared<SharedShadowNodeList>(
-        SharedShadowNodeList{nodeABA_, nodeABB_});
+    auto nodeABChildren = std::make_shared<ShadowNode::ListOfShared>(
+        ShadowNode::ListOfShared{nodeABA_, nodeABB_});
 
     auto familyAB = std::make_shared<ShadowNodeFamily>(
         ShadowNodeFamilyFragment{
@@ -120,8 +120,8 @@ class ShadowNodeTest : public ::testing::Test {
         familyAC,
         traits);
 
-    auto nodeAChildren = std::make_shared<SharedShadowNodeList>(
-        SharedShadowNodeList{nodeAA_, nodeAB_, nodeAC_});
+    auto nodeAChildren = std::make_shared<ShadowNode::ListOfShared>(
+        ShadowNode::ListOfShared{nodeAA_, nodeAB_, nodeAC_});
 
     auto familyA = std::make_shared<ShadowNodeFamily>(
         ShadowNodeFamilyFragment{

package/ReactCommon/react/renderer/debug/BUCK

@@ -50,7 +50,7 @@ rn_xplat_cxx_library(
     visibility = ["PUBLIC"],
     deps = [
         "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:headers_only",
+        "//xplat/folly:headers_only_do_not_use",
         "//xplat/folly:memory",
         "//xplat/folly:molly",
         react_native_xplat_target("butter:butter"),

package/ReactCommon/react/renderer/graphics/BUCK

@@ -108,7 +108,7 @@ rn_xplat_cxx_library(
         react_native_xplat_target("butter:butter"),
         "//third-party/glog:glog",
         "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:headers_only",
+        "//xplat/folly:headers_only_do_not_use",
         "//xplat/folly:memory",
         "//xplat/folly:molly",
     ],

package/ReactCommon/react/renderer/graphics/React-graphics.podspec

@@ -17,7 +17,7 @@ else
 end
 
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2021.06.28.00-v2'
+folly_version = '2021.07.22.00'
 boost_compiler_flags = '-Wno-documentation'
 
 Pod::Spec.new do |s|

package/ReactCommon/react/renderer/graphics/RectangleEdges.h

@@ -39,8 +39,13 @@ struct RectangleEdges {
   bool isUniform() const noexcept {
     return left == top && left == right && left == bottom;
   }
+
+  static RectangleEdges<T> const ZERO;
 };
 
+template <typename T>
+constexpr RectangleEdges<T> const RectangleEdges<T>::ZERO = {};
+
 template <typename T>
 RectangleEdges<T> operator+(
     RectangleEdges<T> const &lhs,

package/ReactCommon/react/renderer/graphics/platform/android/react/renderer/graphics/PlatformColorParser.h

@@ -22,35 +22,23 @@ inline ColorComponents parsePlatformColor(
   ColorComponents colorComponents = {0, 0, 0, 0};
 
   if (value.hasType<butter::map<std::string, std::vector<std::string>>>()) {
-    auto map = (butter::map<std::string, std::vector<std::string>>)value;
-    auto resourcePaths = map["resource_paths"];
-    auto dynamicResourcePaths = folly::dynamic::array();
-    for (const auto &resourcePath : resourcePaths) {
-      dynamicResourcePaths.push_back(resourcePath);
-    }
-    folly::dynamic dynamicPlatformColor = folly::dynamic::object();
-    dynamicPlatformColor["resource_paths"] = dynamicResourcePaths;
-
-    auto fabricUIManager =
+    const auto &fabricUIManager =
         context.contextContainer.at<jni::global_ref<jobject>>(
             "FabricUIManager");
-
     static auto getColorFromJava =
-        facebook::jni::findClassStatic(
-            "com/facebook/react/fabric/FabricUIManager")
-            ->getMethod<jint(jint, ReadableMap::javaobject)>("getColor");
+        fabricUIManager->getClass()
+            ->getMethod<jint(jint, jni::JArrayClass<jni::JString>)>("getColor");
 
-    jni::local_ref<ReadableNativeMap::javaobject> dynamicPlatformColorRNM =
-        ReadableNativeMap::newObjectCxxArgs(dynamicPlatformColor);
-    jni::local_ref<ReadableMap::javaobject> dynamicPlatformColorRM =
-        jni::make_local(reinterpret_cast<ReadableMap::javaobject>(
-            dynamicPlatformColorRNM.get()));
+    auto map = (butter::map<std::string, std::vector<std::string>>)value;
+    auto &resourcePaths = map["resource_paths"];
 
+    auto javaResourcePaths =
+        jni::JArrayClass<jni::JString>::newArray(resourcePaths.size());
+    for (int i = 0; i < resourcePaths.size(); i++) {
+      javaResourcePaths->setElement(i, *jni::make_jstring(resourcePaths[i]));
+    }
     auto color = getColorFromJava(
-        fabricUIManager, context.surfaceId, dynamicPlatformColorRM.get());
-
-    dynamicPlatformColorRM.reset();
-    dynamicPlatformColorRNM.reset();
+        fabricUIManager, context.surfaceId, *javaResourcePaths);
 
     auto argb = (int64_t)color;
     auto ratio = 255.f;

package/ReactCommon/react/renderer/imagemanager/BUCK

@@ -18,39 +18,23 @@ APPLE_COMPILER_FLAGS = get_apple_compiler_flags()
 rn_xplat_cxx_library(
     name = "imagemanager",
     srcs = glob(
-        [
-            "*.cpp",
-        ],
+        ["*.cpp"],
         exclude = glob(["tests/**/*.cpp"]),
     ),
+    headers = subdir_glob(
+        [("", "*.h")],
+        prefix = "",
+    ),
     header_namespace = "",
     exported_headers = subdir_glob(
-        [
-            ("", "*.h"),
-            ("platform/cxx", "**/*.h"),
-        ],
+        [("", "*.h")],
         prefix = "react/renderer/imagemanager",
     ),
     contacts = ["oncall+react_native@xmail.facebook.com"],
-    fbandroid_exported_headers = subdir_glob(
-        [
-            ("", "*.h"),
-            ("platform/cxx", "**/*.h"),
-        ],
-        prefix = "react/renderer/imagemanager",
-    ),
-    fbandroid_headers = subdir_glob(
-        [
-            ("", "*.h"),
-            ("platform/cxx", "**/*.h"),
-        ],
-        prefix = "",
-    ),
-    fbandroid_srcs = glob(
-        [
-            "platform/cxx/**/*.cpp",
-        ],
-    ),
+    cxx_srcs = glob(["platform/cxx/**/*.cpp"]),
+    # FIXME: android relies on stubs implemented for the cxx platform
+    fbandroid_srcs = glob(["platform/cxx/**/*.cpp"]),
+    fbandroid_tests_override = [],
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags() + [
         "-DLOG_TAG=\"ReactNative\"",
@@ -99,7 +83,7 @@ rn_xplat_cxx_library(
     tests = [":tests"],
     visibility = ["PUBLIC"],
     deps = [
-        "//xplat/folly:headers_only",
+        "//xplat/folly:headers_only_do_not_use",
         "//xplat/folly:molly",
         YOGA_CXX_TARGET,
         react_native_xplat_target("react/debug:debug"),
@@ -121,7 +105,7 @@ fb_xplat_cxx_test(
         "-Wall",
     ],
     contacts = ["oncall+react_native@xmail.facebook.com"],
-    platforms = (ANDROID, APPLE, CXX),
+    platforms = (APPLE, CXX),
     deps = [
         ":imagemanager",
         "//xplat/folly:molly",

package/ReactCommon/react/renderer/mapbuffer/BUCK

@@ -47,7 +47,7 @@ rn_xplat_cxx_library(
     deps = [
         "//third-party/glog:glog",
         "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:headers_only",
+        "//xplat/folly:headers_only_do_not_use",
         "//xplat/folly:memory",
         react_native_xplat_target("react/debug:debug"),
     ],

package/ReactCommon/react/renderer/mounting/BUCK

@@ -50,7 +50,7 @@ rn_xplat_cxx_library(
     deps = [
         "//third-party/glog:glog",
         "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:headers_only",
+        "//xplat/folly:headers_only_do_not_use",
         "//xplat/folly:memory",
         "//xplat/folly:molly",
         react_native_xplat_target("butter:butter"),

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

@@ -341,7 +341,8 @@ static void calculateShadowViewMutationsV2(
     ShadowViewMutation::List &mutations,
     ShadowView const &parentShadowView,
     ShadowViewNodePair::NonOwningList &&oldChildPairs,
-    ShadowViewNodePair::NonOwningList &&newChildPairs);
+    ShadowViewNodePair::NonOwningList &&newChildPairs,
+    bool isRecursionRedundant = false);
 
 struct OrderedMutationInstructionContainer {
   ShadowViewMutation::List createMutations{};
@@ -1083,7 +1084,9 @@ static void calculateShadowViewMutationsV2(
     ShadowViewMutation::List &mutations,
     ShadowView const &parentShadowView,
     ShadowViewNodePair::NonOwningList &&oldChildPairs,
-    ShadowViewNodePair::NonOwningList &&newChildPairs) {
+    ShadowViewNodePair::NonOwningList &&newChildPairs,
+    bool isRecursionRedundant) {
+  SystraceSection s("Differentiator::calculateShadowViewMutationsV2");
   if (oldChildPairs.empty() && newChildPairs.empty()) {
     return;
   }
@@ -1201,13 +1204,39 @@ static void calculateShadowViewMutationsV2(
         continue;
       }
 
+      // If we take this path, technically the operations and recursion below
+      // are redundant. However, some parts of the Fabric ecosystem (namely, as
+      // of writing this, LayoutAnimations) rely heavily on getting /explicit/
+      // Remove/Delete instructions for every single node in the tree. Thus, we
+      // generate the "RemoveDeleteTree" instruction as well as all of the
+      // individual Remove/Delete operations below, but we mark those as
+      // redundant. The platform layer can then discard the unnecessary
+      // instructions. RemoveDeleteTreeMutation is a significant performance
+      // improvement but could be improved significantly by eliminating the need
+      // for any of the redundant instructions in the future.
+      if (ShadowViewMutation::PlatformSupportsRemoveDeleteTreeInstruction &&
+          !isRecursionRedundant) {
+        mutationContainer.removeMutations.push_back(
+            ShadowViewMutation::RemoveDeleteTreeMutation(
+                parentShadowView,
+                oldChildPair.shadowView,
+                static_cast<int>(oldChildPair.mountIndex)));
+      }
+
       mutationContainer.deleteMutations.push_back(
-          ShadowViewMutation::DeleteMutation(oldChildPair.shadowView));
+          ShadowViewMutation::DeleteMutation(
+              oldChildPair.shadowView,
+              isRecursionRedundant ||
+                  ShadowViewMutation::
+                      PlatformSupportsRemoveDeleteTreeInstruction));
       mutationContainer.removeMutations.push_back(
           ShadowViewMutation::RemoveMutation(
               parentShadowView,
               oldChildPair.shadowView,
-              static_cast<int>(oldChildPair.mountIndex)));
+              static_cast<int>(oldChildPair.mountIndex),
+              isRecursionRedundant ||
+                  ShadowViewMutation::
+                      PlatformSupportsRemoveDeleteTreeInstruction));
 
       // We also have to call the algorithm recursively to clean up the entire
       // subtree starting from the removed view.
@@ -1220,7 +1249,8 @@ static void calculateShadowViewMutationsV2(
           oldChildPair.shadowView,
           sliceChildShadowNodeViewPairsFromViewNodePair(
               oldChildPair, innerScope),
-          {});
+          {},
+          ShadowViewMutation::PlatformSupportsRemoveDeleteTreeInstruction);
     }
   } else if (index == oldChildPairs.size()) {
     // If we don't have any more existing children we can choose a fast path

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

@@ -161,8 +161,8 @@ static ShadowNode::Unshared progressState(
 }
 
 static void updateMountedFlag(
-    const SharedShadowNodeList &oldChildren,
-    const SharedShadowNodeList &newChildren) {
+    const ShadowNode::ListOfShared &oldChildren,
+    const ShadowNode::ListOfShared &newChildren) {
   // This is a simplified version of Diffing algorithm that only updates
   // `mounted` flag on `ShadowNode`s. The algorithm sets "mounted" flag before
   // "unmounted" to allow `ShadowNode` detect a situation where the node was

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

@@ -12,6 +12,12 @@
 namespace facebook {
 namespace react {
 
+/**
+ * Initialize static feature flags for this module.
+ * These flags should be treated as temporary.
+ */
+bool ShadowViewMutation::PlatformSupportsRemoveDeleteTreeInstruction = false;
+
 ShadowViewMutation ShadowViewMutation::CreateMutation(ShadowView shadowView) {
   return {
       /* .type = */ Create,
@@ -22,13 +28,16 @@ ShadowViewMutation ShadowViewMutation::CreateMutation(ShadowView shadowView) {
   };
 }
 
-ShadowViewMutation ShadowViewMutation::DeleteMutation(ShadowView shadowView) {
+ShadowViewMutation ShadowViewMutation::DeleteMutation(
+    ShadowView shadowView,
+    bool isRedundantOperation) {
   return {
       /* .type = */ Delete,
       /* .parentShadowView = */ {},
       /* .oldChildShadowView = */ std::move(shadowView),
       /* .newChildShadowView = */ {},
       /* .index = */ -1,
+      /* .isRedundantOperation */ isRedundantOperation,
   };
 }
 
@@ -48,13 +57,28 @@ ShadowViewMutation ShadowViewMutation::InsertMutation(
 ShadowViewMutation ShadowViewMutation::RemoveMutation(
     ShadowView parentShadowView,
     ShadowView childShadowView,
-    int index) {
+    int index,
+    bool isRedundantOperation) {
   return {
       /* .type = */ Remove,
       /* .parentShadowView = */ std::move(parentShadowView),
       /* .oldChildShadowView = */ std::move(childShadowView),
       /* .newChildShadowView = */ {},
       /* .index = */ index,
+      /* .isRedundantOperation */ isRedundantOperation,
+  };
+}
+
+ShadowViewMutation ShadowViewMutation::RemoveDeleteTreeMutation(
+    ShadowView parentShadowView,
+    ShadowView childShadowView,
+    int index) {
+  return {
+      /* .type = */ RemoveDeleteTree,
+      /* .parentShadowView = */ std::move(parentShadowView),
+      /* .oldChildShadowView = */ std::move(childShadowView),
+      /* .newChildShadowView = */ {},
+      /* .index = */ index,
   };
 }
 
@@ -91,12 +115,14 @@ ShadowViewMutation::ShadowViewMutation(
     ShadowView parentShadowView,
     ShadowView oldChildShadowView,
     ShadowView newChildShadowView,
-    int index)
+    int index,
+    bool isRedundantOperation)
     : type(type),
       parentShadowView(std::move(parentShadowView)),
       oldChildShadowView(std::move(oldChildShadowView)),
       newChildShadowView(std::move(newChildShadowView)),
-      index(index) {}
+      index(index),
+      isRedundantOperation(isRedundantOperation) {}
 
 #if RN_DEBUG_STRING_CONVERTIBLE
 
@@ -112,6 +138,8 @@ std::string getDebugName(ShadowViewMutation const &mutation) {
       return "Remove";
     case ShadowViewMutation::Update:
       return "Update";
+    case ShadowViewMutation::RemoveDeleteTree:
+      return "RemoveDeleteTree";
   }
 }
 

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

@@ -25,6 +25,10 @@ struct ShadowViewMutation final {
 
   ShadowViewMutation() = delete;
 
+#pragma mark - Platform feature flags
+
+  static bool PlatformSupportsRemoveDeleteTreeInstruction;
+
 #pragma mark - Designated Initializers
 
   /*
@@ -35,7 +39,9 @@ struct ShadowViewMutation final {
   /*
    * Creates and returns an `Delete` mutation.
    */
-  static ShadowViewMutation DeleteMutation(ShadowView shadowView);
+  static ShadowViewMutation DeleteMutation(
+      ShadowView shadowView,
+      bool isRedundantOperation = false);
 
   /*
    * Creates and returns an `Insert` mutation.
@@ -49,6 +55,18 @@ struct ShadowViewMutation final {
    * Creates and returns a `Remove` mutation.
    */
   static ShadowViewMutation RemoveMutation(
+      ShadowView parentShadowView,
+      ShadowView childShadowView,
+      int index,
+      bool isRedundantOperation = false);
+
+  /*
+   * Creates and returns a `RemoveDelete` mutation.
+   * This is a signal to (for supported platforms)
+   * remove and delete an entire subtree with a single
+   * instruction.
+   */
+  static ShadowViewMutation RemoveDeleteTreeMutation(
       ShadowView parentShadowView,
       ShadowView childShadowView,
       int index);
@@ -62,7 +80,14 @@ struct ShadowViewMutation final {
 
 #pragma mark - Type
 
-  enum Type { Create = 1, Delete = 2, Insert = 4, Remove = 8, Update = 16 };
+  enum Type {
+    Create = 1,
+    Delete = 2,
+    Insert = 4,
+    Remove = 8,
+    Update = 16,
+    RemoveDeleteTree = 32
+  };
 
 #pragma mark - Fields
 
@@ -72,6 +97,12 @@ struct ShadowViewMutation final {
   ShadowView newChildShadowView = {};
   int index = -1;
 
+  // RemoveDeleteTree causes many Remove/Delete operations to be redundant.
+  // However, we must internally produce all of them for any consumers that
+  // rely on explicit instructions to remove/delete every node in the tree.
+  // Notably (as of the time of writing this) LayoutAnimations.
+  bool isRedundantOperation = false;
+
   // Some platforms can have the notion of virtual views - views that are in the
   // ShadowTree hierarchy but never are on the platform. Generally this is used
   // so notify the platform that a view exists so that we can keep EventEmitters
@@ -85,7 +116,8 @@ struct ShadowViewMutation final {
       ShadowView parentShadowView,
       ShadowView oldChildShadowView,
       ShadowView newChildShadowView,
-      int index);
+      int index,
+      bool isRedundantOperation = false);
 };
 
 using ShadowViewMutationList = std::vector<ShadowViewMutation>;

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

@@ -35,7 +35,7 @@ class StubView final {
   ComponentHandle componentHandle;
   SurfaceId surfaceId;
   Tag tag;
-  SharedProps props;
+  Props::Shared props;
   SharedEventEmitter eventEmitter;
   LayoutMetrics layoutMetrics;
   State::Shared state;