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

package/harmony/reanimated/src/main/cpp/Common/cpp/reanimated/CSS/registries/CSSTransitionsRegistry.h

@@ -1,51 +1,51 @@
-#pragma once
-
-#include <reanimated/CSS/core/CSSTransition.h>
-#include <reanimated/CSS/registries/StaticPropsRegistry.h>
-#include <reanimated/CSS/utils/DelayedItemsManager.h>
-#include <reanimated/CSS/utils/props.h>
-#include <reanimated/Fabric/updates/UpdatesRegistry.h>
-#include <reanimated/Tools/PlatformDepMethodsHolder.h>
-
-#include <memory>
-#include <set>
-#include <unordered_map>
-#include <unordered_set>
-#include <utility>
-#include <vector>
-
-namespace reanimated::css {
-
-class CSSTransitionsRegistry : public UpdatesRegistry, public std::enable_shared_from_this<CSSTransitionsRegistry> {
- public:
-  CSSTransitionsRegistry(
-      const std::shared_ptr<StaticPropsRegistry> &staticPropsRegistry,
-      const GetAnimationTimestampFunction &getCurrentTimestamp);
-
-  bool isEmpty() const override;
-  bool hasUpdates() const;
-
-  void add(const std::shared_ptr<CSSTransition> &transition);
-  void updateSettings(Tag viewTag, const PartialCSSTransitionConfig &config);
-  void remove(Tag viewTag) override;
-
-  void update(double timestamp);
-
- private:
-  using Registry = std::unordered_map<Tag, std::shared_ptr<CSSTransition>>;
-
-  const GetAnimationTimestampFunction &getCurrentTimestamp_;
-  const std::shared_ptr<StaticPropsRegistry> staticPropsRegistry_;
-
-  Registry registry_;
-
-  std::unordered_set<Tag> runningTransitionTags_;
-  DelayedItemsManager<Tag> delayedTransitionsManager_;
-
-  void activateDelayedTransitions(double timestamp);
-  void scheduleOrActivateTransition(const std::shared_ptr<CSSTransition> &transition);
-  PropsObserver createPropsObserver(Tag viewTag);
-  void updateInUpdatesRegistry(const std::shared_ptr<CSSTransition> &transition, const folly::dynamic &updates);
-};
-
-} // namespace reanimated::css
+#pragma once
+
+#include <reanimated/CSS/core/CSSTransition.h>
+#include <reanimated/CSS/registries/StaticPropsRegistry.h>
+#include <reanimated/CSS/utils/DelayedItemsManager.h>
+#include <reanimated/CSS/utils/props.h>
+#include <reanimated/Fabric/updates/UpdatesRegistry.h>
+#include <reanimated/Tools/PlatformDepMethodsHolder.h>
+
+#include <memory>
+#include <set>
+#include <unordered_map>
+#include <unordered_set>
+#include <utility>
+#include <vector>
+
+namespace reanimated::css {
+
+class CSSTransitionsRegistry : public UpdatesRegistry, public std::enable_shared_from_this<CSSTransitionsRegistry> {
+ public:
+  CSSTransitionsRegistry(
+      const std::shared_ptr<StaticPropsRegistry> &staticPropsRegistry,
+      const GetAnimationTimestampFunction &getCurrentTimestamp);
+
+  bool isEmpty() const override;
+  bool hasUpdates() const;
+
+  void add(const std::shared_ptr<CSSTransition> &transition);
+  void updateSettings(Tag viewTag, const PartialCSSTransitionConfig &config);
+  void remove(Tag viewTag) override;
+
+  void update(double timestamp);
+
+ private:
+  using Registry = std::unordered_map<Tag, std::shared_ptr<CSSTransition>>;
+
+  const GetAnimationTimestampFunction &getCurrentTimestamp_;
+  const std::shared_ptr<StaticPropsRegistry> staticPropsRegistry_;
+
+  Registry registry_;
+
+  std::unordered_set<Tag> runningTransitionTags_;
+  DelayedItemsManager<Tag> delayedTransitionsManager_;
+
+  void activateDelayedTransitions(double timestamp);
+  void scheduleOrActivateTransition(const std::shared_ptr<CSSTransition> &transition);
+  PropsObserver createPropsObserver(Tag viewTag);
+  void updateInUpdatesRegistry(const std::shared_ptr<CSSTransition> &transition, const folly::dynamic &updates);
+};
+
+} // namespace reanimated::css

