@swiftbrowser/native 0.14.1 → 0.15.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swiftbrowser/native",
-  "version": "0.14.1",
+  "version": "0.15.0",
   "type": "module",
   "description": "Run a @swiftbrowser/react app natively: the runtime a JavaScriptCore-hosted app needs (timers, console, fetch and the other web globals over the SwiftBrowser Native bridge), the `run` entry that renders into the native SwiftUI renderer, and the bundler that builds app.js for the Xcode target.",
   "repository": {
@@ -59,8 +59,8 @@
   },
   "dependencies": {
     "@babel/core": "^7.29.7",
-    "@swiftbrowser/react": "0.14.1",
-    "@swiftbrowser/web": "0.14.1",
+    "@swiftbrowser/react": "0.15.0",
+    "@swiftbrowser/web": "0.15.0",
     "esbuild": "^0.28.2",
     "react-refresh": "^0.17.0"
   },

package/swift/Package.swift

@@ -23,10 +23,14 @@ let package = Package(
         .library(name: "SwiftBrowserProtocol", targets: ["SwiftBrowserProtocol"]),
         .library(name: "SwiftBrowserTree", targets: ["SwiftBrowserTree"]),
     ],
+    dependencies: [
+        // SVG images, which the system's image decoding does not read (Views/Kinds/RemoteImage.swift).
+        .package(url: "https://github.com/swhitty/SwiftDraw.git", .upToNextMinor(from: "0.29.0")),
+    ],
     targets: [
         .target(name: "SwiftBrowserProtocol"),
         .target(name: "SwiftBrowserTree", dependencies: ["SwiftBrowserProtocol"]),
-        .target(name: "SwiftBrowserNative", dependencies: ["SwiftBrowserProtocol", "SwiftBrowserTree"]),
+        .target(name: "SwiftBrowserNative", dependencies: ["SwiftBrowserProtocol", "SwiftBrowserTree", .product(name: "SwiftDraw", package: "SwiftDraw", condition: .when(platforms: [.iOS, .macOS]))]),
         // Apple platforms only (JavaScriptCore): the workers; empty elsewhere.
     ]
 )

package/swift/Sources/SwiftBrowserNative/Views/Kinds/Navigation.swift

