@react-native-ohos/react-native-reanimated 3.18.1-rc.5 → 3.18.2-rc.2

package/harmony/reanimated/src/main/cpp/Common/cpp/reanimated/Fabric/ReanimatedMountHook.cpp

@@ -1,87 +1,96 @@
-#ifdef RCT_NEW_ARCH_ENABLED
-
-#include <reanimated/Fabric/ReanimatedCommitShadowNode.h>
-#include <reanimated/Fabric/ReanimatedMountHook.h>
-
-namespace reanimated {
-
-ReanimatedMountHook::ReanimatedMountHook(
-    const std::shared_ptr<PropsRegistry> &propsRegistry,
-    const std::shared_ptr<UIManager> &uiManager)
-    : propsRegistry_(propsRegistry), uiManager_(uiManager) {
-  uiManager_->registerMountHook(*this);
-}
-
-ReanimatedMountHook::~ReanimatedMountHook() noexcept {
-  uiManager_->unregisterMountHook(*this);
-}
-
-void ReanimatedMountHook::shadowTreeDidMount(
-    const RootShadowNode::Shared &rootShadowNode,
-    double) noexcept {
-  auto reaShadowNode =
-      std::reinterpret_pointer_cast<ReanimatedCommitShadowNode>(
-          std::const_pointer_cast<RootShadowNode>(rootShadowNode));
-
-  if (reaShadowNode->hasReanimatedMountTrait()) {
-    // We mark reanimated commits with ReanimatedMountTrait. We don't want other
-    // shadow nodes to use this trait, but since this rootShadowNode is Shared,
-    // we don't have that guarantee. That's why we also unset this trait in the
-    // commit hook. We remove it here mainly for the sake of cleanliness.
-    reaShadowNode->unsetReanimatedMountTrait();
-    return;
-  }
-
-  {
-    auto lock = propsRegistry_->createLock();
-    propsRegistry_->handleNodeRemovals(*rootShadowNode);
-
-    // When commit from React Native has finished, we reset the skip commit flag
-    // in order to allow Reanimated to commit its tree
-    propsRegistry_->unpauseReanimatedCommits();
-    if (!propsRegistry_->shouldCommitAfterPause()) {
-      return;
-    }
-  }
-
-  const auto &shadowTreeRegistry = uiManager_->getShadowTreeRegistry();
-  shadowTreeRegistry.visit(
-      rootShadowNode->getSurfaceId(), [&](ShadowTree const &shadowTree) {
-        shadowTree.commit(
-            [&](RootShadowNode const &oldRootShadowNode)
-                -> RootShadowNode::Unshared {
-              PropsMap propsMap;
-
-              RootShadowNode::Unshared rootNode =
-                  std::static_pointer_cast<RootShadowNode>(
-                      oldRootShadowNode.ShadowNode::clone({}));
-              {
-                auto lock = propsRegistry_->createLock();
-
-                propsRegistry_->for_each([&](const ShadowNodeFamily &family,
-                                             const folly::dynamic &props) {
-                  propsMap[&family].emplace_back(props);
-                });
-
-                rootNode =
-                    cloneShadowTreeWithNewProps(oldRootShadowNode, propsMap);
-              }
-
-              // Mark the commit as Reanimated commit so that we can
-              // distinguish it in ReanimatedCommitHook.
-              auto reaShadowNode =
-                  std::reinterpret_pointer_cast<ReanimatedCommitShadowNode>(
-                      rootNode);
-              reaShadowNode->setReanimatedCommitTrait();
-
-              return rootNode;
-            },
-            {/* .enableStateReconciliation = */
-             false,
-             /* .mountSynchronously = */ true});
-      });
-}
-
-} // namespace reanimated
-
-#endif // RCT_NEW_ARCH_ENABLED
+#ifdef RCT_NEW_ARCH_ENABLED
+
+#include <glog/logging.h>
+#include <reanimated/Fabric/ReanimatedCommitShadowNode.h>
+#include <reanimated/Fabric/ReanimatedMountHook.h>
+
+namespace reanimated {
+
+ReanimatedMountHook::ReanimatedMountHook(
+    const std::shared_ptr<PropsRegistry> &propsRegistry,
+    const std::shared_ptr<UIManager> &uiManager)
+    : propsRegistry_(propsRegistry), uiManager_(uiManager) {
+  uiManager_->registerMountHook(*this);
+}
+
+ReanimatedMountHook::~ReanimatedMountHook() noexcept {
+  uiManager_->unregisterMountHook(*this);
+}
+
+void ReanimatedMountHook::shadowTreeDidMount(
+    const RootShadowNode::Shared &rootShadowNode,
+    double) noexcept {
+  auto reaShadowNode =
+      std::reinterpret_pointer_cast<ReanimatedCommitShadowNode>(
+          std::const_pointer_cast<RootShadowNode>(rootShadowNode));
+
+  if (reaShadowNode->hasReanimatedMountTrait()) {
+    // We mark reanimated commits with ReanimatedMountTrait. We don't want other
+    // shadow nodes to use this trait, but since this rootShadowNode is Shared,
+    // we don't have that guarantee. That's why we also unset this trait in the
+    // commit hook. We remove it here mainly for the sake of cleanliness.
+    reaShadowNode->unsetReanimatedMountTrait();
+    return;
+  }
+
+  {
+    auto lock = propsRegistry_->createLock();
+    propsRegistry_->handleNodeRemovals(*rootShadowNode);
+
+    // When commit from React Native has finished, we reset the skip commit flag
+    // in order to allow Reanimated to commit its tree
+    propsRegistry_->unpauseReanimatedCommits();
+    if (!propsRegistry_->shouldCommitAfterPause()) {
+      return;
+    }
+  }
+
+  try {
+    const auto &shadowTreeRegistry = uiManager_->getShadowTreeRegistry();
+    shadowTreeRegistry.visit(
+        rootShadowNode->getSurfaceId(), [=](ShadowTree const &shadowTree) {
+        shadowTree.commit(
+            [=](RootShadowNode const &oldRootShadowNode)
+                -> RootShadowNode::Unshared {
+              PropsMap propsMap;
+
+              RootShadowNode::Unshared rootNode =
+                  std::static_pointer_cast<RootShadowNode>(
+                      oldRootShadowNode.ShadowNode::clone({}));
+
+              if (rootNode) {
+                auto lock = propsRegistry_->createLock();
+
+                if (!propsRegistry_->isEmpty()) {
+                  propsRegistry_->for_each([&](const ShadowNodeFamily &family,
+                                               const folly::dynamic &props) {
+                    propsMap[&family].emplace_back(props);
+                  });
+
+                  rootNode = cloneShadowTreeWithNewProps(oldRootShadowNode, propsMap);
+                }
+              }
+
+              if (rootNode) {
+                auto reaShadowNode =
+                    std::reinterpret_pointer_cast<ReanimatedCommitShadowNode>(
+                        rootNode);
+                reaShadowNode->setReanimatedCommitTrait();
+              }
+
+              return rootNode;
+            },
+            {/* .enableStateReconciliation = */
+             false,
+             /* .mountSynchronously = */ true});
+      });
+  } catch (const std::exception &e) {
+    LOG(ERROR) << "ReanimatedMountHook::shadowTreeDidMount error: " << e.what();
+  } catch (...) {
+    LOG(ERROR) << "ReanimatedMountHook::shadowTreeDidMount unknown error";
+  }
+}
+
+} // namespace reanimated
+
+#endif // RCT_NEW_ARCH_ENABLED

