@webspatial/platform-visionos 1.0.5 → 1.2.0

package/web-spatial/model/SpatialScene.swift

@@ -39,7 +39,7 @@ class SpatialScene: SpatialObject, ScrollAbleSpatialElementContainer, WebMsgSend
     var parent: (any ScrollAbleSpatialElementContainer)?
 
     // Enum
-    public enum WindowStyle: String, Codable, CaseIterable {
+    enum WindowStyle: String, Codable, CaseIterable {
         case window
         case volume
     }
@@ -51,7 +51,7 @@ class SpatialScene: SpatialObject, ScrollAbleSpatialElementContainer, WebMsgSend
     var setLoadingWindowData = PassthroughSubject<XLoadingViewData, Never>()
 
     var url: String = "" // start_url
-    public var windowStyle: WindowStyle {
+    var windowStyle: WindowStyle {
         didSet {
             resetBackgroundMaterialOnWindowStyleChange(windowStyle)
         }
@@ -116,6 +116,35 @@ class SpatialScene: SpatialObject, ScrollAbleSpatialElementContainer, WebMsgSend
         return true
     }
 
+    private func handleNavigationCheckCustom(_ url: URL) -> Bool {
+        /*
+         because full url is webspatial://createSpatialScene?url=xxx
+         we need to get the real url.
+         we do 2 things:
+
+         1. let curUrl = parse url
+         2. if url is in scope do webviewModel.load(curUrl)
+            else open in safari
+         */
+        guard let components = URLComponents(string: url.absoluteString),
+              let queryItems = components.queryItems
+        else {
+            print("❌ fail to parse URL")
+            return false
+        }
+        guard let encodedUrl = queryItems.first(where: { $0.name == "url" })?.value,
+              let decodedUrl = encodedUrl.removingPercentEncoding
+        else {
+            return false
+        }
+        if pwaManager.checkInScope(url: decodedUrl) {
+            spatialWebViewModel.load(decodedUrl)
+            return false
+        }
+        UIApplication.shared.open(URL(string: decodedUrl)!, options: [:], completionHandler: nil)
+        return false
+    }
+
     private func handleWindowOpenCustom(_ url: URL) -> WebViewElementInfo? {
         // get config from url
         guard let components = URLComponents(string: url.absoluteString),
@@ -132,6 +161,11 @@ class SpatialScene: SpatialObject, ScrollAbleSpatialElementContainer, WebMsgSend
             return nil
         }
 
+        if !pwaManager.checkInScope(url: decodedUrl) {
+            UIApplication.shared.open(URL(string: decodedUrl)!, options: [:], completionHandler: nil)
+            return nil
+        }
+
         if let encodedConfig = queryItems.first(where: { $0.name == "config" })?.value,
            let decodedConfig = encodedConfig.removingPercentEncoding
         {
@@ -190,9 +224,9 @@ class SpatialScene: SpatialObject, ScrollAbleSpatialElementContainer, WebMsgSend
         SpatialApp.Instance.closeWindowGroup(self)
     }
 
-    public var sceneConfig: SceneOptions?
+    var sceneConfig: SceneOptions?
 
-    public func moveToState(_ newState: SceneStateKind, _ sceneConfig: SceneOptions?) {
+    func moveToState(_ newState: SceneStateKind, _ sceneConfig: SceneOptions?) {
         print(" moveToState \(state) to \(newState) ")
 
         let oldState = state
@@ -214,7 +248,7 @@ class SpatialScene: SpatialObject, ScrollAbleSpatialElementContainer, WebMsgSend
 
         } else if oldState == .idle, newState == .visible {
             // SpatialApp opened SpatialScene
-        } else if oldState == .idle && newState == .willVisible {
+        } else if oldState == .idle, newState == .willVisible {
             // window.open with scene config
             SpatialApp.Instance.openWindowGroup(self, sceneConfig!)
         }
@@ -269,6 +303,8 @@ class SpatialScene: SpatialObject, ScrollAbleSpatialElementContainer, WebMsgSend
 
         spatialWebViewModel
             .addNavigationListener(protocal: SpatialApp.Instance.scope, event: handleNavigationCheck)
+        spatialWebViewModel
+            .addNavigationListener(protocal: "webspatial://createSpatialScene", event: handleNavigationCheckCustom)
     }
 
     var width: Double = 0
@@ -292,7 +328,7 @@ class SpatialScene: SpatialObject, ScrollAbleSpatialElementContainer, WebMsgSend
         ])
     }
 