@@ -156,9 +156,14 @@ struct NavigationScreenElement: View {
         case "secondary": return .secondaryAction
         case "bottom": return bottomPlacement
         case "largeTitle":
-            // Beside the large title: the shim's own placement; SwiftUI has none, so the bar's trailing edge.
+            // In the large title's place: the shim's placement, and SwiftUI's
+            // from iOS 26 (it stands in for `navigationTitle`'s text while the
+            // title is large). Before that SwiftUI has none: the bar's trailing edge.
             #if canImport(FoundationBridge)
             return .largeTitle
+            #elseif os(iOS)
+            if #available(iOS 26, *) { return .largeTitle }
+            return trailingPlacement
             #else
             return trailingPlacement
             #endif

package/swift/Sources/SwiftBrowserNative/Views/Kinds/RemoteImage.swift

@@ -0,0 +1,88 @@
+#if canImport(SwiftUI)
+import Foundation
+import SwiftUI
+#if canImport(FoundationBridge)
+import FoundationBridge // `AsyncImage`, against the shim
+#endif
+#if canImport(SwiftDraw)
+import SwiftDraw
+#endif
+
+/// An `image` with a URL: SwiftUI's `AsyncImage`, and for an SVG, which the
+/// system's image decoding does not read (a logo found on a website often
+/// is one), SwiftDraw's parser and renderer, drawn as vectors at any size.
+/// SwiftDraw is the package's dependency on Apple platforms only; the round
+/// trip's build of these views has the page, which draws SVG itself.
+struct RemoteImage: View {
+    let url: URL?
+    let resizable: Bool
+    let width: Double
+    let height: Double
+
+    var body: some View {
+        AsyncImage(url: url) { phase in
+            if let image = phase.image {
+                if resizable { image.resizable() } else { image }
+            } else if phase.error != nil, let url {
+                undecoded(url)
+            } else {
+                placeholder
+            }
+        }
+    }
+
+    /// Nothing, at the image's size when the app knows it.
+    @ViewBuilder private var placeholder: some View {
+        if width > 0, height > 0 {
+            Color.clear.frame(width: width, height: height)
+        } else {
+            Color.clear
+        }
+    }
+
+    /// What `AsyncImage` could not decode: an SVG, drawn by SwiftDraw, else nothing.
+    @ViewBuilder private func undecoded(_ url: URL) -> some View {
+        #if canImport(SwiftDraw)
+        RemoteSVG(url: url, resizable: resizable) { placeholder }
+        #else
+        placeholder
+        #endif
+    }
+}
+
+#if canImport(SwiftDraw)
+/// The SVG at `url`, loaded through the shared session (so the cookies and
+/// cache `AsyncImage` used apply), or the placeholder while it loads and
+/// when the data is not an SVG.
+struct RemoteSVG<Placeholder: View>: View {
+    let url: URL
+    let resizable: Bool
+    @ViewBuilder let placeholder: () -> Placeholder
+    @State private var loaded: LoadedSVG?
+
+    var body: some View {
+        Group {
+            if let loaded, loaded.url == url, let svg = loaded.svg {
+                if resizable { SVGView(svg: svg).resizable() } else { SVGView(svg: svg) }
+            } else {
+                placeholder()
+            }
+        }
+        .task(id: url) {
+            loaded = LoadedSVG(url: url, svg: await loadSVG(from: url))
+        }
+    }
+}
+
+struct LoadedSVG: Equatable {
+    let url: URL
+    let svg: SVG?
+}
+
+/// The SVG at `url`, or nil when it cannot be loaded or is not an SVG.
+func loadSVG(from url: URL, session: URLSession = .shared) async -> SVG? {
+    guard let data = try? await session.data(from: url).0 else { return nil }
+    return SVG(data: data)
+}
+#endif
+#endif

package/swift/Sources/SwiftBrowserNative/Views/Kinds/TextAndImages.swift

@@ -60,7 +60,8 @@ struct TextElement: View {
 }
 
 /// `image`: an SF Symbol (every name is right here, unlike the web's mapped
-/// glyphs), an asset catalog image, a remote image, or a bitmap recipe (not drawn yet).
+/// glyphs), an asset catalog image, a remote image (RemoteImage.swift: SVG
+/// too), or a bitmap recipe (not drawn yet).
 struct ImageElement: View {
     let node: ElementNode
 
@@ -82,15 +83,7 @@ struct ImageElement: View {
                 Image(name)
             }
         case .url(let url, let resizable, let width, let height):
-            AsyncImage(url: URL(string: url)) { phase in
-                if let image = phase.image {
-                    if resizable { image.resizable() } else { image }
-                } else if width > 0, height > 0 {
-                    Color.clear.frame(width: width, height: height)
-                } else {
-                    Color.clear
-                }
-            }
+            RemoteImage(url: URL(string: url), resizable: resizable, width: width, height: height)
         case .bitmap(_, _, let width, let height):
             // A `UIImage` recipe the page would decode; not drawn natively yet.
             Rectangle().fill(.quaternary).frame(width: width > 0 ? CGFloat(width) : nil, height: height > 0 ? CGFloat(height) : nil)

package/wasm/SwiftBrowserNative.wasm

@@ -1,4 +1,4 @@
 [diffend] Oversized file quarantined before diffing.
 name: package/wasm/SwiftBrowserNative.wasm
-size: 49301069 bytes
-sha256: 644cdf56fe487eb95d2c2c0e40782626f6fb70259a3ea40a6b9e11d2c23c401a
+size: 49302313 bytes
+sha256: a2426ea2bd5032a173f7975b94c57b9f331404b419e57e87c5573e7350eac8da