refactor: clean up ShadowTreeUpdateManager 3/n

Author: marklawlor

cpp/ShadowTreeUpdateManager.cpp

@@ -16,7 +16,6 @@
 #include <cassert>
 
 namespace margelo::nitro::cssnitro {
-
     using jsi::Runtime;
     using reactnativecss::Observable;
     namespace nitro_ns = ::margelo::nitro;
@@ -81,7 +80,6 @@ namespace margelo::nitro::cssnitro {
                                       Runtime &runtime,
                                       const nitro_ns::AnyMap &entry) {
             folly::dynamic obj = folly::dynamic::object();
-            // Iterate key-value pairs from AnyMap
             for (const auto &kv: entry.getMap()) {
                 const auto &v = static_cast<const nitro_ns::VariantType &>(kv.second);
                 auto dynVal = convert(self, runtime, v);
@@ -121,7 +119,6 @@ namespace margelo::nitro::cssnitro {
             obs = Observable<UpdatesMap>::create(UpdatesMap{});
         }
 
-        // Convert each style entry into a dynamic update object (merged into a single object per tag)
         folly::dynamic payload = folly::dynamic::object();
         for (const auto &p: styleEntries) {
             if (!p) {
@@ -154,17 +151,19 @@ namespace margelo::nitro::cssnitro {
         }
         if (runtime_effects_.find(rt) == runtime_effects_.end()) {
             auto obs = rtObsIt->second;
-            auto holder = std::make_shared<RuntimeEffectHolder>();
-            holder->effect = std::make_shared<reactnativecss::Effect>(
-                    [obs, rt, holder]() {
-                        const ShadowTreeUpdateManager::UpdatesMap &updates = obs->get(
-                                *holder->effect);
+            auto weakBox = std::make_shared<std::weak_ptr<reactnativecss::Effect>>();
+            auto effect = std::make_shared<reactnativecss::Effect>(
+                    [obs, rt, weakBox]() {
+                        auto eff = weakBox->lock();
+                        if (!eff) return;
+                        const ShadowTreeUpdateManager::UpdatesMap &updates = obs->get(*eff);
                         if (updates.empty()) return;
                         ShadowTreeUpdateManager::applyUpdates(*rt, updates);
                         obs->set(ShadowTreeUpdateManager::UpdatesMap{});
                     });
-            holder->effect->run();
-            runtime_effects_.emplace(rt, std::move(holder));
+            *weakBox = effect;
+            effect->run();
+            runtime_effects_.emplace(rt, std::move(effect));
         }
     }
 

cpp/ShadowTreeUpdateManager.hpp

@@ -6,79 +6,71 @@
 #include <vector>
 
 #include <folly/dynamic.h>
-#include <react/renderer/core/ReactPrimitives.h> // facebook::react::Tag
-#include <jsi/jsi.h>
+#include <react/renderer/core/ReactPrimitives.h>
 
-#include "Observable.hpp"
-#include "Effect.hpp"
+namespace facebook::jsi {
+    class Runtime;
 
-// Forward declarations for Nitro Any types
-namespace margelo {
-    namespace nitro {
-        class AnyMap;
-    }
+    class Function;
 }
 
-// Provide a convenient alias matching React Native's JSI namespace
-namespace jsi = facebook::jsi;
+namespace reactnativecss {
+    template<typename T>
+    class Observable;
+
+    class Effect;
+}
 
-namespace margelo {
-    namespace nitro {
-        namespace cssnitro {
+namespace margelo::nitro { class AnyMap; }
+
+namespace jsi = facebook::jsi;
 
-            struct VariantConverter; // forward decl for friend
+namespace margelo::nitro::cssnitro {
 
-            class ShadowTreeUpdateManager final {
-            public:
-                using UpdatesMap = std::unordered_map<facebook::react::Tag, folly::dynamic>;
+    struct VariantConverter;
 
-                ShadowTreeUpdateManager();
+    class ShadowTreeUpdateManager final {
+    public:
+        using UpdatesMap = std::unordered_map<facebook::react::Tag, folly::dynamic>;
 
-                void linkComponent(jsi::Runtime &runtime,
-                                   const std::string &componentId,
-                                   facebook::react::Tag tag);
+        ShadowTreeUpdateManager();
 
-                void unlinkComponent(const std::string &componentId);
+        void linkComponent(jsi::Runtime &runtime,
+                           const std::string &componentId,
+                           facebook::react::Tag tag);
 
-                // Accept the style entries from Styled.next.style and convert internally
-                void addUpdates(const std::string &componentId,
-                                const std::vector<std::shared_ptr<::margelo::nitro::AnyMap>> &styleEntries);
+        void unlinkComponent(const std::string &componentId);
 
-                void registerProcessColorFunction(jsi::Function &&fn);
+        void addUpdates(const std::string &componentId,
+                        const std::vector<std::shared_ptr<::margelo::nitro::AnyMap>> &styleEntries);
 
-            private:
-                friend struct VariantConverter;
-                struct ComponentLink {
-                    facebook::react::Tag tag{0};
-                    jsi::Runtime *runtime{nullptr};
-                };
+        void registerProcessColorFunction(jsi::Function &&fn);
 
-                std::shared_ptr<jsi::Function> process_color_;
-                // Cache for processed color strings -> int result
-                std::unordered_map<std::string, int> process_color_cache_;
+    private:
+        friend struct VariantConverter;
+        struct ComponentLink {
+            facebook::react::Tag tag{0};
+            jsi::Runtime *runtime{nullptr};
+        };
 
-                // componentId -> {tag, runtime*}
-                std::unordered_map<std::string, ComponentLink> component_links_;
+        std::shared_ptr<jsi::Function> process_color_;
+        std::unordered_map<std::string, int> process_color_cache_;
 
-                // Per-runtime updates observable/effect
-                std::unordered_map<jsi::Runtime *, std::shared_ptr<reactnativecss::Observable<UpdatesMap>>> runtime_updates_;
+        std::unordered_map<std::string, ComponentLink> component_links_;
 
-                struct RuntimeEffectHolder {
-                    std::shared_ptr<reactnativecss::Effect> effect;
-                };
-                std::unordered_map<jsi::Runtime *, std::shared_ptr<RuntimeEffectHolder>> runtime_effects_;
+        std::unordered_map<jsi::Runtime *, std::shared_ptr<reactnativecss::Observable<UpdatesMap>>> runtime_updates_;
 
-                void ensureRuntimeEffect(jsi::Runtime &runtime);
+        // Keep one effect per runtime
+        std::unordered_map<jsi::Runtime *, std::shared_ptr<reactnativecss::Effect>> runtime_effects_;
 
-                static void applyUpdates(jsi::Runtime &runtime, const UpdatesMap &updates);
+        void ensureRuntimeEffect(jsi::Runtime &runtime);
 
-                // String color processing (with caching)
-                folly::dynamic
-                processColorDynamic(jsi::Runtime &runtime, const folly::dynamic &value);
+        static void applyUpdates(jsi::Runtime &runtime, const UpdatesMap &updates);
 
-                // styleEntryToUpdate was inlined into addUpdates
-            };
+        // String color processing (with caching)
+        folly::dynamic
+        processColorDynamic(jsi::Runtime &runtime, const folly::dynamic &value);
 
-        }
-    }
+        // styleEntryToUpdate was inlined into addUpdates
+    };
 } // namespace margelo::nitro::cssnitro