@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/LayoutAnimations/LayoutAnimationsProxy.h

@@ -1,147 +1,147 @@
-#pragma once
-#ifdef RCT_NEW_ARCH_ENABLED
-
-#include <reanimated/Fabric/PropsRegistry.h>
-#include <reanimated/LayoutAnimations/LayoutAnimationsManager.h>
-#include <reanimated/LayoutAnimations/LayoutAnimationsUtils.h>
-
-#include <worklets/Tools/UIScheduler.h>
-
-#include <react/renderer/componentregistry/ComponentDescriptorFactory.h>
-#include <react/renderer/mounting/MountingOverrideDelegate.h>
-#include <react/renderer/mounting/ShadowView.h>
-
-#include <memory>
-#include <string>
-#include <unordered_map>
-#include <unordered_set>
-#include <vector>
-
-namespace reanimated {
-
-class ReanimatedModuleProxy;
-
-using namespace facebook;
-
-struct LayoutAnimation {
-#if REACT_NATIVE_MINOR_VERSION >= 78
-  std::shared_ptr<ShadowView> finalView, currentView;
-  Tag parentTag;
-#else
-  std::shared_ptr<ShadowView> finalView, currentView, parentView;
-#endif // REACT_NATIVE_MINOR_VERSION >= 78
-  std::optional<double> opacity;
-  int count = 1;
-  LayoutAnimation &operator=(const LayoutAnimation &other) = default;
-};
-
-struct LayoutAnimationsProxy
-    : public MountingOverrideDelegate,
-      public std::enable_shared_from_this<LayoutAnimationsProxy> {
-  mutable std::unordered_map<Tag, std::shared_ptr<Node>> nodeForTag_;
-  mutable std::unordered_map<Tag, LayoutAnimation> layoutAnimations_;
-  mutable std::recursive_mutex mutex;
-  mutable SurfaceManager surfaceManager;
-  mutable std::unordered_set<std::shared_ptr<MutationNode>> deadNodes;
-  mutable std::unordered_map<Tag, int> leastRemoved;
-  std::shared_ptr<LayoutAnimationsManager> layoutAnimationsManager_;
-  ContextContainer::Shared contextContainer_;
-  SharedComponentDescriptorRegistry componentDescriptorRegistry_;
-  jsi::Runtime &uiRuntime_;
-  const std::shared_ptr<UIScheduler> uiScheduler_;
-  LayoutAnimationsProxy(
-      std::shared_ptr<LayoutAnimationsManager> layoutAnimationsManager,
-      SharedComponentDescriptorRegistry componentDescriptorRegistry,
-      ContextContainer::Shared contextContainer,
-      jsi::Runtime &uiRuntime,
-      const std::shared_ptr<UIScheduler> uiScheduler)
-      : layoutAnimationsManager_(layoutAnimationsManager),
-        contextContainer_(contextContainer),
-        componentDescriptorRegistry_(componentDescriptorRegistry),
-        uiRuntime_(uiRuntime),
-        uiScheduler_(uiScheduler) {}
-
-  void startEnteringAnimation(const int tag, ShadowViewMutation &mutation)
-      const;
-  void startExitingAnimation(const int tag, ShadowViewMutation &mutation) const;
-  void startLayoutAnimation(const int tag, const ShadowViewMutation &mutation)
-      const;
-
-  void transferConfigFromNativeID(const std::string nativeId, const int tag)
-      const;
-  std::optional<SurfaceId> progressLayoutAnimation(
-      int tag,
-      const jsi::Object &newStyle);
-  std::optional<SurfaceId> endLayoutAnimation(int tag, bool shouldRemove);
-  void maybeCancelAnimation(const int tag) const;
-
-  void parseRemoveMutations(
-      std::unordered_map<Tag, ShadowView> &movedViews,
-      ShadowViewMutationList &mutations,
-      std::vector<std::shared_ptr<MutationNode>> &roots) const;
-  void handleRemovals(
-      ShadowViewMutationList &filteredMutations,
-      std::vector<std::shared_ptr<MutationNode>> &roots) const;
-
-  void handleUpdatesAndEnterings(
-      ShadowViewMutationList &filteredMutations,
-      const std::unordered_map<Tag, ShadowView> &movedViews,
-      ShadowViewMutationList &mutations,
-      const PropsParserContext &propsParserContext,
-      SurfaceId surfaceId) const;
-  void addOngoingAnimations(
-      SurfaceId surfaceId,
-      ShadowViewMutationList &mutations) const;
-  void updateOngoingAnimationTarget(
-      const int tag,
-      const ShadowViewMutation &mutation) const;
-  std::shared_ptr<ShadowView> cloneViewWithoutOpacity(
-      facebook::react::ShadowViewMutation &mutation,
-      const PropsParserContext &propsParserContext) const;
-  void maybeRestoreOpacity(
-      LayoutAnimation &layoutAnimation,
-      const jsi::Object &newStyle) const;
-  void maybeUpdateWindowDimensions(
-      facebook::react::ShadowViewMutation &mutation,
-      SurfaceId surfaceId) const;
-  void createLayoutAnimation(
-      const ShadowViewMutation &mutation,
-      ShadowView &oldView,
-      const SurfaceId &surfaceId,
-      const int tag) const;
-
-  void updateIndexForMutation(ShadowViewMutation &mutation) const;
-
-  void removeRecursively(
-      std::shared_ptr<MutationNode> node,
-      ShadowViewMutationList &mutations) const;
-  bool startAnimationsRecursively(
-      std::shared_ptr<MutationNode> node,
-      const bool shouldRemoveSubviewsWithoutAnimations,
-      const bool shouldAnimate,
-      const bool isScreenPop,
-      ShadowViewMutationList &mutations) const;
-  void endAnimationsRecursively(
-      std::shared_ptr<MutationNode> node,
-      ShadowViewMutationList &mutations) const;
-  void maybeDropAncestors(
-      std::shared_ptr<Node> node,
-      std::shared_ptr<MutationNode> child,
-      ShadowViewMutationList &cleanupMutations) const;
-
-  const ComponentDescriptor &getComponentDescriptorForShadowView(
-      const ShadowView &shadowView) const;
-
-  // MountingOverrideDelegate
-
-  bool shouldOverridePullTransaction() const override;
-  std::optional<MountingTransaction> pullTransaction(
-      SurfaceId surfaceId,
-      MountingTransaction::Number number,
-      const TransactionTelemetry &telemetry,
-      ShadowViewMutationList mutations) const override;
-};
-
-} // namespace reanimated
-
-#endif // RCT_NEW_ARCH_ENABLED
+#pragma once
+#ifdef RCT_NEW_ARCH_ENABLED
+
+#include <reanimated/Fabric/PropsRegistry.h>
+#include <reanimated/LayoutAnimations/LayoutAnimationsManager.h>
+#include <reanimated/LayoutAnimations/LayoutAnimationsUtils.h>
+
+#include <worklets/Tools/UIScheduler.h>
+
+#include <react/renderer/componentregistry/ComponentDescriptorFactory.h>
+#include <react/renderer/mounting/MountingOverrideDelegate.h>
+#include <react/renderer/mounting/ShadowView.h>
+
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <unordered_set>
+#include <vector>
+
+namespace reanimated {
+
+class ReanimatedModuleProxy;
+
+using namespace facebook;
+
+struct LayoutAnimation {
+#if REACT_NATIVE_MINOR_VERSION >= 78
+  std::shared_ptr<ShadowView> finalView, currentView;
+  Tag parentTag;
+#else
+  std::shared_ptr<ShadowView> finalView, currentView, parentView;
+#endif // REACT_NATIVE_MINOR_VERSION >= 78
+  std::optional<double> opacity;
+  int count = 1;
+  LayoutAnimation &operator=(const LayoutAnimation &other) = default;
+};
+
+struct LayoutAnimationsProxy
+    : public MountingOverrideDelegate,
+      public std::enable_shared_from_this<LayoutAnimationsProxy> {
+  mutable std::unordered_map<Tag, std::shared_ptr<Node>> nodeForTag_;
+  mutable std::unordered_map<Tag, LayoutAnimation> layoutAnimations_;
+  mutable std::recursive_mutex mutex;
+  mutable SurfaceManager surfaceManager;
+  mutable std::unordered_set<std::shared_ptr<MutationNode>> deadNodes;
+  mutable std::unordered_map<Tag, int> leastRemoved;
+  std::shared_ptr<LayoutAnimationsManager> layoutAnimationsManager_;
+  ContextContainer::Shared contextContainer_;
+  SharedComponentDescriptorRegistry componentDescriptorRegistry_;
+  jsi::Runtime &uiRuntime_;
+  const std::shared_ptr<UIScheduler> uiScheduler_;
+  LayoutAnimationsProxy(
+      std::shared_ptr<LayoutAnimationsManager> layoutAnimationsManager,
+      SharedComponentDescriptorRegistry componentDescriptorRegistry,
+      ContextContainer::Shared contextContainer,
+      jsi::Runtime &uiRuntime,
+      const std::shared_ptr<UIScheduler> uiScheduler)
+      : layoutAnimationsManager_(layoutAnimationsManager),
+        contextContainer_(contextContainer),
+        componentDescriptorRegistry_(componentDescriptorRegistry),
+        uiRuntime_(uiRuntime),
+        uiScheduler_(uiScheduler) {}
+
+  void startEnteringAnimation(const int tag, ShadowViewMutation &mutation)
+      const;
+  void startExitingAnimation(const int tag, ShadowViewMutation &mutation) const;
+  void startLayoutAnimation(const int tag, const ShadowViewMutation &mutation)
+      const;
+
+  void transferConfigFromNativeID(const std::string nativeId, const int tag)
+      const;
+  std::optional<SurfaceId> progressLayoutAnimation(
+      int tag,
+      const jsi::Object &newStyle);
+  std::optional<SurfaceId> endLayoutAnimation(int tag, bool shouldRemove);
+  void maybeCancelAnimation(const int tag) const;
+
+  void parseRemoveMutations(
+      std::unordered_map<Tag, ShadowView> &movedViews,
+      ShadowViewMutationList &mutations,
+      std::vector<std::shared_ptr<MutationNode>> &roots) const;
+  void handleRemovals(
+      ShadowViewMutationList &filteredMutations,
+      std::vector<std::shared_ptr<MutationNode>> &roots) const;
+
+  void handleUpdatesAndEnterings(
+      ShadowViewMutationList &filteredMutations,
+      const std::unordered_map<Tag, ShadowView> &movedViews,
+      ShadowViewMutationList &mutations,
+      const PropsParserContext &propsParserContext,
+      SurfaceId surfaceId) const;
+  void addOngoingAnimations(
+      SurfaceId surfaceId,
+      ShadowViewMutationList &mutations) const;
+  void updateOngoingAnimationTarget(
+      const int tag,
+      const ShadowViewMutation &mutation) const;
+  std::shared_ptr<ShadowView> cloneViewWithoutOpacity(
+      facebook::react::ShadowViewMutation &mutation,
+      const PropsParserContext &propsParserContext) const;
+  void maybeRestoreOpacity(
+      LayoutAnimation &layoutAnimation,
+      const jsi::Object &newStyle) const;
+  void maybeUpdateWindowDimensions(
+      facebook::react::ShadowViewMutation &mutation,
+      SurfaceId surfaceId) const;
+  void createLayoutAnimation(
+      const ShadowViewMutation &mutation,
+      ShadowView &oldView,
+      const SurfaceId &surfaceId,
+      const int tag) const;
+
+  void updateIndexForMutation(ShadowViewMutation &mutation) const;
+
+  void removeRecursively(
+      std::shared_ptr<MutationNode> node,
+      ShadowViewMutationList &mutations) const;
+  bool startAnimationsRecursively(
+      std::shared_ptr<MutationNode> node,
+      const bool shouldRemoveSubviewsWithoutAnimations,
+      const bool shouldAnimate,
+      const bool isScreenPop,
+      ShadowViewMutationList &mutations) const;
+  void endAnimationsRecursively(
+      std::shared_ptr<MutationNode> node,
+      ShadowViewMutationList &mutations) const;
+  void maybeDropAncestors(
+      std::shared_ptr<Node> node,
+      std::shared_ptr<MutationNode> child,
+      ShadowViewMutationList &cleanupMutations) const;
+
+  const ComponentDescriptor &getComponentDescriptorForShadowView(
+      const ShadowView &shadowView) const;
+
+  // MountingOverrideDelegate
+
+  bool shouldOverridePullTransaction() const override;
+  std::optional<MountingTransaction> pullTransaction(
+      SurfaceId surfaceId,
+      MountingTransaction::Number number,
+      const TransactionTelemetry &telemetry,
+      ShadowViewMutationList mutations) const override;
+};
+
+} // namespace reanimated
+
+#endif // RCT_NEW_ARCH_ENABLED

