@swiftbrowser/native 0.11.0 → 0.13.0

package/swift/Sources/SwiftBrowserProtocol/Props.swift

@@ -54,9 +54,13 @@ public struct StackProps: Equatable, Sendable {
     /// A `VStack`'s horizontal alignment, an `HStack`'s vertical one, a `ZStack`'s frame alignment.
     public var alignment: String
 
+    /// `.scrollTargetLayout()`: the stack's children are the snap points of the scroll view around it.
+    public var scrollTarget: Bool
+
     public init(props: JSONObject) {
         spacing = props.double("spacing")
         alignment = props.string("alignment") ?? "center"
+        scrollTarget = props.bool("scrollTarget") ?? false
     }
 }
 
@@ -111,13 +115,27 @@ public struct ScrollViewProps: Equatable, Sendable {
     public var axes: String
     public var showsIndicators: Bool
     public var refreshable: Bool
+    /// `.scrollTargetBehavior`: `viewAligned` or `paging`.
+    public var snap: String?
+    /// `.scrollPosition(id:)`: the view reports the marked element at its anchor as it settles.
+    public var reportsPosition: Bool
+    public var positionAnchor: UnitPointSpec?
     public init(props: JSONObject) {
         axes = props.string("axes") ?? "vertical"
         showsIndicators = props.bool("showsIndicators") ?? true
         refreshable = props.bool("refreshable") ?? false
+        snap = props.string("snap")
+        reportsPosition = props.bool("reportsPosition") ?? false
+        positionAnchor = UnitPointSpec(json: props.value("positionAnchor"))
     }
 }
 
+/// `inspector`: the modified view's elements, then an `inspectorpanel`.
+public struct InspectorProps: Equatable, Sendable {
+    public var presented: Bool
+    public init(props: JSONObject) { presented = props.bool("presented") ?? false }
+}
+
 public struct ListProps: Equatable, Sendable {
     /// `insetGrouped` (the default), `grouped`, `plain`, `sidebar`.
     public var style: String
@@ -473,3 +491,155 @@ public struct SizeReportProps: Equatable, Sendable {
         reader = props.int("reader")
     }
 }
