craft-native 0.0.189 → 0.0.192

package/dist/android/templates/CraftNativeServices.kt.template

@@ -286,7 +286,10 @@ internal class CraftNativeServices(
             else -> Intent(Intent.ACTION_SEND).apply { type = "text/plain" }
         }
         if (text.isNotBlank()) intent.putExtra(Intent.EXTRA_TEXT, text)
-        options.optString("title").takeIf { it.isNotBlank() }?.let { intent.putExtra(Intent.EXTRA_SUBJECT, it) }
+        options.optString("title").takeIf { it.isNotBlank() }?.let {
+            intent.putExtra(Intent.EXTRA_SUBJECT, it)
+            intent.putExtra(Intent.EXTRA_TITLE, it)
+        }
         intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
         host.startActivity(Intent.createChooser(intent, options.optString("title").ifBlank { null }))
         // Android does not say whether something was shared; the sheet opened.

package/dist/android/templates/CraftNativeShell.kt.template

@@ -576,6 +576,9 @@ internal class CraftNativeChrome(context: Context, private val tabs: List<CraftN
     private val buttons = LinearLayout(context)
     private val tabBar = LinearLayout(context)
     private val tabViews = mutableListOf<Pair<TextView, TextView>>()
+    private val tabIconText = mutableMapOf<String, String>()
+    private val tabImageURLs = mutableMapOf<String, String>()
+    private val tabImages = mutableMapOf<String, android.graphics.drawable.Drawable>()
     private val density = resources.displayMetrics.density
     private var selectedTab = 0
     private var swipeTracking = false
@@ -703,6 +706,7 @@ internal class CraftNativeChrome(context: Context, private val tabs: List<CraftN
 
     /** Draws `options` (a screen's `setOptions`) for a screen `depth` deep in its stack. */
     fun apply(options: JSONObject, depth: Int, fallbackTitle: String?) {
+        options.optJSONObject("tabItem")?.let(::updateTab)
         val hidden = options.optBoolean("hidden", false)
         val large = options.optBoolean("largeTitle", false) && depth == 0
         val title = options.optString("title").takeIf { options.has("title") } ?: fallbackTitle.orEmpty()
@@ -728,6 +732,42 @@ internal class CraftNativeChrome(context: Context, private val tabs: List<CraftN
         refreshColors()
     }
 
+    private fun updateTab(item: JSONObject) {
+        val id = item.optString("id")
+        val index = tabs.indexOfFirst { it.id == id }
+        if (index < 0) return
+        val cell = tabBar.getChildAt(index)
+        if (item.has("accessibilityLabel")) cell.contentDescription = item.optString("accessibilityLabel").takeUnless { item.isNull("accessibilityLabel") || it.isBlank() } ?: tabs[index].title
+        if (item.has("iconText")) {
+            tabIconText.remove(id)
+            item.optString("iconText").takeUnless { item.isNull("iconText") || it.isBlank() }?.let { tabIconText[id] = it.take(8) }
+        }
+        if (item.has("image")) {
+            val address = item.optString("image").takeIf { !item.isNull("image") && it.startsWith("https://") }
+            if (address != tabImageURLs[id]) {
+                tabImages.remove(id)
+                tabImageURLs.remove(id)
+                if (address != null) {
+                    tabImageURLs[id] = address
+                    Thread {
+                        val image = runCatching {
+                            val connection = java.net.URL(address).openConnection().apply { connectTimeout = 5000; readTimeout = 5000 }
+                            val bitmap = connection.getInputStream().use { android.graphics.BitmapFactory.decodeStream(it) } ?: return@runCatching null
+                            androidx.core.graphics.drawable.RoundedBitmapDrawableFactory.create(resources, android.graphics.Bitmap.createScaledBitmap(bitmap, dp(27), dp(27), true)).apply { isCircular = true }
+                        }.getOrNull()
+                        post {
+                            if (tabImageURLs[id] == address && image != null) {
+                                tabImages[id] = image
+                                refreshColors()
+                            }
+                        }
+                    }.start()
+                }
+            }
+        }
+        refreshColors()
+    }
+
     /** Light or dark changed: the bars follow the screen's background. */
     fun refreshColors() {
         val background = ContextCompat.getColor(context, R.color.background)
@@ -749,11 +789,12 @@ internal class CraftNativeChrome(context: Context, private val tabs: List<CraftN
         )).apply { setLayerInset(1, 0, maxOf(1, (density / 2).toInt()), 0, 0) }
         tabViews.forEachIndexed { index, (icon, label) ->
             val color = if (index == selectedTab) accent else muted
-            icon.setTextColor(color)
+            val number = tabIconText[tabs[index].id]
+            icon.setTextColor(if (number != null) Color.parseColor("#FF2D55") else color)
             label.setTextColor(color)
-            val vector = CraftNativeIcons.drawable(context, null, tabs[index].symbol, color)
+            val vector = tabImages[tabs[index].id] ?: if (number == null) CraftNativeIcons.drawable(context, null, tabs[index].symbol, color) else null
             icon.foreground = vector
-            if (vector != null) icon.text = ""
+            icon.text = if (vector != null) "" else number ?: CraftNativeSymbols.glyph(tabs[index].symbol)
         }
         for (index in 0 until buttons.childCount) (buttons.getChildAt(index) as? TextView)?.setTextColor(accent)
     }

package/dist/android/templates/MainActivityNative.kt.template

@@ -2653,6 +2653,37 @@ private class CraftNativeDatePickerView(context: Context) : FrameLayout(context)
     }
 }
 
