@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/configs/CSSTransitionConfig.cpp

@@ -1,90 +1,90 @@
-#include <reanimated/CSS/configs/CSSTransitionConfig.h>
-
-#include <string>
-
-namespace reanimated::css {
-
-std::optional<CSSTransitionPropertySettings> getTransitionPropertySettings(
-    const CSSTransitionPropertiesSettings &propertiesSettings,
-    const std::string &propName) {
-  // Try to use property specific settings first
-  const auto &propIt = propertiesSettings.find(propName);
-  if (propIt != propertiesSettings.end()) {
-    return propIt->second;
-  }
-  // Fallback to "all" settings if no property specific settings are available
-  const auto &allIt = propertiesSettings.find("all");
-  if (allIt != propertiesSettings.end()) {
-    return allIt->second;
-  }
-  // Or return nullopt if no settings are available
-  return std::nullopt;
-}
-
-TransitionProperties getProperties(jsi::Runtime &rt, const jsi::Object &config) {
-  const auto transitionProperty = config.getProperty(rt, "properties");
-
-  if (transitionProperty.isObject()) {
-    PropertyNames properties;
-
-    const auto propertiesArray = transitionProperty.asObject(rt).asArray(rt);
-    const auto propertiesCount = propertiesArray.size(rt);
-    for (size_t i = 0; i < propertiesCount; ++i) {
-      properties.emplace_back(propertiesArray.getValueAtIndex(rt, i).asString(rt).utf8(rt));
-    }
-
-    return properties;
-  }
-
-  return std::nullopt;
-}
-
-bool getAllowDiscrete(jsi::Runtime &rt, const jsi::Object &config) {
-  return config.getProperty(rt, "allowDiscrete").asBool();
-}
-
-CSSTransitionPropertiesSettings parseCSSTransitionPropertiesSettings(jsi::Runtime &rt, const jsi::Object &settings) {
-  CSSTransitionPropertiesSettings result;
-
-  const auto propertyNames = settings.getPropertyNames(rt);
-  const auto propertiesCount = propertyNames.size(rt);
-
-  for (size_t i = 0; i < propertiesCount; ++i) {
-    const auto propertyName = propertyNames.getValueAtIndex(rt, i).asString(rt).utf8(rt);
-    const auto propertySettings = settings.getProperty(rt, jsi::PropNameID::forUtf8(rt, propertyName)).asObject(rt);
-
-    result.emplace(
-        propertyName,
-        CSSTransitionPropertySettings{
-            getDuration(rt, propertySettings),
-            getTimingFunction(rt, propertySettings),
-            getDelay(rt, propertySettings),
-            getAllowDiscrete(rt, propertySettings)});
-  }
-
-  return result;
-}
-
-CSSTransitionConfig parseCSSTransitionConfig(jsi::Runtime &rt, const jsi::Value &config) {
-  const auto configObj = config.asObject(rt);
-  return CSSTransitionConfig{
-      getProperties(rt, configObj),
-      parseCSSTransitionPropertiesSettings(rt, configObj.getProperty(rt, "settings").asObject(rt))};
-}
-
-PartialCSSTransitionConfig parsePartialCSSTransitionConfig(jsi::Runtime &rt, const jsi::Value &partialConfig) {
-  const auto partialObj = partialConfig.asObject(rt);
-
-  PartialCSSTransitionConfig result;
-
-  if (partialObj.hasProperty(rt, "properties")) {
-    result.properties = getProperties(rt, partialObj);
-  }
-  if (partialObj.hasProperty(rt, "settings")) {
-    result.settings = parseCSSTransitionPropertiesSettings(rt, partialObj.getProperty(rt, "settings").asObject(rt));
-  }
-
-  return result;
-}
-
-} // namespace reanimated::css
+#include <reanimated/CSS/configs/CSSTransitionConfig.h>
+
+#include <string>
+
+namespace reanimated::css {
+
+std::optional<CSSTransitionPropertySettings> getTransitionPropertySettings(
+    const CSSTransitionPropertiesSettings &propertiesSettings,
+    const std::string &propName) {
+  // Try to use property specific settings first
+  const auto &propIt = propertiesSettings.find(propName);
+  if (propIt != propertiesSettings.end()) {
+    return propIt->second;
+  }
+  // Fallback to "all" settings if no property specific settings are available
+  const auto &allIt = propertiesSettings.find("all");
+  if (allIt != propertiesSettings.end()) {
+    return allIt->second;
+  }
+  // Or return nullopt if no settings are available
+  return std::nullopt;
+}
+
+TransitionProperties getProperties(jsi::Runtime &rt, const jsi::Object &config) {
+  const auto transitionProperty = config.getProperty(rt, "properties");
+
+  if (transitionProperty.isObject()) {
+    PropertyNames properties;
+
+    const auto propertiesArray = transitionProperty.asObject(rt).asArray(rt);
+    const auto propertiesCount = propertiesArray.size(rt);
+    for (size_t i = 0; i < propertiesCount; ++i) {
+      properties.emplace_back(propertiesArray.getValueAtIndex(rt, i).asString(rt).utf8(rt));
+    }
+
+    return properties;
+  }
+
+  return std::nullopt;
+}
+
+bool getAllowDiscrete(jsi::Runtime &rt, const jsi::Object &config) {
+  return config.getProperty(rt, "allowDiscrete").asBool();
+}
+
+CSSTransitionPropertiesSettings parseCSSTransitionPropertiesSettings(jsi::Runtime &rt, const jsi::Object &settings) {
+  CSSTransitionPropertiesSettings result;
+
+  const auto propertyNames = settings.getPropertyNames(rt);
+  const auto propertiesCount = propertyNames.size(rt);
+
+  for (size_t i = 0; i < propertiesCount; ++i) {
+    const auto propertyName = propertyNames.getValueAtIndex(rt, i).asString(rt).utf8(rt);
+    const auto propertySettings = settings.getProperty(rt, jsi::PropNameID::forUtf8(rt, propertyName)).asObject(rt);
+
+    result.emplace(
+        propertyName,
+        CSSTransitionPropertySettings{
+            getDuration(rt, propertySettings),
+            getTimingFunction(rt, propertySettings),
+            getDelay(rt, propertySettings),
+            getAllowDiscrete(rt, propertySettings)});
+  }
+
+  return result;
+}
+
+CSSTransitionConfig parseCSSTransitionConfig(jsi::Runtime &rt, const jsi::Value &config) {
+  const auto configObj = config.asObject(rt);
+  return CSSTransitionConfig{
+      getProperties(rt, configObj),
+      parseCSSTransitionPropertiesSettings(rt, configObj.getProperty(rt, "settings").asObject(rt))};
+}
+
+PartialCSSTransitionConfig parsePartialCSSTransitionConfig(jsi::Runtime &rt, const jsi::Value &partialConfig) {
+  const auto partialObj = partialConfig.asObject(rt);
+
+  PartialCSSTransitionConfig result;
+
+  if (partialObj.hasProperty(rt, "properties")) {
+    result.properties = getProperties(rt, partialObj);
+  }
+  if (partialObj.hasProperty(rt, "settings")) {
+    result.settings = parseCSSTransitionPropertiesSettings(rt, partialObj.getProperty(rt, "settings").asObject(rt));
+  }
+
+  return result;
+}
+
+} // namespace reanimated::css

