craft-native 0.0.126 → 0.0.128

package/dist/cli.js

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

package/dist/ios/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);

package/dist/ios/templates/CraftNativeScreen.swift

@@ -1662,9 +1662,38 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
             item.accessibilityLabel = id
         }
         if let tint = (spec["color"] as? String).flatMap({ UIColor(hex: $0) }) { item.tintColor = tint }
+        // `image`: a picture (an https URL, the account's own photo), drawn
+        // round as iOS draws an account button. The symbol or title shows
+        // until it has loaded, and stays if it cannot be.
+        if let source = spec["image"] as? String, let url = URL(string: source), url.scheme == "https" {
+            loadBarImage(url) { [weak item] image in
+                guard let item, let image else { return }
+                let size = CGSize(width: 32, height: 32)
+                let round = UIGraphicsImageRenderer(size: size).image { _ in
+                    UIBezierPath(ovalIn: CGRect(origin: .zero, size: size)).addClip()
+                    let scale = max(size.width / image.size.width, size.height / image.size.height)
+                    let drawn = CGSize(width: image.size.width * scale, height: image.size.height * scale)
+                    image.draw(in: CGRect(x: (size.width - drawn.width) / 2, y: (size.height - drawn.height) / 2, width: drawn.width, height: drawn.height))
+                }
+                item.title = nil
+                item.image = round.withRenderingMode(.alwaysOriginal)
+            }
+        }
         return item
     }
 
+    /// A bar picture, kept for the app's life so each screen does not fetch it again.
+    private static let barImages = NSCache<NSURL, UIImage>()
+
+    private func loadBarImage(_ url: URL, _ done: @escaping (UIImage?) -> Void) {
+        if let cached = Self.barImages.object(forKey: url as NSURL) { done(cached); return }
+        URLSession.shared.dataTask(with: url) { data, _, _ in
+            let image = data.flatMap(UIImage.init(data:))
+            if let image { Self.barImages.setObject(image, forKey: url as NSURL) }
+            DispatchQueue.main.async { done(image) }
+        }.resume()
+    }
+
     /// The first vertical scroll view of the screen drives the bar: a large
     /// title collapses as it scrolls, and the bar's background follows it.
     private func trackContentScrollView() {

package/package.json

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