+/** A field's pending native edits and the props acknowledged by the screen. */
+internal class CraftNativeInputEcho {
+    private val pending = ArrayDeque<String>()
+    private var rendered: String? = null
+    private var initialized = false
+
+    fun record(value: String) {
+        pending.addLast(value)
+        while (pending.size > 64) pending.removeFirst()
+    }
+
+    fun accept(value: String?, nativeValue: String): Boolean {
+        if (value == null) {
+            initialized = false
+            rendered = null
+            pending.clear()
+            return false
+        }
+        // A retained field can render the same prop more than once, after
+        // its echo was consumed. That repeated prop must not overwrite a
+        // keystroke that has not made the native/JS round trip yet.
+        val changed = !initialized || rendered != value
+        initialized = true
+        rendered = value
+        if (!changed) return false
+        val index = pending.indexOf(value)
+        if (index >= 0) repeat(index + 1) { pending.removeFirst() }
+        return nativeValue != value && index < 0
+    }
+}
+
 /**
  * A native screen's `<Video>`: the platform's VideoView.
  *
@@ -3261,7 +3292,7 @@ class MainActivity : AppCompatActivity() {
          * the screen answer with a value the field has already moved past;
          * that echo is not written back over what was typed since.
          */
-        val inputEchoes = mutableMapOf<EditText, ArrayDeque<String>>()
+        val inputEchoes = mutableMapOf<EditText, CraftNativeInputEcho>()
         val controls = mutableMapOf<String, View>()
         // Protocol ids identify mutation targets; authored keys identify the
         // retained view. Keep both mappings so a targeted update can recover
