react-native-unistyles 3.0.0-alpha.22 → 3.0.0-alpha.24

package/cxx/core/UnistylesRegistry.cpp

@@ -149,3 +149,29 @@ core::DependencyMap core::UnistylesRegistry::buildDependencyMap(jsi::Runtime& rt
 
     return dependencyMap;
 }
+
+std::vector<std::shared_ptr<core::StyleSheet>> core::UnistylesRegistry::getStyleSheetsToRefresh(jsi::Runtime& rt, bool themeDidChange, bool runtimeDidChange) {
+    std::vector<std::shared_ptr<core::StyleSheet>> stylesheetsToRefresh{};
+    
+    if (!themeDidChange && !runtimeDidChange) {
+        return stylesheetsToRefresh;
+    }
+    
+    auto& styleSheets = this->_styleSheetRegistry[&rt];
+    
+    std::for_each(styleSheets.begin(), styleSheets.end(), [&](std::pair<int, std::shared_ptr<core::StyleSheet>> pair){
+        auto& [_, styleSheet] = pair;
+        
+        if (styleSheet->type == StyleSheetType::ThemableWithMiniRuntime && runtimeDidChange) {
+            stylesheetsToRefresh.emplace_back(styleSheet);
+            
+            return;
+        }
+        
+        if (styleSheet->type == StyleSheetType::Themable && themeDidChange) {
+            stylesheetsToRefresh.emplace_back(styleSheet);
+        }
+    });
+    
+    return stylesheetsToRefresh;
+}

package/cxx/core/UnistylesRegistry.h

