craft-native 0.0.170 → 0.0.172

package/dist/cli.js

@@ -3303,7 +3303,7 @@ function pinCraftNativeDependency(packagePath, craftVersion) {
 `);
 }
 // package.json
-var version = "0.0.170";
+var version = "0.0.172";
 
 // 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.170";
+var version = "0.0.172";
 
 // 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.170";
+var version = "0.0.172";
 
 // src/sdk-version.ts
 var SDK_VERSION = version;

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/CraftNativeMutation.swift

@@ -150,6 +150,11 @@ final class CraftNativeMutationDocument {
         materialize(id, nodes: nodes)
     }
 
+    /// The committed parent of a node: nil for the root or a node it does not hold.
+    func parentId(of id: String) -> String? {
+        nodes[id]?.parent
+    }
+
     private func createNode(
         _ operation: [String: Any],
         nodes: inout [String: Node],
@@ -291,8 +296,21 @@ final class CraftNativeMutationDocument {
         return values.compactMap { $0 as? String }
     }
 
+    /// Every type the renderer draws children of (CraftNativeScreen's
+    /// reconcile), by the names it accepts (`canonicalType`, so `svg` is
+    /// `Svg`). Only View, SafeAreaView and ScrollView used to be here, so a
+    /// drawing revealed after the first paint (an `:if` around an `<svg>`)
+    /// had its shapes refused as INVALID_PARENT, and the whole screen was
+    /// drawn again; Android's host already took the same list.
+    static let containerTypes: Set<String> = [
+        "View", "SafeAreaView", "ScrollView", "KeyboardAvoidingView", "Modal", "Pressable",
+        "TouchableOpacity", "TouchableHighlight", "ImageBackground", "FlatList", "SectionList",
+        "Fragment", "Svg", "G",
+    ]
+    private static let containerTypeKeys = Set(containerTypes.map { $0.lowercased() })
+
     private func acceptsChildren(_ type: String) -> Bool {
-        type == "View" || type == "SafeAreaView" || type == "ScrollView"
+        Self.containerTypeKeys.contains(type.lowercased())
     }
 
     private func descendants(of id: String, nodes: [String: Node]) -> Set<String> {

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>()
 
@@ -3816,7 +3860,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         let focused = firstResponder(in: rootStack) ?? lastFocusedInput
         var applied = Set<String>()
         for id in ids {
-            let target = flatListOwners[id] ?? svgOwners[id] ?? id
+            guard let target = drawnTarget(id) else { return false }
             guard applied.insert(target).inserted else { continue }
             guard let document = mutationDocument.node(target), let previous = renderedNode(target) else { return false }
             let next = reconcile(document, identity: previous.identity, path: target, previous: previous)
@@ -3828,6 +3872,21 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         return true
     }
 
+    /// The drawn node a change to `id` redraws: the list or drawing a row or
+    /// shape belongs to, else the node itself. A node this batch created is
+    /// not drawn yet (a drawing an `:if` just revealed, its shapes inserted
+    /// into it), so its nearest drawn ancestor draws it, rather than the whole
+    /// screen being reconciled again for want of it.
+    private func drawnTarget(_ id: String) -> String? {
+        var current: String? = id
+        while let candidate = current {
+            let target = flatListOwners[candidate] ?? svgOwners[candidate] ?? candidate
+            if renderedNode(target) != nil { return target }
+            current = mutationDocument.parentId(of: candidate)
+        }
+        return nil
+    }
+
     private func renderedNode(_ id: String, below node: RenderedNode? = nil) -> RenderedNode? {
         guard let node = node ?? renderedRoot else { return nil }
         if node.protocolId == id { return node }

package/package.json

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