craft-native 0.0.171 → 0.0.173

package/dist/cli.js

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

package/dist/index.cjs

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

package/dist/index.js

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

package/dist/ios/templates/CraftApp.swift

@@ -561,7 +561,13 @@ struct CraftApp: App {
                     .ignoresSafeArea(.keyboard, edges: .bottom)
                 } else if appState.config.renderer == "native" {
                     // One native screen and its stack: no paths, no tabs.
+                    // The screen keeps itself out of the keyboard's way (its
+                    // own bottom safe area, CraftNativeScreen.swift); SwiftUI
+                    // shrinking it as well took the keyboard's height twice,
+                    // and a screen's scroll views and text views were squeezed
+                    // to nothing whenever the keyboard came up.
                     CraftNativeScreen(config: appState.config)
+                        .ignoresSafeArea(.keyboard, edges: .bottom)
                 } else {
                     // The page's own chrome, drawn natively over it: the tab
                     // bar the page asks for, and the splash until it is ready.

package/dist/ios/templates/CraftHybrid.swift

@@ -1614,17 +1614,22 @@ final class CraftHybridController: UIViewController, UINavigationControllerDeleg
         return popRecognizers(of: nav).contains { $0 === recognizer }
     }
 
-    private func nativeScreenContainsHorizontalScroll(_ screen: CraftNativeScreenController) -> Bool {
-        guard let root = screen.viewIfLoaded else { return false }
-        func visit(_ view: UIView) -> Bool {
-            if let scroll = view as? UIScrollView,
-               scroll.isScrollEnabled,
-               scroll.alwaysBounceHorizontal || scroll.contentSize.width > scroll.bounds.width + 1 {
+    /// Whether the touch at `point` (in this controller's view) is on a
+    /// horizontal scroll view of `root` that is past its leading edge, so a
+    /// swipe to the right scrolls it back rather than leaving the screen.
+    private func horizontalScrollCanScrollBack(at point: CGPoint, in root: UIView) -> Bool {
+        let local = root.convert(point, from: view)
+        guard root.bounds.contains(local), let hit = root.hitTest(local, with: nil) else { return false }
+        var candidate: UIView? = hit
+        while let current = candidate, current !== root.superview {
+            if let scroll = current as? UIScrollView, scroll.isScrollEnabled,
+               scroll.contentSize.width + scroll.adjustedContentInset.left + scroll.adjustedContentInset.right > scroll.bounds.width + 1,
+               scroll.contentOffset.x > -scroll.adjustedContentInset.left + 1 {
                 return true
             }
-            return view.subviews.contains(where: visit)
+            candidate = current.superview
         }
-        return visit(root)
+        return false
     }
 
     /// The edge swipe goes ahead of the web view's own gestures, which
@@ -1639,8 +1644,14 @@ final class CraftHybridController: UIViewController, UINavigationControllerDeleg
 
     func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool {
         if tabSwipeRecognizers.contains(where: { $0 === gestureRecognizer }) {
-            guard hybrid.tabIds.count > 1, let top = visibleStack?.topViewController else { return false }
+            guard hybrid.tabIds.count > 1, let nav = visibleStack, let top = nav.topViewController else { return false }
             guard CraftChrome.shared.tabSwipeEnabled else { return false }
+            // Only between the tabs' own first screens, as the bar shows them:
+            // deeper in a tab a swipe to the right is Back, and a screen that
+            // put the bar away (a workout under way, a tour) has the whole
+            // screen to itself.
+            guard nav.viewControllers.count == 1, nav.transitionCoordinator == nil,
+                  !CraftChrome.shared.hiddenByScreen else { return false }
             if let pan = gestureRecognizer as? UIPanGestureRecognizer {
                 let velocity = pan.velocity(in: view)
                 guard abs(velocity.x) > abs(velocity.y) else { return false }
@@ -1651,15 +1662,19 @@ final class CraftHybridController: UIViewController, UINavigationControllerDeleg
         }
         guard let nav = visibleStack, isPopRecognizer(gestureRecognizer),
               nav.viewControllers.count > 1, nav.transitionCoordinator == nil else { return false }
-        if let native = nav.topViewController as? CraftNativeScreenController,
-           gestureRecognizer !== nav.interactivePopGestureRecognizer,
-           !native.contentSwipeBack {
-            return false
-        }
-        if let native = nav.topViewController as? CraftNativeScreenController,
-           nativeScreenContainsHorizontalScroll(native) {
-            let moved = (gestureRecognizer as? UIPanGestureRecognizer)?.translation(in: nav.view).x ?? 0
-            if gestureRecognizer.location(in: nav.view).x - moved > 32 { return false }
+        if let native = nav.topViewController as? CraftNativeScreenController {
+            // `swipeBack: false`: the screen's own Back is the only way back.
+            if !native.swipeBack { return false }
+            if gestureRecognizer !== nav.interactivePopGestureRecognizer, !native.contentSwipeBack { return false }
+            // A back-swipe that starts on a pager, a carousel or a chart that
+            // can still scroll back is that view's: the pager goes back a
+            // page. At its first page there is nothing to scroll back to, and
+            // the swipe is the screen's Back again, from the edge or (iOS 26)
+            // from anywhere.
+            let moved = (gestureRecognizer as? UIPanGestureRecognizer)?.translation(in: nav.view) ?? .zero
+            let location = gestureRecognizer.location(in: nav.view)
+            let start = CGPoint(x: location.x - moved.x, y: location.y - moved.y)
+            if horizontalScrollCanScrollBack(at: nav.view.convert(start, to: view), in: native.view) { return false }
         }
         guard let slot = nav.topViewController as? CraftHybridWebSlot else { return true }
         // Over the page, only from its left edge: a swipe across the page is

package/dist/ios/templates/CraftNativeScreen.swift

@@ -2895,7 +2895,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
     /// - `craft.secureStorage.getSync(key)`: the Keychain item the web page's
     ///   `craft.secureStorage.set` wrote.
     /// - `craft.navigation.setOptions({ title, largeTitle, hidden, backTitle,
-    ///   tabBarHidden, contentSwipeBack, tabSwipeEnabled, backgroundColor, rightButtons })`;
+    ///   tabBarHidden, swipeBack, contentSwipeBack, tabSwipeEnabled, backgroundColor, rightButtons })`;
     ///   a right button's tap is the event `navButton`.
     ///
     /// A runtime that assigns `craft.storage` (or the others) afterwards keeps
@@ -3140,6 +3140,11 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
     private var navigationBarHidden: Bool?
     /// The app's tab bar away while this screen shows (`tabBarHidden`).
     private var tabBarHidden = 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
+    /// otherwise lose its place to a stray swipe.
+    private(set) var swipeBack = true
     /// Whether iOS 26's content-wide back-swipe may begin on this screen.
     /// Setting `contentSwipeBack: false` leaves the 32-point edge gesture.
     private(set) var contentSwipeBack = true
@@ -3186,6 +3191,9 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
                 CraftChrome.shared.setHiddenByScreen(hidden)
             }
         }
+        if let swipeBack = options["swipeBack"] as? Bool {
+            self.swipeBack = swipeBack
+        }
         if let contentSwipeBack = options["contentSwipeBack"] as? Bool {
             self.contentSwipeBack = contentSwipeBack
         }
@@ -3265,11 +3273,21 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         button.addAction(action, for: .touchUpInside)
         button.translatesAutoresizingMaskIntoConstraints = false
         NSLayoutConstraint.activate([button.widthAnchor.constraint(equalToConstant: 44), button.heightAnchor.constraint(equalToConstant: 44)])
-        // The system's own fills and blue, as Apple's apps draw a bar's round
-        // buttons: they follow light, dark and Increase Contrast by themselves.
-        let accent = spec["variant"] as? String == "accent"
-        button.backgroundColor = accent ? UIColor.systemBlue.withAlphaComponent(0.15) : .tertiarySystemFill
-        button.layer.cornerRadius = 22
+        // Floating, as the tab bar floats: a round piece of glass on iOS 26
+        // (the bar's own material), the thin material with the tab bar's
+        // hairline and shadow before it. The content scrolls on under it, and
+        // it follows light, dark and Increase Contrast by itself.
+        let surface = Self.floatingSurface(diameter: 44)
+        button.addSubview(surface)
+        // Glass lifts itself off the content; the material needs the tab
+        // bar's shadow to.
+        if surface.effect is UIBlurEffect {
+            button.layer.shadowColor = UIColor.black.cgColor
+            button.layer.shadowOpacity = 0.12
+            button.layer.shadowRadius = 8
+            button.layer.shadowOffset = CGSize(width: 0, height: 3)
+            button.layer.shadowPath = UIBezierPath(ovalIn: CGRect(x: 0, y: 0, width: 44, height: 44)).cgPath
+        }
         button.tintColor = .systemBlue
         button.setTitleColor(button.tintColor, for: .normal)
         button.titleLabel?.font = .systemFont(ofSize: 13, weight: .semibold)
@@ -3314,8 +3332,11 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
                 }
                 button.setTitle(nil, for: .normal)
                 button.setImage(round.withRenderingMode(.alwaysOriginal), for: .normal)
+                if let surface = button.subviews.first(where: { $0 is UIVisualEffectView }) { button.sendSubviewToBack(surface) }
             }
         }
+        // Under the symbol, the initials, the picture and the badge.
+        if let surface = button.subviews.first(where: { $0 is UIVisualEffectView }) { button.sendSubviewToBack(surface) }
         let item = UIBarButtonItem(customView: button)
         // iOS 26 groups adjacent bar items on one glass platter and tints
         // their custom views with it: the two 44-point circles came out as
@@ -3328,6 +3349,29 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         return item
     }
 
