@react-native-ohos/react-native-reanimated 4.0.0-rc.1 → 4.0.2-beta.1

package/harmony/reanimated/src/main/cpp/Common/cpp/reanimated/Fabric/updates/UpdatesRegistryManager.cpp

@@ -1,161 +1,161 @@
-#include <reanimated/Fabric/updates/UpdatesRegistryManager.h>
-#include <reanimated/Tools/FeatureFlags.h>
-
-#include <memory>
-#include <utility>
-#include <vector>
-
-namespace reanimated {
-
-UpdatesRegistryManager::UpdatesRegistryManager(const std::shared_ptr<StaticPropsRegistry> &staticPropsRegistry)
-    : staticPropsRegistry_(staticPropsRegistry) {}
-
-std::lock_guard<std::mutex> UpdatesRegistryManager::lock() const {
-  return std::lock_guard<std::mutex>{mutex_};
-}
-
-void UpdatesRegistryManager::addRegistry(const std::shared_ptr<UpdatesRegistry> &registry) {
-  if (!registry) {
-    throw std::invalid_argument("[Reanimated] Registry cannot be null");
-  }
-  registries_.push_back(registry);
-}
-
-void UpdatesRegistryManager::pauseReanimatedCommits() {
-  if constexpr (!StaticFeatureFlags::getFlag("DISABLE_COMMIT_PAUSING_MECHANISM")) {
-    isPaused_ = true;
-  }
-}
-
-bool UpdatesRegistryManager::shouldReanimatedSkipCommit() {
-  return isPaused_;
-}
-
-void UpdatesRegistryManager::unpauseReanimatedCommits() {
-  isPaused_ = false;
-}
-
-void UpdatesRegistryManager::pleaseCommitAfterPause() {
-  shouldCommitAfterPause_ = true;
-}
-
-void UpdatesRegistryManager::cancelCommitAfterPause() {
-  shouldCommitAfterPause_ = false;
-}
-
-bool UpdatesRegistryManager::shouldCommitAfterPause() {
-  return shouldCommitAfterPause_.exchange(false);
-}
-
-void UpdatesRegistryManager::markNodeAsRemovable(const std::shared_ptr<const ShadowNode> &shadowNode) {
-  removableShadowNodes_[shadowNode->getTag()] = shadowNode;
-}
-
-void UpdatesRegistryManager::unmarkNodeAsRemovable(Tag viewTag) {
-  removableShadowNodes_.erase(viewTag);
-}
-
-void UpdatesRegistryManager::handleNodeRemovals(const RootShadowNode &rootShadowNode) {
-  RemovableShadowNodes remainingShadowNodes;
-
-  for (const auto &[tag, shadowNode] : removableShadowNodes_) {
-    if (!shadowNode) {
-      continue;
-    }
-
-    if (shadowNode->getFamily().getAncestors(rootShadowNode).empty()) {
-      for (auto &registry : registries_) {
-        registry->remove(tag);
-      }
-      staticPropsRegistry_->remove(tag);
-    } else {
-      remainingShadowNodes.emplace(tag, shadowNode);
-    }
-  }
-
-  removableShadowNodes_ = std::move(remainingShadowNodes);
-}
-
-PropsMap UpdatesRegistryManager::collectProps() {
-  PropsMap propsMap;
-  for (auto &registry : registries_) {
-    registry->collectProps(propsMap);
-  }
-  return propsMap;
-}
-
-#ifdef ANDROID
-
-bool UpdatesRegistryManager::hasPropsToRevert() {
-  for (auto &registry : registries_) {
-    if (registry->hasPropsToRevert()) {
-      return true;
-    }
-  }
-  return false;
-}
-
-void UpdatesRegistryManager::addToPropsMap(
-    PropsMap &propsMap,
-    const std::shared_ptr<const ShadowNode> &shadowNode,
-    const folly::dynamic &props) {
-  auto &family = shadowNode->getFamily();
-  auto it = propsMap.find(&family);
-
-  if (it == propsMap.cend()) {
-    auto propsVector = std::vector<RawProps>{};
-    propsVector.emplace_back(props);
-    propsMap.emplace(&family, propsVector);
-  } else {
-    it->second.emplace_back(props);
-  }
-}
-
-void UpdatesRegistryManager::collectPropsToRevertBySurface(std::unordered_map<SurfaceId, PropsMap> &propsMapBySurface) {
-  for (const auto &registry : registries_) {
-    registry->collectPropsToRevert(propsToRevertMap_);
-  }
-
-  for (const auto &[tag, pair] : propsToRevertMap_) {
-    const auto &[shadowNode, props] = pair;
-    const auto &staticStyle = staticPropsRegistry_->get(tag);
-    folly::dynamic filteredStyle = folly::dynamic::object;
-
-    for (const auto &propName : props) {
-      if (!staticStyle.isNull() && staticStyle.count(propName) > 0) {
-        filteredStyle[propName] = staticStyle[propName];
-        continue;
-      }
-
-      const auto &componentName = shadowNode->getComponentName();
-      const auto &interpolators = getComponentInterpolators(componentName);
-      const auto &it = interpolators.find(propName);
-
-      if (it != interpolators.end()) {
-        filteredStyle[propName] = it->second->getDefaultValue().toDynamic();
-        continue;
-      }
-
-      filteredStyle[propName] = nullptr;
-    }
-
-    const auto &surfaceId = shadowNode->getSurfaceId();
-    auto &propsMap = propsMapBySurface[surfaceId];
-
-    addToPropsMap(propsMap, shadowNode, filteredStyle);
-  }
-}
-
-void UpdatesRegistryManager::clearPropsToRevert(const SurfaceId surfaceId) {
-  for (auto it = propsToRevertMap_.begin(); it != propsToRevertMap_.end();) {
-    if (it->second.shadowNode->getSurfaceId() == surfaceId) {
-      it = propsToRevertMap_.erase(it);
-    } else {
-      ++it;
-    }
-  }
-}
-
-#endif
-
-} // namespace reanimated
+#include <reanimated/Fabric/updates/UpdatesRegistryManager.h>
+#include <reanimated/Tools/FeatureFlags.h>
+
+#include <memory>
+#include <utility>
+#include <vector>
+
+namespace reanimated {
+
+UpdatesRegistryManager::UpdatesRegistryManager(const std::shared_ptr<StaticPropsRegistry> &staticPropsRegistry)
+    : staticPropsRegistry_(staticPropsRegistry) {}
+
+std::lock_guard<std::mutex> UpdatesRegistryManager::lock() const {
+  return std::lock_guard<std::mutex>{mutex_};
+}
+
+void UpdatesRegistryManager::addRegistry(const std::shared_ptr<UpdatesRegistry> &registry) {
+  if (!registry) {
+    throw std::invalid_argument("[Reanimated] Registry cannot be null");
+  }
+  registries_.push_back(registry);
+}
+
+void UpdatesRegistryManager::pauseReanimatedCommits() {
+  if constexpr (!StaticFeatureFlags::getFlag("DISABLE_COMMIT_PAUSING_MECHANISM")) {
+    isPaused_ = true;
+  }
+}
+
+bool UpdatesRegistryManager::shouldReanimatedSkipCommit() {
+  return isPaused_;
+}
+
+void UpdatesRegistryManager::unpauseReanimatedCommits() {
+  isPaused_ = false;
+}
+
+void UpdatesRegistryManager::pleaseCommitAfterPause() {
+  shouldCommitAfterPause_ = true;
+}
+
+void UpdatesRegistryManager::cancelCommitAfterPause() {
+  shouldCommitAfterPause_ = false;
+}
+
+bool UpdatesRegistryManager::shouldCommitAfterPause() {
+  return shouldCommitAfterPause_.exchange(false);
+}
+
+void UpdatesRegistryManager::markNodeAsRemovable(const std::shared_ptr<const ShadowNode> &shadowNode) {
+  removableShadowNodes_[shadowNode->getTag()] = shadowNode;
+}
+
+void UpdatesRegistryManager::unmarkNodeAsRemovable(Tag viewTag) {
+  removableShadowNodes_.erase(viewTag);
+}
+
+void UpdatesRegistryManager::handleNodeRemovals(const RootShadowNode &rootShadowNode) {
+  RemovableShadowNodes remainingShadowNodes;
+
+  for (const auto &[tag, shadowNode] : removableShadowNodes_) {
+    if (!shadowNode) {
+      continue;
+    }
+
+    if (shadowNode->getFamily().getAncestors(rootShadowNode).empty()) {
+      for (auto &registry : registries_) {
+        registry->remove(tag);
+      }
+      staticPropsRegistry_->remove(tag);
+    } else {
+      remainingShadowNodes.emplace(tag, shadowNode);
+    }
+  }
+
+  removableShadowNodes_ = std::move(remainingShadowNodes);
+}
+
+PropsMap UpdatesRegistryManager::collectProps() {
+  PropsMap propsMap;
+  for (auto &registry : registries_) {
+    registry->collectProps(propsMap);
+  }
+  return propsMap;
+}
+
+#ifdef ANDROID
+
+bool UpdatesRegistryManager::hasPropsToRevert() {
+  for (auto &registry : registries_) {
+    if (registry->hasPropsToRevert()) {
+      return true;
+    }
+  }
+  return false;
+}
+
+void UpdatesRegistryManager::addToPropsMap(
+    PropsMap &propsMap,
+    const std::shared_ptr<const ShadowNode> &shadowNode,
+    const folly::dynamic &props) {
+  auto &family = shadowNode->getFamily();
+  auto it = propsMap.find(&family);
+
+  if (it == propsMap.cend()) {
+    auto propsVector = std::vector<RawProps>{};
+    propsVector.emplace_back(props);
+    propsMap.emplace(&family, propsVector);
+  } else {
+    it->second.emplace_back(props);
+  }
+}
+
+void UpdatesRegistryManager::collectPropsToRevertBySurface(std::unordered_map<SurfaceId, PropsMap> &propsMapBySurface) {
+  for (const auto &registry : registries_) {
+    registry->collectPropsToRevert(propsToRevertMap_);
+  }
+
+  for (const auto &[tag, pair] : propsToRevertMap_) {
+    const auto &[shadowNode, props] = pair;
+    const auto &staticStyle = staticPropsRegistry_->get(tag);
+    folly::dynamic filteredStyle = folly::dynamic::object;
+
+    for (const auto &propName : props) {
+      if (!staticStyle.isNull() && staticStyle.count(propName) > 0) {
+        filteredStyle[propName] = staticStyle[propName];
+        continue;
+      }
+
+      const auto &componentName = shadowNode->getComponentName();
+      const auto &interpolators = getComponentInterpolators(componentName);
+      const auto &it = interpolators.find(propName);
+
+      if (it != interpolators.end()) {
+        filteredStyle[propName] = it->second->getDefaultValue().toDynamic();
+        continue;
+      }
+
+      filteredStyle[propName] = nullptr;
+    }
+
+    const auto &surfaceId = shadowNode->getSurfaceId();
+    auto &propsMap = propsMapBySurface[surfaceId];
+
+    addToPropsMap(propsMap, shadowNode, filteredStyle);
+  }
+}
+
+void UpdatesRegistryManager::clearPropsToRevert(const SurfaceId surfaceId) {
+  for (auto it = propsToRevertMap_.begin(); it != propsToRevertMap_.end();) {
+    if (it->second.shadowNode->getSurfaceId() == surfaceId) {
+      it = propsToRevertMap_.erase(it);
+    } else {
+      ++it;
+    }
+  }
+}
+
+#endif
+
+} // namespace reanimated

