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

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.23",
+  "version": "3.0.0-alpha.24",
   "description": "Level up your React Native StyleSheet",
   "scripts": {
     "test": "jest",