package/harmony/reanimated/src/main/cpp/Common/cpp/reanimated/LayoutAnimations/LayoutAnimationsUtils.cpp

@@ -1,91 +1,91 @@
-#ifdef RCT_NEW_ARCH_ENABLED
-#include <reanimated/LayoutAnimations/LayoutAnimationsUtils.h>
-
-namespace reanimated {
-
-std::unordered_map<Tag, UpdateValues> &SurfaceManager::getUpdateMap(
-    SurfaceId surfaceId) {
-  auto props = props_.find(surfaceId);
-  if (props != props_.end()) {
-    return *props->second;
-  }
-
-  auto newProps = std::make_shared<std::unordered_map<Tag, UpdateValues>>();
-  props_.insert_or_assign(surfaceId, newProps);
-  return *newProps;
-}
-
-void SurfaceManager::updateWindow(
-    const SurfaceId surfaceId,
-    const double windowWidth,
-    const double windowHeight) {
-  windows_.insert_or_assign(surfaceId, Rect{windowWidth, windowHeight});
-}
-
-Rect SurfaceManager::getWindow(SurfaceId surfaceId) {
-  auto windowIt = windows_.find(surfaceId);
-  if (windowIt != windows_.end()) {
-    return windowIt->second;
-  }
-  return Rect{0, 0};
-}
-
-void Node::applyMutationToIndices(ShadowViewMutation mutation) {
-#if REACT_NATIVE_MINOR_VERSION >= 78
-  const auto parentTag = mutation.parentTag;
-#else
-  const auto parentTag = mutation.parentShadowView.tag;
-#endif // REACT_NATIVE_MINOR_VERSION >= 78
-
-  if (tag != parentTag) {
-    return;
-  }
-
-  int delta = mutation.type == ShadowViewMutation::Insert ? 1 : -1;
-  for (int i = children.size() - 1; i >= 0; i--) {
-    if (children[i]->mutation.index < mutation.index) {
-      return;
-    }
-    children[i]->mutation.index += delta;
-  }
-}
-
-// Should only be called on unflattened parents
-void Node::removeChildFromUnflattenedTree(std::shared_ptr<MutationNode> child) {
-  for (int i = unflattenedChildren.size() - 1; i >= 0; i--) {
-    if (unflattenedChildren[i]->tag == child->tag) {
-      unflattenedChildren.erase(unflattenedChildren.begin() + i);
-      break;
-    }
-  }
-
-  auto &flattenedChildren = child->parent->children;
-  for (int i = flattenedChildren.size() - 1; i >= 0; i--) {
-    if (flattenedChildren[i]->tag == child->tag) {
-      flattenedChildren.erase(flattenedChildren.begin() + i);
-      return;
-    }
-    flattenedChildren[i]->mutation.index--;
-  }
-}
-
-void Node::insertChildren(
-    std::vector<std::shared_ptr<MutationNode>> &newChildren) {
-  mergeAndSwap(children, newChildren);
-}
-
-void Node::insertUnflattenedChildren(
-    std::vector<std::shared_ptr<MutationNode>> &newChildren) {
-  mergeAndSwap(unflattenedChildren, newChildren);
-}
-
-bool Node::isMutationMode() {
-  return false;
-}
-
-bool MutationNode::isMutationMode() {
-  return true;
-}
-} // namespace reanimated
-
-#endif
+#ifdef RCT_NEW_ARCH_ENABLED
+#include <reanimated/LayoutAnimations/LayoutAnimationsUtils.h>
+
+namespace reanimated {
+
+std::unordered_map<Tag, UpdateValues> &SurfaceManager::getUpdateMap(
+    SurfaceId surfaceId) {
+  auto props = props_.find(surfaceId);
+  if (props != props_.end()) {
+    return *props->second;
+  }
+
+  auto newProps = std::make_shared<std::unordered_map<Tag, UpdateValues>>();
+  props_.insert_or_assign(surfaceId, newProps);
+  return *newProps;
+}
+
+void SurfaceManager::updateWindow(
+    const SurfaceId surfaceId,
+    const double windowWidth,
+    const double windowHeight) {
+  windows_.insert_or_assign(surfaceId, Rect{windowWidth, windowHeight});
+}
+
+Rect SurfaceManager::getWindow(SurfaceId surfaceId) {
+  auto windowIt = windows_.find(surfaceId);
+  if (windowIt != windows_.end()) {
+    return windowIt->second;
+  }
+  return Rect{0, 0};
+}
+
+void Node::applyMutationToIndices(ShadowViewMutation mutation) {
+#if REACT_NATIVE_MINOR_VERSION >= 78
+  const auto parentTag = mutation.parentTag;
+#else
+  const auto parentTag = mutation.parentShadowView.tag;
+#endif // REACT_NATIVE_MINOR_VERSION >= 78
+
+  if (tag != parentTag) {
+    return;
+  }
+
+  int delta = mutation.type == ShadowViewMutation::Insert ? 1 : -1;
+  for (int i = children.size() - 1; i >= 0; i--) {
+    if (children[i]->mutation.index < mutation.index) {
+      return;
+    }
+    children[i]->mutation.index += delta;
+  }
+}
+
+// Should only be called on unflattened parents
+void Node::removeChildFromUnflattenedTree(std::shared_ptr<MutationNode> child) {
+  for (int i = unflattenedChildren.size() - 1; i >= 0; i--) {
+    if (unflattenedChildren[i]->tag == child->tag) {
+      unflattenedChildren.erase(unflattenedChildren.begin() + i);
+      break;
+    }
+  }
+
+  auto &flattenedChildren = child->parent->children;
+  for (int i = flattenedChildren.size() - 1; i >= 0; i--) {
+    if (flattenedChildren[i]->tag == child->tag) {
+      flattenedChildren.erase(flattenedChildren.begin() + i);
+      return;
+    }
+    flattenedChildren[i]->mutation.index--;
+  }
+}
+
+void Node::insertChildren(
+    std::vector<std::shared_ptr<MutationNode>> &newChildren) {
+  mergeAndSwap(children, newChildren);
+}
+
+void Node::insertUnflattenedChildren(
+    std::vector<std::shared_ptr<MutationNode>> &newChildren) {
+  mergeAndSwap(unflattenedChildren, newChildren);
+}
+
+bool Node::isMutationMode() {
+  return false;
+}
+
+bool MutationNode::isMutationMode() {
+  return true;
+}
+} // namespace reanimated
+
+#endif