@@ -36,6 +36,7 @@ struct UnistylesRegistry: public StyleSheetRegistry {
 
     UnistylesState& getState(jsi::Runtime& rt);
     void createState(jsi::Runtime& rt);
+    std::vector<std::shared_ptr<core::StyleSheet>> getStyleSheetsToRefresh(jsi::Runtime& rt, bool themeDidChange, bool runtimeDidChange);
     void linkShadowNodeWithUnistyle(jsi::Runtime& rt, const ShadowNodeFamily*, std::vector<core::Unistyle::Shared>& unistyles, Variants& variants, std::vector<folly::dynamic>&);
     void unlinkShadowNodeWithUnistyles(jsi::Runtime& rt, const ShadowNodeFamily*);
     std::shared_ptr<core::StyleSheet> addStyleSheet(jsi::Runtime& rt, int tag, core::StyleSheetType type, jsi::Object&& rawValue);

package/cxx/hybridObjects/HybridStyleSheet.cpp

@@ -223,18 +223,24 @@ void HybridStyleSheet::onPlatformDependenciesChange(std::vector<UnistyleDependen
 
     // check if color scheme changed and then if Unistyles state depend on it (adaptive themes)
     auto colorSchemeIt = std::find(dependencies.begin(), dependencies.end(), UnistyleDependency::COLORSCHEME);
-
-    if (colorSchemeIt != dependencies.end()) {
+    auto hasNewColorScheme = colorSchemeIt != dependencies.end();
+    
+    // in a later step, we will rebuild only Unistyles with mounted StyleSheets
+    // however, user may have StyleSheets with components that haven't mounted yet
+    // we need to rebuild all dependent StyleSheets as well
+    auto dependentStyleSheets = registry.getStyleSheetsToRefresh(rt, hasNewColorScheme, dependencies.size() > 1);
+
+    if (hasNewColorScheme) {
         this->_unistylesRuntime->includeDependenciesForColorSchemeChange(dependencies);
     }
-
+    
     auto dependencyMap = registry.buildDependencyMap(rt, dependencies);
 
     if (dependencyMap.size() == 0) {
         return;
     }
 
-    parser.rebuildUnistylesInDependencyMap(rt, dependencyMap);
+    parser.rebuildUnistylesInDependencyMap(rt, dependencyMap, dependentStyleSheets);
 
     // this is required, otherwise shadow tree will ignore Unistyles commit
     registry.trafficController.setHasUnistylesCommit(true);

package/cxx/parser/Parser.cpp

@@ -99,9 +99,16 @@ void parser::Parser::rebuildUnistylesWithVariants(jsi::Runtime& rt, std::shared_
 }
 
 // rebuild all unistyles that are affected by platform event
-void parser::Parser::rebuildUnistylesInDependencyMap(jsi::Runtime& rt, DependencyMap& dependencyMap) {
+void parser::Parser::rebuildUnistylesInDependencyMap(jsi::Runtime& rt, DependencyMap& dependencyMap, std::vector<std::shared_ptr<core::StyleSheet>> styleSheets) {
     std::unordered_map<std::shared_ptr<StyleSheet>, jsi::Value> parsedStyleSheets{};
+    std::unordered_map<std::shared_ptr<core::Unistyle>, bool> parsedUnistyles{};
 
+    // parse all stylesheets that depends on changes
+    for (auto styleSheet : styleSheets) {
+        parsedStyleSheets.emplace(styleSheet, this->unwrapStyleSheet(rt, styleSheet));
+    }
+
+    // then parse all visible Unistyles
     for (auto& [shadowNode, unistyles] : dependencyMap) {
         auto styleSheet = unistyles.begin()->get()->unistyle->parent;
 
@@ -116,6 +123,10 @@ void parser::Parser::rebuildUnistylesInDependencyMap(jsi::Runtime& rt, Dependenc
             // for RN styles or inline styles, compute styles only once
             if (unistyle->styleKey == helpers::EXOTIC_STYLE_KEY.c_str() && !unistyleData->parsedStyle.has_value()) {
                 unistyleData->parsedStyle = jsi::Value(rt, unistyle->rawValue).asObject(rt);
+                
+                if (!parsedUnistyles.contains(unistyle)) {
+                    parsedUnistyles.emplace(unistyle, true);
+                }
 
                 continue;
             }
@@ -128,6 +139,21 @@ void parser::Parser::rebuildUnistylesInDependencyMap(jsi::Runtime& rt, Dependenc
             unistyle->rawValue = parsedStyleSheets[styleSheet].asObject(rt).getProperty(rt, unistyle->styleKey.c_str()).asObject(rt);
             this->rebuildUnistyle(rt, styleSheet, unistyle, unistyleData->variants, unistyleData->dynamicFunctionMetadata);
             unistyleData->parsedStyle = jsi::Value(rt, unistyle->parsedStyle.value()).asObject(rt);
+            
+            if (!parsedUnistyles.contains(unistyle)) {
+                parsedUnistyles.emplace(unistyle, true);
+            }
+        }
+    }
+    
+    // parse whatever left in StyleSheets
+    for (auto styleSheet : styleSheets) {
+        for (auto& [_, unistyle] : styleSheet->unistyles) {
+            if (!parsedUnistyles.contains(unistyle)) {
+                parsedUnistyles.emplace(unistyle, true);
+                unistyle->rawValue = parsedStyleSheets[styleSheet].asObject(rt).getProperty(rt, unistyle->styleKey.c_str()).asObject(rt);
+                this->rebuildUnistyle(rt, styleSheet, unistyle, {}, std::nullopt);
+            }
         }
     }
 }

package/cxx/parser/Parser.h

@@ -24,7 +24,7 @@ struct Parser {
     void buildUnistyles(jsi::Runtime& rt, std::shared_ptr<StyleSheet> styleSheet);
     void parseUnistyles(jsi::Runtime& rt, std::shared_ptr<StyleSheet> styleSheet);
     void rebuildUnistylesWithVariants(jsi::Runtime& rt, std::shared_ptr<StyleSheet> styleSheet, Variants& variants);
-    void rebuildUnistylesInDependencyMap(jsi::Runtime& rt, core::DependencyMap& dependencyMap);
+    void rebuildUnistylesInDependencyMap(jsi::Runtime& rt, core::DependencyMap& dependencyMap, std::vector<std::shared_ptr<core::StyleSheet>> styleSheets);
     shadow::ShadowLeafUpdates dependencyMapToShadowLeafUpdates(core::DependencyMap& dependencyMap);
 
 private:

package/ios/NativePlatform+ios.swift

@@ -1,12 +1,14 @@
 #if os(iOS)
 
 import Foundation
+import Combine
 import NitroModules
 
 typealias CxxListener = (Array<UnistyleDependency>) -> Void
 
 class NativeIOSPlatform: HybridNativePlatformSpec {
     var miniRuntime: UnistylesNativeMiniRuntime?
+    var cancellables = Set<AnyCancellable>()
 
     var listeners: Array<CxxListener> = []
     var hybridContext = margelo.nitro.HybridContext()

package/ios/NativePlatformListener+ios.swift

@@ -2,16 +2,18 @@ import Foundation
 
 extension NativeIOSPlatform {
     func setupPlatformListeners() {
-        NotificationCenter.default.addObserver(
-            self,
-            selector: #selector(onWindowChange(_:)),
-            name: NSNotification.Name("RCTWindowFrameDidChangeNotification"),
-            object: nil
-        )
+        NotificationCenter.default.publisher(for: NSNotification.Name("RCTWindowFrameDidChangeNotification"))
+            // add small delay (10ms) to make sure all values are up ot date
+            // we MUST call it on current thread, otherwise random crashes occurs
+            .delay(for: .milliseconds(10), scheduler: RunLoop.current)
+            .sink { [weak self] notification in
+                self?.onWindowChange(notification)
+            }
+            .store(in: &cancellables)
     }
 
     func removePlatformListeners() {
-        NotificationCenter.default.removeObserver(self, name: NSNotification.Name("RCTWindowFrameDidChangeNotification"), object: nil)
+        cancellables.removeAll()
     }
 
     func registerPlatformListener(callback: @escaping (CxxListener)) throws {
@@ -24,18 +26,16 @@ extension NativeIOSPlatform {
 
     @objc func onWindowChange(_ notification: Notification) {
         // add small delay (10ms) to make sure all values are up ot date
-        DispatchQueue.main.asyncAfter(deadline: .now() + 0.01) {
-            guard let currentMiniRuntime = self.miniRuntime else {
-                return
-            }
-            
-            let newMiniRuntime = self.buildMiniRuntime()
-            let changedDependencies = UnistylesNativeMiniRuntime.diff(lhs: currentMiniRuntime, rhs: newMiniRuntime)
-  
-            if (changedDependencies.count > 0) {
-                self.miniRuntime = newMiniRuntime
-                self.emitCxxEvent(dependencies: changedDependencies)
-            }
+        guard let currentMiniRuntime = self.miniRuntime else {
+            return
+        }
+        
+        let newMiniRuntime = self.buildMiniRuntime()
+        let changedDependencies = UnistylesNativeMiniRuntime.diff(lhs: currentMiniRuntime, rhs: newMiniRuntime)
+
+        if (changedDependencies.count > 0) {
+            self.miniRuntime = newMiniRuntime
+            self.emitCxxEvent(dependencies: changedDependencies)
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-unistyles",
-  "version": "3.0.0-alpha.22",
+  "version": "3.0.0-alpha.24",
   "description": "Level up your React Native StyleSheet",
   "scripts": {
     "test": "jest",