@webspatial/platform-visionos 1.2.1 → 1.3.0

package/web-spatial/view/SpatialNavView.swift

@@ -21,7 +21,6 @@ struct NavDivider: View {
     }
 }
 
-
 struct NavButton: View {
     var action: () -> Void
     var children: Image
@@ -55,21 +54,18 @@ struct NavButton: View {
     }
 }
 
-
 struct SpatialNavView: View {
     static let navHeight: CGFloat = SpatialScene.navHeight
     static let minWidth: CGFloat = 400
     var spatialScene: SpatialScene
-    var model:SpatialWebViewModel? {
-        get {
-            return spatialScene.spatialWebViewModel
-        }
+    var model: SpatialWebViewModel? {
+        return spatialScene.spatialWebViewModel
     }
+
     var url: String {
-        get {
-            return spatialScene.url
-        }
+        return spatialScene.url
     }
+
     @State var navWidth: CGFloat = 0
     @State private var showCopyTip = false
     @State private var contentHeight: CGFloat = 60
@@ -81,36 +77,40 @@ struct SpatialNavView: View {
     @State private var showNav: Double = 0
     @State private var showUrl: Double = 0
     @Namespace var hoverNamespace
-    
-    func checkButtonState(){
+
+    func checkButtonState() {
         canGoBack = model!.getController().webview!.canGoBack
         canGoForward = model!.getController().webview!.canGoForward
     }
-    
+
     func goBack() {
+        spatialScene.resetForNavigation()
         model?.getController().webview?.goBack()
     }
-    
+
     func goForward() {
+        spatialScene.resetForNavigation()
         model?.getController().webview?.goForward()
     }
-    
+
     func reload() {
+        spatialScene.resetForNavigation()
         model?.getController().webview?.reload()
     }
-    
+
     func navigateToURL(url: URL) {
+        spatialScene.resetForNavigation()
         model?.load(url.absoluteString)
     }
-    
+
     func getURL() -> URL? {
         return model?.getController().webview?.url
     }
-    
+
     @State var canGoBack: Bool = false
-    
+
     @State var canGoForward: Bool = false
-    
+
     var navHoverGroup: HoverEffectGroup {
         HoverEffectGroup(hoverNamespace)
     }
@@ -126,13 +126,15 @@ struct SpatialNavView: View {
                             action: { self.goBack()
                             },
                             children: Image("arrow_left"),
-                            clearBackGround: true)
+                            clearBackGround: true
+                        )
                         .disabled(!(self.canGoBack))
                         NavButton(
                             action: { self.goForward()
                             },
                             children: Image("arrow_right"),
-                            clearBackGround: true)
+                            clearBackGround: true
+                        )
                         .disabled(!(self.canGoBack))
                         NavButton(action: { self.reload() }, children: Image("refresh"), clearBackGround: true)
                         NavDivider()
@@ -156,12 +158,14 @@ struct SpatialNavView: View {
                     NavButton(
                         action: { self.goBack()
                         },
-                        children: Image("arrow_left"))
+                        children: Image("arrow_left")
+                    )
                     .disabled(!(self.canGoBack))
                     NavButton(
                         action: { self.goForward()
                         },
-                        children: Image("arrow_right"))
+                        children: Image("arrow_right")
+                    )
                     .disabled(!(self.canGoBack))
                     NavButton(action: { self.reload() }, children: Image("refresh"))
                     NavDivider()
@@ -187,14 +191,14 @@ struct SpatialNavView: View {
                         self.getURL()?.absoluteString ?? ""
                     )
                 )
