@swiftbrowser/native 0.17.8 → 0.18.0

package/swift/Sources/SwiftBrowserProtocol/Style.swift

@@ -48,6 +48,8 @@ public struct Style: Equatable, Sendable {
     public var hidden: Bool
     public var mask: ShapeStyleSpec?
     public var hitTesting: Bool?
+    /// `.contentShape(Rectangle())`: `rectangle`.
+    public var contentShape: String?
     public var blendMode: String?
     public var zIndex: Double?
     public var blur: Double?
@@ -73,6 +75,8 @@ public struct Style: Equatable, Sendable {
     public var scrollID: Bool
     /// `proxy.scrollTo(x)`: the request (its serial is new each time) on the element it names.
     public var scrollTo: ScrollToSpec?
+    /// `.scrollTransition`: the effects in its three phases.
+    public var scrollTransition: ScrollTransitionSpec?
 
     public init(json: JSONValue) {
         let fields = json.object ?? [:]
@@ -121,6 +125,7 @@ public struct Style: Equatable, Sendable {
         hidden = fields.bool("hidden") ?? false
         mask = ShapeStyleSpec(json: fields.value("mask"))
         hitTesting = fields.bool("hitTesting")
+        contentShape = fields.string("contentShape")
         blendMode = fields.string("blendMode")
         zIndex = fields.double("zIndex")
         blur = fields.double("blur")
@@ -146,6 +151,7 @@ public struct Style: Equatable, Sendable {
         containerRelativeFrame = ContainerRelativeFrameSpec(json: fields.value("containerRelativeFrame"))
         scrollID = fields.bool("scrollID") ?? false
         scrollTo = ScrollToSpec(json: fields.value("scrollTo"))
+        scrollTransition = ScrollTransitionSpec(json: fields.value("scrollTransition"))
     }
 
     public init() {
@@ -187,3 +193,55 @@ public struct ScrollToSpec: Equatable, Sendable {
         axes = fields.string("axes") ?? "both"
     }
 }
+
+/// `.scrollTransition(_:axis:transition:)` as the app sends it: its closure's
+/// effects in each phase, drawn by SwiftUI's own as the view scrolls.
+public struct ScrollTransitionSpec: Equatable, Sendable {
+    /// `interactive`, `animated` or `identity`.
+    public var configuration: String
+    /// `horizontal` or `vertical`; the scroll view's own axis when nil.
+    public var axis: String?
+    public var identity: EffectSpec
+    public var topLeading: EffectSpec
+    public var bottomTrailing: EffectSpec
+    public init?(json: JSONValue) {
+        guard let fields = json.object else { return nil }
+        configuration = fields.string("configuration") ?? "interactive"
+        axis = fields.string("axis")
+        identity = EffectSpec(json: fields.value("identity"))
+        topLeading = EffectSpec(json: fields.value("topLeading"))
+        bottomTrailing = EffectSpec(json: fields.value("bottomTrailing"))
+    }
+}
+
+/// The visual effects of one scroll-transition phase (the `Style` fields of
+/// the same names); absent fields are the identity's.
+public struct EffectSpec: Equatable, Sendable {
+    public var offset: PointSpec?
+    public var scale: PointSpec?
+    public var scaleAnchor: UnitPointSpec?
+    public var rotation: Double?
+    public var rotationAnchor: UnitPointSpec?
+    public var opacity: Double?
+    public var blur: Double?
+    public var brightness: Double?
+    public var contrast: Double?
+    public var saturation: Double?
+    public var grayscale: Double?
+    public var hueRotation: Double?
+    public init(json: JSONValue) {
+        let fields = json.object ?? [:]
+        offset = PointSpec(json: fields.value("offset"))
+        scale = PointSpec(json: fields.value("scale"))
+        scaleAnchor = UnitPointSpec(json: fields.value("scaleAnchor"))
+        rotation = fields.double("rotation")
+        rotationAnchor = UnitPointSpec(json: fields.value("rotationAnchor"))
+        opacity = fields.double("opacity")
+        blur = fields.double("blur")
+        brightness = fields.double("brightness")
+        contrast = fields.double("contrast")
+        saturation = fields.double("saturation")
+        grayscale = fields.double("grayscale")
+        hueRotation = fields.double("hueRotation")
+    }
+}

package/swift/Sources/SwiftBrowserTree/OpTree.swift

@@ -35,6 +35,13 @@ public final class OpTree {
 
     /// Runs the body of a pass, animated as the commit asks (`withAnimation` on a SwiftUI host).
     public var animate: (AnimationSpec?, () -> Void) -> Void = { _, body in body() }
+    /// Runs the body of a pass whose commit wants a completion: the host calls
+    /// the last closure once the pass has finished animating (SwiftUI's
+    /// `withAnimation(_:completionCriteria:_:completion:)`), from any task;
+    /// the tree then sends `animationcomplete` on the main actor, a turn
+    /// later. Without a host hook the tree runs `animate` and sends it right
+    /// after the pass.
+    public var animateWithCompletion: ((AnimationSpec?, CommitCompletionSpec, () -> Void, @escaping @Sendable () -> Void) -> Void)?
     /// Called after every committed pass.
     public var onCommit: ((AnimationSpec?) -> Void)?
     /// Where the renderer's events go (the app's `dispatch`).
@@ -65,17 +72,30 @@ public final class OpTree {
     /// id, an insert into a missing parent); the ops before it have applied.
     public func apply(_ ops: [Op]) throws {
         for op in ops {
-            if case .commit(let animation) = op {
+            if case .commit(let animation, let completion) = op {
                 let pass = pending
                 pending.removeAll()
                 var failure: Error?
-                animate(animation) {
+                let body = {
                     do {
                         for each in pass { try self.applyOne(each) }
                     } catch {
                         failure = error
                     }
                 }
+                if let completion {
+                    if let animateWithCompletion {
+                        let serial = completion.serial
+                        animateWithCompletion(animation, completion, body) { [weak self] in
+                            Task { @MainActor in self?.send(.animationComplete(serial: serial)) }
+                        }
+                    } else {
+                        animate(animation, body)
+                        send(.animationComplete(serial: completion.serial))
+                    }
+                } else {
+                    animate(animation, body)
+                }
                 if let failure { throw failure }
                 commits += 1
                 onCommit?(animation)

package/wasm/SwiftBrowserNative.wasm

@@ -1,4 +1,4 @@
 [diffend] Oversized file quarantined before diffing.
 name: package/wasm/SwiftBrowserNative.wasm
-size: 49791914 bytes
-sha256: 32b3af1ab0d488c6d0d26f3f6e58f7c8886299aadb7f70dd25d2bf5a7e42c3f9
+size: 49982707 bytes
+sha256: 1f02220b4e3d7e74ce3afb42d5336ba9254bb1cd1cb591409c878548c4a6f6c4