package/harmony/reanimated/src/main/cpp/Common/cpp/reanimated/CSS/registries/StaticPropsRegistry.cpp

@@ -1,61 +1,61 @@
-#include <reanimated/CSS/registries/StaticPropsRegistry.h>
-
-#include <utility>
-
-namespace reanimated::css {
-
-void StaticPropsRegistry::set(jsi::Runtime &rt, const Tag viewTag, const jsi::Value &props) {
-  if (props.isNull() || props.isUndefined()) {
-    remove(viewTag);
-  } else {
-    const auto newProps = dynamicFromValue(rt, props);
-    if (has(viewTag)) {
-      notifyObservers(viewTag, get(viewTag), newProps);
-    }
-    registry_[viewTag] = newProps;
-  }
-}
-
-folly::dynamic StaticPropsRegistry::get(const Tag viewTag) const {
-  auto it = registry_.find(viewTag);
-  if (it == registry_.end()) {
-    return nullptr;
-  }
-  return it->second;
-}
-
-bool StaticPropsRegistry::has(const Tag viewTag) const {
-  return registry_.find(viewTag) != registry_.end();
-}
-
-void StaticPropsRegistry::remove(const Tag viewTag) {
-  registry_.erase(viewTag);
-}
-
-bool StaticPropsRegistry::isEmpty() const {
-  return registry_.empty() && observers_.empty();
-}
-
-bool StaticPropsRegistry::hasObservers(const Tag viewTag) const {
-  return observers_.find(viewTag) != observers_.end();
-}
-
-void StaticPropsRegistry::setObserver(const Tag viewTag, PropsObserver observer) {
-  observers_[viewTag] = std::move(observer);
-}
-
-void StaticPropsRegistry::removeObserver(const Tag viewTag) {
-  observers_.erase(viewTag);
-}
-
-void StaticPropsRegistry::notifyObservers(
-    const Tag viewTag,
-    const folly::dynamic &oldProps,
-    const folly::dynamic &newProps) {
-  auto observerIt = observers_.find(viewTag);
-  if (observerIt != observers_.end()) {
-    observerIt->second(oldProps, newProps);
-  }
-}
-
-} // namespace reanimated::css
+#include <reanimated/CSS/registries/StaticPropsRegistry.h>
+
+#include <utility>
+
+namespace reanimated::css {
+
+void StaticPropsRegistry::set(jsi::Runtime &rt, const Tag viewTag, const jsi::Value &props) {
+  if (props.isNull() || props.isUndefined()) {
+    remove(viewTag);
+  } else {
+    const auto newProps = dynamicFromValue(rt, props);
+    if (has(viewTag)) {
+      notifyObservers(viewTag, get(viewTag), newProps);
+    }
+    registry_[viewTag] = newProps;
+  }
+}
+
+folly::dynamic StaticPropsRegistry::get(const Tag viewTag) const {
+  auto it = registry_.find(viewTag);
+  if (it == registry_.end()) {
+    return nullptr;
+  }
+  return it->second;
+}
+
+bool StaticPropsRegistry::has(const Tag viewTag) const {
+  return registry_.find(viewTag) != registry_.end();
+}
+
+void StaticPropsRegistry::remove(const Tag viewTag) {
+  registry_.erase(viewTag);
+}
+
+bool StaticPropsRegistry::isEmpty() const {
+  return registry_.empty() && observers_.empty();
+}
+
+bool StaticPropsRegistry::hasObservers(const Tag viewTag) const {
+  return observers_.find(viewTag) != observers_.end();
+}
+
+void StaticPropsRegistry::setObserver(const Tag viewTag, PropsObserver observer) {
+  observers_[viewTag] = std::move(observer);
+}
+
+void StaticPropsRegistry::removeObserver(const Tag viewTag) {
+  observers_.erase(viewTag);
+}
+
+void StaticPropsRegistry::notifyObservers(
+    const Tag viewTag,
+    const folly::dynamic &oldProps,
+    const folly::dynamic &newProps) {
+  auto observerIt = observers_.find(viewTag);
+  if (observerIt != observers_.end()) {
+    observerIt->second(oldProps, newProps);
+  }
+}
+
+} // namespace reanimated::css