+
+// MARK: - Charts
+
+/// `chart`: the marks in unit coordinates of the plot (x 0…1 left to right,
+/// y 0…1 top to bottom), the axes with their grid lines, ticks and labels
+/// already placed and formatted, and the legend (docs/ops-protocol.md,
+/// "Phase 7"). A renderer measures the labels, lays the plot out and draws.
+public struct ChartProps: Equatable, Sendable {
+    public var marks: [ChartMarkSpec]
+    public var xAxis: ChartAxisSpec?
+    public var yAxis: ChartAxisSpec?
+    public var legend: ChartLegendSpec?
+    public init(props: JSONObject) {
+        marks = (props.array("marks") ?? []).compactMap(ChartMarkSpec.init(json:))
+        xAxis = ChartAxisSpec(json: props.value("xAxis"))
+        yAxis = ChartAxisSpec(json: props.value("yAxis"))
+        legend = ChartLegendSpec(json: props.value("legend"))
+    }
+}
+
+/// A point of a line (`y`) or an area (`y0 ≤ y1`) mark.
+public struct ChartPointSpec: Equatable, Sendable {
+    public var x: Double
+    public var y: Double
+    public var y0: Double
+    public var y1: Double
+    init?(json: JSONValue) {
+        guard let x = json["x"].double else { return nil }
+        self.x = x
+        y = json["y"].double ?? json["y0"].double ?? 0
+        y0 = json["y0"].double ?? y
+        y1 = json["y1"].double ?? y
+    }
+}
+
+/// One mark: `rect` (bars), `line`, `area`, `point` or `rule`.
+public struct ChartMarkSpec: Equatable, Sendable {
+    public var kind: String
+    public var style: ShapeStyleSpec?
+    public var opacity: Double
+    /// `rect` and `rule`: the unit rect (a rule's two ends); `point`: `x0`/`y0`.
+    public var x0: Double
+    public var x1: Double
+    public var y0: Double
+    public var y1: Double
+    public var cornerRadius: Double
+    /// A rect this wide in points, centered on the unit rect, instead of the unit rect's width.
+    public var fixedWidth: Double?
+    /// `line` and `area`.
+    public var points: [ChartPointSpec]
+    public var lineWidth: Double
+    public var interpolation: String
+    /// `circle`, `square`, `triangle`, `diamond`, `cross`, `plus`, `asterisk`; nil for none.
+    public var symbol: String?
+    public var symbolSize: Double
+    public init?(json: JSONValue) {
+        guard let kind = json["kind"].string else { return nil }
+        self.kind = kind
+        style = ShapeStyleSpec(json: json["style"])
+        opacity = json["opacity"].double ?? 1
+        x0 = json["x0"].double ?? json["x"].double ?? 0
+        x1 = json["x1"].double ?? x0
+        y0 = json["y0"].double ?? json["y"].double ?? 0
+        y1 = json["y1"].double ?? y0
+        cornerRadius = json["cornerRadius"].double ?? 0
+        fixedWidth = json["fixedWidth"].double
+        points = (json["points"].array ?? []).compactMap(ChartPointSpec.init(json:))
+        lineWidth = json["lineWidth"].double ?? (kind == "rule" ? 1 : 2)
+        interpolation = json["interpolation"].string ?? "linear"
+        symbol = json["symbol"].string ?? (kind == "point" ? "circle" : nil)
+        symbolSize = json["symbolSize"].double ?? 8
+    }
+}
+
+public struct ChartAxisLabelSpec: Equatable, Sendable {
+    /// Unit position along the axis (y: 0 is the top).
+    public var at: Double
+    public var text: String
+    /// `leading`: an x label that starts at its tick instead of centering on it.
+    public var anchor: String?
+    init?(json: JSONValue) {
+        guard let at = json["at"].double else { return nil }
+        self.at = at
+        text = json["text"].string ?? ""
+        anchor = json["anchor"].string
+    }
+}
+
+public struct ChartAxisSpec: Equatable, Sendable {
+    /// x: `bottom` or `top`; y: `trailing` or `leading`.
+    public var position: String
+    public var gridLines: [Double]
+    public var dashed: Bool
+    public var ticks: [Double]
+    public var labels: [ChartAxisLabelSpec]
+    public init?(json: JSONValue) {
+        guard let fields = json.object else { return nil }
+        position = fields.string("position") ?? "bottom"
+        gridLines = (fields.array("gridLines") ?? []).compactMap(\.double)
+        dashed = fields.bool("dashed") ?? false
+        ticks = (fields.array("ticks") ?? []).compactMap(\.double)
+        labels = (fields.array("labels") ?? []).compactMap(ChartAxisLabelSpec.init(json:))
+    }
+}
+
+public struct ChartLegendItemSpec: Equatable, Sendable {
+    public var label: String
+    public var style: ShapeStyleSpec?
+    /// Nil: a short line instead of a symbol.
+    public var symbol: String?
+    init(json: JSONValue) {
+        label = json["label"].string ?? ""
+        style = ShapeStyleSpec(json: json["style"])
+        symbol = json["symbol"].string
+    }
+}
+
+public struct ChartLegendSpec: Equatable, Sendable {
+    /// `top`, `bottom`, `leading` or `trailing`.
+    public var position: String
+    public var items: [ChartLegendItemSpec]
+    public init?(json: JSONValue) {
+        guard let fields = json.object else { return nil }
+        position = fields.string("position") ?? "bottom"
+        items = (fields.array("items") ?? []).map(ChartLegendItemSpec.init(json:))
+    }
+}
+
+/// `chartitem`: an annotation against its mark's unit rect, or an axis label
+/// view at its tick (`x0 == x1` for an x label, `y0 == y1` for a y label).
+public struct ChartItemProps: Equatable, Sendable {
+    /// `annotation`, `xLabel` or `yLabel`.
+    public var role: String
+    public var x0: Double
+    public var x1: Double
+    public var y0: Double
+    public var y1: Double
+    /// `top`, `bottom`, `leading`, `trailing` or `overlay`.
+    public var position: String
+    public var alignment: String
+    public var spacing: Double
+    public init(props: JSONObject) {
+        role = props.string("role") ?? "annotation"
+        x0 = props.double("x0") ?? 0
+        x1 = props.double("x1") ?? x0
+        y0 = props.double("y0") ?? 0
+        y1 = props.double("y1") ?? y0
+        position = props.string("position") ?? "overlay"
+        alignment = props.string("alignment") ?? "center"
+        spacing = props.double("spacing") ?? 0
+    }
+}

