craft-native 0.0.219 → 0.0.221

package/dist/cli.js

@@ -3424,7 +3424,7 @@ function pinCraftNativeDependency(packagePath, craftVersion) {
 `);
 }
 // package.json
-var version = "0.0.219";
+var version = "0.0.221";
 
 // bin/cli.ts
 var spawnedFrom = process6.env[CRAFT_CLI_SPAWN_MARKER];

package/dist/index.cjs

@@ -309,7 +309,7 @@ function craftBinaryNotFoundMessage(triedPath) {
 `);
 }
 // package.json
-var version = "0.0.219";
+var version = "0.0.221";
 
 // src/sdk-version.ts
 var SDK_VERSION = version;

package/dist/index.js

@@ -57,7 +57,7 @@ function craftBinaryNotFoundMessage(triedPath) {
 `);
 }
 // package.json
-var version = "0.0.219";
+var version = "0.0.221";
 
 // src/sdk-version.ts
 var SDK_VERSION = version;

package/dist/ios/src/index.js

@@ -137,7 +137,12 @@ function serializeSimulatorSteps(steps) {
       arg = step.state;
     else if ("direction" in step)
       arg = step.direction;
-    else if ("x" in step) {
+    else if ("fromX" in step) {
+      const coordinates = [step.fromX, step.fromY, step.toX, step.toY];
+      if (coordinates.some((value) => number(value) > 1))
+        throw new Error("drag coordinates must be between 0 and 1");
+      arg = coordinates.join(" ");
+    } else if ("x" in step) {
       if (number(step.x) > 1 || number(step.y) > 1)
         throw new Error("tapxy coordinates must be between 0 and 1");
       arg = `${step.x} ${step.y}`;

package/dist/ios/src/testing.d.ts

@@ -27,6 +27,14 @@ export type SimulatorStep = {
     command: 'swipe';
     direction: 'up' | 'down' | 'left' | 'right';
 }
+/** A slow drag in app-relative coordinates, held before release to avoid a flick. */
+ | {
+    command: 'drag';
+    fromX: number;
+    fromY: number;
+    toX: number;
+    toY: number;
+}
 /** The system back-swipe: a drag in from the left edge (or the right). */
  | {
     command: 'edge';

package/dist/ios/templates/CraftApp.swift

@@ -691,12 +691,18 @@ final class CraftChrome: ObservableObject {
     }
     /// A destination beside the tab pill, outside the tab stacks and swipe order.
     func updateTabAccessory(_ item: [String: Any]?) {
-        guard let item, let path = item["path"] as? String,
-              path.hasPrefix("/"), !path.hasPrefix("//"),
-              let title = item["title"] as? String else { tabAccessory = nil; return }
-        tabAccessory = Tab(id: path, title: title, symbol: item["symbol"] as? String ?? "message",
-            badge: (item["badge"] as? String).flatMap { $0.isEmpty ? nil : String($0.prefix(8)) },
-            accessibilityLabel: item["accessibilityLabel"] as? String)
+        let next: Tab?
+        if let item, let path = item["path"] as? String,
+           path.hasPrefix("/"), !path.hasPrefix("//"),
+           let title = item["title"] as? String {
+            next = Tab(id: path, title: title, symbol: item["symbol"] as? String ?? "message",
+                badge: (item["badge"] as? String).flatMap { $0.isEmpty ? nil : String($0.prefix(8)) },
+                accessibilityLabel: item["accessibilityLabel"] as? String)
+        } else {
+            next = nil
+        }
+        guard tabAccessory != next else { return }
+        tabAccessory = next
     }
 
     func setHiddenByScreen(_ hidden: Bool) {
@@ -936,6 +942,7 @@ struct CraftTabBarView: View {
                                 .foregroundStyle(Color.primary)
                                 .frame(width: 62, height: 62)
                         }
+                            .contentShape(Rectangle())
                             .overlay(alignment: .topTrailing) {
                                 if let badge = accessory.badge {
                                     Text(badge)
@@ -1098,23 +1105,58 @@ struct CraftSplashView: View {
 }
 
 // MARK: - Deep Link Manager
+/// Launch intent settles when UIKit delivers its URL or completes activation,
+/// independently of when a page or native screen registers its listeners.
+final class CraftInitialLinkState {
+    private(set) var url: URL?
+    private(set) var settled = false
+    private var readers: [(URL?) -> Void] = []
+
+    func receive(_ url: URL) {
+        guard !settled else { return }
+        self.url = url
+        settle()
+    }
+
+    func settle() {
+        guard !settled else { return }
+        settled = true
+        let waiting = readers
+        readers.removeAll()
+        for reader in waiting { reader(url) }
+    }
+
+    func resolve(_ completion: @escaping (URL?) -> Void) {
+        if settled { completion(url) }
+        else { readers.append(completion) }
+    }
+}
+
 class DeepLinkManager {
     static let shared = DeepLinkManager()
 
-    private var initialURL: URL?
+    private let launch = CraftInitialLinkState()
+    private var initialURL: URL? { launch.url }
+    private var activationObservers: [NSObjectProtocol] = []
     // Every link that arrived while no page could receive it, in order. This
     // was a single slot, so a second link before the bridge was ready replaced
     // the first; on a cold start, that could be the link that launched the app.
     private var pendingURLs: [URL] = []
     private weak var webView: WKWebView?
     private var isReady = false
-    // Whether a page has ever become ready. A link that arrives before that is
-    // the one the app was opened with; a link that arrives later is not, and
-    // is no answer to getInitialURL.
+    // Replay bookkeeping only. A native screen can become ready before UIKit
+    // delivers the launch URL; listener readiness cannot classify that URL.
     private var hasBeenReady = false
     private var nativeListeners: [UUID: (URL, Bool) -> Void] = [:]
 
-    private init() {}
+    private init() {
+        for name in [UIApplication.didBecomeActiveNotification, UIApplication.didEnterBackgroundNotification] {
+            activationObservers.append(NotificationCenter.default.addObserver(forName: name, object: nil, queue: .main) { [weak self] _ in
+                self?.launch.settle()
+            })
+        }
+        if UIApplication.shared.applicationState == .active { launch.settle() }
+    }
 
     func setWebView(_ webView: WKWebView) {
         self.webView = webView
@@ -1139,9 +1181,7 @@ class DeepLinkManager {
     }
 
     func handleURL(_ url: URL) {
-        if initialURL == nil && !hasBeenReady {
-            initialURL = url
-        }
+        launch.receive(url)
 
         // A hybrid app opens a native path's screen itself, and tells the
         // native screens that listen; every other link is the page's. An
@@ -1172,6 +1212,17 @@ class DeepLinkManager {
         return initialURL
     }
 
+    /// A foreground scene can draw before SwiftUI delivers its launch activity.
+    /// A headless background launch has no scene or foreground URL to await.
+    func resolveInitialURL(_ completion: @escaping (URL?) -> Void) {
+        let application = UIApplication.shared
+        if application.applicationState == .active ||
+            (application.applicationState == .background && application.connectedScenes.isEmpty) {
+            launch.settle()
+        }
+        launch.resolve(completion)
+    }
+
     @discardableResult
     func addNativeListener(_ listener: @escaping (URL, Bool) -> Void) -> UUID {
         let token = UUID()

package/dist/ios/templates/CraftHybrid.swift

@@ -1243,6 +1243,7 @@ final class CraftHybridController: UIViewController, UINavigationControllerDeleg
                 target.view.isHidden = true
                 target.view.frame = self.view.bounds
                 current.view.frame = self.view.bounds
+                (current.topViewController as? CraftNativeScreenController)?.screenVisibilityChanged(true)
                 if target.topViewController is CraftHybridWebSlot,
                    current.topViewController is CraftNativeScreenController {
                     self.parkWeb()
@@ -1272,6 +1273,7 @@ final class CraftHybridController: UIViewController, UINavigationControllerDeleg
             recognizer.isEnabled = true
         }
         CraftChrome.shared.cancelTabSwipe(restoringSelection: restoringSelection)
+        (visibleStack?.topViewController as? CraftNativeScreenController)?.screenVisibilityChanged(true)
         if visibleStack?.topViewController is CraftNativeScreenController { parkWeb() }
     }
 

package/dist/ios/templates/CraftNativeActions.swift

@@ -258,7 +258,10 @@ enum CraftNativeActions {
             sync = .success(currentAppState())
         case ("DeepLinks", "getInitialURL"):
             if config.enableDeepLinks {
-                sync = .success(claimInitialDeepLink().map(deepLinkData) ?? NSNull())
+                DeepLinkManager.shared.resolveInitialURL { url in
+                    complete(requestToken, .success(claimInitialDeepLink(url).map(deepLinkData) ?? NSNull()), completion)
+                }
+                return
             } else {
                 sync = failure("CAPABILITY_DISABLED", "Deep links are disabled")
             }
@@ -809,12 +812,12 @@ enum CraftNativeActions {
         else { task.resume() }
     }
 
-    private static func claimInitialDeepLink() -> URL? {
+    private static func claimInitialDeepLink(_ url: URL?) -> URL? {
         cancellationLock.lock()
         defer { cancellationLock.unlock() }
         guard !initialDeepLinkClaimed else { return nil }
         initialDeepLinkClaimed = true
-        return DeepLinkManager.shared.getInitialURL()
+        return url
     }
 
     private static func complete(

package/dist/ios/templates/CraftNativeScreen.swift

@@ -4128,8 +4128,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         applyNavigationBarAppearance()
         // Each screen says whether it wants the tab bar, so one that hid it
         // never leaves it hidden for the next.
-        CraftChrome.shared.setHiddenByScreen(tabBarHidden)
-        CraftChrome.shared.updateTabAccessory(tabAccessory)
+        restoreShellChrome()
         refreshTraitDefaults()
     }
 
@@ -4176,13 +4175,24 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         }
     }
 
+    private func restoreShellChrome() {
+        guard !isAppScript else { return }
+        CraftChrome.shared.setHiddenByScreen(tabBarHidden)
+        CraftChrome.shared.updateTabAccessory(tabAccessory)
+    }
+
     /// The screen came on screen or went off it: a screen pushed over it was
     /// popped, or the hybrid shell switched to or away from its tab (which
     /// hides a stack rather than moving it, so UIKit says nothing). The first
     /// appearance is the screen's mount, not news; every later one is
     /// `SCREEN_FOCUS { focused: true }`, and going away is `focused: false`.
     func screenVisibilityChanged(_ visible: Bool) {
-        guard !runtimeDisposed, visible != reportedVisible else { return }
+        guard !runtimeDisposed else { return }
+        // Hidden tab stacks receive no UIKit appearance callback. A cancelled
+        // preview also restores a screen that never lost focus, so restore its
+        // chrome even when no new SCREEN_FOCUS event is needed.
+        if visible { restoreShellChrome() }
+        guard visible != reportedVisible else { return }
         reportedVisible = visible
         if visible, !hasAppeared {
             hasAppeared = true

package/dist/ios/templates/testing/DriverTests.swift.template

@@ -37,6 +37,7 @@ import XCTest
 ///   tab <name>            tap a tab bar button
 ///   scrollto <text>       swipes up (at most 8 times) until text is hittable
 ///   swipe up|down|left|right
+///   drag x1 y1 x2 y2     slow app-relative drag, held 0.3s before release
 ///   audit <name>          accessibility audit (element descriptions, Dynamic Type, contrast); logs each issue
 ///   unlabelled            logs every hittable button without a label (FAIL if any)
 ///   dismiss [label]       a system prompt's button (default Not Now: "Save Password?")
@@ -367,6 +368,18 @@ final class DriverTests: XCTestCase {
             case "left": app.swipeLeft()
             default: app.swipeRight()
             }
+        case "drag":
+            let parts = arg.split(separator: " ")
+            let coordinates = parts.compactMap { Double($0) }
+            guard parts.count == 4, coordinates.count == 4,
+                  coordinates.allSatisfy({ $0.isFinite && (0...1).contains($0) }) else {
+                check(false, "drag needs four coordinates between 0 and 1")
+                return
+            }
+            let start = app.coordinate(withNormalizedOffset: CGVector(dx: CGFloat(coordinates[0]), dy: CGFloat(coordinates[1])))
+            let end = app.coordinate(withNormalizedOffset: CGVector(dx: CGFloat(coordinates[2]), dy: CGFloat(coordinates[3])))
+            start.press(forDuration: 0.05, thenDragTo: end, withVelocity: .slow, thenHoldForDuration: 0.3)
+            note("drag \(arg): ok")
         case "edge":
             // The system back-swipe: a drag in from the left edge (or the
             // right one with `edge right`), which a centred swipe never is.

package/package.json

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