@craft-native/ios 0.0.205 → 0.0.207

package/README.md

@@ -172,6 +172,16 @@ the [Native STX guide](../../docs/guides/native-stx.md). On macOS,
 `bun packages/ios/scripts/test-native-render.ts` runs the renderer's unit and
 simulator UI tests.
 
+`initSimulatorDriver` can also drive an installed release on a paired iPhone.
+Pass `script: serializeSimulatorSteps(steps)` to bundle a journey in the test
+target. `shot`, `tree` and `systemtree` then save native XCTest attachments;
+checks appear in the Xcode test log. Generate the project with XcodeGen, sign
+the test runner for your team and run it against the device. The installed app
+under test is activated by its bundle identifier and is not rebuilt by the
+driver. Export evidence with `xcrun xcresulttool export attachments --path
+<result.xcresult> --output-path <evidence>`. Omitting `script` restores the
+control-server protocol, required for the `net`, `delay` and `exec` hooks.
+
 The iOS host uses the shared tree-layout ABI for eligible definite-size,
 non-grid, non-wrapped containers and retains a local fallback for older
 runtimes or unsupported styles. Both paths implement wrapped-line and grid

package/dist/index.js

@@ -102,6 +102,17 @@ function initSimulatorDriver(options) {
     if (previous !== content)
       writeFileSync(path, content);
   }
