@webspatial/platform-visionos 0.1.10 → 0.1.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webspatial/platform-visionos",
-  "version": "0.1.10",
+  "version": "0.1.13",
   "description": "Used to publish WebSpatial projects to Apple Vision Pro",
   "type": "commonjs",
   "engines": {

package/web-spatial/libs/SpatialWindowContainer.swift

@@ -132,15 +132,6 @@ extension SpatialWindowContainer {
     static func getRootID() -> String {
         return RootID
     }
-
-    static func createRootWindowContainer() -> SpatialWindowContainer {
-        if let rootWindowContainer = getSpatialWindowContainer(RootID) {
-            logger.warning("Root already created! ")
-            return rootWindowContainer
-        }
-        let wgd = WindowContainerData(windowStyle: "Plain", windowContainerID: "root")
-        return SpatialWindowContainer(RootID, wgd)
-    }
 }
 
 extension SpatialWindowContainer {

package/web-spatial/libs/Utils/CommandManager.swift

@@ -492,14 +492,14 @@ class CommandManager {
             }
 
             if let backgroundMaterial: BackgroundMaterial = data.update?.style?.backgroundMaterial {
-                if target.isLoading {
-                    target.loadingStyles.backgroundMaterial = backgroundMaterial
+                if spatialWindowComponent.isLoading {
+                    spatialWindowComponent.loadingStyles.backgroundMaterial = backgroundMaterial
                 }
                 spatialWindowComponent.backgroundMaterial = backgroundMaterial
             }
             if let cornerRadius: CornerRadius = data.update?.style?.cornerRadius {
-                if target.isLoading {
-                    target.loadingStyles.cornerRadius = cornerRadius
+                if spatialWindowComponent.isLoading {
+                    spatialWindowComponent.loadingStyles.cornerRadius = cornerRadius
                 }
                 spatialWindowComponent.cornerRadius = cornerRadius
             }
@@ -617,6 +617,15 @@ class CommandManager {
             WindowContainerMgr.Instance.updateWindowContainerPlainDefaultValues(cfg)
             return
         }
+
+        if let shouldClose = data.update?.close,
+           let wg = SpatialWindowContainer.getSpatialWindowContainer(target.readWindowContainerID(id: info.windowContainerID))
+        {
+            if shouldClose {
+                wg.destroy()
+            }
+        }
+
         target.completeEvent(requestID: info.requestID)
     }
 
@@ -726,6 +735,7 @@ struct JSResourceData: Codable {
     var windowID: String?
     var style: JSEntityStyle?
     var nextOpenSettings: JSNextOpen?
+    var close: Bool?
     var getBoundingBox: Bool?
     var zIndex: Double?
     var visible: Bool?

package/web-spatial/web_spatialApp.swift

@@ -18,13 +18,9 @@ let startURL = pwaManager.start_url
 var sceneStateChangedCB: ((Any) -> Void) = { _ in
 }
 
-// TODO: we need to get rid of rootWGD and rootWC to cleanup memory and better handle close/reopen
-weak var rootWC: SpatialWindowComponent?
-
 @main
 struct web_spatialApp: App {
     @UIApplicationDelegateAdaptor(AppDelegate.self) var appDelegate
-    @State var rootWGD: SpatialWindowContainer
     @State var initialLaunch = true
 
     @ObservedObject var wgm = WindowContainerMgr.Instance
@@ -40,8 +36,7 @@ struct web_spatialApp: App {
         // init pwa manager
         pwaManager._init()
 
-        // create root SpatialWindowContainer and Immersive SpatialWindowContainer
-        rootWGD = SpatialWindowContainer.createRootWindowContainer()
+        // create Immersive SpatialWindowContainer
         let _ = SpatialWindowContainer.createImmersiveWindowContainer()
     }
 
@@ -49,25 +44,6 @@ struct web_spatialApp: App {
         return URL(string: pwaManager.start_url)!
     }
 
-    // There seems to be a bug in WKWebView where it needs to be initialized after the app has loaded so we do this here instead of init()
-    // https://forums.developer.apple.com/forums/thread/61432
-    func initAppOnViewMount() {
-        if rootWC == nil {
-            let fileUrl = getFileUrl()
-
-            // Create a default entity with webview resource
-            let rootEntity = SpatialEntity()
-            rootEntity.coordinateSpace = CoordinateSpaceMode.ROOT
-            let windowComponent = SpatialWindowComponent(parentWindowContainerID: rootWGD.id, url: fileUrl)
-            rootEntity.addComponent(windowComponent)
-            rootEntity.setParentWindowContainer(wg: rootWGD)
-
-            rootWGD.addChildResource(windowComponent)
-            rootWGD.addChildResource(rootEntity)
-            rootWC = windowComponent
-        }
-    }
-
     func getDefaultSize() -> CGSize {
         sceneStateChangedCB("")
         return wgm.getValue().defaultSize!
@@ -75,34 +51,30 @@ struct web_spatialApp: App {
 
     var body: some Scene {
         WindowGroup(id: "Plain", for: WindowContainerData.self) { $windowData in
-            if windowData.windowContainerID == SpatialWindowContainer.getRootID() {
-                VStack {}.onAppear { initAppOnViewMount() }
-
-                PlainWindowContainerView().environment(rootWGD).background(Color.clear.opacity(0))
-//                TODO: Universal link is currently broken
-//                .onOpenURL { myURL in
-//                    initAppOnViewMount()
-//                    let urlToLoad = pwaManager.checkInDeeplink(url: myURL.absoluteString)
-//
-//                    if let url = URL(string: urlToLoad) {
-//                        // root!.navigateToURL(url: url)
-//                    }
-//                }
-            } else {
-                let wg = SpatialWindowContainer.getOrCreateSpatialWindowContainer(
-                    windowData.windowContainerID, windowData
-                )
-                PlainWindowContainerView().environment(wg)
-                // we no longer need the initial windowGroup to live all the time
-                // https://stackoverflow.com/questions/78567737/how-to-get-initial-windowgroup-to-reopen-on-launch-visionos
+            let wg = SpatialWindowContainer.getOrCreateSpatialWindowContainer(
+                windowData.windowContainerID, windowData
+            )
+            PlainWindowContainerView().environment(wg)
+            // https://stackoverflow.com/questions/78567737/how-to-get-initial-windowgroup-to-reopen-on-launch-visionos
 //                    .handlesExternalEvents(preferring: [], allowing: [])
-            }
         }
         defaultValue: {
-            WindowContainerData(
+            let windowData = WindowContainerData(
                 windowStyle: "Plain",
                 windowContainerID: SpatialWindowContainer.getRootID()
             )
+
+            // Initialize entity and webview for deafult value
+            let fileUrl = getFileUrl()
+            let wc = SpatialWindowContainer.getOrCreateSpatialWindowContainer(
+                windowData.windowContainerID, windowData
+            )!
+            let rootEntity = SpatialEntity()
+            rootEntity.coordinateSpace = CoordinateSpaceMode.ROOT
+            let windowComponent = SpatialWindowComponent(parentWindowContainerID: wc.id, url: fileUrl)
+            rootEntity.addComponent(windowComponent)
+            rootEntity.setParentWindowContainer(wg: wc)
+            return windowData
         }
         .windowStyle(.plain).onChange(of: scenePhase) {
             oldPhase,