@craft-native/ios 0.0.189 → 0.0.192

package/package.json

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

package/templates/CraftApp.swift

@@ -614,7 +614,10 @@ final class CraftChrome: ObservableObject {
         let id: String
         let title: String
         let symbol: String
-        let badge: String?
+        var badge: String?
+        var iconText: String? = nil
+        var accessibilityLabel: String? = nil
+        var image: String? = nil
     }
 
     @Published var tabs: [Tab] = []
@@ -668,6 +671,23 @@ final class CraftChrome: ObservableObject {
     /// the bar away while it shows (`tabBarHidden`, CraftNativeScreen.swift);
     /// the next screen shown says again. The page's own hideTabBar is apart.
     private(set) var hiddenByScreen = false
+
+    /// Change one tab's icon without replacing tabs, navigation stacks or selection.
+    func updateTab(_ item: [String: Any]) {
+        guard let id = item["id"] as? String, let index = tabs.firstIndex(where: { $0.id == id }) else { return }
+        if item.keys.contains("iconText") {
+            tabs[index].iconText = (item["iconText"] as? String).flatMap { $0.isEmpty ? nil : String($0.prefix(8)) }
+        }
+        if item.keys.contains("accessibilityLabel") {
+            tabs[index].accessibilityLabel = (item["accessibilityLabel"] as? String).map { String($0.prefix(160)) }
+        }
+        if item.keys.contains("image") {
+            tabs[index].image = (item["image"] as? String).flatMap { URL(string: $0)?.scheme == "https" ? $0 : nil }
+        }
+        if item.keys.contains("badge") {
+            tabs[index].badge = (item["badge"] as? String).flatMap { $0.isEmpty ? nil : String($0.prefix(8)) }
+        }
+    }
     func setHiddenByScreen(_ hidden: Bool) {
         guard hiddenByScreen != hidden else { return }
         hiddenByScreen = hidden
@@ -941,9 +961,28 @@ struct CraftTabBarView: View {
                 Button { chrome.tap(tab) } label: {
                     VStack(spacing: 3) {
                         ZStack(alignment: .topTrailing) {
-                            Image(systemName: symbol(tab.symbol, selected: isSelected))
-                                .font(.system(size: iconSize, weight: isSelected ? .semibold : .regular))
+                            if let image = tab.image, let url = URL(string: image) {
+                                AsyncImage(url: url) { image in
+                                    image.resizable().scaledToFill()
+                                } placeholder: {
+                                    Image(systemName: symbol(tab.symbol, selected: isSelected))
+                                }
+                                .frame(width: iconSize + 4, height: iconSize + 4)
+                                .clipShape(Circle())
                                 .frame(height: iconSize + 6)
+                            } else if let text = tab.iconText {
+                                Text(text)
+                                    .font(.system(size: iconSize, weight: .semibold, design: .rounded))
+                                    .monospacedDigit()
+                                    .foregroundStyle(Color.red)
+                                    .lineLimit(1)
+                                    .minimumScaleFactor(0.7)
+                                    .frame(height: iconSize + 6)
+                            } else {
+                                Image(systemName: symbol(tab.symbol, selected: isSelected))
+                                    .font(.system(size: iconSize, weight: isSelected ? .semibold : .regular))
+                                    .frame(height: iconSize + 6)
+                            }
                             if let badge = tab.badge {
                                 Text(badge)
                                     .font(.system(size: badgeSize, weight: .bold))
@@ -975,7 +1014,7 @@ struct CraftTabBarView: View {
                     Image(systemName: symbol(tab.symbol, selected: isSelected))
                     Text(tab.title)
                 }
-                .accessibilityLabel(tab.badge.map { "\(tab.title), \($0)" } ?? tab.title)
+                .accessibilityLabel(tab.accessibilityLabel ?? tab.badge.map { "\(tab.title), \($0)" } ?? tab.title)
                 .accessibilityAddTraits(isSelected ? [.isSelected, .isButton] : .isButton)
             }
         }
@@ -5709,9 +5748,11 @@ struct CraftWebView: UIViewRepresentable {
                 return
             }
             var items: [Any] = []
-            if let title = options["title"] as? String, !title.isEmpty { items.append(title) }
+            let title = options["title"] as? String ?? ""
             if let text = options["text"] as? String, !text.isEmpty { items.append(text) }
-            if let urlString = options["url"] as? String, let url = URL(string: urlString) { items.append(url) }
+            if let urlString = options["url"] as? String, let url = URL(string: urlString) {
+                items.append(CraftShareLink(url: url, title: title))
+            } else if !title.isEmpty { items.append(title) }
             if let files = options["files"] as? [String] {
                 for file in files {
                     if let url = URL(string: file), url.isFileURL { items.append(url) }

package/templates/CraftNativeScreen.swift

@@ -4355,6 +4355,9 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
     /// `craft.navigation.setOptions`: this screen's bar. Every key is
     /// optional and only the keys given change.
     private func applyNavigationOptions(_ options: [String: Any]) {
+        if let tab = options["tabItem"] as? [String: Any] {
+            CraftChrome.shared.updateTab(tab)
+        }
         // The app script has no screen, so no bar and no tab bar to change.
         guard !isAppScript else { return }
         if options.keys.contains("title") {

package/templates/CraftNativeServices.swift

@@ -1,5 +1,6 @@
 import AVFoundation
 import Foundation
+import LinkPresentation
 import UIKit
 import UserNotifications
 
@@ -687,6 +688,32 @@ enum CraftNativePush {
 
 // MARK: - Share sheet
 
+/// A URL stays a URL in Messages, AirDrop and Copy. Its title belongs in the
+/// system preview and mail subject, rather than becoming a second text item.
+final class CraftShareLink: NSObject, UIActivityItemSource {
+    let url: URL
+    let title: String
+
+    init(url: URL, title: String) {
+        self.url = url
+        self.title = title
+    }
+
+    func activityViewControllerPlaceholderItem(_ activityViewController: UIActivityViewController) -> Any { url }
+
+    func activityViewController(_ activityViewController: UIActivityViewController, itemForActivityType activityType: UIActivity.ActivityType?) -> Any? { url }
+
+    func activityViewController(_ activityViewController: UIActivityViewController, subjectForActivityType activityType: UIActivity.ActivityType?) -> String { title }
+
+    func activityViewControllerLinkMetadata(_ activityViewController: UIActivityViewController) -> LPLinkMetadata? {
+        let metadata = LPLinkMetadata()
+        metadata.originalURL = url
+        metadata.url = url
+        if !title.isEmpty { metadata.title = title }
+        return metadata
+    }
+}
+
 /// `craft.share` on a native screen: the system share sheet with the page's
 /// options (`title`, `text`, `url`, `files`), plus `image`, a picture by URL
 /// that is shared as the picture rather than as its address. Answers true
@@ -694,9 +721,11 @@ enum CraftNativePush {
 enum CraftNativeShare {
     static func share(_ options: [String: Any], done: @escaping (Result<Any, CraftNativeActionError>) -> Void) {
         var items: [Any] = []
-        if let title = options["title"] as? String, !title.isEmpty { items.append(title) }
+        let title = options["title"] as? String ?? ""
         if let text = options["text"] as? String, !text.isEmpty { items.append(text) }
-        if let address = options["url"] as? String, let url = URL(string: address) { items.append(url) }
+        if let address = options["url"] as? String, let url = URL(string: address) {
+            items.append(CraftShareLink(url: url, title: title))
+        } else if !title.isEmpty { items.append(title) }
         // A path or file URL, or a file craft.files made (`{ path, name }`).
         let files = (options["files"] as? [Any] ?? []).compactMap { item -> String? in
             item as? String ?? (item as? [String: Any])?["path"] as? String
@@ -715,7 +744,7 @@ enum CraftNativeShare {
                 if let error { done(.failure(CraftNativeActionError(code: "SHARE_ERROR", message: error.localizedDescription))) }
                 else { done(.success(completed)) }
             }
-            if !CraftPresenter.present(sheet, from: nil, anchor: nil) {
+            if !CraftPresenter.present(sheet, from: nil, anchor: CraftPresenter.rect(options["anchor"])) {
                 done(.failure(CraftNativeActionError(code: "SHARE_ERROR", message: "Unable to present the share sheet")))
             }
         }