@nativescript/core 8.7.0-beta.1 → 8.7.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/core",
-  "version": "8.7.0-beta.1",
+  "version": "8.7.0-beta.2",
   "description": "A JavaScript library providing an easy to use api for interacting with iOS and Android platform APIs.",
   "main": "index",
   "types": "index.d.ts",

package/platforms/ios/src/NativeScriptMainWindow.swift

@@ -26,15 +26,27 @@ struct NativeScriptMainWindow: Scene {
                 }
             }.onReceive(NotificationCenter.default
                 .publisher(for: NSNotification.Name("NativeScriptWindowOpen")), perform: { obj in
-                Task {
-                    await handleWindowEvent(obj: obj)
-                }
+                    let info = parseWindowInfo(obj: obj)
+                    let id = info.keys.first
+                    Task {
+                        if (info[id!]!) {
+                            await openImmersiveSpace(id: id!)
+                        } else {
+                            openWindow(id: id!)
+                        }
+                    }
             }).onReceive(NotificationCenter.default
                 .publisher(for: NSNotification.Name("NativeScriptWindowClose")), perform: { obj in
-                Task {
-                    await handleWindowEvent(obj: obj, close: true)
-                }
-            })
+                    let info = parseWindowInfo(obj: obj)
+                    let id = info.keys.first
+                    Task {
+                        if (info[id!]!) {
+                            await dismissImmersiveSpace()
+                        } else {
+                            dismissWindow(id: id!)
+                        }
+                    }
+                })
             .onOpenURL { (url) in
                 NotificationCenter.default.post(name: Notification.Name("NativeScriptOpenURL"), object: nil, userInfo: ["url": url.absoluteString ])
             }
@@ -61,33 +73,22 @@ struct NativeScriptMainWindow: Scene {
     }
 
     #if os(visionOS)
-    func handleWindowEvent(obj: Notification, close: Bool = false) async {
+    func parseWindowInfo(obj: Notification, close: Bool = false) -> [String:Bool] {
         if let userInfo = obj.userInfo {
-            var sceneType: String = ""
+            var id: String = ""
             var isImmersive = false
             for (key, value) in userInfo {
                 let k = key as! String
                 if (k == "type") {
-                    sceneType = value as! String
+                    id = value as! String
                 } else if (k == "isImmersive") {
                     isImmersive = value as! Bool
                 }
             }
-
-            if (close) {
-                if (isImmersive) {
-                    await dismissImmersiveSpace()
-                } else {
-                    dismissWindow(id: sceneType)
-                }
-            } else {
-                if (isImmersive) {
-                    await openImmersiveSpace(id: sceneType)
-                } else {
-                    openWindow(id: sceneType)
-                }
-            }
+            return [id: isImmersive]
+            
         }
+        return ["_": false]
     }
     #endif
 }
@@ -124,7 +125,7 @@ struct NativeScriptAppView: UIViewRepresentable {
 @available(iOS 13.0, *)
 @objc public class NativeScriptViewFactory: NSObject, NativeScriptEmbedderDelegate {
     @objc static var shared: NativeScriptViewFactory?
-    @objc static var app: UIKitContainerCtrl?
+    @objc static var app: NativeScriptContainerCtrl?
     
     // holds key/value map of views for lifecycle handling
     @objc public var views: NSMutableDictionary?
@@ -154,7 +155,7 @@ struct NativeScriptAppView: UIViewRepresentable {
 
     @objc public static func initShared() {
         if (NativeScriptViewFactory.shared == nil) {
-            NativeScriptViewFactory.app = UIKitContainerCtrl()
+            NativeScriptViewFactory.app = NativeScriptContainerCtrl()
             NativeScriptViewFactory.shared = NativeScriptViewFactory()
             NativeScriptViewFactory.shared!.views = NSMutableDictionary()
         }
@@ -171,7 +172,7 @@ struct NativeScriptAppView: UIViewRepresentable {
 }
 
 // UIViewController
-@objc public class UIKitContainerCtrl: UIViewController {
+@objc public class NativeScriptContainerCtrl: UIViewController {
     // allow NativeScript to override updateData for custom handling
     @objc public var updateData: ((_ data: NSMutableDictionary) -> Void)? = nil
 }