Try with props reverting mechanism

Author: MatiPl01

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

@@ -5,7 +5,6 @@
 #include <string>
 #include <unordered_set>
 #include <utility>
-#include <vector>
 
 namespace reanimated::css {
 

packages/react-native-reanimated/Common/cpp/reanimated/Fabric/updates/UpdatesRegistry.cpp

@@ -67,9 +67,7 @@ void UpdatesRegistry::setInUpdatesRegistry(
     const std::shared_ptr<const ShadowNode> &shadowNode,
     const folly::dynamic &props) {
   const auto tag = shadowNode->getTag();
-#ifdef ANDROID
   updatePropsToRevert(tag, &props);
-#endif
   updatesRegistry_[tag] = std::make_pair(shadowNode, props);
 }
 
@@ -82,9 +80,7 @@ folly::dynamic UpdatesRegistry::getUpdatesFromRegistry(const Tag tag) const {
 }
 
 void UpdatesRegistry::removeFromUpdatesRegistry(const Tag tag) {
-#ifdef ANDROID
   updatePropsToRevert(tag);
-#endif
   updatesRegistry_.erase(tag);
 }
 
@@ -101,8 +97,6 @@ void UpdatesRegistry::flushUpdatesToRegistry(const UpdatesBatch &updatesBatch) {
   }
 }
 
-#ifdef ANDROID
-
 bool UpdatesRegistry::hasPropsToRevert() const {
   return !propsToRevertMap_.empty();
 }
@@ -155,6 +149,4 @@ void UpdatesRegistry::updatePropsToRevert(const Tag tag, const folly::dynamic *n
   }
 }
 
-#endif
-
 } // namespace reanimated

packages/react-native-reanimated/Common/cpp/reanimated/Fabric/updates/UpdatesRegistry.h

@@ -20,14 +20,12 @@ using namespace react;
 using UpdatesBatch = std::vector<std::pair<std::shared_ptr<const ShadowNode>, folly::dynamic>>;
 using RegistryMap = std::unordered_map<Tag, std::pair<std::shared_ptr<const ShadowNode>, folly::dynamic>>;
 
-#ifdef ANDROID
 struct PropsToRevert {
   std::shared_ptr<const ShadowNode> shadowNode;
   std::unordered_set<std::string> props;
 };
 
 using PropsToRevertMap = std::unordered_map<Tag, PropsToRevert>;
-#endif
 
 class UpdatesRegistry {
  public:
@@ -39,10 +37,8 @@ class UpdatesRegistry {
   folly::dynamic get(Tag tag) const;
   virtual void remove(Tag tag) = 0;
 
-#ifdef ANDROID
   bool hasPropsToRevert() const;
   void collectPropsToRevert(PropsToRevertMap &propsToRevertMap);
-#endif
 
   void flushUpdates(UpdatesBatch &updatesBatch);
   void collectProps(PropsMap &propsMap);
@@ -60,12 +56,9 @@ class UpdatesRegistry {
   UpdatesBatch updatesBatch_;
 
   void flushUpdatesToRegistry(const UpdatesBatch &updatesBatch);
-
-#ifdef ANDROID
   PropsToRevertMap propsToRevertMap_;
 
   void updatePropsToRevert(Tag tag, const folly::dynamic *newProps = nullptr);
-#endif
 };
 
 } // namespace reanimated

packages/react-native-reanimated/Common/cpp/reanimated/Fabric/updates/UpdatesRegistryManager.cpp

@@ -84,8 +84,6 @@ PropsMap UpdatesRegistryManager::collectProps() {
   return propsMap;
 }
 
-#ifdef ANDROID
-
 bool UpdatesRegistryManager::hasPropsToRevert() {
   for (auto &registry : registries_) {
     if (registry->hasPropsToRevert()) {
@@ -156,6 +154,4 @@ void UpdatesRegistryManager::clearPropsToRevert(const SurfaceId surfaceId) {
   }
 }
 
-#endif
-
 } // namespace reanimated

packages/react-native-reanimated/Common/cpp/reanimated/Fabric/updates/UpdatesRegistryManager.h

@@ -38,11 +38,9 @@ class UpdatesRegistryManager {
   void handleNodeRemovals(const RootShadowNode &rootShadowNode);
   PropsMap collectProps();
 
-#ifdef ANDROID
   bool hasPropsToRevert();
   void collectPropsToRevertBySurface(std::unordered_map<SurfaceId, PropsMap> &propsMapBySurface);
   void clearPropsToRevert(SurfaceId surfaceId);
-#endif
 
  private:
   using RemovableShadowNodes = std::unordered_map<Tag, std::shared_ptr<const ShadowNode>>;
@@ -54,12 +52,10 @@ class UpdatesRegistryManager {
   std::vector<std::shared_ptr<UpdatesRegistry>> registries_;
   const std::shared_ptr<StaticPropsRegistry> staticPropsRegistry_;
 
-#ifdef ANDROID
   PropsToRevertMap propsToRevertMap_;
 
   static void
   addToPropsMap(PropsMap &propsMap, const std::shared_ptr<const ShadowNode> &shadowNode, const folly::dynamic &props);
-#endif
 };
 
 } // namespace reanimated

packages/react-native-reanimated/Common/cpp/reanimated/NativeModules/ReanimatedModuleProxySpec.h

@@ -5,7 +5,6 @@
 
 #include <memory>
 #include <string>
-#include <vector>
 
 using namespace facebook;
 using namespace react;