-    public var didFailLoad = false
+    var didFailLoad = false
 
     private func setupWebViewStateListener() {
         spatialWebViewModel.addStateListener(.didStartLoad) {
@@ -608,9 +644,7 @@ class SpatialScene: SpatialObject, ScrollAbleSpatialElementContainer, WebMsgSend
         if let enableDragEndGesture = command.enableDragEndGesture {
             spatializedElement.enableDragEndGesture = enableDragEndGesture
         }
-        if let enableRotateStartGesture = command.enableRotateStartGesture {
-            spatializedElement.enableRotateStartGesture = enableRotateStartGesture
-        }
+
         if let enableRotateGesture = command.enableRotateGesture {
             spatializedElement.enableRotateGesture = enableRotateGesture
         }
@@ -618,10 +652,6 @@ class SpatialScene: SpatialObject, ScrollAbleSpatialElementContainer, WebMsgSend
             spatializedElement.enableRotateEndGesture = enableRotateEndGesture
         }
 
-        if let enableMagnifyStartGesture = command.enableMagnifyStartGesture {
-            spatializedElement.enableMagnifyStartGesture = enableMagnifyStartGesture
-        }
-
         if let enableMagnifyGesture = command.enableMagnifyGesture {
             spatializedElement.enableMagnifyGesture = enableMagnifyGesture
         }

package/web-spatial/model/Spatialized2DElement.swift

@@ -53,6 +53,8 @@ class Spatialized2DElement: SpatializedElement, ScrollAbleSpatialElementContaine
             self._scrollOffset.y = point.y
         }
         spatialWebViewModel.scrollEnabled = false
+
+        defaultAlignment = .center
     }
 
     // Spatialized2DElement can hold a collection of SpatializedElement children

package/web-spatial/model/SpatializedElement.swift

