@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/CSS/misc/ViewStylesRepository.cpp

@@ -1,155 +1,155 @@
-#include <reanimated/CSS/misc/ViewStylesRepository.h>
-
-#include <memory>
-#include <string>
-
-namespace reanimated::css {
-
-ViewStylesRepository::ViewStylesRepository(
-    const std::shared_ptr<StaticPropsRegistry> &staticPropsRegistry,
-    const std::shared_ptr<AnimatedPropsRegistry> &animatedPropsRegistry)
-    : staticPropsRegistry_(staticPropsRegistry), animatedPropsRegistry_(animatedPropsRegistry) {}
-
-jsi::Value ViewStylesRepository::getNodeProp(
-    const std::shared_ptr<const ShadowNode> &shadowNode,
-    const std::string &propName) {
-  int tag = shadowNode->getTag();
-
-  auto &cachedNode = shadowNodeCache_[tag];
-  updateCacheIfNeeded(cachedNode, shadowNode);
-
-  if (propName == "width" || propName == "height" || propName == "top" || propName == "left") {
-    const auto &layoutMetrics = cachedNode.layoutMetrics;
-
-    if (propName == "width") {
-      return {layoutMetrics.frame.size.width};
-    } else if (propName == "height") {
-      return {layoutMetrics.frame.size.height};
-    } else if (propName == "top") {
-      return {layoutMetrics.frame.origin.y};
-    } else if (propName == "left") {
-      return {layoutMetrics.frame.origin.x};
-    }
-  } else {
-    const auto &viewProps = cachedNode.viewProps;
-
-    if (propName == "opacity") {
-      return {viewProps->opacity};
-    } else if (propName == "zIndex") {
-      return viewProps->zIndex.has_value() ? jsi::Value(*viewProps->zIndex) : jsi::Value(0);
-    } else if (propName == "backgroundColor") {
-      return {static_cast<int32_t>(*viewProps->backgroundColor)};
-    }
-  }
-
-  throw std::runtime_error("[Reanimated] Unsupported property: " + propName);
-}
-
-jsi::Value ViewStylesRepository::getParentNodeProp(
-    const std::shared_ptr<const ShadowNode> &shadowNode,
-    const std::string &propName) {
-  const auto surfaceId = shadowNode->getSurfaceId();
-  const auto &shadowTreeRegistry = uiManager_->getShadowTreeRegistry();
-
-  std::shared_ptr<const ShadowNode> parentNode = nullptr;
-
-  shadowTreeRegistry.visit(surfaceId, [&](ShadowTree const &shadowTree) {
-    auto currentRevision = shadowTree.getCurrentRevision();
-    parentNode = dom::getParentNode(currentRevision.rootShadowNode, *shadowNode);
-  });
-
-  if (!parentNode) {
-    return jsi::Value::undefined();
-  }
-
-  return getNodeProp(parentNode, propName);
-}
-
-folly::dynamic ViewStylesRepository::getStyleProp(const Tag tag, const PropertyPath &propertyPath) {
-  auto animatedValue = getPropertyValue(animatedPropsRegistry_->get(tag), propertyPath);
-  if (!animatedValue.isNull()) {
-    return animatedValue;
-  }
-
-  return getPropertyValue(staticPropsRegistry_->get(tag), propertyPath);
-}
-
-void ViewStylesRepository::clearNodesCache() {
-  shadowNodeCache_.clear();
-}
-
-void ViewStylesRepository::updateCacheIfNeeded(
-    CachedShadowNode &cachedNode,
-    const std::shared_ptr<const ShadowNode> &shadowNode) {
-  auto newestCloneOfShadowNode = uiManager_->getNewestCloneOfShadowNode(*shadowNode);
-
-  // Check if newestCloneOfShadowNode is valid (is already mounted / not
-  // yet unmounted)
-  if (!newestCloneOfShadowNode) {
-    return;
-  }
-
-  auto layoutableShadowNode = dynamic_cast<const LayoutableShadowNode *>(newestCloneOfShadowNode.get());
-  if (!layoutableShadowNode) {
-    return;
-  }
-
-  cachedNode.layoutMetrics = layoutableShadowNode->layoutMetrics_;
-  cachedNode.viewProps = std::static_pointer_cast<const ViewProps>(newestCloneOfShadowNode->getProps());
-}
-
-folly::dynamic ViewStylesRepository::getPropertyValue(const folly::dynamic &value, const PropertyPath &propertyPath) {
-  const folly::dynamic *currentValue = &value;
-
-  for (size_t i = 0; i < propertyPath.size(); ++i) {
-    if (currentValue->isNull() || currentValue->empty()) {
-      return {};
-    }
-
-    const auto &propName = propertyPath[i];
-
-    if (!currentValue->isObject()) {
-      return {};
-    }
-
-    if (propName == "transform") {
-      auto transformIt = currentValue->find("transform");
-      if (transformIt == currentValue->items().end()) {
-        return {};
-      }
-
-      const auto &transform = transformIt->second;
-      if (!transform.isArray()) {
-        return {};
-      }
-
-      if (i + 1 >= propertyPath.size()) {
-        return transform;
-      }
-
-      const std::string &transformPropName = propertyPath[i + 1];
-
-      for (const auto &transformEntry : transform) {
-        if (transformEntry.isObject()) {
-          auto transformPropIt = transformEntry.find(transformPropName);
-          if (transformPropIt != transformEntry.items().end()) {
-            return transformPropIt->second;
-          }
-        }
-      }
-
-      return {};
-    }
-
-    auto propIt = currentValue->find(propName);
-    if (propIt == currentValue->items().end()) {
-      return {};
-    }
-
-    currentValue = &propIt->second;
-  }
-
-  return *currentValue;
-}
-
-} // namespace reanimated::css
+#include <reanimated/CSS/misc/ViewStylesRepository.h>
+
+#include <memory>
+#include <string>
+
+namespace reanimated::css {
+
+ViewStylesRepository::ViewStylesRepository(
+    const std::shared_ptr<StaticPropsRegistry> &staticPropsRegistry,
+    const std::shared_ptr<AnimatedPropsRegistry> &animatedPropsRegistry)
+    : staticPropsRegistry_(staticPropsRegistry), animatedPropsRegistry_(animatedPropsRegistry) {}
+
+jsi::Value ViewStylesRepository::getNodeProp(
+    const std::shared_ptr<const ShadowNode> &shadowNode,
+    const std::string &propName) {
+  int tag = shadowNode->getTag();
+
+  auto &cachedNode = shadowNodeCache_[tag];
+  updateCacheIfNeeded(cachedNode, shadowNode);
+
+  if (propName == "width" || propName == "height" || propName == "top" || propName == "left") {
+    const auto &layoutMetrics = cachedNode.layoutMetrics;
+
+    if (propName == "width") {
+      return {layoutMetrics.frame.size.width};
+    } else if (propName == "height") {
+      return {layoutMetrics.frame.size.height};
+    } else if (propName == "top") {
+      return {layoutMetrics.frame.origin.y};
+    } else if (propName == "left") {
+      return {layoutMetrics.frame.origin.x};
+    }
+  } else {
+    const auto &viewProps = cachedNode.viewProps;
+
+    if (propName == "opacity") {
+      return {viewProps->opacity};
+    } else if (propName == "zIndex") {
+      return viewProps->zIndex.has_value() ? jsi::Value(*viewProps->zIndex) : jsi::Value(0);
+    } else if (propName == "backgroundColor") {
+      return {static_cast<int32_t>(*viewProps->backgroundColor)};
+    }
+  }
+
+  throw std::runtime_error("[Reanimated] Unsupported property: " + propName);
+}
+
+jsi::Value ViewStylesRepository::getParentNodeProp(
+    const std::shared_ptr<const ShadowNode> &shadowNode,
+    const std::string &propName) {
+  const auto surfaceId = shadowNode->getSurfaceId();
+  const auto &shadowTreeRegistry = uiManager_->getShadowTreeRegistry();
+
+  std::shared_ptr<const ShadowNode> parentNode = nullptr;
+
+  shadowTreeRegistry.visit(surfaceId, [&](ShadowTree const &shadowTree) {
+    auto currentRevision = shadowTree.getCurrentRevision();
+    parentNode = dom::getParentNode(currentRevision.rootShadowNode, *shadowNode);
+  });
+
+  if (!parentNode) {
+    return jsi::Value::undefined();
+  }
+
+  return getNodeProp(parentNode, propName);
+}
+
+folly::dynamic ViewStylesRepository::getStyleProp(const Tag tag, const PropertyPath &propertyPath) {
+  auto animatedValue = getPropertyValue(animatedPropsRegistry_->get(tag), propertyPath);
+  if (!animatedValue.isNull()) {
+    return animatedValue;
+  }
+
+  return getPropertyValue(staticPropsRegistry_->get(tag), propertyPath);
+}
+
+void ViewStylesRepository::clearNodesCache() {
+  shadowNodeCache_.clear();
+}
+
+void ViewStylesRepository::updateCacheIfNeeded(
+    CachedShadowNode &cachedNode,
+    const std::shared_ptr<const ShadowNode> &shadowNode) {
+  auto newestCloneOfShadowNode = uiManager_->getNewestCloneOfShadowNode(*shadowNode);
+
+  // Check if newestCloneOfShadowNode is valid (is already mounted / not
+  // yet unmounted)
+  if (!newestCloneOfShadowNode) {
+    return;
+  }
+
+  auto layoutableShadowNode = dynamic_cast<const LayoutableShadowNode *>(newestCloneOfShadowNode.get());
+  if (!layoutableShadowNode) {
+    return;
+  }
+
+  cachedNode.layoutMetrics = layoutableShadowNode->layoutMetrics_;
+  cachedNode.viewProps = std::static_pointer_cast<const ViewProps>(newestCloneOfShadowNode->getProps());
+}
+
+folly::dynamic ViewStylesRepository::getPropertyValue(const folly::dynamic &value, const PropertyPath &propertyPath) {
+  const folly::dynamic *currentValue = &value;
+
+  for (size_t i = 0; i < propertyPath.size(); ++i) {
+    if (currentValue->isNull() || currentValue->empty()) {
+      return {};
+    }
+
+    const auto &propName = propertyPath[i];
+
+    if (!currentValue->isObject()) {
+      return {};
+    }
+
+    if (propName == "transform") {
+      auto transformIt = currentValue->find("transform");
+      if (transformIt == currentValue->items().end()) {
+        return {};
+      }
+
+      const auto &transform = transformIt->second;
+      if (!transform.isArray()) {
+        return {};
+      }
+
+      if (i + 1 >= propertyPath.size()) {
+        return transform;
+      }
+
+      const std::string &transformPropName = propertyPath[i + 1];
+
+      for (const auto &transformEntry : transform) {
+        if (transformEntry.isObject()) {
+          auto transformPropIt = transformEntry.find(transformPropName);
+          if (transformPropIt != transformEntry.items().end()) {
+            return transformPropIt->second;
+          }
+        }
+      }
+
+      return {};
+    }
+
+    auto propIt = currentValue->find(propName);
+    if (propIt == currentValue->items().end()) {
+      return {};
+    }
+
+    currentValue = &propIt->second;
+  }
+
+  return *currentValue;
+}
+
+} // namespace reanimated::css