package/harmony/reanimated/src/main/cpp/Common/cpp/reanimated/CSS/configs/CSSTransitionConfig.h

@@ -1,43 +1,43 @@
-#pragma once
-
-#include <reanimated/CSS/common/definitions.h>
-#include <reanimated/CSS/configs/common.h>
-#include <reanimated/CSS/easing/EasingFunctions.h>
-
-#include <string>
-#include <unordered_map>
-
-namespace reanimated::css {
-
-struct CSSTransitionPropertySettings {
-  double duration;
-  EasingFunction easingFunction;
-  double delay;
-  bool allowDiscrete;
-};
-
-using CSSTransitionPropertiesSettings = std::unordered_map<std::string, CSSTransitionPropertySettings>;
-
-struct CSSTransitionConfig {
-  TransitionProperties properties;
-  CSSTransitionPropertiesSettings settings;
-};
-
-struct PartialCSSTransitionConfig {
-  std::optional<TransitionProperties> properties;
-  std::optional<CSSTransitionPropertiesSettings> settings;
-};
-
-std::optional<CSSTransitionPropertySettings> getTransitionPropertySettings(
-    const CSSTransitionPropertiesSettings &propertiesSettings,
-    const std::string &propName);
-
-TransitionProperties getProperties(jsi::Runtime &rt, const jsi::Object &config);
-
-CSSTransitionPropertiesSettings parseCSSTransitionPropertiesSettings(jsi::Runtime &rt, const jsi::Object &settings);
-
-CSSTransitionConfig parseCSSTransitionConfig(jsi::Runtime &rt, const jsi::Value &config);
-
-PartialCSSTransitionConfig parsePartialCSSTransitionConfig(jsi::Runtime &rt, const jsi::Value &partialConfig);
-
-} // namespace reanimated::css
+#pragma once
+
+#include <reanimated/CSS/common/definitions.h>
+#include <reanimated/CSS/configs/common.h>
+#include <reanimated/CSS/easing/EasingFunctions.h>
+
+#include <string>
+#include <unordered_map>
+
+namespace reanimated::css {
+
+struct CSSTransitionPropertySettings {
+  double duration;
+  EasingFunction easingFunction;
+  double delay;
+  bool allowDiscrete;
+};
+
+using CSSTransitionPropertiesSettings = std::unordered_map<std::string, CSSTransitionPropertySettings>;
+
+struct CSSTransitionConfig {
+  TransitionProperties properties;
+  CSSTransitionPropertiesSettings settings;
+};
+
+struct PartialCSSTransitionConfig {
+  std::optional<TransitionProperties> properties;
+  std::optional<CSSTransitionPropertiesSettings> settings;
+};
+
+std::optional<CSSTransitionPropertySettings> getTransitionPropertySettings(
+    const CSSTransitionPropertiesSettings &propertiesSettings,
+    const std::string &propName);
+
+TransitionProperties getProperties(jsi::Runtime &rt, const jsi::Object &config);
+
+CSSTransitionPropertiesSettings parseCSSTransitionPropertiesSettings(jsi::Runtime &rt, const jsi::Object &settings);
+
+CSSTransitionConfig parseCSSTransitionConfig(jsi::Runtime &rt, const jsi::Value &config);
+
+PartialCSSTransitionConfig parsePartialCSSTransitionConfig(jsi::Runtime &rt, const jsi::Value &partialConfig);
+
+} // namespace reanimated::css