@@ -26,20 +26,20 @@ class SpatializedElement: SpatialObject {
     var enableDragStartGesture: Bool = false
     var enableDragGesture: Bool = false
     var enableDragEndGesture: Bool = false
-    var enableRotateStartGesture: Bool = false
     var enableRotateGesture: Bool = false
     var enableRotateEndGesture: Bool = false
-    var enableMagnifyStartGesture: Bool = false
     var enableMagnifyGesture: Bool = false
     var enableMagnifyEndGesture: Bool = false
     var enableTapGesture: Bool = false
 
+    var defaultAlignment: DepthAlignment = .back
+
     var enableGesture: Bool {
-        return enableDragStartGesture || enableDragGesture || enableDragEndGesture || enableRotateStartGesture || enableRotateGesture || enableRotateEndGesture || enableMagnifyStartGesture || enableMagnifyGesture || enableMagnifyEndGesture || enableTapGesture
+        return enableDragStartGesture || enableDragGesture || enableDragEndGesture || enableRotateGesture || enableRotateEndGesture || enableMagnifyGesture || enableMagnifyEndGesture || enableTapGesture
     }
 
     enum CodingKeys: String, CodingKey {
-        case clientX, clientY, width, height, depth, backOffset, transform, rotationAnchor, opacity, visible, scrollWithParent, zIndex, parent, enableGesture, enableTapGesture, enableDragGesture, enableDragEndGesture, enableRotateStartGesture, enableRotateGesture, enableRotateEndGesture, enableMagnifyStartGesture, enableMagnifyGesture, enableMagnifyEndGesture
+        case clientX, clientY, width, height, depth, backOffset, transform, rotationAnchor, opacity, visible, scrollWithParent, zIndex, parent, enableGesture, enableTapGesture, enableDragStartGesture, enableDragGesture, enableDragEndGesture, enableRotateGesture, enableRotateEndGesture, enableMagnifyGesture, enableMagnifyEndGesture
     }
 
     override func encode(to encoder: Encoder) throws {
@@ -60,12 +60,11 @@ class SpatializedElement: SpatialObject {
         try container.encode(parent?.id, forKey: .parent)
         try container.encode(enableGesture, forKey: .enableGesture)
         try container.encode(enableTapGesture, forKey: .enableTapGesture)
+        try container.encode(enableDragStartGesture, forKey: .enableDragStartGesture)
         try container.encode(enableDragGesture, forKey: .enableDragGesture)
         try container.encode(enableDragEndGesture, forKey: .enableDragEndGesture)
-        try container.encode(enableRotateStartGesture, forKey: .enableRotateStartGesture)
         try container.encode(enableRotateGesture, forKey: .enableRotateGesture)
         try container.encode(enableRotateEndGesture, forKey: .enableRotateEndGesture)
-        try container.encode(enableMagnifyStartGesture, forKey: .enableMagnifyStartGesture)
         try container.encode(enableMagnifyGesture, forKey: .enableMagnifyGesture)
         try container.encode(enableMagnifyEndGesture, forKey: .enableMagnifyEndGesture)
     }

package/web-spatial/model/dynamic3d/SpatialEntity.swift

@@ -1,118 +1,123 @@
-import SwiftUI
 import RealityKit
+import SwiftUI
 
 @Observable
 class SpatialEntity: Entity, SpatialObjectProtocol {
     let spatialId: String
-    
+
     private var _isDestroyed: Bool = false
     var isDestroyed: Bool {
         return _isDestroyed
     }
-    internal var listeners: [String: [(_ object: Any, _ data: Any) -> Void]] = [:]
-    
+
+    var listeners: [String: [(_ object: Any, _ data: Any) -> Void]] = [:]
+
     private var _enableTap: Bool = false
     private var _enableRotate: Bool = false
-    private var _enableRotateStart: Bool = false
     private var _enableRotateEnd: Bool = false
     private var _enableDrag: Bool = false
     private var _enableDragStart: Bool = false
     private var _enableDragEnd: Bool = false
     private var _enableMagnify: Bool = false
-    private var _enableMagnifyStart: Bool = false
     private var _enableMagnifyEnd: Bool = false
-    
-    internal var rotation: simd_quatd = simd_quatd()
-    internal var spatialChildren: [String:SpatialEntity] = [:]
-    internal var spatialComponents: [String: SpatialComponent] = [:]
-    
+
+    var rotation: simd_quatd = .init()
+    var spatialChildren: [String: SpatialEntity] = [:]
+    var spatialComponents: [String: SpatialComponent] = [:]
+
     var enableTap: Bool {
         return _enableTap
     }
+
     var enableRotate: Bool {
-        return _enableRotate || _enableRotateStart
+        return _enableRotate || _enableRotateEnd
     }
+
     var enableDrag: Bool {
-        return _enableDrag || _enableDragStart
+        return _enableDrag || _enableDragStart || _enableDragEnd
     }
+
     var enableMagnify: Bool {
-        return _enableMagnify || _enableMagnifyStart
+        return _enableMagnify || _enableMagnifyEnd
     }
-    
+
     var enableRotateEnd: Bool {
         return _enableRotateEnd
     }
+
     var enableDragEnd: Bool {
         return _enableDragEnd
     }
+
     var enableMagnifyEnd: Bool {
         return _enableMagnifyEnd
     }
-    
+
     var enableInteractive: Bool {
-        return enableTap || enableRotate || enableDrag || enableMagnify || enableRotateEnd || enableDragEnd || enableMagnifyEnd
+        return enableTap || enableRotate || enableDrag || enableMagnify
     }
-    
+
     required init() {
-        self.spatialId = UUID().uuidString
+        spatialId = UUID().uuidString
         super.init()
-        SpatialObject.objects[spatialId] = self
+        SpatialObject.serialQueue.sync {
+            SpatialObject.objects[spatialId] = self
+        }
         SpatialObjectWeakRefManager.setWeakRef(spatialId, self)
     }
-    
-    init(_ _name:String){
-        self.spatialId = UUID().uuidString
+
+    init(_ _name: String) {
+        spatialId = UUID().uuidString
         super.init()
-        self.name = _name
-        SpatialObject.objects[spatialId] = self
+        name = _name
+        SpatialObject.serialQueue.sync {
+            SpatialObject.objects[spatialId] = self
+        }
         SpatialObjectWeakRefManager.setWeakRef(spatialId, self)
     }
-    
-    func addChild(entity:SpatialEntity){
+
+    func addChild(entity: SpatialEntity) {
         spatialChildren[entity.spatialId] = entity
         super.addChild(entity)
     }
-    
-    func removeChild(id:String){
-        if let entity = spatialChildren[id]{
+
+    func removeChild(id: String) {
+        if let entity = spatialChildren[id] {
             super.removeChild(entity)
             spatialChildren.removeValue(forKey: id)
-        }
-        else {
+        } else {
             print("no child found")
         }
     }
-    
-    func removeFromParent(){
-        if let parent = parent as? SpatialEntity{
+
+    func removeFromParent() {
+        if let parent = parent as? SpatialEntity {
             parent.removeChild(self)
         }
     }
-    
+
     func addComponent(_ comp: SpatialComponent) {
         spatialComponents[comp.type.rawValue] = comp
         comp.addToEntity(entity: self)
     }
-    
+
     func removeComponent(_ comp: SpatialComponent) {
         if spatialComponents[comp.type.rawValue] != nil {
             comp.removeFromEntity(entity: self)
             spatialComponents.removeValue(forKey: comp.type.rawValue)
         }
     }
-    
-    func updateTransform(_ matrix:[String:Float]){
+
+    func updateTransform(_ matrix: [String: Float]) {
         transform.matrix = float4x4([matrix["0"]!, matrix["1"]!, matrix["2"]!, matrix["3"]!], [matrix["4"]!, matrix["5"]!, matrix["6"]!, matrix["7"]!], [matrix["8"]!, matrix["9"]!, matrix["10"]!, matrix["11"]!], [matrix["12"]!, matrix["13"]!, matrix["14"]!, matrix["15"]!])
     }
-    
-    func updateGesture(_ type:String, _ isEable:Bool){
-        switch WebSpatialGestureType(rawValue: type){
+
+    func updateGesture(_ type: String, _ isEable: Bool) {
+        switch WebSpatialGestureType(rawValue: type) {
         case .spatialtap:
             _enableTap = isEable
         case .spatialrotate:
             _enableRotate = isEable
-        case .spatialrotatestart:
-            _enableRotateStart = isEable
         case .spatialrotateend:
             _enableRotateEnd = isEable
         case .spatialdrag:
@@ -123,46 +128,42 @@ class SpatialEntity: Entity, SpatialObjectProtocol {
             _enableDragEnd = isEable
         case .spatialmagnify:
             _enableMagnify = isEable
-        case .spatialmagnifystart:
-            _enableMagnifyStart = isEable
         case .spatialmagnifyend:
             _enableMagnifyEnd = isEable
         default:
             return
         }
-        
+
         if enableInteractive {
-            if !components.has(InputTargetComponent.self){
+            if !components.has(InputTargetComponent.self) {
                 components.set(InputTargetComponent())
             }
-        }
-        else {
-            if components.has(InputTargetComponent.self){
+        } else {
+            if components.has(InputTargetComponent.self) {
                 components.remove(InputTargetComponent.self)
             }
         }
     }
-    
-    static func findNearestParent(entity: Entity) -> SpatialEntity?{
-        if let parent = entity.parent as? SpatialEntity{
+
+    static func findNearestParent(entity: Entity) -> SpatialEntity? {
+        if let parent = entity.parent as? SpatialEntity {
             return parent
-        }
-        else if entity.parent != nil {
+        } else if entity.parent != nil {
             return findNearestParent(entity: entity.parent!)
         }
         return nil
     }
-    
+
     func setRotation(_ rotation: simd_quatd) {
         self.rotation = rotation
-        self.transform.rotation = simd_quatf(ix: Float(rotation.imag.x), iy: Float(rotation.imag.y), iz: Float(rotation.imag.z), r: Float(rotation.real))
+        transform.rotation = simd_quatf(ix: Float(rotation.imag.x), iy: Float(rotation.imag.y), iz: Float(rotation.imag.z), r: Float(rotation.real))
     }
-    
+
     // Encodable
     enum CodingKeys: String, CodingKey {
         case id, name, isDestroyed, children, components
     }
-    
+
     func encode(to encoder: any Encoder) throws {
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(spatialId, forKey: .id)
@@ -171,12 +172,12 @@ class SpatialEntity: Entity, SpatialObjectProtocol {
         try container.encode(spatialChildren, forKey: .children)
         try container.encode(spatialComponents, forKey: .components)
     }
-    
+
     // Equatable
     static func == (lhs: SpatialEntity, rhs: SpatialEntity) -> Bool {
         return lhs.spatialId == rhs.spatialId
     }
-    
+
     func destroy() {
         if _isDestroyed {
             return
@@ -187,24 +188,26 @@ class SpatialEntity: Entity, SpatialObjectProtocol {
 
         emit(event: SpatialObject.Events.Destroyed.rawValue, data: ["object": self])
         listeners = [:]
-        SpatialObject.objects.removeValue(forKey: spatialId)
+        SpatialObject.serialQueue.sync {
+            SpatialObject.objects.removeValue(forKey: spatialId)
+        }
     }
-    
-    internal func onDestroy() {
-        if(parent != nil){
+
+    func onDestroy() {
+        if parent != nil {
             removeFromParent()
         }
         components.removeAll()
-        spatialChildren.forEach { id, child in
+        for (id, child) in spatialChildren {
             child.destroy()
         }
         spatialChildren = [:]
-        spatialComponents.forEach { id, components in
+        for (id, components) in spatialComponents {
             components.destroy()
         }
         spatialComponents = [:]
     }
-    
+
     deinit {
         SpatialObjectWeakRefManager.removeWeakRef(spatialId)
     }

package/web-spatial/view/Spatialized2DElementView.swift

@@ -71,7 +71,7 @@ struct Spatialized2DElementView: View {
     private var dragWebGesture: some Gesture {
         DragGesture()
             .onChanged { gesture in
-                print("\(spatialized2DElement.name) dragWebGesture")
+//                print("\(spatialized2DElement.name) dragWebGesture")
                 if spatialized2DElement.scrollPageEnabled {
                     if !gestureData.dragStarted {
                         gestureData.dragStarted = true

package/web-spatial/view/SpatializedDynamic3DView.swift

@@ -7,90 +7,99 @@ struct SpatializedDynamic3DView: View {
     @State private var isDrag = false
     @State private var isRotate = false
     @State private var isScale = false
-    
+
     private var spatializedDynamic3DElement: SpatializedDynamic3DElement {
         return spatializedElement as! SpatializedDynamic3DElement
     }
-    
-    var spatialTapEvent: some Gesture{
+
+    var spatialTapEvent: some Gesture {
         SpatialTapGesture(count: 1).targetedToAnyEntity()
-            .onEnded{ value in
-                if let entity = value.entity as? SpatialEntity{
+            .onEnded { value in
+                if let entity = value.entity as? SpatialEntity {
                     spatialScene.sendWebMsg(entity.spatialId, WebSpatialTapGuestureEvent(detail: WebSpatialTapGuestureEventDetail(location3D: value.location3D)))
-                }
-                else {
-                    if let spatialEntity = SpatialEntity.findNearestParent(entity: value.entity){
+                } else {
+                    if let spatialEntity = SpatialEntity.findNearestParent(entity: value.entity) {
                         spatialScene.sendWebMsg(spatialEntity.spatialId, WebSpatialTapGuestureEvent(detail: WebSpatialTapGuestureEventDetail(location3D: value.location3D)))
                     }
                 }
-        }
+            }
     }
-    
-    var rotate3dEvent: some Gesture{
-        RotateGesture3D().targetedToAnyEntity().onChanged{ value in
-            print(value.gestureValue)
-            if let entity = value.entity as? SpatialEntity{
-                if entity.enableTap == true {
-//                    if(isRotate == false){
-//                        print("start rotate")
-//                    }
-//                    else{
-//                        print("rotating")
-//                    }
-//                    isRotate = true
-                    return
-                }
+
+    var rotate3dEvent: some Gesture {
+        RotateGesture3D().targetedToAnyEntity().onChanged { value in
+            // Always forward rotate gesture events to JS
+            if let entity = value.entity as? SpatialEntity {
+                let gestureEvent = WebSpatialRotateGuestureEvent(
+                    detail: .init(
+                        quaternion: Quaternion(
+                            x: value.rotation.quaternion.imag.x,
+                            y: value.rotation.quaternion.imag.y,
+                            z: value.rotation.quaternion.imag.z,
+                            w: value.rotation.quaternion.real
+                        )
+                    )
+                )
+                spatialScene.sendWebMsg(entity.spatialId, gestureEvent)
+            }
+        }.onEnded { value in
+            // Always forward rotate end event to JS
+            if let entity = value.entity as? SpatialEntity {
+                let gestureEvent = WebSpatialRotateEndGuestureEvent()
+                spatialScene.sendWebMsg(entity.spatialId, gestureEvent)
             }
             isRotate = false
-        }.onEnded{ value in
-            print(value.rotation)
-            print("rotate end")
-//            isRotate = false
         }
     }
-    
-    var magnifyEvent: some Gesture{
-        MagnifyGesture().targetedToAnyEntity().onChanged{ value in
-            print(value)
-            if let entity = value.entity as? SpatialEntity{
-                if entity.enableTap == true {
-//                    if(isScale == false){
-//                        print("start scale")
-//                    }
-//                    else{
-//                        print("scaling")
-//                    }
-//                    isScale = true
-                    return
-                }
+
+    var magnifyEvent: some Gesture {
+        MagnifyGesture().targetedToAnyEntity().onChanged { value in
+            // Always forward magnify gesture events to JS
+            if let entity = value.entity as? SpatialEntity {
+                let detail = WebSpatialMagnifyGuestureEventDetail(magnification: value.magnification)
+                let gestureEvent = WebSpatialMagnifyGuestureEvent(
+                    detail: detail
+                )
+                spatialScene.sendWebMsg(entity.spatialId, gestureEvent)
+            }
+        }.onEnded { value in
+            // Always forward magnify end event to JS
+            if let entity = value.entity as? SpatialEntity {
+                let gestureEvent = WebSpatialMagnifyEndGuestureEvent()
+                spatialScene.sendWebMsg(entity.spatialId, gestureEvent)
             }
-        }.onEnded{ value in
-            print("scale end")
-//            isScale = false
+            isScale = false
         }
     }
-    
-    var dragEvent: some Gesture{
-        DragGesture().targetedToAnyEntity().onChanged{ value in
-            if let entity = value.entity as? SpatialEntity{
-                if entity.enableTap == true {
-//                    if(isDrag == false){
-//                        print("start drag")
-//                    }
-//                    else{
-//                        print("dragging")
-//                    }
-//                    isDrag = true
-                    return
+
+    var dragEvent: some Gesture {
+        DragGesture().targetedToAnyEntity().onChanged { value in
+            // Always forward drag gesture events to JS
+            if let entity = value.entity as? SpatialEntity {
+                if !isDrag {
+                    let startEvent = WebSpatialDragStartGuestureEvent(
+                        detail: .init(
+                            startLocation3D: value.startLocation3D
+                        )
+                    )
+                    spatialScene.sendWebMsg(entity.spatialId, startEvent)
+                    isDrag = true
+                } else {
+                    let gestureEvent = WebSpatialDragGuestureEvent(
+                        detail: .init(translation3D: value.translation3D)
+                    )
+                    spatialScene.sendWebMsg(entity.spatialId, gestureEvent)
                 }
             }
-            
-        }.onEnded{ value in
-            print("drag end")
-//            isDrag = false
+        }.onEnded { value in
+            // Always forward drag end event to JS
+            if let entity = value.entity as? SpatialEntity {
+                let gestureEvent = WebSpatialDragEndGuestureEvent()
+                spatialScene.sendWebMsg(entity.spatialId, gestureEvent)
+            }
+            isDrag = false
         }
     }
-    
+
     var body: some View {
         RealityView(make: { content in
             let rootEntity = spatializedDynamic3DElement.getRoot()