+  const script = join2(output, "UITests/journey.txt");
+  if (options.script === undefined)
+    rmSync(script, { force: true });
+  else {
+    let previous;
+    try {
+      previous = readFileSync(script, "utf8");
+    } catch {}
+    if (previous !== options.script)
+      writeFileSync(script, options.script);
+  }
 }
 function serializeSimulatorSteps(steps) {
   const number = (value) => {

package/dist/testing.d.ts

@@ -7,6 +7,8 @@ export interface SimulatorDriverOptions {
     deploymentTarget?: string;
     controlUrl?: string;
     tabs?: readonly string[];
+    /** Bundle a wire-protocol journey and save native XCTest attachments. No control server is needed on physical devices. */
+    script?: string;
 }
 /** Generate the reusable XCUITest shell from package templates. No app-owned Swift. */
 export declare function initSimulatorDriver(options: SimulatorDriverOptions): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@craft-native/ios",
-  "version": "0.0.205",
+  "version": "0.0.207",
   "homepage": "https://github.com/craft-native/craft/tree/main/packages/ios#readme",
   "repository": {
     "type": "git",

package/templates/CraftHybrid.swift

@@ -854,9 +854,11 @@ final class CraftHybrid: NSObject {
         let show: (CraftHybridController) -> Void = { [weak self] controller in
             if native { controller.showNative(path: path, replace: false, fromLink: true) } else { self?.openOutside(url.absoluteString) }
         }
-        guard let controller else {
+        guard let controller, controller.isViewLoaded else {
             // Before the shell: a hybrid app's page has it; an all-native app
             // opens it once the shell is up (a link that launched the app).
+            // Construction assigns controller before viewDidLoad makes the
+            // navigation stacks; a link in that interval must wait too.
             guard !hasWeb else { return false }
             untilShell.append(show)
             return true

package/templates/CraftNativeFlatList.swift

@@ -348,6 +348,10 @@ final class CraftNativeFlatList: UICollectionView, UICollectionViewDelegateFlowL
         }
     }
 
+    func setRefreshAppearance(_ props: [String: Any]) {
+        nativeRefreshControl.tintColor = (props["tintColor"] as? String).flatMap { UIColor(hex: $0) }
+    }
+
     @objc private func refreshTriggered() {
         refreshHandler?()
         DispatchQueue.main.async { [weak self] in

package/templates/CraftNativeScreen.swift

@@ -21,6 +21,13 @@ private func number(_ value: Any?) -> CGFloat? {
     return value.isFinite ? value : nil
 }
 
+private func craftNativeFontWeight(_ value: Any?) -> String? {
+    if let value = value as? String { return value }
+    guard !(value is Bool), let number = value as? NSNumber, number.doubleValue.isFinite else { return nil }
+    let integer = number.doubleValue.rounded()
+    return integer == number.doubleValue ? String(Int(integer)) : nil
+}
+
 private func craftNativePickerValue(_ value: Any?) -> String? {
     if let value = value as? String, !value.isEmpty { return value }
     if let value = value as? NSNumber, value.doubleValue.isFinite { return String(value.doubleValue) }
@@ -1228,6 +1235,11 @@ private final class CraftNativeMapView: MKMapView, MKMapViewDelegate {
         return MKCoordinateRegion(center: CLLocationCoordinate2D(latitude: latitude, longitude: longitude), span: MKCoordinateSpan(latitudeDelta: latitudeDelta, longitudeDelta: longitudeDelta))
     }
 
+    private func nonEmptyHandler(_ handler: String?) -> String? {
+        guard let handler, !handler.isEmpty else { return nil }
+        return handler
+    }
+
     private static func color(_ value: String?) -> UIColor {
         switch value?.lowercased() {
         case "red": return .systemRed
@@ -3318,6 +3330,7 @@ private final class CraftNativeSvgView: UIView {
         var linejoin: String?
         var dashes: [CGFloat]?
         var vectorEffect: String?
+        var fontWeight: String?
         var dominantBaseline: String?
 
         func merged(_ node: [String: Any]) -> Paint {
@@ -3330,6 +3343,11 @@ private final class CraftNativeSvgView: UIView {
                 let value = CGFloat(truncating: number)
                 return value.isFinite ? value : nil
             }
+            func string(_ raw: Any?) -> String? {
+                if let value = raw as? String { return value }
+                if let number = raw as? NSNumber { return number.stringValue }
+                return nil
+            }
             if let color = style["color"] as? String { next.color = color }
             if let fill = style["fill"] as? String ?? props["fill"] as? String { next.fill = fill }
             if let stroke = style["stroke"] as? String ?? props["stroke"] as? String { next.stroke = stroke }
@@ -3346,6 +3364,7 @@ private final class CraftNativeSvgView: UIView {
             if let join = value("strokeLinejoin") as? String { next.linejoin = join }
             if let dashes = value("strokeDasharray") as? [Any] { next.dashes = dashes.compactMap(finite).filter { $0 >= 0 } }
             if let vectorEffect = value("vectorEffect") as? String { next.vectorEffect = vectorEffect }
+            if let fontWeight = string(value("fontWeight")) { next.fontWeight = fontWeight }
             if let baseline = value("dominantBaseline") as? String { next.dominantBaseline = baseline }
             return next
         }
@@ -3446,7 +3465,14 @@ private final class CraftNativeSvgView: UIView {
         let props = node["props"] as? [String: Any] ?? [:]
         let style = node["style"] as? [String: Any] ?? [:]
         let size = number(props["fontSize"]) ?? number(style["fontSize"]) ?? 12
-        let weight: UIFont.Weight = (props["fontWeight"] as? String ?? style["fontWeight"] as? String).map { ["500": .medium, "600": .semibold, "700": .bold, "bold": .bold][$0] ?? .regular } ?? .regular
+        let weight: UIFont.Weight = {
+            switch paint.fontWeight?.lowercased() {
+            case "500": return .medium
+            case "600": return .semibold
+            case "bold", "700", "800", "900": return .bold
+            default: return .regular
+            }
+        }()
         let font = UIFont.systemFont(ofSize: size, weight: weight)
         let resolvedTextColor = paint.resolve(paint.fill) ?? UIColor.label
         let textAlpha = max(0, min(1, paint.opacity * paint.fillOpacity))
@@ -5779,6 +5805,15 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
             updateImage(image, source: props["source"], defaultSource: props["defaultSource"])
         case "ImageBackground":
             let background = result as! CraftNativeImageBackgroundView
+            let backgroundID = ObjectIdentifier(background)
+            if let tint = color(style["tintColor"]) {
+                tintedImages.insert(backgroundID)
+                background.tintColor = tint
+            } else {
+                tintedImages.remove(backgroundID)
+                background.tintColor = nil
+            }
+            if let current = background.image { background.image = imageForDisplay(current, view: background) }
             let requestedResizeMode = style["resizeMode"] as? String ?? props["resizeMode"] as? String
             background.contentMode = imageContentMode(requestedResizeMode)
             background.clipsToBounds = background.contentMode == .scaleAspectFill
@@ -6139,6 +6174,11 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         let owner = parent.protocolId ?? path
         flatListOwners = flatListOwners.filter { $0.value != owner }
         for child in children { registerFlatListOwnership(child, owner: owner) }
+        let propRefresh = props["refreshControl"] as? [String: Any] ?? [:]
+        let propRefreshEvents = propRefresh["events"] as? [String: String] ?? [:]
+        let refreshHandler = nonEmptyHandler(propRefreshEvents["onRefresh"])
+            ?? nonEmptyHandler(events["onRefresh"])
+        let refreshing = (propRefresh["refreshing"] ?? props["refreshing"]) as? Bool == true
         list.bounces = props["bounces"] as? Bool ?? true
         list.isScrollEnabled = props["scrollEnabled"] as? Bool != false
         list.onFittingHeightChanged = { [weak list] in
@@ -6147,9 +6187,10 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         }
         list.setKeyboardShouldPersistTaps(props["keyboardShouldPersistTaps"])
         list.setContentContainerStyle(props["contentContainerStyle"] as? [String: Any])
-        list.setRefreshHandler(nonEmptyHandler(events["onRefresh"]).map { [weak self] handler in
+        list.setRefreshHandler(refreshHandler.map { [weak self] handler in
             { self?.send(type: "EVENT", payload: ["handlerName": handler, "nativeEvent": [:]]) }
-        }, refreshing: props["refreshing"] as? Bool == true)
+        }, refreshing: refreshing)
+        list.setRefreshAppearance(propRefresh)
         list.keyboardDismissMode = keyboardDismissMode(props["keyboardDismissMode"])
         list.onScrollEvent = nonEmptyHandler(events["onScroll"]).map { handler in
             { [weak self] scrollView in self?.send(type: "EVENT", payload: ["handlerName": handler, "nativeEvent": self?.scrollEvent(scrollView) ?? [:]]) }
@@ -6581,7 +6622,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         (icon as? CraftNativeIconView)?.defaultBox = box == nil && fontSize == nil ? 20 : nil
         let pointSize = fontSize ?? (box ?? 20) * 0.84
         let weight: UIImage.SymbolWeight
-        switch style["fontWeight"] as? String {
+        switch craftNativeFontWeight(style["fontWeight"]) {
         case "100": weight = .ultraLight
         case "200": weight = .thin
         case "300": weight = .light

package/templates/testing/DriverTests.swift.template

@@ -42,11 +42,14 @@ import XCTest
 ///   ifid <id> <command…>  runs the command only when that element is there (a screen shown the first time)
 ///   log <text>
 ///
-/// Checks log `PASS …` / `FAIL …` lines into driver.log; matrix.sh counts them.
+/// With a bundled journey.txt, evidence is kept as native XCTest attachments
+/// and PASS/FAIL lines appear in the test log. Control-server journeys also
+/// write driver.log; matrix.sh counts those checks.
 final class DriverTests: XCTestCase {
     let control = ProcessInfo.processInfo.environment["CRAFT_TEST_CONTROL"] ?? {{CONTROL_URL}}
     let app = XCUIApplication(bundleIdentifier: {{BUNDLE_ID}})
     let tabs: [String] = {{TABS}}
+    private var bundledJourney = false
 
     func get(_ path: String, timeout: Double = 15) -> Data? {
         var result: Data?
@@ -57,6 +60,15 @@ final class DriverTests: XCTestCase {
     }
 
     func post(_ path: String, _ body: Data) {
+        if bundledJourney {
+            guard path.hasPrefix("/save?"),
+                  let name = URLComponents(string: path)?.queryItems?.first(where: { $0.name == "name" })?.value else { return }
+            let attachment = XCTAttachment(data: body, uniformTypeIdentifier: name.hasSuffix(".png") ? "public.png" : "public.plain-text")
+            attachment.name = name
+            attachment.lifetime = .keepAlways
+            add(attachment)
+            return
+        }
         var request = URLRequest(url: URL(string: control + path)!)
         request.httpMethod = "POST"
         request.httpBody = body
@@ -67,7 +79,7 @@ final class DriverTests: XCTestCase {
 
     func note(_ text: String) {
         print("DRIVER \(text)")
-        post("/note", Data(text.utf8))
+        if !bundledJourney { post("/note", Data(text.utf8)) }
     }
 
     func check(_ ok: Bool, _ what: String) {
@@ -156,7 +168,14 @@ final class DriverTests: XCTestCase {
 
     func testScript() throws {
         continueAfterFailure = true
-        guard let data = get("/script"), let script = String(data: data, encoding: .utf8) else {
+        let data: Data?
+        if let resource = Bundle(for: DriverTests.self).url(forResource: "journey", withExtension: "txt") {
+            bundledJourney = true
+            data = try Data(contentsOf: resource)
+        } else {
+            data = get("/script")
+        }
+        guard let data, let script = String(data: data, encoding: .utf8) else {
             XCTFail("no script")
             return
         }
@@ -171,6 +190,10 @@ final class DriverTests: XCTestCase {
         let parts = line.split(separator: " ", maxSplits: 1).map(String.init)
         let command = parts[0]
         let arg = parts.count > 1 ? parts[1] : ""
+        if bundledJourney && ["net", "delay", "exec"].contains(command) {
+            check(false, "\(command) requires a control-server journey")
+            return
+        }
         switch command {
         case "ifid":
             let rest = arg.split(separator: " ", maxSplits: 1).map(String.init)