@craft-native/ios 0.0.467 → 0.0.471

package/dist/cli.js

@@ -1401,6 +1401,7 @@ function writeShell(output, config) {
   writeSource(join4(output, "Sources", "CraftVoiceRecording.swift"), readFileSync2(join4(TEMPLATES_DIR, "CraftVoiceRecording.swift"), "utf8"));
   writeSource(join4(output, "Sources", "CraftWebAudio.swift"), readFileSync2(join4(TEMPLATES_DIR, "CraftWebAudio.swift"), "utf8"));
   writeSource(join4(output, "Sources", "CraftHybrid.swift"), readFileSync2(join4(TEMPLATES_DIR, "CraftHybrid.swift"), "utf8"));
+  writeSource(join4(output, "Sources", "CraftFramePacingLog.swift"), readFileSync2(join4(TEMPLATES_DIR, "CraftFramePacingLog.swift"), "utf8"));
   writeSource(join4(output, "Sources", "CraftCrashReporter.swift"), readFileSync2(join4(TEMPLATES_DIR, "CraftCrashReporter.swift"), "utf-8").replace(/\{\{CRAFT_VERSION\}\}/g, CRAFT_VERSION));
   writeSource(join4(output, "Sources", "CraftLiveActivities.swift"), readFileSync2(join4(TEMPLATES_DIR, "CraftLiveActivities.swift"), "utf8"));
   writeSource(join4(output, "Shared", "CraftActivityAttributes.swift"), readFileSync2(join4(TEMPLATES_DIR, "CraftActivityAttributes.swift"), "utf8"));

package/dist/index.js

@@ -1615,6 +1615,7 @@ function writeShell(output, config) {
   writeSource(join4(output, "Sources", "CraftVoiceRecording.swift"), readFileSync3(join4(TEMPLATES_DIR, "CraftVoiceRecording.swift"), "utf8"));
   writeSource(join4(output, "Sources", "CraftWebAudio.swift"), readFileSync3(join4(TEMPLATES_DIR, "CraftWebAudio.swift"), "utf8"));
   writeSource(join4(output, "Sources", "CraftHybrid.swift"), readFileSync3(join4(TEMPLATES_DIR, "CraftHybrid.swift"), "utf8"));
+  writeSource(join4(output, "Sources", "CraftFramePacingLog.swift"), readFileSync3(join4(TEMPLATES_DIR, "CraftFramePacingLog.swift"), "utf8"));
   writeSource(join4(output, "Sources", "CraftCrashReporter.swift"), readFileSync3(join4(TEMPLATES_DIR, "CraftCrashReporter.swift"), "utf-8").replace(/\{\{CRAFT_VERSION\}\}/g, CRAFT_VERSION));
   writeSource(join4(output, "Sources", "CraftLiveActivities.swift"), readFileSync3(join4(TEMPLATES_DIR, "CraftLiveActivities.swift"), "utf8"));
   writeSource(join4(output, "Shared", "CraftActivityAttributes.swift"), readFileSync3(join4(TEMPLATES_DIR, "CraftActivityAttributes.swift"), "utf8"));

package/package.json

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

package/templates/CraftFramePacingLog.swift

@@ -0,0 +1,18 @@
+import Foundation
+
+/// The opt-in frame trace shares one append-only file for this app process.
+enum CraftFramePacingLog {
+    static func open(in directory: URL) throws -> FileHandle {
+        let manager = FileManager.default
+        try manager.createDirectory(at: directory, withIntermediateDirectories: true)
+        let url = directory.appendingPathComponent("craft-frame-pacing.log")
+        if !manager.fileExists(atPath: url.path),
+           !manager.createFile(atPath: url.path, contents: nil) {
+            throw NSError(domain: NSCocoaErrorDomain, code: NSFileWriteUnknownError,
+                          userInfo: [NSFilePathErrorKey: url.path])
+        }
+        let handle = try FileHandle(forWritingTo: url)
+        _ = try handle.seekToEnd()
+        return handle
+    }
+}

package/templates/CraftHybrid.swift

@@ -2703,11 +2703,11 @@ final class CraftFramePacing: NSObject {
     private let output = DispatchQueue(label: "craft.frame-pacing", qos: .utility)
     private lazy var file: FileHandle? = {
         guard let caches = FileManager.default.urls(for: .cachesDirectory, in: .userDomainMask).first else { return nil }
-        let url = caches.appendingPathComponent("craft-frame-pacing.log")
-        if !FileManager.default.fileExists(atPath: url.path) { FileManager.default.createFile(atPath: url.path, contents: nil) }
-        let handle = try? FileHandle(forWritingTo: url)
-        _ = try? handle?.seekToEnd()
-        return handle
+        do { return try CraftFramePacingLog.open(in: caches) }
+        catch {
+            NSLog("[craft frames] trace file unavailable: %@", String(describing: error))
+            return nil
+        }
     }()
 
     private func write(_ line: String) {

package/templates/CraftNativeScreen.swift

@@ -10779,6 +10779,10 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         // beneath the screen's floating chrome.
         let overflow = style["overflow"] as? String
         view.clipsToBounds = overflow == "hidden"
+            // A single-line editor owns a text viewport. Its private label
+            // can be wider than the control while editing or showing a URL;
+            // inherited visible overflow must not open that viewport.
+            || view is UITextField
             || (view is UIScrollView && overflow != "visible")
             || (view is UILabel && (view.craftRequestedCornerRadius ?? 0) > 0)
             || ((view is UIImageView || view is CraftNativePositionedImageView) && (borderRadius > 0 || hasCornerRadii))

package/templates/testing/DriverTests.swift.template

@@ -182,6 +182,30 @@ final class DriverTests: XCTestCase {
         return nil
     }
 
+    /// Safari's web view extends behind its browser bars. Those regions accept
+    /// touches for the bars, not for page controls reported inside the web view.
+    func browserContentFrame(_ frame: CGRect, topBar: CGRect?, bottomBar: CGRect?) -> CGRect {
+        var top = frame.minY
+        var bottom = frame.maxY
+        if let bar = topBar, bar.contains(CGPoint(x: frame.midX, y: bar.midY)), bar.intersects(frame) {
+            top = max(top, bar.maxY)
+        }
+        if let bar = bottomBar, bar.contains(CGPoint(x: frame.midX, y: bar.midY)), bar.intersects(frame) {
+            bottom = min(bottom, bar.minY)
+        }
+        return CGRect(x: frame.minX, y: top, width: frame.width, height: max(0, bottom - top))
+    }
+
+    func scrollViewport() -> CGRect {
+        let webView = app.webViews.firstMatch
+        let topBar = app.otherElements["TopBrowserBar"]
+        let bottomBar = app.toolbars["BottomBrowserToolbar"]
+        guard webView.exists, topBar.exists || bottomBar.exists else { return app.frame }
+        return browserContentFrame(webView.frame.intersection(app.frame),
+            topBar: topBar.exists ? topBar.frame : nil,
+            bottomBar: bottomBar.exists ? bottomBar.frame : nil)
+    }
+
     /// A short target fits entirely; an oversized target fills the viewport.
     func visibleScrollFrame(_ target: CGRect, in viewport: CGRect) -> Bool {
         let visible = target.intersection(viewport)
@@ -192,7 +216,7 @@ final class DriverTests: XCTestCase {
 
     func scrollTargetVisible(_ target: XCUIElement?) -> Bool {
         guard let target, target.exists, target.isHittable,
-              visibleScrollFrame(target.frame, in: app.frame) else { return false }
+              visibleScrollFrame(target.frame, in: scrollViewport()) else { return false }
         // Hittable alone accepts controls clipped by the scroll view's edge.
         // Only an ancestor scroll view clips this target, not its siblings.
         // One that does not overlap the target is not its ancestor, whatever
@@ -220,7 +244,7 @@ final class DriverTests: XCTestCase {
     /// below the screen while drawing it over the lower half - and it stops
     /// short of a keyboard whose frame is known.
     func scrollPage(towardTop: Bool) {
-        let frame = app.frame
+        let frame = scrollViewport()
         var lower = frame.minY + frame.height * 0.55
         let keyboard = app.keyboards.firstMatch
         if keyboard.exists, !keyboard.frame.isEmpty, keyboard.frame.minY < frame.maxY {
@@ -719,7 +743,7 @@ final class DriverTests: XCTestCase {
             var found = element(containing: arg)
             var drags = 0
             while !scrollTargetVisible(found) && drags < 12 {
-                let towardTop = found.map { !$0.frame.isEmpty && $0.frame.midY < app.frame.midY } ?? false
+                let towardTop = found.map { !$0.frame.isEmpty && $0.frame.midY < scrollViewport().midY } ?? false
                 scrollPage(towardTop: towardTop)
                 drags += 1
                 found = element(containing: arg)