@webspatial/platform-visionos 0.1.11 → 0.1.14

package/package.json

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

package/web-spatial/libs/SpatialWindowComponent.swift

@@ -227,6 +227,20 @@ class SpatialWindowComponent: SpatialComponent {
         webViewNative!.initialLoad()
     }
 
+    /// Remove webview window.name
+    ///
+    /// The expectation is that when the app is reopened, the root page should not have a window.name. However, under the current scene mechanism, if the last closed scene had set a window.name, it will still exist the next time the app is opened.
+    ///
+    /// Currently, window.name is only deleted when non-main scenes are closed along with the destruction of the WebView.
+    ///
+    /// the root page should always have a blank name
+
+    func removeWebviewName(completion: (() -> Void)? = nil) {
+        webViewNative?.webViewHolder.appleWebView?.evaluateJavaScript("window.name = '';") { _, _ in
+            completion?()
+        }
+    }
+
     func isScrollEnabled() -> Bool {
         return webViewNative!.webViewHolder.appleWebView!.scrollView.isScrollEnabled
     }

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/libs/Utils/version.swift

@@ -0,0 +1,25 @@
+import Foundation
+
+struct PackageJSON: Codable {
+    let version: String
+}
+
+func getPackageVersion() -> String {
+    let currentFileURL = URL(fileURLWithPath: #file) // path of version
+    let currentDirectoryURL = currentFileURL.deletingLastPathComponent()
+
+    let packageJSONURL = currentDirectoryURL
+        .deletingLastPathComponent()
+        .deletingLastPathComponent()
+        .deletingLastPathComponent() // .. project root
+        .appendingPathComponent("package.json")
+
+    do {
+        // read file
+        let data = try Data(contentsOf: packageJSONURL)
+        let package = try JSONDecoder().decode(PackageJSON.self, from: data)
+        return package.version
+    } catch {
+        fatalError("⚠️ Error reading package.json at \(packageJSONURL.path): \(error)")
+    }
+}

package/web-spatial/libs/webView/backend/NativeWebView.swift

@@ -56,33 +56,6 @@ class Coordinator: NSObject, WKNavigationDelegate, WKScriptMessageHandler, WKUID
             dataTask.resume()
             return
         }
-
-        var styleJsonString: String? = URLComponents(string: url!.absoluteString)?.queryItems?.first(where: { $0.name == "style" })?.value
-
-        do {
-            if styleJsonString?.contains("?") != nil {
-                // remove invalid query string
-                // before "{\"glassEffect\":true,\"cornerRadius\":50}?uniqueURL=0.0010192470591506853"
-                // after "{\"glassEffect\":true,\"cornerRadius\":50}"
-                styleJsonString = styleJsonString?
-                    .components(separatedBy: "?").first
-            }
-            let styleToSet = try decoder.decode(PreloadStyleSettings.self, from: styleJsonString!.data(using: .utf8)!)
-
-            webviewGetEarlyStyleData.send(WebviewEarlyStyle(webview: webView, style: styleToSet))
-        } catch {
-            logger.warning("Style url parse failure " + error.localizedDescription)
-        }
-
-        // Respond with empty css file
-        let response = ".ignoreThis{}".data(using: .utf8)
-        let mimeType = "text/css"
-        let headers = ["Content-Type": mimeType, "Cache-Control": "no-cache"]
-        let resp = HTTPURLResponse(url: url!, statusCode: 200, httpVersion: "1.1", headerFields: headers)
-
-        urlSchemeTask.didReceive(resp!)
-        urlSchemeTask.didReceive(response!)
-        urlSchemeTask.didFinish()
     }
 
     func webView(_ webView: WKWebView, stop urlSchemeTask: any WKURLSchemeTask) {}
@@ -120,6 +93,27 @@ class Coordinator: NSObject, WKNavigationDelegate, WKScriptMessageHandler, WKUID
             decisionHandler(.cancel)
             return
         }
