craft-native 0.0.218 → 0.0.220

package/dist/cli.js

@@ -3424,7 +3424,7 @@ function pinCraftNativeDependency(packagePath, craftVersion) {
 `);
 }
 // package.json
-var version = "0.0.218";
+var version = "0.0.220";
 
 // 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.218";
+var version = "0.0.220";
 
 // 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.218";
+var version = "0.0.220";
 
 // 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)

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/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
@@ -5709,7 +5719,10 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
     }
 
     private func restoreFocus(_ focused: UIView?) {
-        guard let focused, focused.window != nil, !focused.isFirstResponder else { return }
+        guard let focused, focused.window != nil, !focused.isFirstResponder,
+              lastFocusedInput === focused, firstResponder(in: rootStack) == nil else { return }
+        // A delayed acknowledgement belongs to the input that scheduled it.
+        // A newer field or an explicit dismissal owns focus now.
         _ = focused.becomeFirstResponder()
     }
 

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.218",
+  "version": "0.0.220",
   "type": "module",
   "description": "Build desktop apps with web languages - TypeScript SDK for Craft",
   "author": "Chris Breuer <chris@stacksjs.org>",