package/harmony/reanimated/src/main/cpp/Common/cpp/reanimated/CSS/registries/StaticPropsRegistry.h

@@ -1,33 +1,33 @@
-#pragma once
-
-#include <react/renderer/core/ShadowNode.h>
-
-#include <unordered_map>
-
-namespace reanimated::css {
-
-using namespace facebook;
-using namespace react;
-
-using PropsObserver = std::function<void(const folly::dynamic &oldProps, const folly::dynamic &newProps)>;
-
-class StaticPropsRegistry {
- public:
-  void set(jsi::Runtime &rt, Tag viewTag, const jsi::Value &props);
-  folly::dynamic get(Tag viewTag) const;
-  bool has(Tag viewTag) const;
-  void remove(Tag viewTag);
-  bool isEmpty() const;
-
-  bool hasObservers(Tag viewTag) const;
-  void setObserver(Tag viewTag, PropsObserver observer);
-  void removeObserver(Tag viewTag);
-
- private:
-  std::unordered_map<Tag, folly::dynamic> registry_;
-  std::unordered_map<Tag, PropsObserver> observers_;
-
-  void notifyObservers(Tag viewTag, const folly::dynamic &oldProps, const folly::dynamic &newProps);
-};
-
-} // namespace reanimated::css
+#pragma once
+
+#include <react/renderer/core/ShadowNode.h>
+
+#include <unordered_map>
+
+namespace reanimated::css {
+
+using namespace facebook;
+using namespace react;
+
+using PropsObserver = std::function<void(const folly::dynamic &oldProps, const folly::dynamic &newProps)>;
+
+class StaticPropsRegistry {
+ public:
+  void set(jsi::Runtime &rt, Tag viewTag, const jsi::Value &props);
+  folly::dynamic get(Tag viewTag) const;
+  bool has(Tag viewTag) const;
+  void remove(Tag viewTag);
+  bool isEmpty() const;
+
+  bool hasObservers(Tag viewTag) const;
+  void setObserver(Tag viewTag, PropsObserver observer);
+  void removeObserver(Tag viewTag);
+
+ private:
+  std::unordered_map<Tag, folly::dynamic> registry_;
+  std::unordered_map<Tag, PropsObserver> observers_;
+
+  void notifyObservers(Tag viewTag, const folly::dynamic &oldProps, const folly::dynamic &newProps);
+};
+
+} // namespace reanimated::css

package/harmony/reanimated/src/main/cpp/Common/cpp/reanimated/CSS/svg/values/SVGBrush.cpp

