craft-native 0.0.135 → 0.0.136

package/dist/cli.js

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

package/dist/ios/templates/CraftApp.swift

@@ -535,8 +535,25 @@ final class CraftChrome: ObservableObject {
     private var occupied: CGFloat = 0
     private var pendingHide: DispatchWorkItem?
     private var splashDeadline: DispatchWorkItem?
+    /// 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
 
-    private init() {}
+    private init() {
+        let center = NotificationCenter.default
+        center.addObserver(forName: UIResponder.keyboardWillShowNotification, object: nil, queue: .main) { [weak self] _ in
+            self?.keyboardChanged(up: true)
+        }
+        center.addObserver(forName: UIResponder.keyboardWillHideNotification, object: nil, queue: .main) { [weak self] _ in
+            self?.keyboardChanged(up: false)
+        }
+    }
+
+    private func keyboardChanged(up: Bool) {
+        guard up != keyboardUp else { return }
+        keyboardUp = up
+        publishLayout()
+    }
 
     /// The tab bar from `tabs` in craft.config.json, there before the page
     /// loads; the page's own `tabBar` message replaces it later. `splash`
@@ -685,7 +702,7 @@ final class CraftChrome: ObservableObject {
     /// The bar's height as `--craft-tab-bar-height`, so the page leaves room
     /// for it, and as an event for anything that measures.
     func publishLayout() {
-        let height = tabBarVisible ? Int(occupied) : 0
+        let height = tabBarVisible && !keyboardUp ? Int(occupied) : 0
         CraftHybrid.shared.tabBarCovers(CGFloat(height))
         let script = "document.documentElement.style.setProperty('--craft-tab-bar-height','\(height)px');window.dispatchEvent(new CustomEvent('craftTabBarLayout',{detail:{height:\(height)}}));"
         DispatchQueue.main.async { [weak self] in self?.webView?.evaluateJavaScript(script, completionHandler: nil) }

package/dist/ios/templates/CraftHybrid.swift

@@ -539,6 +539,14 @@ final class CraftHybrid: NSObject {
             }, function () { arriving = null; finish(); });
           });
         },
+        // Put the page at `path` in place of where it is, without a step in
+        // its history: the shell is back at a native screen and the page
+        // behind it had no history left to go back through (it reloaded).
+        reset: function (path) {
+          if (!(navigate && current && current.__craftHybrid)) { location.replace(path); return Promise.resolve(false); }
+          hostNav = path;
+          return Promise.resolve(navigate(path, { instant: true, replace: true }));
+        },
         setBase: function (value) { base = typeof value === 'number' ? value : null; },
         // Back to `target` in the page's stack, after the shell popped the
         // entries above it.
@@ -667,6 +675,11 @@ final class CraftHybrid: NSObject {
         webView?.evaluateJavaScript("window.__craftHybrid && window.__craftHybrid.setBase(\(value))", completionHandler: nil)
     }
 
+    func pageReset(to path: String) {
+        guard let data = try? JSONSerialization.data(withJSONObject: [path]), let json = String(data: data, encoding: .utf8) else { return }
+        webView?.evaluateJavaScript("window.__craftHybrid && window.__craftHybrid.reset && window.__craftHybrid.reset(\(json)[0])", completionHandler: nil)
+    }
+
     func pageBack(to depth: Int) {
         webView?.evaluateJavaScript("window.__craftHybrid && window.__craftHybrid.backTo(\(max(0, depth)))", completionHandler: nil)
     }
@@ -752,7 +765,10 @@ final class CraftHybridController: UIViewController, UINavigationControllerDeleg
 
     init(config: CraftConfig) {
         self.config = config
-        webHost = UIHostingController(rootView: AnyView(CraftWebView(config: config).ignoresSafeArea()))
+        // Edge to edge, but not under the keyboard: the web view ends at its
+        // top. Under it, WebKit scrolled the page's layout viewport to show a
+        // focused field and carried every sticky header off the screen.
+        webHost = UIHostingController(rootView: AnyView(CraftWebView(config: config).ignoresSafeArea(.container)))
         super.init(nibName: nil, bundle: nil)
         hybrid.controller = self
     }
@@ -784,7 +800,7 @@ final class CraftHybridController: UIViewController, UINavigationControllerDeleg
         guard !webAttached else { return }
         webAttached = true
         webHost.view.backgroundColor = config.resolvedBackgroundColor
-        if #available(iOS 16.4, *) { webHost.safeAreaRegions = [] }
+        if #available(iOS 16.4, *) { webHost.safeAreaRegions = [.keyboard] }
         if let slot = visibleStack?.topViewController as? CraftHybridWebSlot, slot.isViewLoaded {
             moveWeb(to: slot, in: slot.view)
         } else {
@@ -1109,6 +1125,16 @@ final class CraftHybridController: UIViewController, UINavigationControllerDeleg
         if let depth = removed.compactMap({ ($0 as? CraftHybridWebSlot)?.depth }).min() {
             hybrid.pageBack(to: depth - 1)
         }
+        // Back at a tab's native root while the page, with no history left
+        // to go back through (it reloaded on the screen just popped), still
+        // shows that screen: it moves to the root's path. Left there, the
+        // next screen opened from the root was pushed on top of it and named
+        // it in its Back button ("Me" instead of "Today").
+        if !removed.isEmpty, !(viewController is CraftHybridWebSlot), navigationController.viewControllers.first === viewController,
+           let rootPath = nativePaths[ObjectIdentifier(viewController)], !rootPath.contains(":"), hybrid.pageDepth == 0,
+           let pagePath = hybrid.pagePath, CraftHybridRoutes.normalize(pagePath) != CraftHybridRoutes.normalize(rootPath) {
+            hybrid.pageReset(to: rootPath)
+        }
         guard navigationController === visibleStack else { return }
         if let slot = viewController as? CraftHybridWebSlot { adoptWeb(into: slot) } else { parkWeb() }
     }

package/package.json

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