craft-native 0.0.262 → 0.0.272

package/dist/ios/templates/CraftNativeScreen.swift

@@ -2164,6 +2164,13 @@ extension UIView {
         set { objc_setAssociatedObject(self, &craftNativeLayoutStyleKey, CraftNativeLayoutStyleBox(newValue), .OBJC_ASSOCIATION_RETAIN_NONATOMIC) }
     }
 
+    /// The margins this view's style asks for, for a container that places
+    /// it without a flex parent (a FlatList cell).
+    var craftLayoutMargins: UIEdgeInsets {
+        let style = craftLayoutStyle
+        return UIEdgeInsets(top: max(0, style.marginTop), left: max(0, style.marginLeft), bottom: max(0, style.marginBottom), right: max(0, style.marginRight))
+    }
+
     /// The corner radius the style asked for. The layer gets at most half the
     /// shortest side: Core Animation draws nothing at all for a radius larger
     /// than the view (`rounded-full` is 9999).
@@ -4328,9 +4335,13 @@ private final class CraftNativeScrollView: UIScrollView, UIGestureRecognizerDele
 /// 3 quadratic, 4 close, in viewBox units - and scaled to the view. Paint is
 /// inherited down the tree as SVG does; `dark:` classes arrive already
 /// resolved for the appearance, so a redraw is all a theme change needs.