package/swift/Sources/SwiftBrowserProtocol/RendererEvent.swift

@@ -88,6 +88,8 @@ public struct RendererEvent: Equatable, Sendable {
     public static func longPress(_ id: Int) -> RendererEvent { with("longpress", id: id) }
     /// A `list` or `scrollview` with `refreshable` was pulled.
     public static func refresh(_ id: Int) -> RendererEvent { with("refresh", id: id) }
+    /// `.scrollPosition(id:)`: the marked element at the scroll view's anchor once it settled.
+    public static func scrollPosition(_ id: Int) -> RendererEvent { with("scrollposition", id: id) }
     /// A `menu` opened or closed (lazy menus build their items on `open`).
     public static func menu(_ id: Int, open: Bool) -> RendererEvent { with("menu", id: id, ["open": .bool(open)]) }
     /// The host's answer to a `native` element's own event (docs/native.md, the escape hatch).

package/swift/Sources/SwiftBrowserProtocol/Style.swift

@@ -67,6 +67,12 @@ public struct Style: Equatable, Sendable {
     public var help: String?
     public var matchedGeometry: String?
     public var contentTransition: String?
+    /// `.containerRelativeFrame`: the length along each named axis is `a × container + b`.
+    public var containerRelativeFrame: ContainerRelativeFrameSpec?
+    /// `.id(x)` inside a `ScrollViewReader`: the element a `scrollTo` or a scroll position names.
+    public var scrollID: Bool
+    /// `proxy.scrollTo(x)`: the request (its serial is new each time) on the element it names.
+    public var scrollTo: ScrollToSpec?
 
     public init(json: JSONValue) {
         let fields = json.object ?? [:]
@@ -137,6 +143,9 @@ public struct Style: Equatable, Sendable {
         help = fields.string("help")
         matchedGeometry = fields.string("matchedGeometry")
         contentTransition = fields.object("contentTransition")?.string("kind")
+        containerRelativeFrame = ContainerRelativeFrameSpec(json: fields.value("containerRelativeFrame"))
+        scrollID = fields.bool("scrollID") ?? false
+        scrollTo = ScrollToSpec(json: fields.value("scrollTo"))
     }
 
     public init() {
@@ -146,3 +155,35 @@ public struct Style: Equatable, Sendable {
     /// The style's field names, for the unsupported-field diagnostics and tests.
     public var fieldNames: [String] { raw.keys.sorted() }
 }
+
+/// `.containerRelativeFrame(axes)` as the style hint carries it: `length = a × container + b`.
+public struct ContainerRelativeFrameSpec: Equatable, Sendable {
+    public var horizontal: Bool
+    public var vertical: Bool
+    public var a: Double
+    public var b: Double
+    public var alignment: String
+    public init?(json: JSONValue) {
+        guard let fields = json.object else { return nil }
+        horizontal = fields.bool("horizontal") ?? false
+        vertical = fields.bool("vertical") ?? false
+        a = fields.double("a") ?? 1
+        b = fields.double("b") ?? 0
+        alignment = fields.string("alignment") ?? "center"
+    }
+}
+
+/// A `ScrollViewReader` proxy's `scrollTo` on the element it names.
+public struct ScrollToSpec: Equatable, Sendable {
+    /// Increases with every request, across all readers.
+    public var serial: Double
+    public var anchor: UnitPointSpec?
+    /// `horizontal`, `vertical` or `both` (the default).
+    public var axes: String
+    public init?(json: JSONValue) {
+        guard let fields = json.object, let serial = fields.double("serial") else { return nil }
+        self.serial = serial
+        anchor = UnitPointSpec(json: fields.value("anchor"))
+        axes = fields.string("axes") ?? "both"
+    }
+}

package/wasm/SwiftBrowserNative.wasm

@@ -1,4 +1,4 @@
 [diffend] Oversized file quarantined before diffing.
 name: package/wasm/SwiftBrowserNative.wasm
-size: 49193851 bytes
-sha256: 314a751e10bb902322011666194057cb533dfcdc7f31df7d4c6a7e55f1b8181d
+size: 49299538 bytes
+sha256: 4d0446e4f7414a5c80780f1206c3d3b1d8577840d60b07efbb1e925b00caea88