package/harmony/reanimated/src/main/cpp/Common/cpp/reanimated/CSS/configs/common.cpp

@@ -1,17 +1,17 @@
-#include <reanimated/CSS/configs/common.h>
-
-namespace reanimated::css {
-
-double getDuration(jsi::Runtime &rt, const jsi::Object &config) {
-  return config.getProperty(rt, "duration").asNumber();
-}
-
-EasingFunction getTimingFunction(jsi::Runtime &rt, const jsi::Object &config) {
-  return createEasingFunction(rt, config.getProperty(rt, "timingFunction"));
-}
-
-double getDelay(jsi::Runtime &rt, const jsi::Object &config) {
-  return config.getProperty(rt, "delay").asNumber();
-}
-
-} // namespace reanimated::css
+#include <reanimated/CSS/configs/common.h>
+
+namespace reanimated::css {
+
+double getDuration(jsi::Runtime &rt, const jsi::Object &config) {
+  return config.getProperty(rt, "duration").asNumber();
+}
+
+EasingFunction getTimingFunction(jsi::Runtime &rt, const jsi::Object &config) {
+  return createEasingFunction(rt, config.getProperty(rt, "timingFunction"));
+}
+
+double getDelay(jsi::Runtime &rt, const jsi::Object &config) {
+  return config.getProperty(rt, "delay").asNumber();
+}
+
+} // namespace reanimated::css

