@webspatial/platform-visionos 0.1.2 → 0.1.4

package/package.json

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

package/web-spatial/libs/SpatialWindowComponent.swift

@@ -18,6 +18,10 @@ struct LoadingStyles {
     var backgroundMaterial: BackgroundMaterial = .None
 }
 
+class NavInfo: ObservableObject {
+    @Published var url: String = ""
+}
+
 @Observable
 class SpatialWindowComponent: SpatialComponent {
     override func inspect() -> [String: Any] {
@@ -66,6 +70,7 @@ class SpatialWindowComponent: SpatialComponent {
     var parentWindowContainerID: String
     var childWindowContainers = [String: WindowContainerData]()
     var spawnedNativeWebviews = [String: WebViewNative]()
+    var navInfo = NavInfo()
 
     // Resources that will be destroyed when this webpage is destoryed or if it is navigated away from
     private var childResources = [String: SpatialObject]()

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

@@ -129,6 +129,7 @@ class Coordinator: NSObject, WKNavigationDelegate, WKScriptMessageHandler, WKUID
                 // backward/forward
                 webViewRef?.didNavBackForward()
             }
+            webViewRef?.navInfo.url = resource
             decisionHandler(.allow)
         } else {
             decisionHandler(.cancel)

package/web-spatial/views/MaterialWithBorderCornerModifier.swift

@@ -7,6 +7,27 @@ enum BackgroundMaterial: String, Codable {
     case ThickMaterial = "thick"
     case RegularMaterial = "regular"
     case ThinMaterial = "thin"
+
+    init(from decoder: Decoder) throws {
+        let container = try decoder.singleValueContainer()
+        let rawValue = try container.decode(String.self)
+        switch rawValue {
+        case "none":
+            self = .None
+        case "transparent":
+            self = .Transparent
+        case "translucent":
+            self = .GlassMaterial
+        case "thick":
+            self = .ThickMaterial
+        case "regular":
+            self = .RegularMaterial
+        case "thin":
+            self = .ThinMaterial
+        default:
+            self = .None
+        }
+    }
 }
 
 struct CornerRadius: Codable {

package/web-spatial/views/SpatialWebViewUI.swift

@@ -18,6 +18,9 @@ struct OptionalClip<Content: View>: View {
     }
 }
 
+// zIndex() have some bug, so use zOrderBias to simulate zIndex effect
+let zOrderBias = 0.001
+
 struct SpatialWebViewUI: View {
     @Environment(SpatialEntity.self) var ent: SpatialEntity
     var body: some View {
@@ -38,7 +41,7 @@ struct SpatialWebViewUI: View {
                                         let view = childWindowcomponent
                                         let x = CGFloat(e.modelEntity.position.x)
                                         let y = CGFloat(e.modelEntity.position.y - (view.scrollWithParent ? parentYOffset : 0))
-                                        let z = CGFloat(e.modelEntity.position.z)
+                                        let z = CGFloat(e.modelEntity.position.z) + (e.zIndex * zOrderBias)
                                         let width = CGFloat(view.resolutionX)
                                         let height = CGFloat(view.resolutionY)
                                         let anchor = view.rotationAnchor
@@ -66,7 +69,6 @@ struct SpatialWebViewUI: View {
 
                                             .position(x: x, y: y)
                                             .offset(z: z)
-                                            .zIndex(e.zIndex)
                                             .gesture(
                                                 DragGesture()
                                                     .onChanged { gesture in
@@ -178,7 +180,7 @@ struct SpatialWebViewUI: View {
             .hidden(!ent.visible)
             .ornament(attachmentAnchor: .scene(.bottomTrailing), contentAlignment: .bottomTrailing) {
                 if wv.isRootWebview() {
-                    NavView(swc: wv)
+                    NavView(swc: wv, navInfo: wv.navInfo)
                 }
             }
         }

package/web-spatial/views/ui/NavView.swift

@@ -3,6 +3,7 @@ import WebKit
 
 struct NavView: View {
     @State var swc: SpatialWindowComponent?
+    @StateObject var navInfo: NavInfo
     @State var showUrl: Bool = true
     @State private var showCopyTip = false
     @State private var navWidth: CGFloat = 0
@@ -52,7 +53,7 @@ struct NavView: View {
                 HStack(spacing: 5) {
                     if showUrl {
                         Text(
-                            swc?.getURL()?.absoluteString ?? "http://localhost:5173/"
+                            navInfo.url
                         )
                         .padding()
                         .lineLimit(1)
@@ -64,7 +65,7 @@ struct NavView: View {
                             }
                             return AnyView(EmptyView())
                         })
-                        .frame(width: texWidth == 0 ? .infinity : texWidth)
+                        .frame(width: .maximum(300, texWidth))
                         Button(action: {
                             UIPasteboard.general.string = swc?.getURL()?.absoluteString ?? ""
                             showCopyTip = true