react-native-reanimated 4.0.3 → 4.1.0-jsx-fix

package/Common/cpp/reanimated/CSS/interpolation/groups/RecordPropertiesInterpolator.cpp

@@ -20,15 +20,23 @@ bool RecordPropertiesInterpolator::equalsReversingAdjustedStartValue(
 }
 
 void RecordPropertiesInterpolator::updateKeyframes(
-    const folly::dynamic &keyframes) {
-  // TODO - maybe add a possibility to remove interpolators that are no
-  // longer used  (for now, for simplicity, we only add new ones)
-  for (const auto &item : keyframes.items()) {
-    const auto &propName = item.first.getString();
-    const auto &propValue = item.second;
-
-    maybeCreateInterpolator(propName);
-    interpolators_[propName]->updateKeyframes(propValue);
+    jsi::Runtime &rt,
+    const jsi::Value &keyframes) {
+  // TODO - maybe add a possibility to remove interpolators that are no longer
+  // used (for now, for simplicity, we only add new ones)
+  const jsi::Object keyframesObject = keyframes.asObject(rt);
+
+  jsi::Array propertyNames = keyframesObject.getPropertyNames(rt);
+  size_t propertiesCount = propertyNames.size(rt);
+
+  for (size_t i = 0; i < propertiesCount; ++i) {
+    const std::string propertyName =
+        propertyNames.getValueAtIndex(rt, i).asString(rt).utf8(rt);
+    const jsi::Value &propertyKeyframes = keyframesObject.getProperty(
+        rt, jsi::PropNameID::forUtf8(rt, propertyName));
+
+    maybeCreateInterpolator(propertyName);
+    interpolators_[propertyName]->updateKeyframes(rt, propertyKeyframes);
   }
 }
 

package/Common/cpp/reanimated/CSS/interpolation/groups/RecordPropertiesInterpolator.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <reanimated/CSS/interpolation/groups/GroupPropertiesInterpolator.h>
-#include <reanimated/CSS/util/interpolators.h>
+#include <reanimated/CSS/utils/interpolators.h>
 
 #include <memory>
 #include <string>
@@ -20,7 +20,7 @@ class RecordPropertiesInterpolator : public GroupPropertiesInterpolator {
   bool equalsReversingAdjustedStartValue(
       const folly::dynamic &propertyValue) const override;
 
-  void updateKeyframes(const folly::dynamic &keyframes) override;
+  void updateKeyframes(jsi::Runtime &rt, const jsi::Value &keyframes) override;
   void updateKeyframesFromStyleChange(
       const folly::dynamic &oldStyleValue,
       const folly::dynamic &newStyleValue,

package/Common/cpp/reanimated/CSS/interpolation/styles/AnimationStyleInterpolator.h

@@ -1,9 +1,10 @@
 #pragma once
 
-#include <reanimated/CSS/config/PropertyInterpolatorsConfig.h>
+#include <reanimated/CSS/configs/interpolators/registry.h>
 #include <reanimated/CSS/interpolation/groups/RecordPropertiesInterpolator.h>
 
 #include <memory>
+#include <string>
 
 namespace reanimated::css {
 
@@ -13,11 +14,16 @@ namespace reanimated::css {
 class AnimationStyleInterpolator : public RecordPropertiesInterpolator {
  public:
   explicit AnimationStyleInterpolator(
+      jsi::Runtime &rt,
+      const jsi::Value &keyframes,
+      const std::string &componentName,
       const std::shared_ptr<ViewStylesRepository> &viewStylesRepository)
       : RecordPropertiesInterpolator(
-            PROPERTY_INTERPOLATORS_CONFIG,
+            getComponentInterpolators(componentName),
             {},
-            viewStylesRepository) {}
+            viewStylesRepository) {
+    updateKeyframes(rt, keyframes);
+  }
 };
 
 } // namespace reanimated::css

package/Common/cpp/reanimated/CSS/interpolation/styles/TransitionStyleInterpolator.cpp

@@ -3,8 +3,10 @@
 namespace reanimated::css {
 
 TransitionStyleInterpolator::TransitionStyleInterpolator(
+    const std::string &componentName,
     const std::shared_ptr<ViewStylesRepository> &viewStylesRepository)
-    : viewStylesRepository_(viewStylesRepository) {}
+    : componentName_(componentName),
+      viewStylesRepository_(viewStylesRepository) {}
 
 std::unordered_set<std::string>
 TransitionStyleInterpolator::getReversedPropertyNames(
@@ -78,7 +80,7 @@ void TransitionStyleInterpolator::updateInterpolatedProperties(
       const auto newInterpolator = createPropertyInterpolator(
           propertyName,
           {},
-          PROPERTY_INTERPOLATORS_CONFIG,
+          getComponentInterpolators(componentName_),
           viewStylesRepository_);
       it = interpolators_.emplace(propertyName, newInterpolator).first;
     }

package/Common/cpp/reanimated/CSS/interpolation/styles/TransitionStyleInterpolator.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <reanimated/CSS/common/definitions.h>
-#include <reanimated/CSS/config/PropertyInterpolatorsConfig.h>
+#include <reanimated/CSS/configs/interpolators/registry.h>
 #include <reanimated/CSS/interpolation/groups/RecordPropertiesInterpolator.h>
 #include <reanimated/CSS/progress/TransitionProgressProvider.h>
 
@@ -15,6 +15,7 @@ namespace reanimated::css {
 class TransitionStyleInterpolator {
  public:
   TransitionStyleInterpolator(
+      const std::string &componentName,
       const std::shared_ptr<ViewStylesRepository> &viewStylesRepository);
 
   std::unordered_set<std::string> getReversedPropertyNames(
@@ -37,6 +38,7 @@ class TransitionStyleInterpolator {
       const std::shared_ptr<PropertyInterpolator> &,
       const std::shared_ptr<KeyframeProgressProvider> &)>;
 
+  const std::string componentName_;
   const std::shared_ptr<ViewStylesRepository> viewStylesRepository_;
 
   PropertyInterpolatorsRecord interpolators_;

package/Common/cpp/reanimated/CSS/interpolation/transforms/TransformInterpolator.h

@@ -10,9 +10,8 @@ namespace reanimated::css {
 
 class TransformInterpolator {
  public:
-  using Interpolators = std::unordered_map<
-      TransformOperationType,
-      std::shared_ptr<TransformInterpolator>>;
+  using Interpolators =
+      std::unordered_map<TransformOp, std::shared_ptr<TransformInterpolator>>;
 
   struct UpdateContext {
     const std::shared_ptr<const ShadowNode> &node;