@@ -4601,10 +4632,8 @@ class MainActivity : AppCompatActivity() {
                 val autofillHint = autofillHintFor(props)
                 if (autofillHint == null) setAutofillHints(*emptyArray()) else setAutofillHints(autofillHint)
                 val controlledValue = props.opt("value")?.takeUnless { it == JSONObject.NULL }?.toString()
-                val echoes = screen.inputEchoes[this]
-                val echoIndex = if (controlledValue == null || echoes == null) -1 else echoes.indexOf(controlledValue)
-                if (echoIndex >= 0) repeat(echoIndex + 1) { echoes!!.removeFirst() }
-                if (controlledValue != null && text.toString() != controlledValue && echoIndex < 0) {
+                val echoes = screen.inputEchoes.getOrPut(this) { CraftNativeInputEcho() }
+                if (echoes.accept(controlledValue, text.toString()) && controlledValue != null) {
                     screen.suppressedTextChanges.add(this)
                     setTextPreservingSelection(this, controlledValue)
                 }
@@ -4662,9 +4691,7 @@ class MainActivity : AppCompatActivity() {
                         (screen.inputIdentities[this@apply] ?: identity).let { screen.drafts[it] = updated }
                         if (screen.suppressedTextChanges.remove(this@apply)) return
                         val current = screen.handlers[this@apply] ?: return
-                        val echoes = screen.inputEchoes.getOrPut(this@apply) { ArrayDeque() }
-                        echoes.addLast(updated)
-                        while (echoes.size > 64) echoes.removeFirst()
+                        screen.inputEchoes.getOrPut(this@apply) { CraftNativeInputEcho() }.record(updated)
                         send(screen, "EVENT", JSONObject()
                             .put("handlerName", current)
                             .put("nativeEvent", JSONObject().put("text", updated)))
@@ -5084,7 +5111,7 @@ class MainActivity : AppCompatActivity() {
         val pressOutHandler = craftNativeEventName(events, "onPressOut").takeIf { it.isNotBlank() }
         if (pressInHandler != null) screen.pressInHandlers[control] = pressInHandler else screen.pressInHandlers.remove(control)
         if (pressOutHandler != null) screen.pressOutHandlers[control] = pressOutHandler else screen.pressOutHandlers.remove(control)
-        if (type != "Button" && type != "Link" && type != "TextInput" && type != "Picker" && type != "DatePicker" && type != "Modal" && type != "Switch" && type != "Slider" && type != "ActivityIndicator" && type != "KeyboardAvoidingView" && type != "StatusBar" && type != "RefreshControl" && type != "Map") {
+        if (type != "Button" && type != "Link" && type != "Checkbox" && type != "TextInput" && type != "Picker" && type != "DatePicker" && type != "Modal" && type != "Switch" && type != "Slider" && type != "ActivityIndicator" && type != "KeyboardAvoidingView" && type != "StatusBar" && type != "RefreshControl" && type != "Map") {
             val handler = craftNativeEventName(events, "onPress", "onClick")
             val disabled = props.optBoolean("disabled", false)
             val target = listOf(props.opt("href"), props.opt("to"))
@@ -5430,6 +5457,11 @@ class MainActivity : AppCompatActivity() {
         view.elevation = dp(craftNativeNonNegativeDouble(style, "elevation", 0.0)).toFloat()
         view.z = craftNativeFiniteFloat(style, "zIndex", 0f)
         val background = style.has("backgroundColor") && !style.isNull("backgroundColor")
+        // VideoView's Surface is behind this window. An opaque View
+        // background paints over the decoded picture (only rounded corners
+        // showed it). Keep the outline/borders, with a transparent fill.
+        val backgroundColor = if (view is CraftNativeVideoView) Color.TRANSPARENT
+            else color(style.optString("backgroundColor"), Color.TRANSPARENT)
         val border = craftNativeNonNegativeDouble(style, "borderWidth", 0.0)
         val radius = craftNativeNonNegativeDouble(style, "borderRadius", 0.0)
         val sideBorderKeys = listOf("borderTopWidth", "borderRightWidth", "borderBottomWidth", "borderLeftWidth")
@@ -5452,14 +5484,14 @@ class MainActivity : AppCompatActivity() {
         if (background || border > 0 || radius > 0 || hasSideBorders) {
             if (hasSideBorders) {
                 view.background = CraftNativeSideBorderDrawable(
-                    color(style.optString("backgroundColor"), Color.TRANSPARENT),
+                    backgroundColor,
                     cornerRadii,
                     sideWidths,
                     sideColors,
                 )
             } else {
                 view.background = GradientDrawable().apply {
-                    setColor(color(style.optString("backgroundColor"), Color.TRANSPARENT))
+                    setColor(backgroundColor)
                     if (hasCornerRadii) setCornerRadii(cornerRadii) else cornerRadius = dp(radius).toFloat()
                     if (border > 0) {
                         val borderColor = color(style.optString("borderColor"), Color.TRANSPARENT)

package/dist/cli.js

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

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

package/package.json

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