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

package/harmony/reanimated/src/main/cpp/Common/cpp/reanimated/CSS/interpolation/styles/TransitionStyleInterpolator.cpp

@@ -1,103 +1,103 @@
-#include <reanimated/CSS/interpolation/styles/TransitionStyleInterpolator.h>
-
-#include <memory>
-#include <string>
-#include <unordered_set>
-
-namespace reanimated::css {
-
-TransitionStyleInterpolator::TransitionStyleInterpolator(
-    const std::string &componentName,
-    const std::shared_ptr<ViewStylesRepository> &viewStylesRepository)
-    : componentName_(componentName), viewStylesRepository_(viewStylesRepository) {}
-
-std::unordered_set<std::string> TransitionStyleInterpolator::getReversedPropertyNames(
-    const folly::dynamic &newPropertyValues) const {
-  std::unordered_set<std::string> reversedProperties;
-
-  if (!newPropertyValues.isObject()) {
-    return reversedProperties;
-  }
-
-  for (const auto &[propertyName, propertyValue] : newPropertyValues.items()) {
-    const auto propertyNameStr = propertyName.getString();
-    const auto it = interpolators_.find(propertyNameStr);
-    if (it != interpolators_.end() &&
-        // First keyframe value of the previous transition is the reversing
-        // adjusted start value
-        it->second->equalsReversingAdjustedStartValue(propertyValue)) {
-      reversedProperties.insert(propertyNameStr);
-    }
-  }
-
-  return reversedProperties;
-}
-
-folly::dynamic TransitionStyleInterpolator::interpolate(
-    const std::shared_ptr<const ShadowNode> &shadowNode,
-    const TransitionProgressProvider &transitionProgressProvider,
-    const std::unordered_set<std::string> &allowDiscreteProperties) const {
-  folly::dynamic result = folly::dynamic::object;
-
-  const auto allFallbackInterpolateThreshold = allowDiscreteProperties.contains("all") ? 0.5 : 0;
-
-  for (const auto &[propertyName, progressProvider] : transitionProgressProvider.getPropertyProgressProviders()) {
-    const auto &interpolator = interpolators_.at(propertyName);
-    const auto fallbackInterpolateThreshold =
-        (allowDiscreteProperties.contains(propertyName)) ? 0.5 : allFallbackInterpolateThreshold;
-    result[propertyName] = interpolator->interpolate(shadowNode, progressProvider, fallbackInterpolateThreshold);
-  }
-
-  return result;
-}
-
-void TransitionStyleInterpolator::discardFinishedInterpolators(
-    const TransitionProgressProvider &transitionProgressProvider) {
-  for (const auto &propertyName : transitionProgressProvider.getRemovedProperties()) {
-    interpolators_.erase(propertyName);
-  }
-}
-
-void TransitionStyleInterpolator::discardIrrelevantInterpolators(
-    const std::unordered_set<std::string> &transitionPropertyNames) {
-  for (auto it = interpolators_.begin(); it != interpolators_.end();) {
-    // Remove property interpolators for properties not specified in the
-    // transition property names
-    if (transitionPropertyNames.find(it->first) == transitionPropertyNames.end()) {
-      it = interpolators_.erase(it);
-    } else {
-      ++it;
-    }
-  }
-}
-
-void TransitionStyleInterpolator::updateInterpolatedProperties(
-    const ChangedProps &changedProps,
-    const folly::dynamic &lastUpdateValue) {
-  const auto &oldPropsObj = changedProps.oldProps;
-  const auto &newPropsObj = changedProps.newProps;
-
-  const auto empty = folly::dynamic();
-
-  for (const auto &propertyName : changedProps.changedPropertyNames) {
-    auto it = interpolators_.find(propertyName);
-    const auto shouldCreateInterpolator = it == interpolators_.end();
-
-    if (shouldCreateInterpolator) {
-      const auto newInterpolator = createPropertyInterpolator(
-          propertyName, {}, getComponentInterpolators(componentName_), viewStylesRepository_);
-      it = interpolators_.emplace(propertyName, newInterpolator).first;
-    }
-
-    const auto &oldValue = oldPropsObj.getDefault(propertyName, empty);
-    const auto &newValue = newPropsObj.getDefault(propertyName, empty);
-    // Pass lastValue only if the interpolator is updated (no new interpolator
-    // was created), otherwise pass an empty value
-    const auto &lastValue =
-        (shouldCreateInterpolator || lastUpdateValue.empty()) ? empty : lastUpdateValue.getDefault(propertyName, empty);
-
-    it->second->updateKeyframesFromStyleChange(oldValue, newValue, lastValue);
-  }
-}
-
-} // namespace reanimated::css
+#include <reanimated/CSS/interpolation/styles/TransitionStyleInterpolator.h>
+
+#include <memory>
+#include <string>
+#include <unordered_set>
+
+namespace reanimated::css {
+
+TransitionStyleInterpolator::TransitionStyleInterpolator(
+    const std::string &componentName,
+    const std::shared_ptr<ViewStylesRepository> &viewStylesRepository)
+    : componentName_(componentName), viewStylesRepository_(viewStylesRepository) {}
+
+std::unordered_set<std::string> TransitionStyleInterpolator::getReversedPropertyNames(
+    const folly::dynamic &newPropertyValues) const {
+  std::unordered_set<std::string> reversedProperties;
+
+  if (!newPropertyValues.isObject()) {
+    return reversedProperties;
+  }
+
+  for (const auto &[propertyName, propertyValue] : newPropertyValues.items()) {
+    const auto propertyNameStr = propertyName.getString();
+    const auto it = interpolators_.find(propertyNameStr);
+    if (it != interpolators_.end() &&
+        // First keyframe value of the previous transition is the reversing
+        // adjusted start value
+        it->second->equalsReversingAdjustedStartValue(propertyValue)) {
+      reversedProperties.insert(propertyNameStr);
+    }
+  }
+
+  return reversedProperties;
+}
+
+folly::dynamic TransitionStyleInterpolator::interpolate(
+    const std::shared_ptr<const ShadowNode> &shadowNode,
+    const TransitionProgressProvider &transitionProgressProvider,
+    const std::unordered_set<std::string> &allowDiscreteProperties) const {
+  folly::dynamic result = folly::dynamic::object;
+
+  const auto allFallbackInterpolateThreshold = allowDiscreteProperties.contains("all") ? 0.5 : 0;
+
+  for (const auto &[propertyName, progressProvider] : transitionProgressProvider.getPropertyProgressProviders()) {
+    const auto &interpolator = interpolators_.at(propertyName);
+    const auto fallbackInterpolateThreshold =
+        (allowDiscreteProperties.contains(propertyName)) ? 0.5 : allFallbackInterpolateThreshold;
+    result[propertyName] = interpolator->interpolate(shadowNode, progressProvider, fallbackInterpolateThreshold);
+  }
+
+  return result;
+}
+
+void TransitionStyleInterpolator::discardFinishedInterpolators(
+    const TransitionProgressProvider &transitionProgressProvider) {
+  for (const auto &propertyName : transitionProgressProvider.getRemovedProperties()) {
+    interpolators_.erase(propertyName);
+  }
+}
+
+void TransitionStyleInterpolator::discardIrrelevantInterpolators(
+    const std::unordered_set<std::string> &transitionPropertyNames) {
+  for (auto it = interpolators_.begin(); it != interpolators_.end();) {
+    // Remove property interpolators for properties not specified in the
+    // transition property names
+    if (transitionPropertyNames.find(it->first) == transitionPropertyNames.end()) {
+      it = interpolators_.erase(it);
+    } else {
+      ++it;
+    }
+  }
+}
+
+void TransitionStyleInterpolator::updateInterpolatedProperties(
+    const ChangedProps &changedProps,
+    const folly::dynamic &lastUpdateValue) {
+  const auto &oldPropsObj = changedProps.oldProps;
+  const auto &newPropsObj = changedProps.newProps;
+
+  const auto empty = folly::dynamic();
+
+  for (const auto &propertyName : changedProps.changedPropertyNames) {
+    auto it = interpolators_.find(propertyName);
+    const auto shouldCreateInterpolator = it == interpolators_.end();
+
+    if (shouldCreateInterpolator) {
+      const auto newInterpolator = createPropertyInterpolator(
+          propertyName, {}, getComponentInterpolators(componentName_), viewStylesRepository_);
+      it = interpolators_.emplace(propertyName, newInterpolator).first;
+    }
+
+    const auto &oldValue = oldPropsObj.getDefault(propertyName, empty);
+    const auto &newValue = newPropsObj.getDefault(propertyName, empty);
+    // Pass lastValue only if the interpolator is updated (no new interpolator
+    // was created), otherwise pass an empty value
+    const auto &lastValue =
+        (shouldCreateInterpolator || lastUpdateValue.empty()) ? empty : lastUpdateValue.getDefault(propertyName, empty);
+
+    it->second->updateKeyframesFromStyleChange(oldValue, newValue, lastValue);
+  }
+}
+
+} // namespace reanimated::css