package/harmony/reanimated/src/main/cpp/Common/cpp/reanimated/Fabric/updates/UpdatesRegistryManager.h

@@ -1,65 +1,65 @@
-#pragma once
-
-#include <reanimated/CSS/InterpolatorRegistry.h>
-#include <reanimated/CSS/registries/StaticPropsRegistry.h>
-
-#include <reanimated/Fabric/ShadowTreeCloner.h>
-#include <reanimated/Fabric/updates/UpdatesRegistry.h>
-
-#include <memory>
-#include <unordered_map>
-#include <utility>
-#include <vector>
-
-namespace reanimated {
-
-using namespace css;
-
-class UpdatesRegistryManager {
- public:
-  explicit UpdatesRegistryManager(const std::shared_ptr<StaticPropsRegistry> &staticPropsRegistry);
-
-  std::lock_guard<std::mutex> lock() const;
-
-  // TODO - ensure that other sublibraries can easily hook into this registry
-  // manager (e.g. add priority to registries)
-  void addRegistry(const std::shared_ptr<UpdatesRegistry> &registry);
-
-  void pauseReanimatedCommits();
-  bool shouldReanimatedSkipCommit();
-  void unpauseReanimatedCommits();
-
-  void pleaseCommitAfterPause();
-  bool shouldCommitAfterPause();
-  void cancelCommitAfterPause();
-
-  void markNodeAsRemovable(const std::shared_ptr<const ShadowNode> &shadowNode);
-  void unmarkNodeAsRemovable(Tag viewTag);
-  void handleNodeRemovals(const RootShadowNode &rootShadowNode);
-  PropsMap collectProps();
-
-#ifdef ANDROID
-  bool hasPropsToRevert();
-  void collectPropsToRevertBySurface(std::unordered_map<SurfaceId, PropsMap> &propsMapBySurface);
-  void clearPropsToRevert(SurfaceId surfaceId);
-#endif
-
- private:
-  using RemovableShadowNodes = std::unordered_map<Tag, std::shared_ptr<const ShadowNode>>;
-
-  mutable std::mutex mutex_;
-  std::atomic<bool> isPaused_;
-  std::atomic<bool> shouldCommitAfterPause_;
-  RemovableShadowNodes removableShadowNodes_;
-  std::vector<std::shared_ptr<UpdatesRegistry>> registries_;
-  const std::shared_ptr<StaticPropsRegistry> staticPropsRegistry_;
-
-#ifdef ANDROID
-  PropsToRevertMap propsToRevertMap_;
-
-  static void
-  addToPropsMap(PropsMap &propsMap, const std::shared_ptr<const ShadowNode> &shadowNode, const folly::dynamic &props);
-#endif
-};
-
-} // namespace reanimated
+#pragma once
+
+#include <reanimated/CSS/InterpolatorRegistry.h>
+#include <reanimated/CSS/registries/StaticPropsRegistry.h>
+
+#include <reanimated/Fabric/ShadowTreeCloner.h>
+#include <reanimated/Fabric/updates/UpdatesRegistry.h>
+
+#include <memory>
+#include <unordered_map>
+#include <utility>
+#include <vector>
+
+namespace reanimated {
+
+using namespace css;
+
+class UpdatesRegistryManager {
+ public:
+  explicit UpdatesRegistryManager(const std::shared_ptr<StaticPropsRegistry> &staticPropsRegistry);
+
+  std::lock_guard<std::mutex> lock() const;
+
+  // TODO - ensure that other sublibraries can easily hook into this registry
+  // manager (e.g. add priority to registries)
+  void addRegistry(const std::shared_ptr<UpdatesRegistry> &registry);
+
+  void pauseReanimatedCommits();
+  bool shouldReanimatedSkipCommit();
+  void unpauseReanimatedCommits();
+
+  void pleaseCommitAfterPause();
+  bool shouldCommitAfterPause();
+  void cancelCommitAfterPause();
+
+  void markNodeAsRemovable(const std::shared_ptr<const ShadowNode> &shadowNode);
+  void unmarkNodeAsRemovable(Tag viewTag);
+  void handleNodeRemovals(const RootShadowNode &rootShadowNode);
+  PropsMap collectProps();
+
+#ifdef ANDROID
+  bool hasPropsToRevert();
+  void collectPropsToRevertBySurface(std::unordered_map<SurfaceId, PropsMap> &propsMapBySurface);
+  void clearPropsToRevert(SurfaceId surfaceId);
+#endif
+
+ private:
+  using RemovableShadowNodes = std::unordered_map<Tag, std::shared_ptr<const ShadowNode>>;
+
+  mutable std::mutex mutex_;
+  std::atomic<bool> isPaused_;
+  std::atomic<bool> shouldCommitAfterPause_;
+  RemovableShadowNodes removableShadowNodes_;
+  std::vector<std::shared_ptr<UpdatesRegistry>> registries_;
+  const std::shared_ptr<StaticPropsRegistry> staticPropsRegistry_;
+
+#ifdef ANDROID
+  PropsToRevertMap propsToRevertMap_;
+
+  static void
+  addToPropsMap(PropsMap &propsMap, const std::shared_ptr<const ShadowNode> &shadowNode, const folly::dynamic &props);
+#endif
+};
+
+} // namespace reanimated

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

@@ -1,11 +1,11 @@
-#pragma once
-
-#include <cstdint>
-
-typedef enum class LayoutAnimationType : std::uint8_t {
-  ENTERING = 1,
-  EXITING = 2,
-  LAYOUT = 3,
-  SHARED_ELEMENT_TRANSITION = 4,
-  SHARED_ELEMENT_TRANSITION_NATIVE_ID = 5,
-} LayoutAnimationType;
+#pragma once
+
+#include <cstdint>
+
+typedef enum class LayoutAnimationType : std::uint8_t {
+  ENTERING = 1,
+  EXITING = 2,
+  LAYOUT = 3,
+  SHARED_ELEMENT_TRANSITION = 4,
+  SHARED_ELEMENT_TRANSITION_NATIVE_ID = 5,
+} LayoutAnimationType;