package/harmony/reanimated/src/main/cpp/Common/cpp/reanimated/CSS/misc/ViewStylesRepository.h

@@ -1,53 +1,53 @@
-#pragma once
-
-#include <reanimated/CSS/common/definitions.h>
-#include <reanimated/CSS/registries/StaticPropsRegistry.h>
-#include <reanimated/Fabric/updates/AnimatedPropsRegistry.h>
-
-#include <react/renderer/components/view/ViewProps.h>
-#include <react/renderer/core/LayoutableShadowNode.h>
-#include <react/renderer/dom/DOM.h>
-
-#include <memory>
-#include <string>
-#include <unordered_map>
-
-namespace reanimated::css {
-
-using namespace facebook;
-using namespace react;
-
-struct CachedShadowNode {
-  LayoutMetrics layoutMetrics;
-  std::shared_ptr<const ViewProps> viewProps;
-};
-
-class ViewStylesRepository {
- public:
-  ViewStylesRepository(
-      const std::shared_ptr<StaticPropsRegistry> &staticPropsRegistry,
-      const std::shared_ptr<AnimatedPropsRegistry> &animatedPropsRegistry);
-
-  void setUIManager(const std::shared_ptr<UIManager> &uiManager) {
-    uiManager_ = uiManager;
-  }
-
-  jsi::Value getNodeProp(const std::shared_ptr<const ShadowNode> &shadowNode, const std::string &propName);
-  jsi::Value getParentNodeProp(const std::shared_ptr<const ShadowNode> &shadowNode, const std::string &propName);
-  folly::dynamic getStyleProp(Tag tag, const PropertyPath &propertyPath);
-
-  void clearNodesCache();
-
- private:
-  std::shared_ptr<UIManager> uiManager_;
-  std::shared_ptr<StaticPropsRegistry> staticPropsRegistry_;
-  std::shared_ptr<AnimatedPropsRegistry> animatedPropsRegistry_;
-
-  std::unordered_map<int, CachedShadowNode> shadowNodeCache_;
-
-  void updateCacheIfNeeded(CachedShadowNode &cachedNode, const std::shared_ptr<const ShadowNode> &shadowNode);
-
-  static folly::dynamic getPropertyValue(const folly::dynamic &value, const PropertyPath &propertyPath);
-};
-
-} // namespace reanimated::css
+#pragma once
+
+#include <reanimated/CSS/common/definitions.h>
+#include <reanimated/CSS/registries/StaticPropsRegistry.h>
+#include <reanimated/Fabric/updates/AnimatedPropsRegistry.h>
+
+#include <react/renderer/components/view/ViewProps.h>
+#include <react/renderer/core/LayoutableShadowNode.h>
+#include <react/renderer/dom/DOM.h>
+
+#include <memory>
+#include <string>
+#include <unordered_map>
+
+namespace reanimated::css {
+
+using namespace facebook;
+using namespace react;
+
+struct CachedShadowNode {
+  LayoutMetrics layoutMetrics;
+  std::shared_ptr<const ViewProps> viewProps;
+};
+
+class ViewStylesRepository {
+ public:
+  ViewStylesRepository(
+      const std::shared_ptr<StaticPropsRegistry> &staticPropsRegistry,
+      const std::shared_ptr<AnimatedPropsRegistry> &animatedPropsRegistry);
+
+  void setUIManager(const std::shared_ptr<UIManager> &uiManager) {
+    uiManager_ = uiManager;
+  }
+
+  jsi::Value getNodeProp(const std::shared_ptr<const ShadowNode> &shadowNode, const std::string &propName);
+  jsi::Value getParentNodeProp(const std::shared_ptr<const ShadowNode> &shadowNode, const std::string &propName);
+  folly::dynamic getStyleProp(Tag tag, const PropertyPath &propertyPath);
+
+  void clearNodesCache();
+
+ private:
+  std::shared_ptr<UIManager> uiManager_;
+  std::shared_ptr<StaticPropsRegistry> staticPropsRegistry_;
+  std::shared_ptr<AnimatedPropsRegistry> animatedPropsRegistry_;
+
+  std::unordered_map<int, CachedShadowNode> shadowNodeCache_;
+
+  void updateCacheIfNeeded(CachedShadowNode &cachedNode, const std::shared_ptr<const ShadowNode> &shadowNode);
+
+  static folly::dynamic getPropertyValue(const folly::dynamic &value, const PropertyPath &propertyPath);
+};
+
+} // namespace reanimated::css