+        if let url = navigationAction.request.url,
+           url.absoluteString.starts(with: "forcestyle://")
+        {
+            var styleJsonString: String? = URLComponents(string: url.absoluteString)?.queryItems?.first(where: { $0.name == "style" })?.value
+            do {
+                if styleJsonString?.contains("?") != nil {
+                    // remove invalid query string
+                    // before "{\"glassEffect\":true,\"cornerRadius\":50}?uniqueURL=0.0010192470591506853"
+                    // after "{\"glassEffect\":true,\"cornerRadius\":50}"
+                    styleJsonString = styleJsonString?
+                        .components(separatedBy: "?").first
+                }
+                let styleToSet = try decoder.decode(PreloadStyleSettings.self, from: styleJsonString!.data(using: .utf8)!)
+
+                webviewGetEarlyStyleData.send(WebviewEarlyStyle(webview: webView, style: styleToSet))
+            } catch {
+                logger.warning("Style url parse failure " + error.localizedDescription)
+            }
+            decisionHandler(.cancel)
+            return
+        }
         var resource = navigationAction.request.url!.absoluteString
         if pwaManager.isLocal {
             resource = pwaManager.getLocalResourceURL(url: resource)
@@ -244,10 +238,6 @@ struct WebViewNative: UIViewRepresentable {
             myConfig.userContentController = userContentController
             myConfig.preferences.javaScriptCanOpenWindowsAutomatically = true
             myConfig.preferences.setValue(true, forKey: "allowFileAccessFromFileURLs")
-
-            if myConfig.urlSchemeHandler(forURLScheme: "forceStyle") == nil {
-                myConfig.setURLSchemeHandler(webViewHolder.webViewCoordinator, forURLScheme: "forceStyle")
-            }
             if myConfig.urlSchemeHandler(forURLScheme: "file") == nil {
                 myConfig.setURLSchemeHandler(webViewHolder.webViewCoordinator, forURLScheme: "file")
             }

package/web-spatial/web_spatialApp.swift

@@ -10,7 +10,8 @@ import SwiftUI
 let logger = Logger()
 
 // To load a local path, remove http:// eg.  "static-web/"
-let nativeAPIVersion = "0.0.1"
+let nativeAPIVersion = getPackageVersion()
+
 // start URL
 let startURL = pwaManager.start_url
 
@@ -97,7 +98,10 @@ struct web_spatialApp: App {
                         }.first?.value
 
                         if let wv = rootEntity?.getComponent(SpatialWindowComponent.self) {
-                            wv.navigateToURL(url: fileUrl)
+                            // remove the webview's name to behave like new opened root scene
+                            wv.removeWebviewName {
+                                wv.navigateToURL(url: fileUrl)
+                            }
                         }
                         // reset to mainScene size
                         wgm.setToMainSceneCfg()

package/web-spatial.xcodeproj/project.pbxproj

@@ -30,6 +30,7 @@
 		2BC261222D38F1DA00BCA977 /* NavView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2BC261202D38F1DA00BCA977 /* NavView.swift */; };
 		2BC9A2212D1E829B00912170 /* HideViewModifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2BC9A2202D1E829B00912170 /* HideViewModifier.swift */; };
 		2BD510562D54A30D0001E5E6 /* SceneManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2BD510552D54A2FF0001E5E6 /* SceneManager.swift */; };
+		2BD5880E2DB1237F00C0E13B /* version.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2BD5880D2DB1236000C0E13B /* version.swift */; };
 		2BDBED5F2D3F885A0065443F /* SpatialModel3DComponent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2BDBED5E2D3F885A0065443F /* SpatialModel3DComponent.swift */; };
 		2BDBED632D3FE8EC0065443F /* SpatialModel3DView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2BDBED622D3FE8EA0065443F /* SpatialModel3DView.swift */; };
 		2BDBF9B62C4ED9F600D269D7 /* static-web in Resources */ = {isa = PBXBuildFile; fileRef = 2BDBF9B52C4ED9F600D269D7 /* static-web */; };
@@ -83,6 +84,7 @@
 		2BC261202D38F1DA00BCA977 /* NavView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavView.swift; sourceTree = "<group>"; };
 		2BC9A2202D1E829B00912170 /* HideViewModifier.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HideViewModifier.swift; sourceTree = "<group>"; };
 		2BD510552D54A2FF0001E5E6 /* SceneManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneManager.swift; sourceTree = "<group>"; };
+		2BD5880D2DB1236000C0E13B /* version.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = version.swift; sourceTree = "<group>"; };
 		2BDBED5E2D3F885A0065443F /* SpatialModel3DComponent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpatialModel3DComponent.swift; sourceTree = "<group>"; };
 		2BDBED622D3FE8EA0065443F /* SpatialModel3DView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpatialModel3DView.swift; sourceTree = "<group>"; };
 		2BDBF9B52C4ED9F600D269D7 /* static-web */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "static-web"; sourceTree = "<group>"; };
@@ -121,6 +123,7 @@
 		2B0B1C0E2C494E4100E644F9 /* Utils */ = {
 			isa = PBXGroup;
 			children = (
+				2BD5880D2DB1236000C0E13B /* version.swift */,
 				2BD510552D54A2FF0001E5E6 /* SceneManager.swift */,
 				2B0B43092CBE21540003CEF3 /* CommandManager.swift */,
 				2B0B1C0F2C494E5400E644F9 /* Logger.swift */,
@@ -384,6 +387,7 @@
 				2BDBED5F2D3F885A0065443F /* SpatialModel3DComponent.swift in Sources */,
 				2B2F1D6B2BEBFAAA006897EE /* web_spatialApp.swift in Sources */,
 				2B0B1C102C494E5400E644F9 /* Logger.swift in Sources */,
+				2BD5880E2DB1237F00C0E13B /* version.swift in Sources */,
 				2B37E8E12D002C4D0096749A /* MaterialWithBorderCornerModifier.swift in Sources */,
 				2BC261222D38F1DA00BCA977 /* NavView.swift in Sources */,
 				2BAC1BE22CDC49040022E29B /* SpatialViewUI.swift in Sources */,