-private final class CraftNativeSvgView: UIView {
+final class CraftNativeSvgView: UIView {
     var drawing: [String: Any] = [:] {
-        didSet { setNeedsDisplay() }
+        didSet {
+            animates = Self.hasAnimation(drawing["children"] as? [Any] ?? [])
+            setNeedsDisplay()
+            updateFrames()
+        }
     }
 
     override init(frame: CGRect) {
@@ -4338,10 +4349,123 @@ private final class CraftNativeSvgView: UIView {
         isOpaque = false
         backgroundColor = .clear
         contentMode = .redraw
+        NotificationCenter.default.addObserver(self, selector: #selector(reduceMotionChanged), name: UIAccessibility.reduceMotionStatusDidChangeNotification, object: nil)
     }
 
     required init?(coder: NSCoder) { fatalError("init(coder:) has not been implemented") }
 
+    deinit { CraftNativeFrameClock.shared.cancel(self) }
+
+    // MARK: Animation
+
+    /// Whether a shape carries keyframes (SMIL `<animate attributeName="d">`,
+    /// stx's `Animate`: an exercise's moving figure).
+    private var animates = false
+    /// When this drawing's repetition began: each one starts from its first
+    /// pose when it comes on screen, as a page's SMIL starts when it loads.
+    private var animationStart: CFTimeInterval?
+
+    /// Moving now: on display, and the person has not asked for less motion,
+    /// when each shape keeps its own outline (the still pose).
+    var isAnimating: Bool { animates && window != nil && !isHidden && !UIAccessibility.isReduceMotionEnabled }
+
+    override func didMoveToWindow() {
+        super.didMoveToWindow()
+        updateFrames()
+    }
+
+    override var isHidden: Bool {
+        didSet { if isHidden != oldValue { updateFrames() } }
+    }
+
+    @objc private func reduceMotionChanged() {
+        updateFrames()
+        setNeedsDisplay()
+    }
+
+    /// Frames from the screens' display link (CraftNativeFrameClock, up to
+    /// 120Hz) while moving; none at all while still or out of sight.
+    private func updateFrames() {
+        if isAnimating {
+            if animationStart == nil { animationStart = CACurrentMediaTime() }
+            CraftNativeFrameClock.shared.request(self) { [weak self] in self?.nextFrame() }
+        } else {
+            animationStart = nil
+            CraftNativeFrameClock.shared.cancel(self)
+        }
+    }
+
+    private func nextFrame() {
+        guard isAnimating else { return updateFrames() }
+        // Drawn only while some of it is on screen; a row scrolled away keeps
+        // its time and is right when it comes back.
+        if let window, window.bounds.intersects(convert(bounds, to: window)) { setNeedsDisplay() }
+        CraftNativeFrameClock.shared.request(self) { [weak self] in self?.nextFrame() }
+    }
+
+    private static func hasAnimation(_ children: [Any]) -> Bool {
+        children.contains { child in
+            guard let node = child as? [String: Any] else { return false }
+            if node["type"] as? String == "Animate" { return (node["props"] as? [String: Any])?["frames"] != nil }
+            return hasAnimation(node["children"] as? [Any] ?? [])
+        }
+    }
+
+    /// A shape's outline now: between the keyframes either side of `elapsed`
+    /// seconds into its animation (SMIL's linear `calcMode`), or its own
+    /// outline when it has none, the animation has ended, or motion is reduced.
+    private func outline(of shape: [String: Any]) -> Any? {
+        let geometry = (shape["props"] as? [String: Any])?["geometry"]
+        guard isAnimating, let start = animationStart,
+              let animate = (shape["children"] as? [Any])?.lazy.compactMap({ $0 as? [String: Any] }).first(where: { $0["type"] as? String == "Animate" }),
+              let current = Self.keyframe(animate["props"] as? [String: Any] ?? [:], at: CACurrentMediaTime() - start) else { return geometry }
+        return current
+    }
+
+    /// The outline `elapsed` seconds into an `Animate`'s repetitions; nil
+    /// when it does not animate path data or its repetitions are over.
+    static func keyframe(_ props: [String: Any], at elapsed: CFTimeInterval) -> [Any]? {
+        guard props["attributeName"] as? String == "d",
+              let duration = number(props["duration"]), duration > 0, duration.isFinite,
+              let frames = (props["frames"] as? [Any])?.compactMap({ ($0 as? [Any])?.compactMap(number) }),
+              frames.count >= 2, elapsed >= 0 else { return nil }
+        if let count = number(props["repeatCount"]), elapsed >= Double(count * duration) { return nil }
+        let given = (props["frameTimes"] as? [Any])?.compactMap(number) ?? []
+        let times = given.count == frames.count ? given : frames.indices.map { CGFloat($0) / CGFloat(frames.count - 1) }
+        let phase = CGFloat(elapsed.truncatingRemainder(dividingBy: Double(duration))) / duration
+        var index = 0
+        while index < frames.count - 2, times[index + 1] <= phase { index += 1 }
+        let from = frames[index]
+        let to = frames[index + 1]
+        let span = times[index + 1] - times[index]
+        let share = span > 0 ? min(1, max(0, (phase - times[index]) / span)) : 0
+        return interpolate(from, to, share).map { NSNumber(value: Double($0)) }
+    }
+
+    /// Two outlines with the same commands, a share of the way from one to
+    /// the other; the first as it is when their commands differ.
+    static func interpolate(_ from: [CGFloat], _ to: [CGFloat], _ share: CGFloat) -> [CGFloat] {
+        guard from.count == to.count, share > 0 else { return from }
+        var out = from
+        var i = 0
+        while i < from.count {
+            let command = Int(from[i])
+            guard to[i] == from[i] else { return from }
+            let count: Int
+            switch command {
+            case 0, 1: count = 2
+            case 2: count = 6
+            case 3: count = 4
+            case 4: count = 0
+            default: return from
+            }
+            guard i + count < from.count else { return from }
+            if count > 0 { for k in 1...count { out[i + k] = from[i + k] + (to[i + k] - from[i + k]) * share } }
+            i += count + 1
+        }
+        return out
+    }
+
     var viewBox: CGRect? {
         let props = drawing["props"] as? [String: Any] ?? [:]
         guard let box = props["viewBox"] as? [Any], box.count == 4 else { return nil }
@@ -4461,8 +4585,10 @@ private final class CraftNativeSvgView: UIView {
                 draw(children: shape["children"] as? [Any] ?? [], paint: own, in: context)
             case "SvgText":
                 drawText(shape, paint: own)
+            case "Animate":
+                continue
             default:
-                guard let path = CraftNativeSvgView.path((shape["props"] as? [String: Any])?["geometry"]) else { continue }
+                guard let path = CraftNativeSvgView.path(outline(of: shape)) else { continue }
                 context.saveGState()
                 path.usesEvenOddFillRule = own.fillRule == "evenodd"
                 if let fill = own.resolve(own.fill) {
@@ -4859,9 +4985,24 @@ enum CraftNativeScriptThread {
     static let queue = DispatchQueue(label: "craft.native.script", qos: .userInteractive)
 
     /// `work` where the screens' JavaScript runs: now on the main thread, or
-    /// queued in order on the script thread.
-    static func run(_ work: @escaping () -> Void) {
-        if isBackground { queue.async(execute: work) } else { work() }
+    /// queued in order on the script thread. With frame pacing on
+    /// (`CRAFT_FRAME_PACING=1`), work that waited or ran for 4ms or more is
+    /// logged under `label`, so a slow screen can be told from a queued one.
+    static func run(label: @autoclosure @escaping () -> String = "script", _ work: @escaping () -> Void) {
+        let pacing = CraftFramePacing.shared
+        guard pacing.enabled else {
+            if isBackground { queue.async(execute: work) } else { work() }
+            return
+        }
+        let queued = CACurrentMediaTime()
+        let timed = {
+            let started = CACurrentMediaTime()
+            work()
+            let ran = CACurrentMediaTime() - started
+            let waited = started - queued
+            if waited + ran >= 0.004 { pacing.scriptWork(label(), waited: waited, ran: ran) }
+        }
+        if isBackground { queue.async(execute: timed) } else { timed() }
     }
 
     /// From the script thread, `work` on the main thread, not waited for.
@@ -5241,7 +5382,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         let pacing = CraftFramePacing.shared
         let inputs = scriptInputs()
         let name = routeName ?? "screen"
-        CraftNativeScriptThread.run { [self] in
+        CraftNativeScriptThread.run(label: "mount \(name)") { [self] in
             pacing.measure("mount \(name) setup") { setupJavaScript(inputs) }
             pacing.measure("mount \(name) bundle") { loadBundle() }
         }
@@ -5302,8 +5443,9 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         screenVisibilityChanged(false)
         stopCelebrations(in: view)
         // Release only this screen's accessory. A retained or prepared screen
-        // can disappear after the destination has already published its own.
-        CraftChrome.shared.clearTabAccessory(ownedBy: self)
+        // can disappear after the destination has already published its own;
+        // released, it stays drawn until the destination says what it wants.
+        CraftChrome.shared.releaseTabAccessory(ownedBy: self)
         // Popped (or its stack dismissed) while the bar was away: it comes
         // back for whatever shows next, a web page included.
         if tabBarHidden, isMovingFromParent || isBeingDismissed || navigationController?.isBeingDismissed == true {
@@ -5348,7 +5490,11 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
     private func restoreShellChrome() {
         guard !isAppScript else { return }
         CraftChrome.shared.setHiddenByScreen(tabBarHidden)
-        CraftChrome.shared.updateTabAccessory(tabAccessory, owner: self)
+        // A screen not yet asked about the accessory (one shown for the first
+        // time, before its script has run) leaves the bar as it is; one that
+        // has drawn without asking for it takes off what nobody claims.
+        if tabAccessoryDeclared { CraftChrome.shared.updateTabAccessory(tabAccessory, owner: self) }
+        else if hybridRendered { CraftChrome.shared.clearUnclaimedTabAccessory() }
     }
 
     /// `requestAnimationFrame`: the next display frame, for a screen on display
@@ -5365,7 +5511,8 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         guard frameWanted, !runtimeDisposed else { return }
         frameWanted = false
         let context = jsContext
-        CraftNativeScriptThread.run { context.objectForKeyedSubscript("__craftNativeFireFrame")?.call(withArguments: []) }
+        let route = routeName ?? "screen"
+        CraftNativeScriptThread.run(label: "frame \(route)") { context.objectForKeyedSubscript("__craftNativeFireFrame")?.call(withArguments: []) }
     }
 
     /// The screen came on screen or went off it: a screen pushed over it was
@@ -5400,7 +5547,8 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         routeProps = props
         guard isViewLoaded, !runtimeDisposed else { return }
         let context = jsContext
-        CraftNativeScriptThread.run {
+        let route = routeName ?? "screen"
+        CraftNativeScriptThread.run(label: "params \(route)") {
             context.setObject(params as NSDictionary, forKeyedSubscript: "__stxNativeParams" as NSString)
             context.setObject(props as NSDictionary, forKeyedSubscript: "__stxNativeProps" as NSString)
         }
@@ -5414,7 +5562,8 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         CraftNativeFrameClock.shared.cancel(self)
         disposeRenderedTree()
         let context = jsContext
-        CraftNativeScriptThread.run { context.objectForKeyedSubscript("__stxNativeUnmount")?.call(withArguments: []) }
+        let route = routeName ?? "screen"
+        CraftNativeScriptThread.run(label: "unmount \(route)") { context.objectForKeyedSubscript("__stxNativeUnmount")?.call(withArguments: []) }
         audio.close()
         sounds.close()
         streams.close()
@@ -6215,6 +6364,10 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
     /// The app's tab bar away while this screen shows (`tabBarHidden`).
     private var tabBarHidden = false
     private var tabAccessory: [String: Any]?
+    /// Whether the screen has said anything about the accessory yet
+    /// (`tabAccessory`, null included): until it has, the bar keeps showing
+    /// the one it had (CraftChrome.releaseTabAccessory).
+    private var tabAccessoryDeclared = false
     /// Whether a back-swipe may leave this screen at all, the edge's
     /// included (`swipeBack: false`): a screen that steps through its own
     /// pages with a Back of its own (a first-run tour's questions) would
@@ -6263,6 +6416,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         guard !isAppScript else { return }
         if options.keys.contains("tabAccessory") {
             tabAccessory = options["tabAccessory"] as? [String: Any]
+            tabAccessoryDeclared = true
             if navigationController?.topViewController === self, view.window != nil {
                 CraftChrome.shared.updateTabAccessory(tabAccessory, owner: self)
             }
@@ -6652,7 +6806,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
                 let previous = info["previous"] as? String
                 self.send(type: "SESSION_CHANGED", payload: ["key": key, "token": token ?? NSNull(), "previous": previous ?? NSNull()])
                 let context = self.jsContext
-                CraftNativeScriptThread.run { context.objectForKeyedSubscript("__craftSessionChanged")?.call(withArguments: [token ?? NSNull(), previous ?? NSNull()]) }
+                CraftNativeScriptThread.run(label: "session \(self.routeName ?? "screen")") { context.objectForKeyedSubscript("__craftSessionChanged")?.call(withArguments: [token ?? NSNull(), previous ?? NSNull()]) }
             })
         }
         if config.enablePushNotifications {
@@ -6937,8 +7091,15 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
             }
             let module = payload["module"] as? String ?? ""
             let method = payload["method"] as? String ?? ""
+            // With frame pacing on: how long the capability took to answer,
+            // which a screen's script waits on (a request, the keychain).
+            let pacing = CraftFramePacing.shared
+            let asked = pacing.enabled ? CACurrentMediaTime() : 0
+            let route = routeName ?? "screen"
+            let what = module == "Network" ? "\(module).\(method) \(((args.first as? [String: Any])?["url"] as? String).flatMap { URL(string: $0)?.path } ?? "")" : "\(module).\(method)"
             let reply: (Result<Any, CraftNativeActionError>) -> Void = { [weak self] answer in
                 guard let self = self, self.pendingCapabilityRequests.remove(requestToken) != nil else { return }
+                if pacing.enabled { pacing.capability("\(what) \(route)", took: CACurrentMediaTime() - asked) }
                 self.pendingCapabilityDeadlines.removeValue(forKey: requestToken)?.cancel()
                 self.screenRequestCancellers.removeValue(forKey: requestToken)
                 switch answer {
@@ -7167,6 +7328,8 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
             hybridRendered = true
             // The app script's drawing is never on screen: not a first frame.
             if !isAppScript { hybridEvents?.nativeScreenDidRender(self) }
+            // Drawn without a word about the accessory: it wants none.
+            if !isAppScript, !tabAccessoryDeclared, isShownOnScreen { CraftChrome.shared.clearUnclaimedTabAccessory() }
             let waiting = renderWaiters
             renderWaiters.removeAll()
             waiting.forEach { $0() }
@@ -9832,7 +9995,8 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         guard let data = try? JSONSerialization.data(withJSONObject: message),
               let json = String(data: data, encoding: .utf8) else { return }
         let context = jsContext
-        CraftNativeScriptThread.run { context.objectForKeyedSubscript("__stxNativeCallback")?.call(withArguments: [json]) }
+        let route = routeName ?? "screen"
+        CraftNativeScriptThread.run(label: "\(type) \(route)") { context.objectForKeyedSubscript("__stxNativeCallback")?.call(withArguments: [json]) }
     }
 
     private func number(_ value: Any?) -> CGFloat? {

package/dist/macos/templates/CraftNativeMutation.swift

@@ -339,11 +339,13 @@ final class CraftNativeMutationDocument {
     /// `Svg`). Only View, SafeAreaView and ScrollView used to be here, so a
     /// drawing revealed after the first paint (an `:if` around an `<svg>`)
     /// had its shapes refused as INVALID_PARENT, and the whole screen was
-    /// drawn again; Android's host already took the same list.
+    /// drawn again; Android's host already took the same list. A shape holds
+    /// its `Animate` (SMIL keyframes: HQ's moving exercise figures).
     static let containerTypes: Set<String> = [
         "View", "SafeAreaView", "ScrollView", "KeyboardAvoidingView", "Modal", "Pressable",
         "TouchableOpacity", "TouchableHighlight", "ImageBackground", "FlatList", "SectionList",
         "Fragment", "Svg", "G", "Map",
+        "Path", "Line", "Rect", "Circle", "Ellipse", "Polyline", "Polygon",
     ]
     private static let containerTypeKeys = Set(containerTypes.map { $0.lowercased() })
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "craft-native",
-  "version": "0.0.262",
+  "version": "0.0.272",
   "type": "module",
   "description": "Build desktop apps with web languages - TypeScript SDK for Craft",
   "author": "Chris Breuer <chris@stacksjs.org>",