+    /// The round surface under a bar button: glass on iOS 26, the tab bar's
+    /// thin material and hairline before it. It takes no touches.
+    private static func floatingSurface(diameter: CGFloat) -> UIVisualEffectView {
+        let effect: UIVisualEffect
+        #if compiler(>=6.2)
+        if #available(iOS 26.0, *) { effect = UIGlassEffect() } else { effect = UIBlurEffect(style: .systemUltraThinMaterial) }
+        #else
+        effect = UIBlurEffect(style: .systemUltraThinMaterial)
+        #endif
+        let surface = UIVisualEffectView(effect: effect)
+        surface.frame = CGRect(x: 0, y: 0, width: diameter, height: diameter)
+        surface.autoresizingMask = [.flexibleWidth, .flexibleHeight]
+        surface.isUserInteractionEnabled = false
+        surface.layer.cornerRadius = diameter / 2
+        surface.layer.cornerCurve = .circular
+        surface.clipsToBounds = true
+        if effect is UIBlurEffect {
+            surface.layer.borderWidth = 0.5
+            surface.layer.borderColor = UIColor.white.withAlphaComponent(0.35).cgColor
+        }
+        return surface
+    }
+
     /// A bar picture, kept for the app's life so each screen does not fetch it again.
     private static let barImages = NSCache<NSURL, UIImage>()
 