package/harmony/reanimated/src/main/cpp/Common/cpp/reanimated/CSS/configs/common.h

@@ -1,13 +1,13 @@
-#pragma once
-
-#include <reanimated/CSS/easing/EasingFunctions.h>
-
-namespace reanimated::css {
-
-double getDuration(jsi::Runtime &rt, const jsi::Object &config);
-
-EasingFunction getTimingFunction(jsi::Runtime &rt, const jsi::Object &config);
-
-double getDelay(jsi::Runtime &rt, const jsi::Object &config);
-
-} // namespace reanimated::css
+#pragma once
+
+#include <reanimated/CSS/easing/EasingFunctions.h>
+
+namespace reanimated::css {
+
+double getDuration(jsi::Runtime &rt, const jsi::Object &config);
+
+EasingFunction getTimingFunction(jsi::Runtime &rt, const jsi::Object &config);
+
+double getDelay(jsi::Runtime &rt, const jsi::Object &config);
+
+} // namespace reanimated::css

package/harmony/reanimated/src/main/cpp/Common/cpp/reanimated/CSS/core/CSSAnimation.cpp

@@ -1,127 +1,127 @@
-#include <reanimated/CSS/core/CSSAnimation.h>
-
-#include <memory>
-#include <string>
-#include <utility>
-
-namespace reanimated::css {
-
-CSSAnimation::CSSAnimation(
-    jsi::Runtime &rt,
-    std::shared_ptr<const ShadowNode> shadowNode,
-    std::string animationName,
-    const CSSKeyframesConfig &cssKeyframesConfig,
-    const CSSAnimationSettings &settings,
-    const double timestamp)
-    : name_(std::move(animationName)),
-      shadowNode_(std::move(shadowNode)),
-      fillMode_(settings.fillMode),
-      styleInterpolator_(cssKeyframesConfig.styleInterpolator),
-      progressProvider_(std::make_shared<AnimationProgressProvider>(
-          timestamp,
-          settings.duration,
-          settings.delay,
-          settings.iterationCount,
-          settings.direction,
-          settings.easingFunction,
-          cssKeyframesConfig.keyframeEasingFunctions)) {
-  if (settings.playState == AnimationPlayState::Paused) {
-    progressProvider_->pause(timestamp);
-  }
-}
-
-const std::string &CSSAnimation::getName() const {
-  return name_;
-}
-
-std::shared_ptr<const ShadowNode> CSSAnimation::getShadowNode() const {
-  return shadowNode_;
-}
-
-double CSSAnimation::getStartTimestamp(const double timestamp) const {
-  return progressProvider_->getStartTimestamp(timestamp);
-}
-
-AnimationProgressState CSSAnimation::getState(double timestamp) const {
-  return progressProvider_->getState(timestamp);
-}
-
-bool CSSAnimation::isReversed() const {
-  const auto direction = progressProvider_->getDirection();
-  return direction == AnimationDirection::Reverse || direction == AnimationDirection::AlternateReverse;
-}
-
-bool CSSAnimation::hasForwardsFillMode() const {
-  return fillMode_ == AnimationFillMode::Forwards || fillMode_ == AnimationFillMode::Both;
-}
-
-bool CSSAnimation::hasBackwardsFillMode() const {
-  return fillMode_ == AnimationFillMode::Backwards || fillMode_ == AnimationFillMode::Both;
-}
-
-folly::dynamic CSSAnimation::getCurrentInterpolationStyle() const {
-  return styleInterpolator_->interpolate(shadowNode_, progressProvider_, FALLBACK_INTERPOLATION_THRESHOLD);
-}
-
-folly::dynamic CSSAnimation::getBackwardsFillStyle() const {
-  return isReversed() ? styleInterpolator_->getLastKeyframeValue() : styleInterpolator_->getFirstKeyframeValue();
-}
-
-folly::dynamic CSSAnimation::getResetStyle() const {
-  return styleInterpolator_->getResetStyle(shadowNode_);
-}
-
-void CSSAnimation::run(const double timestamp) {
-  if (progressProvider_->getState(timestamp) == AnimationProgressState::Finished) {
-    return;
-  }
-  progressProvider_->play(timestamp);
-}
-
-folly::dynamic CSSAnimation::update(const double timestamp) {
-  progressProvider_->update(timestamp);
-
-  // Check if the animation has not started yet because of the delay
-  // (In general, it shouldn't be activated until the delay has passed but we
-  // add this check to make sure that animation doesn't start with the negative
-  // progress)
-  if (progressProvider_->getState(timestamp) == AnimationProgressState::Pending) {
-    return hasBackwardsFillMode() ? getBackwardsFillStyle() : folly::dynamic();
-  }
-
-  return styleInterpolator_->interpolate(shadowNode_, progressProvider_, FALLBACK_INTERPOLATION_THRESHOLD);
-}
-
-void CSSAnimation::updateSettings(const PartialCSSAnimationSettings &updatedSettings, const double timestamp) {
-  progressProvider_->resetProgress();
-
-  if (updatedSettings.duration.has_value()) {
-    progressProvider_->setDuration(updatedSettings.duration.value());
-  }
-  if (updatedSettings.easingFunction.has_value()) {
-    progressProvider_->setEasingFunction(updatedSettings.easingFunction.value());
-  }
-  if (updatedSettings.delay.has_value()) {
-    progressProvider_->setDelay(updatedSettings.delay.value());
-  }
-  if (updatedSettings.iterationCount.has_value()) {
-    progressProvider_->setIterationCount(updatedSettings.iterationCount.value());
-  }
-  if (updatedSettings.direction.has_value()) {
-    progressProvider_->setDirection(updatedSettings.direction.value());
-  }
-  if (updatedSettings.fillMode.has_value()) {
-    fillMode_ = updatedSettings.fillMode.value();
-  }
-  if (updatedSettings.playState.has_value()) {
-    if (updatedSettings.playState.value() == AnimationPlayState::Paused) {
-      progressProvider_->pause(timestamp);
-    } else {
-      progressProvider_->play(timestamp);
-    }
-  }
-
-  progressProvider_->update(timestamp);
-}
-
-} // namespace reanimated::css
+#include <reanimated/CSS/core/CSSAnimation.h>
+
+#include <memory>
+#include <string>
+#include <utility>
+
+namespace reanimated::css {
+
+CSSAnimation::CSSAnimation(
+    jsi::Runtime &rt,
+    std::shared_ptr<const ShadowNode> shadowNode,
+    std::string animationName,
+    const CSSKeyframesConfig &cssKeyframesConfig,
+    const CSSAnimationSettings &settings,
+    const double timestamp)
+    : name_(std::move(animationName)),
+      shadowNode_(std::move(shadowNode)),
+      fillMode_(settings.fillMode),
+      styleInterpolator_(cssKeyframesConfig.styleInterpolator),
+      progressProvider_(std::make_shared<AnimationProgressProvider>(
+          timestamp,
+          settings.duration,
+          settings.delay,
+          settings.iterationCount,
+          settings.direction,
+          settings.easingFunction,
+          cssKeyframesConfig.keyframeEasingFunctions)) {
+  if (settings.playState == AnimationPlayState::Paused) {
+    progressProvider_->pause(timestamp);
+  }
+}
+
+const std::string &CSSAnimation::getName() const {
+  return name_;
+}
+
+std::shared_ptr<const ShadowNode> CSSAnimation::getShadowNode() const {
+  return shadowNode_;
+}
+
+double CSSAnimation::getStartTimestamp(const double timestamp) const {
+  return progressProvider_->getStartTimestamp(timestamp);
+}
+
+AnimationProgressState CSSAnimation::getState(double timestamp) const {
+  return progressProvider_->getState(timestamp);
+}
+
+bool CSSAnimation::isReversed() const {
+  const auto direction = progressProvider_->getDirection();
+  return direction == AnimationDirection::Reverse || direction == AnimationDirection::AlternateReverse;
+}
+
+bool CSSAnimation::hasForwardsFillMode() const {
+  return fillMode_ == AnimationFillMode::Forwards || fillMode_ == AnimationFillMode::Both;
+}
+
+bool CSSAnimation::hasBackwardsFillMode() const {
+  return fillMode_ == AnimationFillMode::Backwards || fillMode_ == AnimationFillMode::Both;
+}
+
+folly::dynamic CSSAnimation::getCurrentInterpolationStyle() const {
+  return styleInterpolator_->interpolate(shadowNode_, progressProvider_, FALLBACK_INTERPOLATION_THRESHOLD);
+}
+
+folly::dynamic CSSAnimation::getBackwardsFillStyle() const {
+  return isReversed() ? styleInterpolator_->getLastKeyframeValue() : styleInterpolator_->getFirstKeyframeValue();
+}
+
+folly::dynamic CSSAnimation::getResetStyle() const {
+  return styleInterpolator_->getResetStyle(shadowNode_);
+}
+
+void CSSAnimation::run(const double timestamp) {
+  if (progressProvider_->getState(timestamp) == AnimationProgressState::Finished) {
+    return;
+  }
+  progressProvider_->play(timestamp);
+}
+
+folly::dynamic CSSAnimation::update(const double timestamp) {
+  progressProvider_->update(timestamp);
+
+  // Check if the animation has not started yet because of the delay
+  // (In general, it shouldn't be activated until the delay has passed but we
+  // add this check to make sure that animation doesn't start with the negative
+  // progress)
+  if (progressProvider_->getState(timestamp) == AnimationProgressState::Pending) {
+    return hasBackwardsFillMode() ? getBackwardsFillStyle() : folly::dynamic();
+  }
+
+  return styleInterpolator_->interpolate(shadowNode_, progressProvider_, FALLBACK_INTERPOLATION_THRESHOLD);
+}
+
+void CSSAnimation::updateSettings(const PartialCSSAnimationSettings &updatedSettings, const double timestamp) {
+  progressProvider_->resetProgress();
+
+  if (updatedSettings.duration.has_value()) {
+    progressProvider_->setDuration(updatedSettings.duration.value());
+  }
+  if (updatedSettings.easingFunction.has_value()) {
+    progressProvider_->setEasingFunction(updatedSettings.easingFunction.value());
+  }
+  if (updatedSettings.delay.has_value()) {
+    progressProvider_->setDelay(updatedSettings.delay.value());
+  }
+  if (updatedSettings.iterationCount.has_value()) {
+    progressProvider_->setIterationCount(updatedSettings.iterationCount.value());
+  }
+  if (updatedSettings.direction.has_value()) {
+    progressProvider_->setDirection(updatedSettings.direction.value());
+  }
+  if (updatedSettings.fillMode.has_value()) {
+    fillMode_ = updatedSettings.fillMode.value();
+  }
+  if (updatedSettings.playState.has_value()) {
+    if (updatedSettings.playState.value() == AnimationPlayState::Paused) {
+      progressProvider_->pause(timestamp);
+    } else {
+      progressProvider_->play(timestamp);
+    }
+  }
+
+  progressProvider_->update(timestamp);
+}
+
+} // namespace reanimated::css