@craft-native/ios 0.0.126 → 0.0.127

package/package.json

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

package/templates/CraftHybrid.swift

@@ -402,12 +402,17 @@ final class CraftHybrid: NSObject {
         navigate = function () { return own.apply(router, arguments); };
         // A forward navigation to a native path is the shell's to show; the
         // page draws nothing. Back (pushState false), tab switches and the
-        // shell's own navigations go through untouched.
+        // shell's own navigations go through untouched. A redirect (replace),
+        // as after signing in, is the page leaving where it was: the shell
+        // shows the native screen and the page follows it there behind it,
+        // or it stayed on the sign-in page and the next screen pushed from it
+        // came up blank.
         router.navigate = router.navigateTo = function (url, pushState, force) {
           var path = local(url);
           if (path !== null && pushState !== false && pushState !== 'tab' && hostNav === null && match(path)) {
             var replace = pushState === 'replace' || !!(pushState && typeof pushState === 'object' && pushState.replace);
             post({ type: 'navigateNative', path: path, replace: replace });
+            if (replace) return own.apply(router, arguments);
             return Promise.resolve(false);
           }
           return own.apply(router, arguments);
@@ -441,6 +446,16 @@ final class CraftHybrid: NSObject {
         if (event.defaultPrevented || event.button !== 0 || event.metaKey || event.ctrlKey || event.shiftKey || event.altKey) return;
         var link = event.target && event.target.closest ? event.target.closest('a[href]') : null;
         if (!link) return;
+        // The bar's Back (data-native-back). Its href is only where to go
+        // without history, often a native path like the calendar; at the
+        // entry a native screen opened, Back is that screen.
+        if (link.hasAttribute('data-native-back')) {
+          if (!atBase()) return;
+          event.preventDefault();
+          event.stopPropagation();
+          post({ type: 'back' });
+          return;
+        }
         if ((link.target && link.target !== '_self') || link.hasAttribute('download') || link.hasAttribute('data-native-tab')
           || link.getAttribute('data-stx-nav') === 'tab' || link.hasAttribute('data-craft-web')) return;
         var path = local(link.href);