@@ -1,80 +1,80 @@
-#include <reanimated/CSS/svg/values/SVGBrush.h>
-
-#include <string>
-
-namespace reanimated::css {
-
-SVGBrush::SVGBrush(jsi::Runtime &rt, const jsi::Value &value)
-    : CSSColorBase<SVGBrushType, SVGBrush>(SVGBrushType::Transparent) {
-  if (value.isBool()) {
-    *this = SVGBrush(value.getBool());
-  } else if (value.isNumber()) {
-    *this = SVGBrush(static_cast<int64_t>(value.getNumber()));
-  } else if (value.asString(rt).utf8(rt) == "currentColor") {
-    colorType = SVGBrushType::CurrentColor;
-  }
-}
-
-SVGBrush::SVGBrush(const folly::dynamic &value) : CSSColorBase<SVGBrushType, SVGBrush>(SVGBrushType::Transparent) {
-  if (value.isBool()) {
-    *this = SVGBrush(value.getBool());
-  } else if (value.isNumber()) {
-    *this = SVGBrush(value.asInt());
-  } else if (value.asString() == "currentColor") {
-    colorType = SVGBrushType::CurrentColor;
-  }
-}
-
-bool SVGBrush::canConstruct(jsi::Runtime &rt, const jsi::Value &jsiValue) {
-  return jsiValue.isNumber() || jsiValue.isBool() ||
-      (jsiValue.isString() && jsiValue.getString(rt).utf8(rt) == "currentColor");
-}
-
-bool SVGBrush::canConstruct(const folly::dynamic &value) {
-  return value.isNumber() || value.isBool() || value.asString() == "currentColor";
-}
-
-folly::dynamic SVGBrush::toDynamic() const {
-  switch (colorType) {
-    case SVGBrushType::Rgba:
-      return (channels[3] << 24) | (channels[0] << 16) | (channels[1] << 8) | channels[2];
-    case SVGBrushType::CurrentColor:
-      return nullptr; // currentColor is represented as nullptr in SVG
-    default:
-      return 0; // Transparent
-  }
-}
-
-std::string SVGBrush::toString() const {
-  switch (colorType) {
-    case SVGBrushType::Rgba:
-      return "rgba(" + std::to_string(channels[0]) + "," + std::to_string(channels[1]) + "," +
-          std::to_string(channels[2]) + "," + std::to_string(channels[3]) + ")";
-    case SVGBrushType::CurrentColor:
-      return "currentColor";
-    default:
-      return "transparent";
-  }
-}
-
-SVGBrush SVGBrush::interpolate(double progress, const SVGBrush &to) const {
-  if (!isInterpolatable()) {
-    return progress < 0.5 ? *this : to;
-  }
-  return CSSColorBase<SVGBrushType, SVGBrush>::interpolate(progress, to);
-}
-
-bool SVGBrush::isInterpolatable() const {
-  return colorType == SVGBrushType::Rgba || colorType == SVGBrushType::Transparent;
-}
-
-#ifndef NDEBUG
-
-std::ostream &operator<<(std::ostream &os, const SVGBrush &colorValue) {
-  os << "SVGBrush(" << colorValue.toString() << ")";
-  return os;
-}
-
-#endif // NDEBUG
-
-} // namespace reanimated::css
+#include <reanimated/CSS/svg/values/SVGBrush.h>
+
+#include <string>
+
+namespace reanimated::css {
+
+SVGBrush::SVGBrush(jsi::Runtime &rt, const jsi::Value &value)
+    : CSSColorBase<SVGBrushType, SVGBrush>(SVGBrushType::Transparent) {
+  if (value.isBool()) {
+    *this = SVGBrush(value.getBool());
+  } else if (value.isNumber()) {
+    *this = SVGBrush(static_cast<int64_t>(value.getNumber()));
+  } else if (value.asString(rt).utf8(rt) == "currentColor") {
+    colorType = SVGBrushType::CurrentColor;
+  }
+}
+
+SVGBrush::SVGBrush(const folly::dynamic &value) : CSSColorBase<SVGBrushType, SVGBrush>(SVGBrushType::Transparent) {
+  if (value.isBool()) {
+    *this = SVGBrush(value.getBool());
+  } else if (value.isNumber()) {
+    *this = SVGBrush(value.asInt());
+  } else if (value.asString() == "currentColor") {
+    colorType = SVGBrushType::CurrentColor;
+  }
+}
+
+bool SVGBrush::canConstruct(jsi::Runtime &rt, const jsi::Value &jsiValue) {
+  return jsiValue.isNumber() || jsiValue.isBool() ||
+      (jsiValue.isString() && jsiValue.getString(rt).utf8(rt) == "currentColor");
+}
+
+bool SVGBrush::canConstruct(const folly::dynamic &value) {
+  return value.isNumber() || value.isBool() || value.asString() == "currentColor";
+}
+
+folly::dynamic SVGBrush::toDynamic() const {
+  switch (colorType) {
+    case SVGBrushType::Rgba:
+      return (channels[3] << 24) | (channels[0] << 16) | (channels[1] << 8) | channels[2];
+    case SVGBrushType::CurrentColor:
+      return nullptr; // currentColor is represented as nullptr in SVG
+    default:
+      return 0; // Transparent
+  }
+}
+
+std::string SVGBrush::toString() const {
+  switch (colorType) {
+    case SVGBrushType::Rgba:
+      return "rgba(" + std::to_string(channels[0]) + "," + std::to_string(channels[1]) + "," +
+          std::to_string(channels[2]) + "," + std::to_string(channels[3]) + ")";
+    case SVGBrushType::CurrentColor:
+      return "currentColor";
+    default:
+      return "transparent";
+  }
+}
+
+SVGBrush SVGBrush::interpolate(double progress, const SVGBrush &to) const {
+  if (!isInterpolatable()) {
+    return progress < 0.5 ? *this : to;
+  }
+  return CSSColorBase<SVGBrushType, SVGBrush>::interpolate(progress, to);
+}
+
+bool SVGBrush::isInterpolatable() const {
+  return colorType == SVGBrushType::Rgba || colorType == SVGBrushType::Transparent;
+}
+
+#ifndef NDEBUG
+
+std::ostream &operator<<(std::ostream &os, const SVGBrush &colorValue) {
+  os << "SVGBrush(" << colorValue.toString() << ")";
+  return os;
+}
+
+#endif // NDEBUG
+
+} // namespace reanimated::css

