Make it work

Author: MatiPl01

packages/react-native-reanimated/Common/cpp/reanimated/CSS/configs/CSSTransitionConfig.h

@@ -11,6 +11,17 @@
 
 namespace reanimated::css {
 
+enum class TransitionPropertyStatus : uint8_t {
+  Updated,
+  Removed,
+  Reversed,
+};
+
+struct TransitionPropertyUpdate {
+  std::string name;
+  TransitionPropertyStatus status;
+};
+
 struct CSSTransitionPropertySettings {
   double duration;
   EasingFunction easingFunction;

packages/react-native-reanimated/Common/cpp/reanimated/CSS/core/CSSTransition.cpp

@@ -1,8 +1,9 @@
 #include <reanimated/CSS/core/CSSTransition.h>
 
 #include <memory>
+#include <optional>
 #include <string>
-#include <unordered_map>
+#include <unordered_set>
 #include <utility>
 #include <vector>
 
@@ -49,18 +50,27 @@ void CSSTransition::updateSettings(const CSSTransitionPropertySettingsUpdates &s
   }
 }
 
-folly::dynamic
-CSSTransition::run(jsi::Runtime &rt, const CSSTransitionPropertyUpdates &propertyUpdates, const double timestamp) {
-  const auto reversedPropertyNames = styleInterpolator_.updateInterpolatedProperties(rt, propertyUpdates);
-
-  std::vector<std::string> propertyNames;
-  propertyNames.reserve(propertyUpdates.size());
-  for (const auto &[key, value] : propertyUpdates) {
-    propertyNames.emplace_back(key);
+std::optional<std::unordered_set<std::string>> CSSTransition::getProperties() const {
+  const auto allIt = settings_.find("all");
+  if (allIt != settings_.end()) {
+    return std::nullopt; // "all" means no specific properties
   }
 
-  progressProvider_.runProgressProviders(timestamp, settings_, propertyNames, reversedPropertyNames);
+  std::unordered_set<std::string> properties;
+  for (const auto &[property, _] : settings_) {
+    properties.insert(property);
+  }
+  return properties;
+}
 
+folly::dynamic CSSTransition::run(
+    jsi::Runtime &rt,
+    const CSSTransitionPropertyUpdates &propertyUpdates,
+    const jsi::Value &lastUpdates,
+    const double timestamp) {
+  const auto updatedProperties =
+      styleInterpolator_.updateInterpolatedProperties(rt, propertyUpdates, lastUpdates, settings_);
+  progressProvider_.runProgressProviders(timestamp, updatedProperties, settings_);
   return update(timestamp);
 }
 

packages/react-native-reanimated/Common/cpp/reanimated/CSS/core/CSSTransition.h

@@ -22,7 +22,12 @@ class CSSTransition {
   double getMinDelay(double timestamp) const;
   TransitionProgressState getState() const;
   void updateSettings(const CSSTransitionPropertySettingsUpdates &settingsUpdates);
-  folly::dynamic run(jsi::Runtime &rt, const CSSTransitionPropertyUpdates &propertyUpdates, double timestamp);
+  std::optional<std::unordered_set<std::string>> getProperties() const;
+  folly::dynamic run(
+      jsi::Runtime &rt,
+      const CSSTransitionPropertyUpdates &propertyUpdates,
+      const jsi::Value &lastUpdates,
+      double timestamp);
   folly::dynamic update(double timestamp);
 
  private:

packages/react-native-reanimated/Common/cpp/reanimated/CSS/interpolation/InterpolatorFactory.cpp

@@ -1,6 +1,7 @@
 #include <reanimated/CSS/interpolation/InterpolatorFactory.h>
 #include <reanimated/CSS/interpolation/filters/FilterStyleInterpolator.h>
 
+#include <algorithm>
 #include <memory>
 #include <string>
 #include <unordered_map>
@@ -12,6 +13,11 @@ class RecordInterpolatorFactory : public PropertyInterpolatorFactory {
   explicit RecordInterpolatorFactory(const InterpolatorFactoriesRecord &factories)
       : PropertyInterpolatorFactory(), factories_(factories) {}
 
+  bool isDiscrete() const override {
+    return std::all_of(
+        factories_.begin(), factories_.end(), [](const auto &pair) { return pair.second->isDiscrete(); });
+  }
+
   const CSSValue &getDefaultValue() const override {
     static EmptyObjectValue emptyObjectValue;
     return emptyObjectValue;
@@ -63,6 +69,10 @@ class ArrayInterpolatorFactory : public ArrayLikeInterpolatorFactory {
   explicit ArrayInterpolatorFactory(const InterpolatorFactoriesArray &factories)
       : ArrayLikeInterpolatorFactory(), factories_(factories) {}
 
+  bool isDiscrete() const override {
+    return std::all_of(factories_.begin(), factories_.end(), [](const auto &factory) { return factory->isDiscrete(); });
+  }
+
   std::shared_ptr<PropertyInterpolator> create(
       const PropertyPath &propertyPath,
       const std::shared_ptr<ViewStylesRepository> &viewStylesRepository) const override {
@@ -78,6 +88,10 @@ class FiltersInterpolatorFactory : public ArrayLikeInterpolatorFactory {
   explicit FiltersInterpolatorFactory(const std::shared_ptr<StyleOperationInterpolators> &interpolators)
       : ArrayLikeInterpolatorFactory(), interpolators_(interpolators) {}
 
+  bool isDiscrete() const override {
+    return false;
+  }
+
   std::shared_ptr<PropertyInterpolator> create(
       const PropertyPath &propertyPath,
       const std::shared_ptr<ViewStylesRepository> &viewStylesRepository) const override {
@@ -93,6 +107,10 @@ class TransformsInterpolatorFactory : public PropertyInterpolatorFactory {
   explicit TransformsInterpolatorFactory(const std::shared_ptr<StyleOperationInterpolators> &interpolators)
       : PropertyInterpolatorFactory(), interpolators_(interpolators) {}
 
+  bool isDiscrete() const override {
+    return false;
+  }
+
   const CSSValue &getDefaultValue() const override {
     static EmptyTransformsValue emptyTransformsValue;
     return emptyTransformsValue;

packages/react-native-reanimated/Common/cpp/reanimated/CSS/interpolation/InterpolatorFactory.h

@@ -28,6 +28,10 @@ class SimpleValueInterpolatorFactory : public PropertyInterpolatorFactory {
   explicit SimpleValueInterpolatorFactory(const TValue &defaultValue)
       : PropertyInterpolatorFactory(), defaultValue_(defaultValue) {}
 
+  bool isDiscrete() const override {
+    return (Discrete<AllowedTypes> && ...);
+  }
+
   const CSSValue &getDefaultValue() const override {
     return defaultValue_;
   }
@@ -50,6 +54,10 @@ class ResolvableValueInterpolatorFactory : public PropertyInterpolatorFactory {
   explicit ResolvableValueInterpolatorFactory(const TValue &defaultValue, ResolvableValueInterpolatorConfig config)
       : PropertyInterpolatorFactory(), defaultValue_(defaultValue), config_(std::move(config)) {}
 
+  bool isDiscrete() const override {
+    return (Discrete<AllowedTypes> && ...);
+  }
+
   const CSSValue &getDefaultValue() const override {
     return defaultValue_;
   }

packages/react-native-reanimated/Common/cpp/reanimated/CSS/interpolation/PropertyInterpolator.cpp

@@ -12,10 +12,6 @@ PropertyInterpolator::PropertyInterpolator(
     const std::shared_ptr<ViewStylesRepository> &viewStylesRepository)
     : propertyPath_(std::move(propertyPath)), viewStylesRepository_(viewStylesRepository) {}
 
-bool PropertyInterpolator::isDiscrete() const {
-  return false;
-}
-
 std::string PropertyInterpolator::getPropertyPathString() const {
   if (propertyPath_.empty()) {
     return "";

packages/react-native-reanimated/Common/cpp/reanimated/CSS/interpolation/PropertyInterpolator.h

@@ -19,7 +19,6 @@ class PropertyInterpolator {
       PropertyPath propertyPath,
       const std::shared_ptr<ViewStylesRepository> &viewStylesRepository);
 
-  virtual bool isDiscrete() const = 0;
   virtual folly::dynamic getStyleValue(const std::shared_ptr<const ShadowNode> &shadowNode) const = 0;
   virtual folly::dynamic getResetStyle(const std::shared_ptr<const ShadowNode> &shadowNode) const = 0;
   virtual folly::dynamic getFirstKeyframeValue() const = 0;
@@ -49,6 +48,7 @@ class PropertyInterpolatorFactory {
   PropertyInterpolatorFactory() = default;
   virtual ~PropertyInterpolatorFactory() = default;
 
+  virtual bool isDiscrete() const = 0;
   virtual const CSSValue &getDefaultValue() const = 0;
 
   virtual std::shared_ptr<PropertyInterpolator> create(

packages/react-native-reanimated/Common/cpp/reanimated/CSS/interpolation/groups/ArrayPropertiesInterpolator.cpp

@@ -11,15 +11,6 @@ ArrayPropertiesInterpolator::ArrayPropertiesInterpolator(
     const std::shared_ptr<ViewStylesRepository> &viewStylesRepository)
     : GroupPropertiesInterpolator(propertyPath, viewStylesRepository), factories_(factories) {}
 
-bool ArrayPropertiesInterpolator::isDiscrete() const {
-  for (const auto &interpolator : interpolators_) {
-    if (!interpolator->isDiscrete()) {
-      return false;
-    }
-  }
-  return true;
-}
-
 void ArrayPropertiesInterpolator::updateKeyframes(jsi::Runtime &rt, const jsi::Value &keyframes) {
   const jsi::Array keyframesArray = keyframes.asObject(rt).asArray(rt);
   const size_t valuesCount = keyframesArray.size(rt);

packages/react-native-reanimated/Common/cpp/reanimated/CSS/interpolation/groups/ArrayPropertiesInterpolator.h

@@ -15,7 +15,6 @@ class ArrayPropertiesInterpolator : public GroupPropertiesInterpolator {
       const std::shared_ptr<ViewStylesRepository> &viewStylesRepository);
   virtual ~ArrayPropertiesInterpolator() = default;
 
-  bool isDiscrete() const override;
   void updateKeyframes(jsi::Runtime &rt, const jsi::Value &keyframes) override;
   bool updateKeyframesFromStyleChange(
       jsi::Runtime &rt,

packages/react-native-reanimated/Common/cpp/reanimated/CSS/interpolation/groups/GroupPropertiesInterpolator.h

@@ -14,7 +14,6 @@ class GroupPropertiesInterpolator : public PropertyInterpolator {
       const PropertyPath &propertyPath,
       const std::shared_ptr<ViewStylesRepository> &viewStylesRepository);
 
-  bool isDiscrete() const override;
   folly::dynamic getStyleValue(const std::shared_ptr<const ShadowNode> &shadowNode) const override;
   folly::dynamic getResetStyle(const std::shared_ptr<const ShadowNode> &shadowNode) const override;
   folly::dynamic getFirstKeyframeValue() const override;