More progress

Author: MatiPl01

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

@@ -28,12 +28,6 @@ class SimpleValueInterpolatorFactory : public PropertyInterpolatorFactory {
   explicit SimpleValueInterpolatorFactory(const TValue &defaultValue)
       : PropertyInterpolatorFactory(), defaultValue_(defaultValue) {}
 
-  bool isDiscreteProperty() const override {
-    // The property is considered discrete if all of the allowed types are
-    // discrete
-    return (Discrete<AllowedTypes> && ...);
-  }
-
   const CSSValue &getDefaultValue() const override {
     return defaultValue_;
   }

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

@@ -12,7 +12,7 @@ PropertyInterpolator::PropertyInterpolator(
     const std::shared_ptr<ViewStylesRepository> &viewStylesRepository)
     : propertyPath_(std::move(propertyPath)), viewStylesRepository_(viewStylesRepository) {}
 
-bool PropertyInterpolatorFactory::isDiscreteProperty() const {
+bool PropertyInterpolator::isDiscrete() const {
   return false;
 }
 

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

@@ -19,6 +19,7 @@ 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;
@@ -48,7 +49,6 @@ class PropertyInterpolatorFactory {
   PropertyInterpolatorFactory() = default;
   virtual ~PropertyInterpolatorFactory() = default;
 
-  virtual bool isDiscreteProperty() const;
   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,6 +11,15 @@ 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,6 +15,7 @@ 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,6 +14,7 @@ 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;

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

@@ -12,6 +12,15 @@ RecordPropertiesInterpolator::RecordPropertiesInterpolator(
     const std::shared_ptr<ViewStylesRepository> &viewStylesRepository)
     : GroupPropertiesInterpolator(propertyPath, viewStylesRepository), factories_(factories) {}
 
+bool RecordPropertiesInterpolator::isDiscrete() const {
+  for (const auto &[propertyName, interpolator] : interpolators_) {
+    if (!interpolator->isDiscrete()) {
+      return false;
+    }
+  }
+  return true;
+}
+
 void RecordPropertiesInterpolator::updateKeyframes(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)

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

@@ -16,6 +16,7 @@ class RecordPropertiesInterpolator : public GroupPropertiesInterpolator {
       const std::shared_ptr<ViewStylesRepository> &viewStylesRepository);
   virtual ~RecordPropertiesInterpolator() = 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/styles/TransitionStyleInterpolator.cpp

@@ -57,6 +57,8 @@ std::unordered_set<std::string> TransitionStyleInterpolator::updateInterpolatedP
   std::unordered_set<std::string> reversedPropertyNames;
 
   for (const auto &[propertyName, diffPair] : propertyUpdates) {
+    // If the diffPair is not present, it means that the property was removed and should no
+    // longer be transitioned. In such a case, we can remove the interpolator for this property.
     if (!diffPair.has_value()) {
       interpolators_.erase(propertyName);
       continue;
@@ -69,7 +71,10 @@ std::unordered_set<std::string> TransitionStyleInterpolator::updateInterpolatedP
       it = interpolators_.emplace(propertyName, newInterpolator).first;
     }
 
-    reversedPropertyNames.insert(it->second->updateKeyframesFromStyleChange(rt, diffPair->first, diffPair->second));
+    auto isPropertyReversed = it->second->updateKeyframesFromStyleChange(rt, diffPair->first, diffPair->second);
+    if (isPropertyReversed) {
+      reversedPropertyNames.insert(propertyName);
+    }
   }
 
   return reversedPropertyNames;

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

@@ -29,6 +29,8 @@ class ResolvableValueInterpolator final : public SimpleValueInterpolator<Allowed
       const std::shared_ptr<ViewStylesRepository> &viewStylesRepository,
       const ResolvableValueInterpolatorConfig &config);
 
+  bool isDiscrete() const override;
+
  protected:
   folly::dynamic interpolateValue(
       double progress,