@webspatial/platform-visionos 1.2.0 → 1.3.0

package/web-spatial/webview/SpatialWebViewModel.swift

@@ -76,6 +76,12 @@ class SpatialWebViewModel {
     }
 
     func getController() -> SpatialWebController {
+        // See TODO in AttachmentManager — async destroy() during SwiftUI teardown
+        // can nil the controller while the view is still being removed.
+        if controller == nil {
+            controller = SpatialWebController()
+            controller!.model = self
+        }
         return controller!
     }
 
@@ -103,8 +109,8 @@ class SpatialWebViewModel {
         controller?.setWebViewTitle(title)
     }
 
-    // events
-    // navigation event
+    /// events
+    /// navigation event
     func addNavigationListener(protocal: String, event: @escaping (_ data: URL) -> Bool) {
         navigationList[protocal] = event
     }
@@ -113,7 +119,7 @@ class SpatialWebViewModel {
         navigationList = [:]
     }
 
-    // open window event
+    /// open window event
     func addOpenWindowListener(protocal: String, _ event: @escaping (_ data: URL) -> WebViewElementInfo?) {
         openWindowList[protocal] = event
     }
@@ -122,7 +128,7 @@ class SpatialWebViewModel {
         openWindowList = [:]
     }
 
-    // jsb event
+    /// jsb event
     func addJSBListener<T: CommandDataProtocol>(_ dataClass: T.Type, _ event: @escaping (T, @escaping JSBManager.ResolveHandler<Encodable>) -> Void) {
         controller?.registeJSBHandler(dataClass, event)
     }
@@ -143,7 +149,7 @@ class SpatialWebViewModel {
         controller?.mockJSB(command)
     }
 
-    // webview state event
+    /// webview state event
     func addStateListener(_ event: @escaping (_ type: SpatialWebViewState) -> Void) {
         stateChangeListeners.append(event)
     }
@@ -176,7 +182,7 @@ class SpatialWebViewModel {
         stateListeners[state] = nil
     }
 
-    // scroll update event
+    /// scroll update event
     func addScrollUpdateListener(_ event: @escaping (_ type: ScrollState, _ point: CGPoint) -> Void) {
         scrollUpdateListeners.append(event)
     }
@@ -199,7 +205,7 @@ class SpatialWebViewModel {
         removeAllScrollUpdateListener()
     }
 
-    // invokes
+    /// invokes
     private func onNavigationInvoke(_ url: URL) -> Bool {
         var matchProtocol = false
         for key in navigationList.keys {

package/web-spatial.xcodeproj/project.pbxproj

@@ -13,6 +13,7 @@
 		2B06AEE42E4C1AE8000327E9 /* manifest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B06AEC12E4C1AE8000327E9 /* manifest.swift */; };
 		2B06AEE62E4C1AE8000327E9 /* JSBCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B06AEC02E4C1AE8000327E9 /* JSBCommand.swift */; };
 		2B06AEE92E4C1AE8000327E9 /* EventEmitter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B06AEBF2E4C1AE8000327E9 /* EventEmitter.swift */; };
+		2B1008A22F0B000800000002 /* NavigationCleanupTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B1008A12F0B000800000001 /* NavigationCleanupTests.swift */; };
 		2B2F1D692BEBFAAA006897EE /* RealityKitContent in Frameworks */ = {isa = PBXBuildFile; productRef = 2B2F1D682BEBFAAA006897EE /* RealityKitContent */; };
 		2B2F1D712BEBFAAC006897EE /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2B2F1D702BEBFAAC006897EE /* Assets.xcassets */; };
 		2B2F1D742BEBFAAC006897EE /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2B2F1D732BEBFAAC006897EE /* Preview Assets.xcassets */; };
@@ -37,6 +38,7 @@
 		2B06AEC22E4C1AE8000327E9 /* SpatialObject.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpatialObject.swift; sourceTree = "<group>"; };
 		2B06AEC32E4C1AE8000327E9 /* WebSpatialApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebSpatialApp.swift; sourceTree = "<group>"; };
 		2B06AEC42E4C1AE8000327E9 /* Window.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Window.swift; sourceTree = "<group>"; };
+		2B1008A12F0B000800000001 /* NavigationCleanupTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavigationCleanupTests.swift; sourceTree = "<group>"; };
 		2B2F1D632BEBFAAA006897EE /* WebSpatial.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = WebSpatial.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		2B2F1D672BEBFAAA006897EE /* RealityKitContent */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = RealityKitContent; sourceTree = "<group>"; };
 		2B2F1D702BEBFAAC006897EE /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -51,6 +53,7 @@
 		2B06AF302E4C1AF8000327E9 /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = {
 			isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
 			membershipExceptions = (
+				AttachmentManager.swift,
 				Dynamic3DManager.swift,
 				FileCoordinator.swift,
 				JSBManager.swift,
@@ -156,11 +159,20 @@
 			isa = PBXGroup;
 			children = (
 				2B2F1D652BEBFAAA006897EE /* web-spatial */,
+				2B1008A32F0B000800000003 /* web-spatialTests */,
 				2B2F1D662BEBFAAA006897EE /* Packages */,
 				2B2F1D642BEBFAAA006897EE /* Products */,
 			);
 			sourceTree = "<group>";
 		};
+		2B1008A32F0B000800000003 /* web-spatialTests */ = {
+			isa = PBXGroup;
+			children = (
+				2B1008A12F0B000800000001 /* NavigationCleanupTests.swift */,
+			);
+			path = "web-spatialTests";
+			sourceTree = "<group>";
+		};
 		2B2F1D642BEBFAAA006897EE /* Products */ = {
 			isa = PBXGroup;
 			children = (
@@ -334,6 +346,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				2B1008A22F0B000800000002 /* NavigationCleanupTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

package/web-spatialTests/NavigationCleanupTests.swift

@@ -0,0 +1,33 @@
+@testable import WebSpatial
+import XCTest
+
+final class NavigationCleanupTests: XCTestCase {
+    func test_resetForNavigation_destroysSceneSpatialObjectsAndAttachments() {
+        // Given: a scene with spatial objects and attachments created by the current page
+        let scene = SpatialApp.Instance.createScene(
+            "http://localhost:5173/",
+            .window,
+            .visible
+        )
+
+        let panel: Spatialized2DElement = scene.createSpatializedElement(.Spatialized2DElement)
+        panel.setParent(scene)
+        XCTAssertNotNil(scene.findSpatialObject(panel.id) as Spatialized2DElement?)
+
+        _ = scene.attachmentManager.create(
+            id: "test-attachment",
+            parentEntityId: "test-parent-entity",
+            position: SIMD3<Float>(0, 0, 0),
+            size: CGSize(width: 100, height: 100)
+        )
+        XCTAssertFalse(scene.attachmentManager.attachments.isEmpty)
+
+        // When: navigation happens (reload/back/forward/new URL)
+        scene.resetForNavigation()
+
+        // Then: all existing spatial objects and attachments should be cleaned up
+        XCTAssertNil(scene.findSpatialObject(panel.id) as Spatialized2DElement?)
+        XCTAssertTrue(scene.attachmentManager.attachments.isEmpty)
+        XCTAssertNil(SpatialObject.get(panel.id))
+    }
+}