@@ -5354,6 +5398,12 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
                 view.accessibilityValue = [current, message].compactMap { $0 }.joined(separator: ", ")
             }
         }
+        // A multiline TextInput is a UITextView, which works out its traits
+        // as it goes: while it has the keyboard they say it is editing, and
+        // that is what UI tests and VoiceOver read focus from. Setting them
+        // froze them, so it read as static text that never had focus ("neither
+        // element nor any descendant has keyboard focus"); it keeps its own.
+        if view is UITextView { return }
         view.accessibilityTraits = traits
     }
 

package/dist/macos/src/index.d.ts

@@ -0,0 +1,16 @@
+export interface MacOSNativeBuildOptions {
+    outdir: string;
+    /** A compiled stx native route bundle, never HTML. */
+    nativeBundle: string;
+    zig?: string;
+    /** zig-js checkout and its public static archive. No system JSC fallback. */
+    zigJS: {
+        source: string;
+        library: string;
+    };
+}
+/** Compile Craft's AppKit host and the shared Zig layout core. No WebKit. */
+export declare function buildMacOSNative(options: MacOSNativeBuildOptions): Promise<{
+    executable: string;
+    bundle: string;
+}>;

package/dist/macos/src/index.js

@@ -0,0 +1,75 @@
+// @bun
+// ../macos/src/index.ts
+import { cp, mkdir } from "fs/promises";
+import { existsSync } from "fs";
+import { join, resolve } from "path";
+import process from "process";
+async function buildMacOSNative(options) {
+  if (process.platform !== "darwin")
+    throw new Error("The AppKit host must be built on macOS.");
+  const outdir = resolve(options.outdir);
+  const templates = join(import.meta.dir, "../templates");
+  const sourceRoot = join(import.meta.dir, "../..");
+  const layout = existsSync(join(sourceRoot, "zig/src/native_layout.zig")) ? join(sourceRoot, "zig/src/native_layout.zig") : join(templates, "native_layout.zig");
+  const mutation = existsSync(join(sourceRoot, "ios/templates/CraftNativeMutation.swift")) ? join(sourceRoot, "ios/templates/CraftNativeMutation.swift") : join(templates, "CraftNativeMutation.swift");
+  if (!existsSync(options.nativeBundle))
+    throw new Error(`Native STX bundle not found: ${options.nativeBundle}`);
+  await mkdir(outdir, { recursive: true });
+  async function run(args) {
+    const child = Bun.spawn(args, { stdout: "inherit", stderr: "inherit" });
+    if (await child.exited !== 0)
+      throw new Error(`Native build failed: ${args[0]}`);
+  }
+  const zig = options.zig || process.env.CRAFT_ZIG || Bun.which("zig");
+  if (!zig)
+    throw new Error("Install the pinned Craft Zig toolchain or set CRAFT_ZIG.");
+  const layoutLibrary = join(outdir, "libcraft-layout.a");
+  await run([zig, "build-lib", layout, "-O", "ReleaseSafe", "-static", "-lc", `-femit-bin=${layoutLibrary}`]);
+  const executable = join(outdir, "craft-native-macos");
+  const engine = options.zigJS;
+  if (!existsSync(engine.library))
+    throw new Error(`Build zig-js first: ${engine.library}`);
+  if (!existsSync(join(engine.source, "include/module.modulemap")))
+    throw new Error("zig-js must expose its owned ZigJS Swift module.");
+  const bridge = join(outdir, "zig-js-objc.o");
+  const dispatch = join(outdir, "zig-js-dispatch.o");
+  const assembly = join(engine.source, `src/objc_abi_${process.arch === "arm64" ? "aarch64" : "x86_64"}.S`);
+  await run(["xcrun", "clang", "-fobjc-arc", "-fblocks", "-Wno-incomplete-implementation", "-I", join(engine.source, "include"), "-include", join(engine.source, "include/ZigJS.h"), "-c", join(engine.source, "src/objc_bridge.m"), "-o", bridge]);
+  await run([zig, "build-obj", join(engine.source, "src/objc_abi_dispatch.zig"), assembly, "-O", "ReleaseFast", `-femit-bin=${dispatch}`]);
+  await run([
+    "swiftc",
+    "-O",
+    "-swift-version",
+    "5",
+    "-I",
+    join(engine.source, "include"),
+    "-framework",
+    "Cocoa",
+    "-framework",
+    "AVKit",
+    "-framework",
+    "UserNotifications",
+    join(templates, "CraftMacRuntime.swift"),
+    join(templates, "CraftMacRenderer.swift"),
+    join(templates, "CraftMacApplication.swift"),
+    mutation,
+    bridge,
+    dispatch,
+    engine.library,
+    "-Xlinker",
+    "-force_load",
+    "-Xlinker",
+    layoutLibrary,
+    "-Xlinker",
+    "-export_dynamic",
+    "-o",
+    executable
+  ]);
+  const bundle = join(outdir, "native-screen.js");
+  if (resolve(options.nativeBundle) !== bundle)
+    await cp(options.nativeBundle, bundle);
+  return { executable, bundle };
+}
+export {
+  buildMacOSNative
+};