package/harmony/reanimated/src/main/cpp/Common/cpp/reanimated/Fabric/ReanimatedMountHook.h

@@ -1,33 +1,33 @@
-#pragma once
-#ifdef RCT_NEW_ARCH_ENABLED
-
-#include <reanimated/Fabric/PropsRegistry.h>
-#include <reanimated/Fabric/ShadowTreeCloner.h>
-
-#include <react/renderer/uimanager/UIManagerMountHook.h>
-
-#include <memory>
-
-namespace reanimated {
-
-using namespace facebook::react;
-
-class ReanimatedMountHook : public UIManagerMountHook {
- public:
-  ReanimatedMountHook(
-      const std::shared_ptr<PropsRegistry> &propsRegistry,
-      const std::shared_ptr<UIManager> &uiManager);
-  ~ReanimatedMountHook() noexcept override;
-
-  void shadowTreeDidMount(
-      RootShadowNode::Shared const &rootShadowNode,
-      double mountTime) noexcept override;
-
- private:
-  const std::shared_ptr<PropsRegistry> propsRegistry_;
-  const std::shared_ptr<UIManager> uiManager_;
-};
-
-} // namespace reanimated
-
-#endif // RCT_NEW_ARCH_ENABLED
+#pragma once
+#ifdef RCT_NEW_ARCH_ENABLED
+
+#include <reanimated/Fabric/PropsRegistry.h>
+#include <reanimated/Fabric/ShadowTreeCloner.h>
+
+#include <react/renderer/uimanager/UIManagerMountHook.h>
+
+#include <memory>
+
+namespace reanimated {
+
+using namespace facebook::react;
+
+class ReanimatedMountHook : public UIManagerMountHook {
+ public:
+  ReanimatedMountHook(
+      const std::shared_ptr<PropsRegistry> &propsRegistry,
+      const std::shared_ptr<UIManager> &uiManager);
+  ~ReanimatedMountHook() noexcept override;
+
+  void shadowTreeDidMount(
+      RootShadowNode::Shared const &rootShadowNode,
+      double mountTime) noexcept override;
+
+ private:
+  const std::shared_ptr<PropsRegistry> propsRegistry_;
+  const std::shared_ptr<UIManager> uiManager_;
+};
+
+} // namespace reanimated
+
+#endif // RCT_NEW_ARCH_ENABLED