package/harmony/reanimated/src/main/cpp/Common/cpp/reanimated/CSS/interpolation/styles/TransitionStyleInterpolator.h

@@ -1,42 +1,42 @@
-#pragma once
-
-#include <reanimated/CSS/InterpolatorRegistry.h>
-#include <reanimated/CSS/common/definitions.h>
-#include <reanimated/CSS/interpolation/groups/RecordPropertiesInterpolator.h>
-#include <reanimated/CSS/progress/TransitionProgressProvider.h>
-
-#include <memory>
-#include <string>
-#include <unordered_map>
-#include <unordered_set>
-
-namespace reanimated::css {
-
-class TransitionStyleInterpolator {
- public:
-  TransitionStyleInterpolator(
-      const std::string &componentName,
-      const std::shared_ptr<ViewStylesRepository> &viewStylesRepository);
-
-  std::unordered_set<std::string> getReversedPropertyNames(const folly::dynamic &newPropertyValues) const;
-
-  folly::dynamic interpolate(
-      const std::shared_ptr<const ShadowNode> &shadowNode,
-      const TransitionProgressProvider &transitionProgressProvider,
-      const std::unordered_set<std::string> &allowDiscreteProperties) const;
-
-  void discardFinishedInterpolators(const TransitionProgressProvider &transitionProgressProvider);
-  void discardIrrelevantInterpolators(const std::unordered_set<std::string> &transitionPropertyNames);
-  void updateInterpolatedProperties(const ChangedProps &changedProps, const folly::dynamic &lastUpdateValue);
-
- private:
-  using MapInterpolatorsCallback = std::function<
-      folly::dynamic(const std::shared_ptr<PropertyInterpolator> &, const std::shared_ptr<KeyframeProgressProvider> &)>;
-
-  const std::string componentName_;
-  const std::shared_ptr<ViewStylesRepository> viewStylesRepository_;
-
-  PropertyInterpolatorsRecord interpolators_;
-};
-
-} // namespace reanimated::css
+#pragma once
+
+#include <reanimated/CSS/InterpolatorRegistry.h>
+#include <reanimated/CSS/common/definitions.h>
+#include <reanimated/CSS/interpolation/groups/RecordPropertiesInterpolator.h>
+#include <reanimated/CSS/progress/TransitionProgressProvider.h>
+
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <unordered_set>
+
+namespace reanimated::css {
+
+class TransitionStyleInterpolator {
+ public:
+  TransitionStyleInterpolator(
+      const std::string &componentName,
+      const std::shared_ptr<ViewStylesRepository> &viewStylesRepository);
+
+  std::unordered_set<std::string> getReversedPropertyNames(const folly::dynamic &newPropertyValues) const;
+
+  folly::dynamic interpolate(
+      const std::shared_ptr<const ShadowNode> &shadowNode,
+      const TransitionProgressProvider &transitionProgressProvider,
+      const std::unordered_set<std::string> &allowDiscreteProperties) const;
+
+  void discardFinishedInterpolators(const TransitionProgressProvider &transitionProgressProvider);
+  void discardIrrelevantInterpolators(const std::unordered_set<std::string> &transitionPropertyNames);
+  void updateInterpolatedProperties(const ChangedProps &changedProps, const folly::dynamic &lastUpdateValue);
+
+ private:
+  using MapInterpolatorsCallback = std::function<
+      folly::dynamic(const std::shared_ptr<PropertyInterpolator> &, const std::shared_ptr<KeyframeProgressProvider> &)>;
+
+  const std::string componentName_;
+  const std::shared_ptr<ViewStylesRepository> viewStylesRepository_;
+
+  PropertyInterpolatorsRecord interpolators_;
+};
+
+} // namespace reanimated::css