@webspatial/platform-visionos 1.2.1 → 1.4.0

package/web-spatial/model/SpatialScene.swift

@@ -1,5 +1,6 @@
 import Combine
 import Foundation
+import RealityKit
 import simd
 import SwiftUI
 
@@ -38,7 +39,9 @@ let defaultSceneConfig = SceneOptions(
 class SpatialScene: SpatialObject, ScrollAbleSpatialElementContainer, WebMsgSender {
     var parent: (any ScrollAbleSpatialElementContainer)?
 
-    // Enum
+    var attachmentManager = AttachmentManager()
+
+    /// Enum
     enum WindowStyle: String, Codable, CaseIterable {
         case window
         case volume
@@ -66,15 +69,15 @@ class SpatialScene: SpatialObject, ScrollAbleSpatialElementContainer, WebMsgSend
     }
 
     enum SceneStateKind: String {
-        // default value
+        /// default value
         case idle
-        // when SpatialScene is loading
+        /// when SpatialScene is loading
         case pending
-        // when SpatialScen will visible after some time
+        /// when SpatialScen will visible after some time
         case willVisible
-        // when SpatialScen load Succesfully
+        /// when SpatialScen load Succesfully
         case visible
-        // when SpatialScen Failed to load
+        /// when SpatialScen Failed to load
         case fail
     }
 
@@ -84,6 +87,9 @@ class SpatialScene: SpatialObject, ScrollAbleSpatialElementContainer, WebMsgSend
 
     var spatialWebViewModel: SpatialWebViewModel
 
+    private var meterToPtUnscaled: Double?
+    private var meterToPtScaled: Double?
+
     init(
         _ url: String,
         _ windowStyle: WindowStyle,
@@ -101,11 +107,25 @@ class SpatialScene: SpatialObject, ScrollAbleSpatialElementContainer, WebMsgSend
         moveToState(state, sceneOptions)
     }
 
-    // used to send message to spatial root webview
+    /// used to send message to spatial root webview
     func sendWebMsg(_ id: String, _ msg: Encodable) {
         spatialWebViewModel.sendWebEvent(id, msg)
     }
 
+    func onUpdatePhysicalMetrics(meterToPtUnscaled: Double, meterToPtScaled: Double) {
+        self.meterToPtUnscaled = meterToPtUnscaled
+        self.meterToPtScaled = meterToPtScaled
+        let js = """
+        window.__webspatialsdk__ = window.__webspatialsdk__ || {};
+        window.__webspatialsdk__.physicalMetrics = {
+            meterToPtUnscaled: \(meterToPtUnscaled),
+            meterToPtScaled: \(meterToPtScaled)
+        };
+        """
+        spatialWebViewModel.getController().callJS(js)
+        sendWebMsg("window", "")
+    }
+
     private func setupSpatialWebView() {
         setupJSBListeners()
         setupWebViewStateListener()
@@ -298,6 +318,10 @@ class SpatialScene: SpatialObject, ScrollAbleSpatialElementContainer, WebMsgSend
         spatialWebViewModel.addJSBListener(ConvertFromEntityToEntity.self, onConvertFromEntityToEntity)
         spatialWebViewModel.addJSBListener(ConvertFromEntityToScene.self, onConvertFromEntityToScene)
         spatialWebViewModel.addJSBListener(ConvertFromSceneToEntity.self, onConvertFromSceneToEntity)
+        spatialWebViewModel.addJSBListener(InitializeAttachmentCommand.self, onInitializeAttachment)
+        spatialWebViewModel.addJSBListener(ConvertCoordinate.self, onConvertCoordinate)
+
+        spatialWebViewModel.addJSBListener(UpdateAttachmentEntityCommand.self, onUpdateAttachmentEntity)
 
         spatialWebViewModel.addOpenWindowListener(protocal: "webspatial", onOpenWindowHandler)
 
@@ -322,8 +346,8 @@ class SpatialScene: SpatialObject, ScrollAbleSpatialElementContainer, WebMsgSend
 
         // write through
         spatialWebViewModel.updateWindowKV([
-            "innerDepth": depth,
-            "outerDepth": depth,
+            "xrInnerDepth": depth,
+            "xrOuterDepth": depth,
             "outerHeight": height + SpatialScene.navHeight,
         ])
     }
@@ -345,6 +369,17 @@ class SpatialScene: SpatialObject, ScrollAbleSpatialElementContainer, WebMsgSend
             self.handleWindowClose()
         }
 
+        spatialWebViewModel.addStateListener(.didReceive) {
+            if let meterToPtUnscaled = self.meterToPtUnscaled,
+               let meterToPtScaled = self.meterToPtScaled
+            {
+                self.onUpdatePhysicalMetrics(
+                    meterToPtUnscaled: meterToPtUnscaled,
+                    meterToPtScaled: meterToPtScaled
+                )
+            }
+        }
+
         spatialWebViewModel.addStateListener(.didFailLoad) {
             self.didFailLoad = true
         }
@@ -380,6 +415,8 @@ class SpatialScene: SpatialObject, ScrollAbleSpatialElementContainer, WebMsgSend
         let host = url.host ?? ""
         if host == "createSpatialScene" {
             return handleWindowOpenCustom(url)
+        } else if host == "createAttachment" {
+            return handleCreateAttachment(url)
         } else {
             let spatialized2DElement: Spatialized2DElement = createSpatializedElement(
                 .Spatialized2DElement
@@ -388,15 +425,70 @@ class SpatialScene: SpatialObject, ScrollAbleSpatialElementContainer, WebMsgSend
         }
     }
 
+    // Temporary storage for webview models awaiting JSB initialization
+    private var pendingAttachmentWebViewModels = [String: SpatialWebViewModel]()
+
+    private func handleCreateAttachment(_ url: URL) -> WebViewElementInfo? {
+        // Just create a bare webview — metadata arrives via InitializeAttachment JSB
+        let id = UUID().uuidString
+        let webViewModel = SpatialWebViewModel(url: nil)
+        webViewModel.setBackgroundTransparent(true)
+        pendingAttachmentWebViewModels[id] = webViewModel
+        return WebViewElementInfo(id: id, element: webViewModel)
+    }
+
+    private func onInitializeAttachment(
+        command: InitializeAttachmentCommand,
+        resolve: @escaping JSBManager.ResolveHandler<Encodable>
+    ) {
+        guard let webViewModel = pendingAttachmentWebViewModels.removeValue(forKey: command.id) else {
+            resolve(.failure(JsbError(code: .InvalidSpatialObject, message: "No pending attachment for \(command.id)")))
+            return
+        }
+
+        var position = SIMD3<Float>(0, 0, 0)
+        if let posArray = command.position, posArray.count >= 3 {
+            position = SIMD3<Float>(posArray[0], posArray[1], posArray[2])
+        }
+
+        let size = CGSize(
+            width: command.size?.width ?? 100,
+            height: command.size?.height ?? 100
+        )
+
+        let ownerId = command.ownerViewId
+        if spatialObjects[ownerId] == nil {
+            resolve(.failure(JsbError(code: .InvalidSpatialObject, message: "ownerViewId must belong to the current scene for attachment \(command.id)")))
+            return
+        }
+        attachmentManager.create(
+            id: command.id,
+            parentEntityId: command.parentEntityId,
+            position: position,
+            size: size,
+            webViewModel: webViewModel
+        )
+
+        resolve(.success(baseReplyData))
+    }
+
     private func onPageStartLoad() {
         // destroy all SpatialObject asset
         let spatialObjectArray = spatialObjects.map { $0.value }
         for spatialObject in spatialObjectArray {
             spatialObject.destroy()
         }
+        attachmentManager.destroyAll()
         backgroundMaterial = .None
     }
 
+    /// Some SPA navigations (history back/forward) do not trigger a full WKNavigation
+    /// lifecycle. SpatialNavView calls this before navigation actions to ensure
+    /// previously-created spatial objects are cleaned up.
+    func resetForNavigation() {
+        onPageStartLoad()
+    }
+
     private func onGetSpatialSceneState(
         command: GetSpatialSceneStateCommand,
         resolve: @escaping JSBManager.ResolveHandler<Encodable>
@@ -424,6 +516,12 @@ class SpatialScene: SpatialObject, ScrollAbleSpatialElementContainer, WebMsgSend
     }
 
     private func onDestroySpatialObjectCommand(command: DestroyCommand, resolve: @escaping JSBManager.ResolveHandler<Encodable>) {
+        // Check if it's an attachment first
+        if attachmentManager.get(id: command.id) != nil {
+            attachmentManager.remove(id: command.id)
+            resolve(.success(nil))
+            return
+        }
         if let spatialObject: SpatialObject = findSpatialObject(command.id) {
             spatialObject.destroy()
             resolve(.success(nil))
@@ -652,6 +750,10 @@ class SpatialScene: SpatialObject, ScrollAbleSpatialElementContainer, WebMsgSend
             spatializedElement.enableRotateEndGesture = enableRotateEndGesture
         }
 
+        if let rotateConstrainedToAxis = command.rotateConstrainedToAxis {
+            spatializedElement.rotateConstrainedToAxis = rotateConstrainedToAxis
+        }
+
         if let enableMagnifyGesture = command.enableMagnifyGesture {
             spatializedElement.enableMagnifyGesture = enableMagnifyGesture
         }
@@ -698,21 +800,21 @@ class SpatialScene: SpatialObject, ScrollAbleSpatialElementContainer, WebMsgSend
      * Begin Implement SpatializedElementContainer Protocol
      */
 
-    // SpatialScene can hold a collection of SpatializedElement children
+    /// SpatialScene can hold a collection of SpatializedElement children
     private var children = [String: SpatializedElement]()
 
-    // Called by SpatializedElement.setParent
+    /// Called by SpatializedElement.setParent
     func addChild(_ spatializedElement: SpatializedElement) {
         children[spatializedElement.id] = spatializedElement
     }
 
-    // Called by SpatializedElement.setParent
+    /// Called by SpatializedElement.setParent
     func removeChild(_ spatializedElement: SpatializedElement) {
         children.removeValue(forKey: spatializedElement.id)
     }
 
     func getChildrenOfType(_ type: SpatializedElementType) -> [String: SpatializedElement] {
-        let typedChildren = children.filter {
+        return children.filter {
             switch type {
             case .Spatialized2DElement:
                 return $0.value is Spatialized2DElement
@@ -722,7 +824,6 @@ class SpatialScene: SpatialObject, ScrollAbleSpatialElementContainer, WebMsgSend
                 return $0.value is SpatializedDynamic3DElement
             }
         }
-        return typedChildren
     }
 
     func getChildren() -> [String: SpatializedElement] {
@@ -733,7 +834,7 @@ class SpatialScene: SpatialObject, ScrollAbleSpatialElementContainer, WebMsgSend
      * End Implement SpatializedElementContainer Protocol
      */
 
-    /*
+    /**
      * Begin Implement SpatialScrollAble Protocol
      */
     let scrollPageEnabled: Bool = true
@@ -789,7 +890,7 @@ class SpatialScene: SpatialObject, ScrollAbleSpatialElementContainer, WebMsgSend
      * Begin SpatialObjects management
      */
 
-    // Resources that will be destroyed when this webpage is destoryed or if it is navigated away from
+    /// Resources that will be destroyed when this webpage is destoryed or if it is navigated away from
     private var spatialObjects = [String: any SpatialObjectProtocol]()
 
     func createSpatializedElement<T: SpatializedElement>(_ type: SpatializedElementType) -> T {
@@ -1006,6 +1107,95 @@ class SpatialScene: SpatialObject, ScrollAbleSpatialElementContainer, WebMsgSend
         resolve(.success(ConvertReply(id: command.entityId, position: point)))
     }
 
+    /// Input: command.position, command.fromId, command.toId
+    /// fromId/toId can reference either the scene (window) or an entity.
+    /// Step 1: Convert position to window coordinates (view global, px)
+    ///   - If from is window (scene), position is already in view global (px). Go to Step 2.
+    ///   - If from is 2d frame(SpatializedElement), position is in view local (px).
+    ///     - view local → window (view global, px) using SpatializedElement.convertToScene
+    ///   - If from is an entity, position is in reality entity local (meters):
+    ///     - entity local → reality world (scene)
+    ///     - reality world → window (view global, px)
+    /// Step 2: Convert window coordinates (view global, px) to target output
+    ///   - If to is window, output directly.
+    ///   - If to is 2d frame(SpatializedElement), output in view local (px).
+    ///     - window (view global, px) → view local using SpatializedElement.convertFromScene
+    ///   - If to is an entity, output in reality entity local (meters):
+    ///     - window (view global, px) → reality world (scene)
+    ///     - reality world → reality entity local (meters)
+
+    private func onConvertCoordinate(command: ConvertCoordinate, resolve: @escaping JSBManager.ResolveHandler<Encodable>) {
+        func isSceneId(_ id: String) -> Bool {
+            return id.isEmpty
+        }
+        let input = SIMD3<Float>(Float(command.position.x), Float(command.position.y), Float(command.position.z))
+        let fromEntity = spatialObjects[command.fromId] as? SpatialEntity
+        let from2dFrame = spatialObjects[command.fromId] as? SpatializedElement
+        let toEntity = spatialObjects[command.toId] as? SpatialEntity
+        let to2dFrame = spatialObjects[command.toId] as? SpatializedElement
+
+        var globalPx: Point3D
+        if isSceneId(command.fromId) {
+            globalPx = Point3D(x: Double(input.x), y: Double(input.y), z: Double(input.z))
+        } else if let fromEntity {
+            let world = fromEntity.convert(position: input, to: nil)
+            guard let content = findSpatializedDynamic3DElement(containingEntityId: fromEntity.spatialId)?.getViewContent() else {
+                resolve(.failure(JsbError(code: .InvalidSpatialObject, message: "RealityView content unavailable for conversion")))
+                return
+            }
+            globalPx = content.convert(point: world, from: .scene, to: .global)
+        } else if let from2dFrame {
+            let localPoint = SIMD3<Double>(Double(input.x), Double(input.y), Double(input.z))
+            let scenePoint = from2dFrame.convertToScene(localPoint)
+            globalPx = Point3D(x: scenePoint.x, y: scenePoint.y, z: scenePoint.z)
+        } else {
+            resolve(.failure(JsbError(code: .InvalidSpatialObject, message: "Invalid fromId")))
+            return
+        }
+
+        if isSceneId(command.toId) {
+            let result = Vec3(x: CGFloat(globalPx.x), y: CGFloat(globalPx.y), z: CGFloat(globalPx.z))
+            resolve(.success(result))
+            return
+        } else if let toEntity {
+            guard let content = findSpatializedDynamic3DElement(containingEntityId: toEntity.spatialId)?.getViewContent() else {
+                resolve(.failure(JsbError(code: .InvalidSpatialObject, message: "RealityView content unavailable for conversion")))
+                return
+            }
+            let world = content.convert(globalPx, from: .global, to: .scene)
+            let local = toEntity.convert(position: world, from: nil)
+            let ret = Vec3(x: CGFloat(local.x), y: CGFloat(local.y), z: CGFloat(local.z))
+            resolve(.success(ret))
+            return
+        } else if let to2dFrame {
+            let scenePoint = SIMD3<Double>(globalPx.x, globalPx.y, globalPx.z)
+            let localPoint = to2dFrame.convertFromScene(scenePoint)
+            let ret = Vec3(x: CGFloat(localPoint.x), y: CGFloat(localPoint.y), z: CGFloat(localPoint.z))
+            resolve(.success(ret))
+            return
+        } else {
+            resolve(.failure(JsbError(code: .InvalidSpatialObject, message: "Invalid toId")))
+            return
+        }
+    }
+
+    private func onUpdateAttachmentEntity(command: UpdateAttachmentEntityCommand, resolve: @escaping JSBManager.ResolveHandler<Encodable>) {
+        guard attachmentManager.get(id: command.id) != nil else {
+            resolve(.failure(JsbError(code: .InvalidSpatialObject, message: "Attachment \(command.id) not found")))
+            return
+        }
+        var newPosition: SIMD3<Float>? = nil
+        if let posArray = command.position, posArray.count >= 3 {
+            newPosition = SIMD3<Float>(posArray[0], posArray[1], posArray[2])
+        }
+        var newSize: CGSize? = nil
+        if let sizeObj = command.size {
+            newSize = CGSize(width: sizeObj.width, height: sizeObj.height)
+        }
+        attachmentManager.update(id: command.id, position: newPosition, size: newSize)
+        resolve(.success(baseReplyData))
+    }
+
     private func addSpatialObject(_ object: any SpatialObjectProtocol) {
         var spatialObject = object
         spatialObjects[spatialObject.spatialId] = spatialObject
@@ -1029,6 +1219,32 @@ class SpatialScene: SpatialObject, ScrollAbleSpatialElementContainer, WebMsgSend
         sendWebMsg(spatialObject.spatialId, SpatialObjectDestroiedEvent())
     }
 
+    /// Find the dynamic 3D container (SpatializedDynamic3DElement) that contains the entity by ID.
+    /// - Parameter entityId: The entity's spatialId.
+    /// - Returns: The container if the entity is a descendant of the container's root; otherwise nil.
+    private func findSpatializedDynamic3DElement(containingEntityId entityId: String) -> SpatializedDynamic3DElement? {
+        guard let entity = spatialObjects[entityId] as? SpatialEntity else {
+            return nil
+        }
+
+        for (_, object) in spatialObjects {
+            guard let dynamic3dElement = object as? SpatializedDynamic3DElement else {
+                continue
+            }
+
+            let root = dynamic3dElement.getRoot()
+            var current: Entity? = entity
+            while let node = current {
+                if node === root {
+                    return dynamic3dElement
+                }
+                current = node.parent
+            }
+        }
+
+        return nil
+    }
+
     func findSpatialObject<T: SpatialObjectProtocol>(_ id: String) -> T? {
         return spatialObjects[id] as? T
     }
@@ -1042,6 +1258,7 @@ class SpatialScene: SpatialObject, ScrollAbleSpatialElementContainer, WebMsgSend
         for spatialObject in spatialObjectArray {
             spatialObject.destroy()
         }
+        attachmentManager.destroyAll()
         spatialWebViewModel.destroy()
     }
 

package/web-spatial/model/Spatialized2DElement.swift

@@ -57,15 +57,15 @@ class Spatialized2DElement: SpatializedElement, ScrollAbleSpatialElementContaine
         defaultAlignment = .center
     }
 
-    // Spatialized2DElement can hold a collection of SpatializedElement children
+    /// Spatialized2DElement can hold a collection of SpatializedElement children
     private var children = [String: SpatializedElement]()
 
-    // Called by SpatializedElement.setParent
+    /// Called by SpatializedElement.setParent
     func addChild(_ spatializedElement: SpatializedElement) {
         children[spatializedElement.id] = spatializedElement
     }
 
-    // Called by SpatializedElement.setParent
+    /// Called by SpatializedElement.setParent
     func removeChild(_ spatializedElement: SpatializedElement) {
         children.removeValue(forKey: spatializedElement.id)
     }
@@ -75,7 +75,7 @@ class Spatialized2DElement: SpatializedElement, ScrollAbleSpatialElementContaine
     }
 
     func getChildrenOfType(_ type: SpatializedElementType) -> [String: SpatializedElement] {
-        let typedChildren = children.filter {
+        return children.filter {
             switch type {
             case .Spatialized2DElement:
                 return $0.value is Spatialized2DElement
@@ -85,7 +85,6 @@ class Spatialized2DElement: SpatializedElement, ScrollAbleSpatialElementContaine
                 return $0.value is SpatializedDynamic3DElement
             }
         }
-        return typedChildren
     }
 
     func loadHtml(_ html: String) {

package/web-spatial/model/SpatializedDynamic3DElement.swift

@@ -1,8 +1,11 @@
+import _RealityKit_SwiftUI
 import Foundation
+import RealityKit
 
 @Observable
 class SpatializedDynamic3DElement: SpatializedElement {
     private var rootEntity = SpatialEntity()
+    private var viewContent: RealityViewContent? = nil
 
     func getRoot() -> SpatialEntity {
         return rootEntity
@@ -16,6 +19,14 @@ class SpatializedDynamic3DElement: SpatializedElement {
         rootEntity.removeChild(entity)
     }
 
+    func getViewContent() -> RealityViewContent? {
+        return viewContent
+    }
+
+    func setViewContent(_ content: RealityViewContent?) {
+        viewContent = content
+    }
+
     enum CodingKeys: String, CodingKey {
         case type, root
     }
@@ -28,6 +39,7 @@ class SpatializedDynamic3DElement: SpatializedElement {
     }
 
     override func onDestroy() {
+        viewContent = nil
         rootEntity.destroy()
         super.onDestroy()
     }

package/web-spatial/model/SpatializedElement.swift

@@ -2,6 +2,9 @@ import Foundation
 import RealityKit
 import SwiftUI
 
+/// zIndex() have some bug, so use zOrderBias to simulate zIndex effect
+let zOrderBias = 0.001
+
 enum SpatializedElementType: String, Codable {
     case Spatialized2DElement
     case SpatializedStatic3DElement
@@ -32,8 +35,45 @@ class SpatializedElement: SpatialObject {
     var enableMagnifyEndGesture: Bool = false
     var enableTapGesture: Bool = false
 
+    /// When non-nil and non-zero length, rotate gesture is constrained to this axis (world space).
+    var rotateConstrainedToAxis: Vec3?
+
     var defaultAlignment: DepthAlignment = .back
 
+    /// Raw layout→scene transform from onGeometryChange3D proxy.
+    /// Does NOT include backOffset or zIndex offset.
+    /// Updated by SpatializedElementView whenever layout changes.
+    var proxySceneTransform: AffineTransform3D = .identity
+
+    /// Full local→scene transform accounting for --xr-back and zIndex.
+    /// Computed on-the-fly so backOffset/zIndex changes are always reflected.
+    var sceneTransform: AffineTransform3D {
+        let frameZ = (zIndex * zOrderBias) + backOffset
+        let localZ = AffineTransform3D(translation: Vector3D(x: 0, y: 0, z: frameZ))
+        return proxySceneTransform.concatenating(localZ)
+    }
+
+    /// Converts a point from this element's local coordinate system to scene space.
+    func convertToScene(_ localPoint: SIMD3<Double>) -> SIMD3<Double> {
+        let p = SIMD4<Double>(localPoint.x, localPoint.y, localPoint.z, 1.0)
+        let scene = sceneTransform.matrix * p
+        return SIMD3<Double>(scene.x, scene.y, scene.z)
+    }
+
+    /// Converts a point from scene space to this element's local coordinate system.
+    func convertFromScene(_ scenePoint: SIMD3<Double>) -> SIMD3<Double> {
+        let inv = sceneTransform.inverse!
+        let p = SIMD4<Double>(scenePoint.x, scenePoint.y, scenePoint.z, 1.0)
+        let local = inv.matrix * p
+        return SIMD3<Double>(local.x, local.y, local.z)
+    }
+
+    /// Converts a point from this element's local space to another element's local space.
+    func convert(_ localPoint: SIMD3<Double>, to target: SpatializedElement) -> SIMD3<Double> {
+        let scenePoint = convertToScene(localPoint)
+        return target.convertFromScene(scenePoint)
+    }
+
     var enableGesture: Bool {
         return enableDragStartGesture || enableDragGesture || enableDragEndGesture || enableRotateGesture || enableRotateEndGesture || enableMagnifyGesture || enableMagnifyEndGesture || enableTapGesture
     }

package/web-spatial/model/SpatializedStatic3DElement.swift

@@ -4,7 +4,7 @@ import SwiftUI
 @Observable
 class SpatializedStatic3DElement: SpatializedElement {
     var modelURL: String = ""
-    var modelTransform: AffineTransform3D = AffineTransform3D.identity
+    var modelTransform: AffineTransform3D = .identity
 
     enum CodingKeys: String, CodingKey {
         case modelURL, type

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

@@ -1,40 +1,40 @@
-import SwiftUI
 import RealityKit
+import SwiftUI
 
 @Observable
 class SpatialComponent: SpatialObject {
     let type: SpatialComponentType
-    
-    
-    internal var _resource:Component? = nil
-    var resource:Component? {
+
+    var _resource: Component?
+    var resource: Component? {
         _resource
     }
-    
-    internal var _entity:SpatialEntity? = nil
-    var entity:SpatialEntity? {
+
+    var _entity: SpatialEntity?
+    var entity: SpatialEntity? {
         _entity
     }
-    
-    init(_ _type:SpatialComponentType){
+
+    init(_ _type: SpatialComponentType) {
         type = _type
         super.init()
     }
-    
-    func addToEntity(entity:SpatialEntity){
+
+    func addToEntity(entity: SpatialEntity) {
         if _entity != nil {
             print("This component has already been added to another entity")
             return
         }
-        if let component = resource{
+        if let component = resource {
             _entity = entity
             entity.components.set(component)
         }
     }
-    
-    func removeFromEntity(entity:SpatialEntity){
+
+    func removeFromEntity(entity: SpatialEntity) {
         if let component = resource,
-           self.entity == entity{
+           self.entity == entity
+        {
             entity.components.remove(Swift.type(of: component))
             _entity = nil
         }
@@ -43,30 +43,30 @@ class SpatialComponent: SpatialObject {
 
 @Observable
 class SpatialModelComponent: SpatialComponent {
-    init(mesh:Geometry, mats:[SpatialMaterial]){
+    init(mesh: Geometry, mats: [SpatialMaterial]) {
         super.init(.ModelComponent)
-        var materials:[any RealityKit.Material] = []
-        mats.forEach{ item in
+        var materials: [any RealityKit.Material] = []
+        for item in mats {
             materials.append(item.resource!)
         }
         _resource = ModelComponent(mesh: mesh.resource!, materials: materials)
     }
-    
-    override func addToEntity(entity:SpatialEntity){
+
+    override func addToEntity(entity: SpatialEntity) {
         super.addToEntity(entity: entity)
         entity.generateCollisionShapes(recursive: true)
     }
-    
-    override func removeFromEntity(entity:SpatialEntity){
+
+    override func removeFromEntity(entity: SpatialEntity) {
         super.removeFromEntity(entity: entity)
         entity.generateCollisionShapes(recursive: true)
     }
-    
-    override internal func onDestroy() {
+
+    override func onDestroy() {
         _resource = nil
     }
 }
 
-enum SpatialComponentType:String {
-    case ModelComponent = "ModelComponent"
+enum SpatialComponentType: String {
+    case ModelComponent
 }

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

@@ -138,10 +138,16 @@ class SpatialEntity: Entity, SpatialObjectProtocol {
             if !components.has(InputTargetComponent.self) {
                 components.set(InputTargetComponent())
             }
+            if !components.has(HoverEffectComponent.self) {
+                components.set(HoverEffectComponent())
+            }
         } else {
             if components.has(InputTargetComponent.self) {
                 components.remove(InputTargetComponent.self)
             }
+            if components.has(HoverEffectComponent.self) {
+                components.remove(HoverEffectComponent.self)
+            }
         }
     }
 
@@ -159,7 +165,7 @@ class SpatialEntity: Entity, SpatialObjectProtocol {
         transform.rotation = simd_quatf(ix: Float(rotation.imag.x), iy: Float(rotation.imag.y), iz: Float(rotation.imag.z), r: Float(rotation.real))
     }
 
-    // Encodable
+    /// Encodable
     enum CodingKeys: String, CodingKey {
         case id, name, isDestroyed, children, components
     }
@@ -173,7 +179,7 @@ class SpatialEntity: Entity, SpatialObjectProtocol {
         try container.encode(spatialComponents, forKey: .components)
     }
 
-    // Equatable
+    /// Equatable
     static func == (lhs: SpatialEntity, rhs: SpatialEntity) -> Bool {
         return lhs.spatialId == rhs.spatialId
     }