package/harmony/reanimated/src/main/cpp/Common/cpp/reanimated/Fabric/ShadowTreeCloner.cpp

@@ -1,95 +1,95 @@
-#ifdef RCT_NEW_ARCH_ENABLED
-
-#include <reanimated/Fabric/ShadowTreeCloner.h>
-
-#include <ranges>
-#include <utility>
-
-namespace reanimated {
-
-Props::Shared mergeProps(
-    const ShadowNode &shadowNode,
-    const PropsMap &propsMap,
-    const ShadowNodeFamily &family) {
-  const auto it = propsMap.find(&family);
-
-  if (it == propsMap.end()) {
-    return ShadowNodeFragment::propsPlaceholder();
-  }
-
-  PropsParserContext propsParserContext{
-      shadowNode.getSurfaceId(), *shadowNode.getContextContainer()};
-  const auto &propsVector = it->second;
-  auto newProps = shadowNode.getProps();
-
-#ifdef ANDROID
-  if (propsVector.size() > 1) {
-    folly::dynamic newPropsDynamic = folly::dynamic::object;
-    for (const auto &props : propsVector) {
-      newPropsDynamic = folly::dynamic::merge(
-          props.operator folly::dynamic(), newPropsDynamic);
-    }
-    return shadowNode.getComponentDescriptor().cloneProps(
-        propsParserContext, newProps, RawProps(newPropsDynamic));
-  }
-#endif
-
-  for (const auto &props : propsVector) {
-    newProps = shadowNode.getComponentDescriptor().cloneProps(
-        propsParserContext, newProps, RawProps(props));
-  }
-
-  return newProps;
-}
-
-ShadowNode::Unshared cloneShadowTreeWithNewPropsRecursive(
-    const ShadowNode &shadowNode,
-    const ChildrenMap &childrenMap,
-    const PropsMap &propsMap) {
-  const auto family = &shadowNode.getFamily();
-  const auto affectedChildrenIt = childrenMap.find(family);
-  auto children = shadowNode.getChildren();
-
-  if (affectedChildrenIt != childrenMap.end()) {
-    for (const auto index : affectedChildrenIt->second) {
-      children[index] = cloneShadowTreeWithNewPropsRecursive(
-          *children[index], childrenMap, propsMap);
-    }
-  }
-
-  return shadowNode.clone(
-      {mergeProps(shadowNode, propsMap, *family),
-       std::make_shared<ShadowNode::ListOfShared>(children),
-       shadowNode.getState()});
-}
-
-RootShadowNode::Unshared cloneShadowTreeWithNewProps(
-    const RootShadowNode &oldRootNode,
-    const PropsMap &propsMap) {
-  ChildrenMap childrenMap;
-
-  for (auto &[family, _] : propsMap) {
-    const auto ancestors = family->getAncestors(oldRootNode);
-
-    for (const auto &[parentNode, index] :
-         std::ranges::reverse_view(ancestors)) {
-      const auto parentFamily = &parentNode.get().getFamily();
-      auto &affectedChildren = childrenMap[parentFamily];
-
-      if (affectedChildren.contains(index)) {
-        continue;
-      }
-
-      affectedChildren.insert(index);
-    }
-  }
-
-  // This cast is safe, because this function returns a clone
-  // of the oldRootNode, which is an instance of RootShadowNode
-  return std::static_pointer_cast<RootShadowNode>(
-      cloneShadowTreeWithNewPropsRecursive(oldRootNode, childrenMap, propsMap));
-}
-
-} // namespace reanimated
-
-#endif // RCT_NEW_ARCH_ENABLED
+#ifdef RCT_NEW_ARCH_ENABLED
+
+#include <reanimated/Fabric/ShadowTreeCloner.h>
+
+#include <ranges>
+#include <utility>
+
+namespace reanimated {
+
+Props::Shared mergeProps(
+    const ShadowNode &shadowNode,
+    const PropsMap &propsMap,
+    const ShadowNodeFamily &family) {
+  const auto it = propsMap.find(&family);
+
+  if (it == propsMap.end()) {
+    return ShadowNodeFragment::propsPlaceholder();
+  }
+
+  PropsParserContext propsParserContext{
+      shadowNode.getSurfaceId(), *shadowNode.getContextContainer()};
+  const auto &propsVector = it->second;
+  auto newProps = shadowNode.getProps();
+
+#ifdef ANDROID
+  if (propsVector.size() > 1) {
+    folly::dynamic newPropsDynamic = folly::dynamic::object;
+    for (const auto &props : propsVector) {
+      newPropsDynamic = folly::dynamic::merge(
+          props.operator folly::dynamic(), newPropsDynamic);
+    }
+    return shadowNode.getComponentDescriptor().cloneProps(
+        propsParserContext, newProps, RawProps(newPropsDynamic));
+  }
+#endif
+
+  for (const auto &props : propsVector) {
+    newProps = shadowNode.getComponentDescriptor().cloneProps(
+        propsParserContext, newProps, RawProps(props));
+  }
+
+  return newProps;
+}
+
+ShadowNode::Unshared cloneShadowTreeWithNewPropsRecursive(
+    const ShadowNode &shadowNode,
+    const ChildrenMap &childrenMap,
+    const PropsMap &propsMap) {
+  const auto family = &shadowNode.getFamily();
+  const auto affectedChildrenIt = childrenMap.find(family);
+  auto children = shadowNode.getChildren();
+
+  if (affectedChildrenIt != childrenMap.end()) {
+    for (const auto index : affectedChildrenIt->second) {
+      children[index] = cloneShadowTreeWithNewPropsRecursive(
+          *children[index], childrenMap, propsMap);
+    }
+  }
+
+  return shadowNode.clone(
+      {mergeProps(shadowNode, propsMap, *family),
+       std::make_shared<ShadowNode::ListOfShared>(children),
+       shadowNode.getState()});
+}
+
+RootShadowNode::Unshared cloneShadowTreeWithNewProps(
+    const RootShadowNode &oldRootNode,
+    const PropsMap &propsMap) {
+  ChildrenMap childrenMap;
+
+  for (auto &[family, _] : propsMap) {
+    const auto ancestors = family->getAncestors(oldRootNode);
+
+    for (const auto &[parentNode, index] :
+         std::ranges::reverse_view(ancestors)) {
+      const auto parentFamily = &parentNode.get().getFamily();
+      auto &affectedChildren = childrenMap[parentFamily];
+
+      if (affectedChildren.contains(index)) {
+        continue;
+      }
+
+      affectedChildren.insert(index);
+    }
+  }
+
+  // This cast is safe, because this function returns a clone
+  // of the oldRootNode, which is an instance of RootShadowNode
+  return std::static_pointer_cast<RootShadowNode>(
+      cloneShadowTreeWithNewPropsRecursive(oldRootNode, childrenMap, propsMap));
+}
+
+} // namespace reanimated
+
+#endif // RCT_NEW_ARCH_ENABLED