-                    .lineLimit(1)
-                    .textSelection(.enabled)
-                    .padding(12)
-                    .frame(minWidth: 200)
-                    .frame(maxWidth: 500)
-                    .frame(height: 44)
-                    .background(.black)
-                    .cornerRadius(100)
+                .lineLimit(1)
+                .textSelection(.enabled)
+                .padding(12)
+                .frame(minWidth: 200)
+                .frame(maxWidth: 500)
+                .frame(height: 44)
+                .background(.black)
+                .cornerRadius(100)
                 NavButton(action: {
                     UIPasteboard.general.string = self.getURL()?.absoluteString ?? ""
                     showCopyTip = true
@@ -204,21 +208,22 @@ struct SpatialNavView: View {
                     withAnimation(.easeInOut(duration: 0.5)) { showUrl = 0; showNav = 1 }
                 }, children: Image("copy"))
                 NavButton(
-action: {
-                    print("open browser")
-                    UIApplication.shared
-        .open(
-            URL(
-                string: url.count > 0 ? url : (
-                    self.getURL()?.absoluteString ?? ""
+                    action: {
+                        print("open browser")
+                        UIApplication.shared
+                            .open(
+                                URL(
+                                    string: url.count > 0 ? url : (
+                                        self.getURL()?.absoluteString ?? ""
+                                    )
+                                )!,
+                                options: [:],
+                                completionHandler: nil
+                            )
+                        withAnimation(.easeInOut(duration: 0.5)) { showUrl = 0; showNav = 1 }
+                    },
+                    children: Image("browser")
                 )
-            )!,
-            options: [:],
-            completionHandler: nil
-        )
-                    withAnimation(.easeInOut(duration: 0.5)) { showUrl = 0; showNav = 1 }
-                },
- children: Image("browser"))
                 NavButton(action: { withAnimation(.easeInOut(duration: 0.5)) { showUrl = 0; showNav = 1 } }, children: Image("close"))
             }
             .popover(isPresented: $showCopyTip) {
@@ -232,8 +237,8 @@ action: {
             .cornerRadius(100)
             .opacity(showUrl)
         }
-        .onAppear(){
-            model?.addStateListener(.didFinishLoad){
+        .onAppear {
+            model?.addStateListener(.didFinishLoad) {
                 self.checkButtonState()
             }
         }

package/web-spatial/view/SpatializedDynamic3DView.swift

@@ -16,10 +16,21 @@ struct SpatializedDynamic3DView: View {
         SpatialTapGesture(count: 1).targetedToAnyEntity()
             .onEnded { value in
                 if let entity = value.entity as? SpatialEntity {
-                    spatialScene.sendWebMsg(entity.spatialId, WebSpatialTapGuestureEvent(detail: WebSpatialTapGuestureEventDetail(location3D: value.location3D)))
+                    // Convert local gesture coordinates into world (global) coordinates via RealityKit.
+                    let globalLocation3D = entity.convert(position: SIMD3<Float>(Float(value.location3D.x), Float(value.location3D.y), Float(value.location3D.z)), to: nil)
+                    let globalPoint3D = Point3D(x: Double(globalLocation3D.x), y: Double(globalLocation3D.y), z: Double(globalLocation3D.z))
+
+                    spatialScene.sendWebMsg(entity.spatialId, WebSpatialTapGuestureEvent(detail: WebSpatialTapGuestureEventDetail(location3D: value.location3D, globalLocation3D: globalPoint3D)))
                 } else {
                     if let spatialEntity = SpatialEntity.findNearestParent(entity: value.entity) {
-                        spatialScene.sendWebMsg(spatialEntity.spatialId, WebSpatialTapGuestureEvent(detail: WebSpatialTapGuestureEventDetail(location3D: value.location3D)))
+                        // Convert using the hit entity's coordinate space, then forward to the nearest SpatialEntity.
+                        let globalLocation3D = value.entity.convert(
+                            position: SIMD3<Float>(Float(value.location3D.x), Float(value.location3D.y), Float(value.location3D.z)),
+                            to: nil
+                        )
+                        let globalPoint3D = Point3D(x: Double(globalLocation3D.x), y: Double(globalLocation3D.y), z: Double(globalLocation3D.z))
+
+                        spatialScene.sendWebMsg(spatialEntity.spatialId, WebSpatialTapGuestureEvent(detail: WebSpatialTapGuestureEventDetail(location3D: value.location3D, globalLocation3D: globalPoint3D)))
                     }
                 }
             }
@@ -76,9 +87,16 @@ struct SpatializedDynamic3DView: View {
             // Always forward drag gesture events to JS
             if let entity = value.entity as? SpatialEntity {
                 if !isDrag {
+                    let globalStartLocation3D = value.entity.convert(
+                        position: SIMD3<Float>(Float(value.startLocation3D.x), Float(value.startLocation3D.y), Float(value.startLocation3D.z)),
+                        to: nil
+                    )
+                    let globalStartPoint3D = Point3D(x: Double(globalStartLocation3D.x), y: Double(globalStartLocation3D.y), z: Double(globalStartLocation3D.z))
+
                     let startEvent = WebSpatialDragStartGuestureEvent(
                         detail: .init(
-                            startLocation3D: value.startLocation3D
+                            startLocation3D: value.startLocation3D,
+                            globalLocation3D: globalStartPoint3D
                         )
                     )
                     spatialScene.sendWebMsg(entity.spatialId, startEvent)
@@ -101,13 +119,59 @@ struct SpatializedDynamic3DView: View {
     }
 
     var body: some View {
-        RealityView(make: { content in
+        RealityView(make: { content, attachments in
             let rootEntity = spatializedDynamic3DElement.getRoot()
             content.add(rootEntity)
+
+            // Add existing attachments on initial creation
+            for (_, info) in spatialScene.attachmentManager.attachments {
+                if let attachmentEntity = attachments.entity(for: info.id) {
+                    attachmentEntity.position = info.position
+                    if let parentEntity = findSpatialEntity(info.parentEntityId) {
+                        parentEntity.addChild(attachmentEntity)
+                    } else {
+                        rootEntity.addChild(attachmentEntity)
+                    }
+                }
+            }
+        }, update: { _, attachments in
+            let rootEntity = spatializedDynamic3DElement.getRoot()
+            // Update attachment positions and parenting
+            for (_, info) in spatialScene.attachmentManager.attachments {
+                if let attachmentEntity = attachments.entity(for: info.id) {
+                    attachmentEntity.position = info.position
+                    // Re-parent if not already under the correct parent
+                    if let parentEntity = findSpatialEntity(info.parentEntityId) {
+                        if attachmentEntity.parent != parentEntity {
+                            parentEntity.addChild(attachmentEntity)
+                        }
+                    } else {
+                        // Parent entity might have been destroyed; fall back to root.
+                        if attachmentEntity.parent != rootEntity {
+                            rootEntity.addChild(attachmentEntity)
+                        }
+                    }
+                }
+            }
+        }, attachments: {
+            ForEach(Array(spatialScene.attachmentManager.attachments.values)) { info in
+                Attachment(id: info.id) {
+                    info.webViewModel.getView()
+                        .frame(
+                            width: info.size.width,
+                            height: info.size.height
+                        )
+                }
+            }
         })
         .simultaneousGesture(spatialTapEvent)
         .simultaneousGesture(rotate3dEvent)
         .simultaneousGesture(dragEvent)
         .simultaneousGesture(magnifyEvent)
     }
+
+    private func findSpatialEntity(_ spatialId: String) -> SpatialEntity? {
+        // Look up the SpatialEntity from the SpatialScene's spatial object registry
+        return spatialScene.findSpatialObject(spatialId)
+    }
 }

package/web-spatial/view/SpatializedElementView.swift

@@ -1,12 +1,17 @@
+import CoreGraphics
 import SwiftUI
 
-// zIndex() have some bug, so use zOrderBias to simulate zIndex effect
+/// zIndex() have some bug, so use zOrderBias to simulate zIndex effect
 let zOrderBias = 0.001
 
 final class GestureFlags {
     var isDrag = false
 }
 
+final class TransformHolder {
+    var transform: AffineTransform3D = .identity
+}
+
 struct SpatializedElementView<Content: View>: View {
     @Environment(SpatializedElement.self) var spatializedElement: SpatializedElement
     @Environment(SpatialScene.self) var spatialScene: SpatialScene
@@ -15,13 +20,15 @@ struct SpatializedElementView<Content: View>: View {
     var content: Content
 
     @State private var gestureFlags = GestureFlags()
+    @State private var transformHolder = TransformHolder()
+    @State private var currentTransform: AffineTransform3D = .identity
 
     init(parentScrollOffset: Vec2, @ViewBuilder content: () -> Content) {
         self.parentScrollOffset = parentScrollOffset
         self.content = content()
     }
 
-    // Begin Interaction
+    /// Begin Interaction
     var gesture: some Gesture {
         DragGesture(minimumDistance: 10)
             .onChanged(onDragging)
@@ -29,17 +36,14 @@ struct SpatializedElementView<Content: View>: View {
             .simultaneously(with:
                 RotateGesture3D()
                     .onChanged(onRotateGesture3D)
-                    .onEnded(onRotateGesture3DEnd)
-            )
+                    .onEnded(onRotateGesture3DEnd))
             .simultaneously(with:
                 MagnifyGesture()
                     .onChanged(onMagnifyGesture)
-                    .onEnded(onMagnifyGestureEnd)
-            )
+                    .onEnded(onMagnifyGestureEnd))
             .simultaneously(with:
                 SpatialTapGesture(count: 1)
-                    .onEnded(onTapEnded)
-            )
+                    .onEnded(onTapEnded))
     }
 
     private func onRotateGesture3D(_ event: RotateGesture3D.Value) {
@@ -64,8 +68,13 @@ struct SpatializedElementView<Content: View>: View {
 
     private func onDragging(_ event: DragGesture.Value) {
         if spatializedElement.enableDragStartGesture, !gestureFlags.isDrag {
+            let localPoint = SIMD4<Double>(event.startLocation3D.x, event.startLocation3D.y, event.startLocation3D.z, 1.0)
+            let transformedPoint = transformHolder.transform.matrix * localPoint
+            let globalPoint3D = Point3D(x: transformedPoint.x, y: transformedPoint.y, z: transformedPoint.z)
+
             let gestureEvent = WebSpatialDragStartGuestureEvent(detail: .init(
-                startLocation3D: event.startLocation3D
+                startLocation3D: event.startLocation3D,
+                globalLocation3D: globalPoint3D
             ))
 
             spatialScene.sendWebMsg(spatializedElement.id, gestureEvent)
@@ -92,7 +101,11 @@ struct SpatializedElementView<Content: View>: View {
 
     private func onTapEnded(_ event: SpatialTapGesture.Value) {
         if spatializedElement.enableTapGesture {
-            spatialScene.sendWebMsg(spatializedElement.id, WebSpatialTapGuestureEvent(detail: .init(location3D: event.location3D)))
+            let localPoint = SIMD4<Double>(event.location3D.x, event.location3D.y, event.location3D.z, 1.0)
+            let transformedPoint = transformHolder.transform.matrix * localPoint
+            let globalPoint3D = Point3D(x: transformedPoint.x, y: transformedPoint.y, z: transformedPoint.z)
+
+            spatialScene.sendWebMsg(spatializedElement.id, WebSpatialTapGuestureEvent(detail: .init(location3D: event.location3D, globalLocation3D: globalPoint3D)))
         }
     }
 
@@ -101,7 +114,8 @@ struct SpatializedElementView<Content: View>: View {
             let gestureEvent = WebSpatialMagnifyGuestureEvent(
                 detail: .init(
                     magnification: event.magnification
-                ))
+                )
+            )
             spatialScene.sendWebMsg(spatializedElement.id, gestureEvent)
         }
     }
@@ -114,7 +128,6 @@ struct SpatializedElementView<Content: View>: View {
 
     // End Interaction
 
-    @ViewBuilder
     var body: some View {
         let transform = spatializedElement.transform
         let translation = transform.translation
@@ -146,7 +159,9 @@ struct SpatializedElementView<Content: View>: View {
             .onGeometryChange3D(for: AffineTransform3D.self) { proxy in
                 let rect3d = proxy.frame(in: .named("SpatialScene"))
                 spatialScene.sendWebMsg(spatializedElement.id, SpatiaizedContainerClientCube(origin: rect3d.origin, size: rect3d.size))
-                return proxy.transform(in: .named("SpatialScene"))!
+                let transform = proxy.transform(in: .named("SpatialScene"))!
+                transformHolder.transform = transform
+                return transform
             } action: { _, new in
                 spatialScene.sendWebMsg(spatializedElement.id, SpatiaizedContainerTransform(detail: new))
             }

package/web-spatial/view/SpatializedStatic3DView.swift

@@ -8,7 +8,7 @@ struct SpatializedStatic3DView: View {
     private var spatializedStatic3DElement: SpatializedStatic3DElement {
         return spatializedElement as! SpatializedStatic3DElement
     }
-    
+
     func onLoadSuccess() {
         spatialScene.sendWebMsg(spatializedElement.id, ModelLoadSuccess())
     }
@@ -17,7 +17,6 @@ struct SpatializedStatic3DView: View {
         spatialScene.sendWebMsg(spatializedElement.id, ModelLoadFailure())
     }
 
-    @ViewBuilder
     var body: some View {
         let depth = spatializedElement.depth
         let transform = spatializedStatic3DElement.modelTransform
@@ -27,14 +26,13 @@ struct SpatializedStatic3DView: View {
         let x = translation.x
         let y = translation.y
         let z = translation.z
-        
+
         let enableGesture = spatializedElement.enableGesture
         if let url = URL(string: spatializedStatic3DElement.modelURL) {
             Model3D(url: url) { newPhase in
                 switch newPhase {
                 case .empty:
                     ProgressView()
-
                 case let .success(resolvedModel3D):
                     resolvedModel3D
                         .resizable(true)
@@ -42,11 +40,11 @@ struct SpatializedStatic3DView: View {
                             nil,
                             contentMode: .fit
                         )
-                        .if(!depth.isZero){ view in view.scaledToFit3D()}
+                        .if(!depth.isZero) { view in view.scaledToFit3D() }
                         .onAppear {
                             self.onLoadSuccess()
                         }
-                        .if(enableGesture) { view in view.hoverEffect()}
+                        .if(enableGesture) { view in view.hoverEffect() }
                 case .failure:
                     Text("").onAppear {
                         self.onLoadFailure()

package/web-spatial/view/view-modifier/HideViewModifier.swift

@@ -2,14 +2,14 @@ import SwiftUI
 
 struct HideViewModifier: ViewModifier {
     let isHidden: Bool
-    @ViewBuilder func body(content: Content) -> some View {
+    func body(content: Content) -> some View {
         content
             .opacity(isHidden ? 0 : 1)
             .disabled(isHidden)
     }
 }
 
-// Extending on View to apply to all Views
+/// Extending on View to apply to all Views
 extension View {
     func hidden(_ isHidden: Bool) -> some View {
         modifier(HideViewModifier(isHidden: isHidden))

package/web-spatial/webview/SpatialWebController.swift

@@ -9,7 +9,7 @@ class SpatialWebController: NSObject, WKNavigationDelegate, WKScriptMessageHandl
     private var openWindowInvoke: ((_ data: URL) -> WebViewElementInfo?)?
     private var webviewStateChangeInvoke: ((_ type: SpatialWebViewState) -> Void)?
     private var scorllUpdateInvoke: ((_ type: ScrollState, _ point: CGPoint) -> Void)?
-    private var webviewTitle: String? = nil
+    private var webviewTitle: String?
     private var firstLoad = true
     private var jsbManager = JSBManager()
 
@@ -62,25 +62,29 @@ class SpatialWebController: NSObject, WKNavigationDelegate, WKScriptMessageHandl
         }
     }
 
-    // navigation request
-    // SpatialDiv/forcestyle/normal web link protocol
+    /// navigation request
+    /// SpatialDiv/forcestyle/normal web link protocol
     func webView(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction, decisionHandler: @escaping (WKNavigationActionPolicy) -> Swift.Void) {
         let deciside = navigationInvoke?(navigationAction.request.url!)
         if deciside == true {
-            if !firstLoad{
+            if !firstLoad {
                 webviewStateChangeInvoke?(.didUnload)
             }
             firstLoad = false
         }
         var needAllow = deciside ?? false
-        
-        if !needAllow{
-            UIApplication.shared.open(navigationAction.request.url!, options: [:], completionHandler: nil)
+
+        if !needAllow {
+            // webspatial:// is an internal scheme for in-app routing between main and attachment windows.
+            // Only open non-webspatial URLs externally via the system.
+            if navigationAction.request.url?.scheme != "webspatial" {
+                UIApplication.shared.open(navigationAction.request.url!, options: [:], completionHandler: nil)
+            }
         }
         decisionHandler(needAllow ? .allow : .cancel)
     }
 
-    // open window request
+    /// open window request
     func webView(
         _ webView: WKWebView,
         createWebViewWith configuration: WKWebViewConfiguration,
@@ -95,7 +99,7 @@ class SpatialWebController: NSObject, WKNavigationDelegate, WKScriptMessageHandl
         return nil
     }
 
-    // invoke jsb
+    /// invoke jsb
     func userContentController(
         _ userContentController: WKUserContentController,
         didReceive message: WKScriptMessage, replyHandler: @escaping (Any?, String?) -> Void
@@ -104,7 +108,7 @@ class SpatialWebController: NSObject, WKNavigationDelegate, WKScriptMessageHandl
         jsbManager.handlerMessage(message.body as! String, replyHandler)
     }
 
-    // custom scheme request
+    /// custom scheme request
     func webView(_ webView: WKWebView, start urlSchemeTask: any WKURLSchemeTask) {
         print("urlSchemeTask")
         let url = urlSchemeTask.request.url
@@ -221,8 +225,8 @@ class SpatialWebController: NSObject, WKNavigationDelegate, WKScriptMessageHandl
         scorllUpdateInvoke = nil
         model = nil
     }
-    
-    private var state:SpatialWebViewState?
+
+    private var state: SpatialWebViewState?
 
     func destroyView() {
         stopObserving()
@@ -236,15 +240,15 @@ class SpatialWebController: NSObject, WKNavigationDelegate, WKScriptMessageHandl
             webviewStateChangeInvoke?(.didDestroyView)
         }
     }
-    
+
     private var isPageLoaded = false
-    
+
     private var jsQueue: [String] = []
-    
+
     private func enqueueJS(_ js: String) {
         jsQueue.append(js)
     }
-    
+
     private func flushJSQueue() {
         guard !jsQueue.isEmpty else { return }
         let combined = jsQueue.joined(separator: ";")
@@ -253,7 +257,7 @@ class SpatialWebController: NSObject, WKNavigationDelegate, WKScriptMessageHandl
     }
 
     func callJS(_ js: String) {
-        if webview != nil && isPageLoaded {
+        if webview != nil, isPageLoaded {
             webview!.evaluateJavaScript(js)
         } else {
             enqueueJS(js)
@@ -268,13 +272,13 @@ enum ScrollState {
     case end
 }
 
-// extend webview to support file://
- @available(iOS 11.0, *)
- extension WKWebView {
+/// extend webview to support file://
+@available(iOS 11.0, *)
+extension WKWebView {
     /// WKWebView,  Support setting file scheme in configuration
     public private(set) static var isEnableFileSupport = false
     public static func enableFileScheme() {
-        /// This method supports adapting supported files through Configuration, but cannot be cancelled (Configuration is immutable).
+        // This method supports adapting supported files through Configuration, but cannot be cancelled (Configuration is immutable).
         if !isEnableFileSupport {
             switchHandlesURLScheme()
         }
@@ -292,9 +296,8 @@ enum ScrollState {
     }
 
     /// Return true if WKWebview supports handling this protocol, but WKWebview supports HTTP by default, so return false to support using custom HTTP Handler
-    @objc private dynamic
-    static func wrapHandles(urlScheme: String) -> Bool {
+    @objc private dynamic static func wrapHandles(urlScheme: String) -> Bool {
         if urlScheme == "file" { return false }
         return wrapHandles(urlScheme: urlScheme)
     }
- }
+}

package/web-spatial/webview/SpatialWebView.swift

@@ -8,7 +8,11 @@ struct SpatialWebView: UIViewRepresentable {
 
     func makeUIView(context: Context) -> WKWebView {
         webviewStateChangeInvoke?(.didMakeView)
-        return model!.getController().webview!
+        let controller = model?.getController()
+        if controller?.webview == nil {
+            model?.load()
+        }
+        return controller?.webview ?? WKWebView(frame: .zero, configuration: WKWebViewConfiguration())
     }
 
     func makeCoordinator() -> SpatialWebController {