package/harmony/reanimated/src/main/cpp/Common/cpp/reanimated/CSS/svg/values/SVGBrush.h

@@ -1,39 +1,39 @@
-#pragma once
-
-#include <reanimated/CSS/common/values/CSSColor.h>
-
-#include <string>
-
-namespace reanimated::css {
-
-enum class SVGBrushType : std::uint8_t {
-  Rgba,
-  Transparent,
-  CurrentColor,
-};
-
-struct SVGBrush : public CSSColorBase<SVGBrushType, SVGBrush> {
-  using CSSColorBase<SVGBrushType, SVGBrush>::CSSColorBase;
-  using CSSColorBase<SVGBrushType, SVGBrush>::operator==;
-
-  explicit SVGBrush(jsi::Runtime &rt, const jsi::Value &jsiValue);
-  explicit SVGBrush(const folly::dynamic &value);
-
-  static bool canConstruct(jsi::Runtime &rt, const jsi::Value &jsiValue);
-  static bool canConstruct(const folly::dynamic &value);
-
-  folly::dynamic toDynamic() const override;
-  std::string toString() const override;
-
-  SVGBrush interpolate(double progress, const SVGBrush &to) const override;
-  bool isInterpolatable() const;
-
-#ifndef NDEBUG
-  friend std::ostream &operator<<(std::ostream &os, const SVGBrush &colorValue);
-#endif // NDEBUG
-
- private:
-  static bool isValidColorString(const std::string &value);
-};
-
-} // namespace reanimated::css
+#pragma once
+
+#include <reanimated/CSS/common/values/CSSColor.h>
+
+#include <string>
+
+namespace reanimated::css {
+
+enum class SVGBrushType : std::uint8_t {
+  Rgba,
+  Transparent,
+  CurrentColor,
+};
+
+struct SVGBrush : public CSSColorBase<SVGBrushType, SVGBrush> {
+  using CSSColorBase<SVGBrushType, SVGBrush>::CSSColorBase;
+  using CSSColorBase<SVGBrushType, SVGBrush>::operator==;
+
+  explicit SVGBrush(jsi::Runtime &rt, const jsi::Value &jsiValue);
+  explicit SVGBrush(const folly::dynamic &value);
+
+  static bool canConstruct(jsi::Runtime &rt, const jsi::Value &jsiValue);
+  static bool canConstruct(const folly::dynamic &value);
+
+  folly::dynamic toDynamic() const override;
+  std::string toString() const override;
+
+  SVGBrush interpolate(double progress, const SVGBrush &to) const override;
+  bool isInterpolatable() const;
+
+#ifndef NDEBUG
+  friend std::ostream &operator<<(std::ostream &os, const SVGBrush &colorValue);
+#endif // NDEBUG
+
+ private:
+  static bool isValidColorString(const std::string &value);
+};
+
+} // namespace reanimated::css