package/harmony/reanimated/src/main/cpp/Common/cpp/reanimated/Fabric/ShadowTreeCloner.h

@@ -1,29 +1,29 @@
-#pragma once
-#ifdef RCT_NEW_ARCH_ENABLED
-
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/uimanager/UIManager.h>
-
-#include <memory>
-#include <type_traits>
-#include <unordered_map>
-#include <unordered_set>
-#include <vector>
-
-using namespace facebook;
-using namespace react;
-
-namespace reanimated {
-
-using PropsMap =
-    std::unordered_map<const ShadowNodeFamily *, std::vector<RawProps>>;
-using ChildrenMap =
-    std::unordered_map<const ShadowNodeFamily *, std::unordered_set<int>>;
-
-RootShadowNode::Unshared cloneShadowTreeWithNewProps(
-    const RootShadowNode &oldRootNode,
-    const PropsMap &propsMap);
-
-} // namespace reanimated
-
-#endif // RCT_NEW_ARCH_ENABLED
+#pragma once
+#ifdef RCT_NEW_ARCH_ENABLED
+
+#include <react/renderer/core/PropsParserContext.h>
+#include <react/renderer/uimanager/UIManager.h>
+
+#include <memory>
+#include <type_traits>
+#include <unordered_map>
+#include <unordered_set>
+#include <vector>
+
+using namespace facebook;
+using namespace react;
+
+namespace reanimated {
+
+using PropsMap =
+    std::unordered_map<const ShadowNodeFamily *, std::vector<RawProps>>;
+using ChildrenMap =
+    std::unordered_map<const ShadowNodeFamily *, std::unordered_set<int>>;
+
+RootShadowNode::Unshared cloneShadowTreeWithNewProps(
+    const RootShadowNode &oldRootNode,
+    const PropsMap &propsMap);
+
+} // namespace reanimated
+
+#endif // RCT_NEW_ARCH_ENABLED

package/harmony/reanimated/src/main/cpp/Common/cpp/reanimated/LayoutAnimations/LayoutAnimationType.h

@@ -1,9 +1,9 @@
-#pragma once
-
-typedef enum LayoutAnimationType {
-  ENTERING = 1,
-  EXITING = 2,
-  LAYOUT = 3,
-  SHARED_ELEMENT_TRANSITION = 4,
-  SHARED_ELEMENT_TRANSITION_PROGRESS = 5,
-} LayoutAnimationType;
+#pragma once
+
+typedef enum LayoutAnimationType {
+  ENTERING = 1,
+  EXITING = 2,
+  LAYOUT = 3,
+  SHARED_ELEMENT_TRANSITION = 4,
+  SHARED_ELEMENT_TRANSITION_PROGRESS = 5,
+} LayoutAnimationType;