craft-native 0.0.227 → 0.0.228

package/dist/cli.js

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

package/dist/ios/templates/CraftApp.swift

@@ -627,6 +627,7 @@ final class CraftChrome: ObservableObject {
     @Published var tabs: [Tab] = []
     @Published var tabAccessory: Tab?
     @Published var selected: String?
+    @Published private(set) var tabSwipePosition: CGFloat?
     @Published var tabBarVisible = false
     @Published var splashVisible = true
     @Published var tint: UIColor?
@@ -640,6 +641,7 @@ final class CraftChrome: ObservableObject {
     private var pendingHide: DispatchWorkItem?
     private var splashDeadline: DispatchWorkItem?
     private var tabSwipePrevious: String?
+    private var tabSwipeTarget: String?
     /// The keyboard is up and covers the tab bar, so the page need not leave
     /// room for it: the web view ends at the keyboard (CraftHybrid's webHost).
     private var keyboardUp = false
@@ -821,12 +823,34 @@ final class CraftChrome: ObservableObject {
         // A page's pending selection report may disagree with the native
         // stack. Cancellation belongs to the stack the finger left.
         tabSwipePrevious = previous
-        withAnimation(nil) { selected = id }
+        tabSwipeTarget = id
+        withAnimation(nil) {
+            tabSwipePosition = tabs.firstIndex(where: { $0.id == previous }).map { CGFloat($0) }
+            selected = id
+        }
+    }
+
+    /// The capsule shares the gesture's progress, rather than jumping to the
+    /// next item as soon as the pan recognizer begins.
+    func updateTabSwipe(progress: CGFloat) {
+        guard let previous = tabSwipePrevious, let target = tabSwipeTarget,
+              let from = tabs.firstIndex(where: { $0.id == previous }),
+              let to = tabs.firstIndex(where: { $0.id == target }) else { return }
+        let position = CGFloat(from) + CGFloat(to - from) * min(1, max(0, progress))
+        if tabSwipePosition != position { withAnimation(nil) { tabSwipePosition = position } }
+    }
+
+    func settleTabSwipe(completed: Bool, duration: TimeInterval) {
+        guard let id = completed ? tabSwipeTarget : tabSwipePrevious,
+              let index = tabs.firstIndex(where: { $0.id == id }) else { return }
+        withAnimation(Self.motion(.easeOut(duration: duration))) { tabSwipePosition = CGFloat(index) }
     }
 
     func cancelTabSwipe(restoringSelection: Bool = true) {
         guard let previous = tabSwipePrevious else { return }
         tabSwipePrevious = nil
+        tabSwipeTarget = nil
+        withAnimation(nil) { tabSwipePosition = nil }
         if restoringSelection {
             withAnimation(nil) { selected = previous }
         }
@@ -834,6 +858,8 @@ final class CraftChrome: ObservableObject {
 
     func commitTabSwipe(to id: String) {
         tabSwipePrevious = nil
+        tabSwipeTarget = nil
+        withAnimation(nil) { tabSwipePosition = nil }
         guard tabs.contains(where: { $0.id == id }) else { return }
         withAnimation(nil) { selected = id }
         UISelectionFeedbackGenerator().selectionChanged()
@@ -934,7 +960,6 @@ final class CraftChromeRelay: NSObject, WKScriptMessageHandler {
 /// The floating tab bar: Liquid Glass on iOS 26 and later, a material capsule before.
 struct CraftTabBarView: View {
     @ObservedObject private var chrome = CraftChrome.shared
-    @Namespace private var selection
     @Environment(\.accessibilityReduceMotion) private var reduceMotion
     @Environment(\.scenePhase) private var scenePhase
     // Dynamic Type, relative to the styles UIKit's own bar uses. The bar is
@@ -1064,13 +1089,6 @@ struct CraftTabBarView: View {
                     }
                     .foregroundStyle(isSelected ? selectedColor : Color.primary)
                     .frame(maxWidth: .infinity, minHeight: 54)
-                    .background {
-                        if isSelected {
-                            Capsule()
-                                .fill(Color.primary.opacity(0.09))
-                                .matchedGeometryEffect(id: "selection", in: selection)
-                        }
-                    }
                     .contentShape(Capsule())
                 }
                 .buttonStyle(.plain)
@@ -1083,6 +1101,20 @@ struct CraftTabBarView: View {
                 .accessibilityAddTraits(isSelected ? [.isSelected, .isButton] : .isButton)
             }
         }
+        .background {
+            GeometryReader { geometry in
+                if let position = chrome.tabSwipePosition
+                    ?? chrome.tabs.firstIndex(where: { $0.id == chrome.selected }).map({ CGFloat($0) }) {
+                    let width = geometry.size.width / CGFloat(max(1, chrome.tabs.count))
+                    Capsule()
+                        .fill(Color.primary.opacity(0.09))
+                        .frame(width: width, height: geometry.size.height)
+                        .offset(x: position * width)
+                }
+            }
+            .allowsHitTesting(false)
+            .accessibilityHidden(true)
+        }
     }
 
     private var selectedColor: Color {

package/dist/ios/templates/CraftHybrid.swift

@@ -1104,6 +1104,11 @@ final class CraftHybridController: UIViewController, UINavigationControllerDeleg
         DispatchQueue.main.async { [weak self] in self?.hybrid.shellReady() }
     }
 
+    override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+        prepareAdjacentNativeTabs()
+    }
+
     private var webAttached = false
 
     private func installTabSwipeGestures() {
@@ -1152,9 +1157,10 @@ final class CraftHybridController: UIViewController, UINavigationControllerDeleg
             let speed = velocity * direction
             let complete = recognizer.state == .ended && speed > -700
                 && (progress >= max(32, view.bounds.width * 0.28) || speed > 700)
-            finishInteractiveTabSwipe(completed: complete) { [weak self] in
+            finishInteractiveTabSwipe(completed: complete, velocity: velocity) { [weak self] in
                 self?.activeTabSwipeTarget = nil
                 self?.tabSwipeSettling = false
+                self?.prepareAdjacentNativeTabs()
                 guard complete else {
                     CraftChrome.shared.cancelTabSwipe()
                     return
@@ -1224,9 +1230,10 @@ final class CraftHybridController: UIViewController, UINavigationControllerDeleg
             : max(0, min(width, translation))
         target.view.frame.origin.x = tabSwipeFrom + offset
         current.view.frame.origin.x = offset
+        CraftChrome.shared.updateTabSwipe(progress: abs(offset) / width)
     }
 
-    private func finishInteractiveTabSwipe(completed: Bool, completion: @escaping () -> Void) {
+    private func finishInteractiveTabSwipe(completed: Bool, velocity: CGFloat, completion: @escaping () -> Void) {
         guard let targetId = activeTabSwipeTarget, let current = visibleStack,
               let target = stacks[targetId] else { completion(); return }
         let width = view.bounds.width
@@ -1235,7 +1242,12 @@ final class CraftHybridController: UIViewController, UINavigationControllerDeleg
         let settlingDuration = completed ? 0.22 : 0.18
         let duration = CraftChrome.motion(.easeOut(duration: settlingDuration)) == nil ? 0 : settlingDuration
         let generation = tabSwipeGeneration
-        UIView.animate(withDuration: duration, delay: 0, options: [.curveEaseOut, .beginFromCurrentState], animations: {
+        CraftChrome.shared.settleTabSwipe(completed: completed, duration: duration)
+        let remaining = end - target.view.frame.minX
+        let initialVelocity = abs(remaining) > 1 ? max(0, min(12, velocity / remaining)) : 0
+        UIView.animate(withDuration: duration, delay: 0, usingSpringWithDamping: 1,
+                       initialSpringVelocity: initialVelocity,
+                       options: [.beginFromCurrentState, .allowUserInteraction], animations: {
             target.view.frame.origin.x = end
             current.view.frame.origin.x = completed ? -direction * width : 0
         }, completion: { _ in
@@ -1449,6 +1461,7 @@ final class CraftHybridController: UIViewController, UINavigationControllerDeleg
         for (key, other) in stacks { other.view.isHidden = key != id }
         nav.view.frame = view.bounds
         view.bringSubviewToFront(nav.view)
+        prepareAdjacentNativeTabs()
         if let slot = nav.topViewController as? CraftHybridWebSlot, slot.isViewLoaded {
             adoptWeb(into: slot)
         } else if !(nav.topViewController is CraftHybridWebSlot) {
@@ -1456,6 +1469,31 @@ final class CraftHybridController: UIViewController, UINavigationControllerDeleg
         }
     }
 
+    /// Prepare one neighbour after the first frame, never inside the finger's
+    /// tracking run-loop mode. A first swipe then uses a laid-out native root
+    /// rather than compiling, measuring and fetching at gesture start.
+    private func prepareAdjacentNativeTabs() {
+        let owner = currentTab
+        let timer = Timer(timeInterval: 0.15, repeats: false) { [weak self] _ in
+            guard let self, self.currentTab == owner, self.activeTabSwipeTarget == nil,
+                  self.view.window != nil,
+                  let index = self.hybrid.tabIds.firstIndex(of: owner) else { return }
+            let tabs = self.hybrid.tabIds
+            for neighbour in [index + 1, index - 1] where tabs.indices.contains(neighbour) {
+                let id = tabs[neighbour]
+                guard self.stacks[id] == nil, self.hybrid.routes.match(id) != nil else { continue }
+                let nav = self.makeStack(tab: id, rootPath: id)
+                nav.view.isHidden = true
+                nav.view.layoutIfNeeded()
+                (nav.topViewController as? CraftNativeScreenController)?.screenVisibilityChanged(false)
+                (self.visibleStack?.topViewController as? CraftNativeScreenController)?.screenVisibilityChanged(true)
+                self.prepareAdjacentNativeTabs()
+                break
+            }
+        }
+        RunLoop.main.add(timer, forMode: .default)
+    }
+
     private func cancelPendingTab() {
         pendingTab?.deadline.cancel()
         pendingTab = nil

package/dist/ios/templates/CraftNativeActions.swift

@@ -1436,6 +1436,16 @@ enum CraftSnapshots {
     private static let lock = NSLock()
     /// Writes not on disk yet, so a read right after a write sees it.
     private static var pending: [String: String?] = [:]
+    private static var revisions: [String: UInt64] = [:]
+    private static var revision: UInt64 = 0
+    // Screens read shared headers many times while evaluating bindings. Keep
+    // settled JSON in memory instead of reopening the same file on the UI thread.
+    private static let cache: NSCache<NSString, NSString> = {
+        let cache = NSCache<NSString, NSString>()
+        cache.countLimit = 32
+        cache.totalCostLimit = 8 * 1024 * 1024
+        return cache
+    }()
 
     static var directory: URL? {
         FileManager.default.urls(for: .applicationSupportDirectory, in: .userDomainMask).first?
@@ -1458,11 +1468,13 @@ enum CraftSnapshots {
     static func read(_ name: String) -> String? {
         guard let url = url(for: name) else { return nil }
         lock.lock()
-        let waiting = pending[name]
-        lock.unlock()
-        if let waiting { return waiting }
+        defer { lock.unlock() }
+        if let waiting = pending[name] { return waiting }
+        if let cached = cache.object(forKey: name as NSString) { return cached as String }
         guard let data = try? Data(contentsOf: url) else { return nil }
-        return String(decoding: data, as: UTF8.self)
+        let json = String(decoding: data, as: UTF8.self)
+        cache.setObject(json as NSString, forKey: name as NSString, cost: data.count)
+        return json
     }
 
     /// Replaces the snapshot with JSON text (nil deletes it) off the main
@@ -1477,7 +1489,11 @@ enum CraftSnapshots {
             return
         }
         lock.lock()
+        revision &+= 1
+        let mine = revision
+        revisions[name] = mine
         pending[name] = .some(json)
+        cache.removeObject(forKey: name as NSString)
         lock.unlock()
         queue.async {
             var ok = true
@@ -1492,7 +1508,13 @@ enum CraftSnapshots {
                 ok = false
             }
             lock.lock()
-            if let current = pending[name], current == json { pending.removeValue(forKey: name) }
+            if revisions[name] == mine {
+                revisions.removeValue(forKey: name)
+                pending.removeValue(forKey: name)
+                if ok, let json {
+                    cache.setObject(json as NSString, forKey: name as NSString, cost: json.utf8.count)
+                }
+            }
             lock.unlock()
             DispatchQueue.main.async {
                 if ok { NotificationCenter.default.post(name: changed, object: nil, userInfo: ["name": name]) }

package/dist/ios/templates/CraftNativeScreen.swift

@@ -4224,7 +4224,14 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         screenRequestCancellers.removeAll()
     }
 
+    private var appliedTraitDefaults: String?
+
     private func refreshTraitDefaults() {
+        // Tab navigation is not a theme change. Reapplying the entire tree
+        // discards every measurement just as an interactive transition starts.
+        let traits = "\(colorScheme):\(traitCollection.preferredContentSizeCategory.rawValue):\(UIAccessibility.isReduceTransparencyEnabled)"
+        guard traits != appliedTraitDefaults else { return }
+        appliedTraitDefaults = traits
         view.backgroundColor = screenBackgroundColor ?? config.resolvedBackgroundColor
         applyNavigationBarAppearance()
         if let document = mutationDocument.node("root") {

package/dist/ios/templates/Info.plist.template

@@ -20,6 +20,8 @@
     <string>{{VERSION}}</string>
     <key>CFBundleVersion</key>
     <string>{{BUILD_NUMBER}}</string>
+    <key>CADisableMinimumFrameDurationOnPhone</key>
+    <true/>
     <key>LSRequiresIPhoneOS</key>
     <true/>
     <key>ITSAppUsesNonExemptEncryption</key>

package/package.json

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