craft-native 0.0.205 → 0.0.206

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

@@ -1,6 +1,7 @@
 package {{PACKAGE_NAME}}
 
 import android.content.Context
+import org.json.JSONObject
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 
 /** Swipe-to-refresh host for a native FlatList. */
@@ -21,6 +22,12 @@ internal class CraftNativeRefreshableFlatList(context: Context) : SwipeRefreshLa
         if (handler == null) isRefreshing = false
     }
 
+    fun setRefreshAppearance(props: JSONObject, fallback: Int) {
+        val tint = props.optString("tintColor").takeIf { it.isNotBlank() }
+        val resolved = tint?.let { runCatching { craftNativeColor(it) }.getOrNull() } ?: fallback
+        setColorSchemeColors(resolved)
+    }
+
     override fun onDetachedFromWindow() {
         refreshHandler = null
         isRefreshing = false

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

@@ -149,8 +149,9 @@ private fun craftNativeOptionalString(value: Any?): String? = value
     ?.takeIf { it.isNotBlank() }
 
 private fun craftNativePickerValue(value: Any?): String? = when (value) {
+    is String -> value.takeIf { it.isNotEmpty() }
     is Number -> value.toDouble().takeIf { it.isFinite() }?.toString()
-    else -> craftNativeOptionalString(value)
+    else -> null
 }
 
 private fun craftNativeEventName(events: JSONObject, vararg names: String): String =
@@ -352,6 +353,14 @@ private class CraftNativeSvgView(context: Context) : View(context) {
         val vectorEffect: String? = null,
         val dominantBaseline: String? = null,
     ) {
+        private fun svgTypeface(weight: String?, inherited: Typeface): Typeface = when (weight?.lowercase()) {
+            "500" -> Typeface.create("sans-serif-medium", Typeface.NORMAL)
+            "600" -> Typeface.create("sans-serif", Typeface.BOLD)
+            "bold", "700", "800", "900" -> Typeface.DEFAULT_BOLD
+            "normal", "100", "200", "300", "400" -> Typeface.DEFAULT
+            else -> inherited
+        }
+
         fun merge(node: JSONObject): SvgPaint {
             val props = node.optJSONObject("props") ?: JSONObject()
             val style = node.optJSONObject("style") ?: JSONObject()
@@ -387,7 +396,7 @@ private class CraftNativeSvgView(context: Context) : View(context) {
                 strokeDashoffset = number("strokeDashoffset") ?: strokeDashoffset,
                 strokeMiterlimit = number("strokeMiterlimit")?.takeIf { it > 0 } ?: strokeMiterlimit,
                 fillRule = value("fillRule") ?: fillRule,
-                typeface = if (weight in setOf("bold", "700")) Typeface.DEFAULT_BOLD else typeface,
+                typeface = svgTypeface(weight, typeface),
                 strokeLinecap = value("strokeLinecap") ?: strokeLinecap,
                 strokeLinejoin = value("strokeLinejoin") ?: strokeLinejoin,
                 strokeDasharray = dashes(raw("strokeDasharray")) ?: strokeDasharray,
@@ -2209,13 +2218,13 @@ private class CraftNativeScrollView(context: Context) : SwipeRefreshLayout(conte
         }
     }
 
-    fun setRefreshAppearance(props: JSONObject, density: Float) {
+    fun setRefreshAppearance(props: JSONObject, density: Float, fallback: Int) {
         val tint = craftNativeOptionalString(props.opt("tintColor"))
-        if (tint != null) setColorSchemeColors(craftNativeColor(tint))
-        else setColorSchemeColors(Color.WHITE)
+        setColorSchemeColors(tint?.let { runCatching { craftNativeColor(it) }.getOrNull() } ?: fallback)
         val background = craftNativeOptionalString(props.opt("progressBackgroundColor"))
-        if (background != null) setProgressBackgroundColorSchemeColor(craftNativeColor(background))
-        else setProgressBackgroundColorSchemeColor(Color.TRANSPARENT)
+        setProgressBackgroundColorSchemeColor(
+            background?.let { runCatching { craftNativeColor(it) }.getOrNull() } ?: Color.TRANSPARENT,
+        )
         val offset = props.optDouble("progressViewOffset", Double.NaN)
         val requested = if (offset.isFinite()) (offset * density).roundToInt() else null
         if (configuredProgressOffset != requested) {
@@ -2862,7 +2871,8 @@ private class CraftNativeDatePickerView(context: Context) : FrameLayout(context)
         if (text.isBlank() || text == JSONObject.NULL.toString()) return null
         val formats = listOf(
             "HH:mm", "HH:mm:ss", "yyyy-MM-dd", "yyyy-MM-dd'T'HH:mm",
-            "yyyy-MM-dd'T'HH:mm:ss", "yyyy-MM-dd'T'HH:mm:ss.SSSXXX", "yyyy-MM-dd'T'HH:mm:ssX",
+            "yyyy-MM-dd'T'HH:mm:ss", "yyyy-MM-dd'T'HH:mm:ss.SSS",
+            "yyyy-MM-dd'T'HH:mm:ss.SSSXXX", "yyyy-MM-dd'T'HH:mm:ssX",
         )
         formats.firstNotNullOfOrNull { format ->
             runCatching {
@@ -4485,6 +4495,13 @@ class MainActivity : AppCompatActivity() {
         screen.view.setBackgroundColor(configured ?: ContextCompat.getColor(this, R.color.background))
     }
 
+    /** Refresh controls use a contrasting system tint when no color is authored. */
+    private fun refreshTintFallback(screen: Screen): Int {
+        val background = (screen.view.background as? ColorDrawable)?.color
+            ?: ContextCompat.getColor(this, R.color.background)
+        return if (Color.luminance(background) < 0.5f) Color.WHITE else Color.BLACK
+    }
+
     /** The bridge's capability names: Craft's core set and this host's services. */
     private fun capabilityNames(): JSONArray = capabilities.names().apply {
         services.names().forEach { name -> put(name) }
@@ -4961,7 +4978,9 @@ class MainActivity : AppCompatActivity() {
                 val title = craftNativeOptionalString(props.opt("title")) ?: childText(children)
                 isAllCaps = false
                 configureText(this, title, style)
-                craftNativeOptionalString(props.opt("color"))?.let { setTextColor(color(it, defaultTextColor)) }
+                val buttonColor = craftNativeOptionalString(props.opt("color"))
+                    ?: craftNativeOptionalString(style.opt("color"))
+                setTextColor(buttonColor?.let { color(it, defaultTextColor) } ?: defaultTextColor)
                 isEnabled = !props.optBoolean("disabled", false)
                 val handler = craftNativeEventName(events, "onPress", "onClick")
                 if (handler.isNotBlank()) screen.handlers[this] = handler else screen.handlers.remove(this)
@@ -4973,11 +4992,11 @@ class MainActivity : AppCompatActivity() {
             "Checkbox" -> (previous as? CheckBox ?: CheckBox(this)).apply {
                 text = craftNativeOptionalString(props.opt("label")) ?: childText(children)
                 configureText(this, text.toString(), style)
-                val requested = props.opt("checked") ?: props.opt("value")
-                val checked = when (requested) {
-                    is Boolean -> requested
-                    is Number -> requested.toDouble() != 0.0
-                    is String -> requested.equals("true", ignoreCase = true) || requested == "1"
+                val checkboxChecked = props.opt("checked")
+                val checkboxValue = props.opt("value")
+                val checked = when {
+                    checkboxChecked is Boolean -> checkboxChecked
+                    checkboxValue is Boolean -> checkboxValue
                     else -> false
                 }
                 setOnCheckedChangeListener(null)
@@ -4985,11 +5004,14 @@ class MainActivity : AppCompatActivity() {
                 // an indeterminate control must announce "mixed" and its next
                 // user toggle should transition to checked, not unchecked.
                 isChecked = checked
-                isActivated = props.optBoolean("indeterminate", false)
+                val indeterminate = (props.opt("indeterminate") as? Boolean) == true
+                isActivated = indeterminate
                 isEnabled = !props.optBoolean("disabled", false)
                 val checkboxColor = craftNativeOptionalString(props.opt("color"))
                     ?: craftNativeOptionalString(style.opt("color"))
-                buttonTintList = checkboxColor?.let { ColorStateList.valueOf(color(it, defaultTextColor)) }
+                buttonTintList = checkboxColor
+                    ?.let { runCatching { craftNativeColor(it) }.getOrNull() }
+                    ?.let { ColorStateList.valueOf(it) }
                 val handler = craftNativeEventName(events, "onValueChange", "onChange")
                 if (handler.isNotBlank()) screen.handlers[this] = handler else screen.handlers.remove(this)
                 setOnCheckedChangeListener { _, value ->
@@ -5016,11 +5038,12 @@ class MainActivity : AppCompatActivity() {
                 hint = craftNativeOptionalString(props.opt("placeholder")).orEmpty()
                 setHintTextColor(
                     craftNativeOptionalString(props.opt("placeholderTextColor"))
-                        ?.let { ColorStateList.valueOf(color(it, Color.GRAY)) }
+                        ?.let { runCatching { craftNativeColor(it) }.getOrNull() }
+                        ?.let { ColorStateList.valueOf(it) }
                         ?: defaultHintColors,
                 )
                 highlightColor = craftNativeOptionalString(props.opt("selectionColor"))
-                    ?.let { color(it, defaultHighlightColor) }
+                    ?.let { runCatching { craftNativeColor(it) }.getOrNull() }
                     ?: defaultHighlightColor
                 val maxLength = props.optInt("maxLength", 0)
                 val currentLength = (filters.firstOrNull { it is InputFilter.LengthFilter } as? InputFilter.LengthFilter)?.max ?: 0
@@ -5254,24 +5277,29 @@ class MainActivity : AppCompatActivity() {
                 val requestedValue = props.opt("value")
                 val requestedChecked = props.opt("checked")
                 isChecked = when {
-                    requestedValue != null && requestedValue != JSONObject.NULL -> props.optBoolean("value")
-                    requestedChecked == null || requestedChecked == JSONObject.NULL -> false
+                    requestedValue != null && requestedValue != JSONObject.NULL -> requestedValue as? Boolean ?: false
                     requestedChecked is Boolean -> requestedChecked
-                    requestedChecked is Number -> requestedChecked.toDouble() != 0.0
-                    requestedChecked is String -> requestedChecked.isBlank() || requestedChecked.equals("true", ignoreCase = true)
-                    else -> props.optBoolean("checked", false)
+                    else -> false
                 }
                 isEnabled = !props.optBoolean("disabled", false)
                 props.optJSONObject("trackColor")?.let { track ->
-                    val falseColor = color(track.optString("false"), Color.GRAY)
-                    val trueColor = color(track.optString("true"), falseColor)
-                    trackTintList = ColorStateList(
-                        arrayOf(intArrayOf(android.R.attr.state_checked), intArrayOf()),
-                        intArrayOf(trueColor, falseColor),
-                    )
+                    val falseRaw = craftNativeOptionalString(track.opt("false"))
+                    val trueRaw = craftNativeOptionalString(track.opt("true"))
+                    val falseColor = falseRaw?.let { runCatching { craftNativeColor(it) }.getOrNull() }
+                    val trueColor = trueRaw?.let { runCatching { craftNativeColor(it) }.getOrNull() }
+                    trackTintList = if ((falseRaw != null && falseColor == null) || (trueRaw != null && trueColor == null)) {
+                        null
+                    } else {
+                        val resolvedFalse = falseColor ?: Color.GRAY
+                        ColorStateList(
+                            arrayOf(intArrayOf(android.R.attr.state_checked), intArrayOf()),
+                            intArrayOf(trueColor ?: resolvedFalse, resolvedFalse),
+                        )
+                    }
                 } ?: run { trackTintList = null }
                 craftNativeOptionalString(props.opt("thumbColor"))
-                    ?.let { thumbTintList = ColorStateList.valueOf(color(it, Color.WHITE)) }
+                    ?.let { runCatching { craftNativeColor(it) }.getOrNull() }
+                    ?.let { thumbTintList = ColorStateList.valueOf(it) }
                     ?: run { thumbTintList = null }
                 val handler = craftNativeEventName(events, "onValueChange", "onChange")
                 if (handler.isNotBlank()) screen.handlers[this] = handler else screen.handlers.remove(this)
@@ -5308,15 +5336,15 @@ class MainActivity : AppCompatActivity() {
                     (((value - minimum) / (maximum - minimum)) * max).roundToInt().coerceIn(0, max)
                 }
                 if (step != null) screen.sliderSteps[this] = step else screen.sliderSteps.remove(this)
-                craftNativeOptionalString(props.opt("minimumTrackTintColor"))
-                    ?.let { ColorStateList.valueOf(color(it, Color.WHITE)) }
-                    ?: run { progressTintList = null }
-                craftNativeOptionalString(props.opt("maximumTrackTintColor"))
-                    ?.let { ColorStateList.valueOf(color(it, Color.GRAY)) }
-                    ?: run { progressBackgroundTintList = null }
-                craftNativeOptionalString(props.opt("thumbTintColor"))
-                    ?.let { ColorStateList.valueOf(color(it, Color.WHITE)) }
-                    ?: run { thumbTintList = null }
+                progressTintList = craftNativeOptionalString(props.opt("minimumTrackTintColor"))
+                    ?.let { runCatching { craftNativeColor(it) }.getOrNull() }
+                    ?.let { ColorStateList.valueOf(it) }
+                progressBackgroundTintList = craftNativeOptionalString(props.opt("maximumTrackTintColor"))
+                    ?.let { runCatching { craftNativeColor(it) }.getOrNull() }
+                    ?.let { ColorStateList.valueOf(it) }
+                thumbTintList = craftNativeOptionalString(props.opt("thumbTintColor"))
+                    ?.let { runCatching { craftNativeColor(it) }.getOrNull() }
+                    ?.let { ColorStateList.valueOf(it) }
                 isEnabled = !props.optBoolean("disabled", false)
                 val handler = craftNativeEventName(events, "onValueChange", "onChange")
                 if (handler.isNotBlank()) screen.handlers[this] = handler else screen.handlers.remove(this)
@@ -5354,9 +5382,9 @@ class MainActivity : AppCompatActivity() {
                 val animating = props.optBoolean("animating", true)
                 isIndeterminate = animating
                 visibility = if (!animating && props.optBoolean("hidesWhenStopped", true)) View.GONE else View.VISIBLE
-                craftNativeOptionalString(props.opt("color"))
-                    ?.let { ColorStateList.valueOf(color(it, Color.WHITE)) }
-                    ?: run { indeterminateTintList = null }
+                indeterminateTintList = craftNativeOptionalString(props.opt("color"))
+                    ?.let { runCatching { craftNativeColor(it) }.getOrNull() }
+                    ?.let { ColorStateList.valueOf(it) }
             }
             "Icon" -> (previous as? CraftNativeIconView ?: CraftNativeIconView(this)).apply {
                 configureIcon(this, props, style)
@@ -5386,9 +5414,9 @@ class MainActivity : AppCompatActivity() {
                     "center" -> ImageView.ScaleType.CENTER
                     else -> ImageView.ScaleType.CENTER_INSIDE
                 }
-                craftNativeOptionalString(style.opt("tintColor"))
-                    ?.let { image.setColorFilter(color(it, Color.TRANSPARENT)) }
-                    ?: image.clearColorFilter()
+                val tint = craftNativeOptionalString(style.opt("tintColor"))
+                    ?.let { runCatching { craftNativeColor(it) }.getOrNull() }
+                if (tint == null) image.clearColorFilter() else image.setColorFilter(tint)
                 val onLoadStart = craftNativeEventName(events, "onLoadStart")
                 if (onLoadStart.isNotBlank()) screen.imageLoadStartHandlers[image] = onLoadStart else screen.imageLoadStartHandlers.remove(image)
                 val onLoad = craftNativeEventName(events, "onLoad")
@@ -5458,7 +5486,7 @@ class MainActivity : AppCompatActivity() {
                     { send(screen, "EVENT", JSONObject().put("handlerName", handler).put("nativeEvent", JSONObject())) }
                 }
                 setRefreshHandler(refreshHandler, refreshProps.optBoolean("refreshing", props.optBoolean("refreshing", false)))
-                setRefreshAppearance(refreshProps, resources.displayMetrics.density)
+                setRefreshAppearance(refreshProps, resources.displayMetrics.density, refreshTintFallback(screen))
                 val onScroll = craftNativeEventName(events, "onScroll")
                 if (onScroll.isNotBlank()) screen.scrollHandlers[this] = onScroll else screen.scrollHandlers.remove(this)
                 val onBegin = craftNativeEventName(events, "onScrollBeginDrag")
@@ -5528,9 +5556,15 @@ class MainActivity : AppCompatActivity() {
             }
             "FlatList" -> (previous as? CraftNativeRefreshableFlatList ?: CraftNativeRefreshableFlatList(this)).apply {
                 val nativeList = list
-                configureRefresh(craftNativeEventName(events, "onRefresh").takeIf { it.isNotBlank() }?.let { handler ->
+                val propRefresh = props.optJSONObject("refreshControl") ?: JSONObject()
+                val propRefreshEvents = propRefresh.optJSONObject("events") ?: JSONObject()
+                val refreshHandlerName = craftNativeEventName(propRefreshEvents, "onRefresh")
+                    .takeIf { it.isNotBlank() }
+                    ?: craftNativeEventName(events, "onRefresh").takeIf { it.isNotBlank() }
+                configureRefresh(refreshHandlerName?.let { handler ->
                     { send(screen, "EVENT", JSONObject().put("handlerName", handler).put("nativeEvent", JSONObject())) }
-                }, props.optBoolean("refreshing", false))
+                }, propRefresh.optBoolean("refreshing", props.optBoolean("refreshing", false)))
+                setRefreshAppearance(propRefresh, refreshTintFallback(screen))
                 nativeList.setKeyboardShouldPersistTaps(props.optString("keyboardShouldPersistTaps", "never"))
                 nativeList.setContentContainerStyle(props.optJSONObject("contentContainerStyle"), resources.displayMetrics.density)
                 nativeList.setKeyboardDismissMode(props.optString("keyboardDismissMode")) {
@@ -5800,8 +5834,7 @@ class MainActivity : AppCompatActivity() {
                 is JSONObject -> makeView(screen, child, "$path.$index", next, previousControls)
                 is String -> TextView(this).apply {
                     includeFontPadding = false
-                    text = child
-                    setTextColor(defaultTextColor)
+                    configureText(this, child, craftNativeTypography(style))
                 }
                 else -> null
             }
@@ -6046,10 +6079,13 @@ class MainActivity : AppCompatActivity() {
         }
         if (view is ImageView) {
             val tint = style.opt("tintColor") as? String
-            if (tint.isNullOrBlank() || tint == "null" || tint == "undefined") {
+            val resolvedTint = tint
+                ?.takeUnless { it.isBlank() || it == "null" || it == "undefined" }
+                ?.let { runCatching { craftNativeColor(it) }.getOrNull() }
+            if (resolvedTint == null) {
                 view.clearColorFilter()
             } else {
-                view.setColorFilter(color(tint, Color.TRANSPARENT))
+                view.setColorFilter(resolvedTint)
             }
         }
     }
@@ -6120,6 +6156,22 @@ class MainActivity : AppCompatActivity() {
         configureTextStyle(view, style)
     }
 
+    /**
+     * Raw strings inside a native container are implicit Text nodes. Keep
+     * their typography, but not the parent's padding or layout, just like
+     * the iOS reconciler does for the same child shape.
+     */
+    private fun craftNativeTypography(style: JSONObject): JSONObject = JSONObject().also { typography ->
+        listOf(
+            "color", "letterSpacing", "lineHeight", "fontSize", "fontFamily",
+            "fontWeight", "fontStyle", "textAlign", "textTransform",
+            "textDecorationLine", "textDecorationStyle", "textDecorationColor",
+            "textShadowColor", "textShadowRadius", "textShadowOffset",
+        ).forEach { key ->
+            if (style.has(key) && !style.isNull(key)) typography.put(key, style.opt(key))
+        }
+    }
+
     private fun configureIcon(view: CraftNativeIconView, props: JSONObject, style: JSONObject) {
         val symbol = craftNativeOptionalString(props.opt("symbol"))
             ?: craftNativeOptionalString(props.opt("name")).orEmpty()
@@ -6466,7 +6518,7 @@ class MainActivity : AppCompatActivity() {
         }
         ViewCompat.setStateDescription(
             view,
-            if (type == "Checkbox" && props.optBoolean("indeterminate", false)) "mixed" else null,
+            if (type == "Checkbox" && (props.opt("indeterminate") as? Boolean) == true) "mixed" else null,
         )
         ViewCompat.setAccessibilityDelegate(view, object : AccessibilityDelegateCompat() {
             override fun onInitializeAccessibilityNodeInfo(host: View, info: AccessibilityNodeInfoCompat) {

package/dist/cli.js

@@ -3424,7 +3424,7 @@ function pinCraftNativeDependency(packagePath, craftVersion) {
 `);
 }
 // package.json
-var version = "0.0.205";
+var version = "0.0.206";
 
 // bin/cli.ts
 var spawnedFrom = process6.env[CRAFT_CLI_SPAWN_MARKER];

package/dist/components/index.d.ts

@@ -527,6 +527,8 @@ export interface SvgPaintProps extends BaseProps {
     vectorEffect?: 'none' | 'non-scaling-stroke';
     color?: string;
     opacity?: number;
+    /** Font weight inherited by descendant native SVG text. */
+    fontWeight?: string | number;
 }
 /** Root native SVG drawing surface. */
 export interface SvgProps extends SvgPaintProps {
@@ -559,7 +561,6 @@ export interface SvgTextProps extends SvgPaintProps {
     x?: number;
     y?: number;
     fontSize?: number;
-    fontWeight?: string | number;
     textAnchor?: 'start' | 'middle' | 'end' | string;
     dominantBaseline?: string;
 }
@@ -679,6 +680,7 @@ export interface TextInputProps extends BaseProps {
 export type KeyboardType = 'default' | 'email-address' | 'numeric' | 'phone-pad' | 'number-pad' | 'decimal-pad' | 'url' | 'web-search' | 'visible-password';
 export type ReturnKeyType = 'done' | 'go' | 'next' | 'search' | 'send' | 'join' | 'route' | 'continue' | 'emergency-call' | 'default';
 export interface SwitchProps extends BaseProps {
+    /** Controlled boolean state; malformed native bridge values stay off. */
     value?: boolean;
     onValueChange?: (value: boolean) => void;
     onChange?: (value: boolean) => void;
@@ -691,6 +693,7 @@ export interface SwitchProps extends BaseProps {
     ios_backgroundColor?: string;
 }
 export interface CheckboxProps extends BaseProps {
+    /** Controlled boolean state; malformed native bridge values stay off. */
     value?: boolean;
     checked?: boolean;
     indeterminate?: boolean;
@@ -715,6 +718,7 @@ export interface SliderProps extends BaseProps {
 }
 export interface PickerOption {
     label: string;
+    /** String or finite number; other bridge values are ignored by native hosts. */
     value: string | number;
 }
 export interface PickerProps extends BaseProps {

package/dist/index.cjs

@@ -309,7 +309,7 @@ function craftBinaryNotFoundMessage(triedPath) {
 `);
 }
 // package.json
-var version = "0.0.205";
+var version = "0.0.206";
 
 // 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.205";
+var version = "0.0.206";
 
 // src/sdk-version.ts
 var SDK_VERSION = version;

package/dist/ios/src/index.js

@@ -102,6 +102,17 @@ function initSimulatorDriver(options) {
     if (previous !== content)
       writeFileSync(path, content);
   }
+  const script = join2(output, "UITests/journey.txt");
+  if (options.script === undefined)
+    rmSync(script, { force: true });
+  else {
+    let previous;
+    try {
+      previous = readFileSync(script, "utf8");
+    } catch {}
+    if (previous !== options.script)
+      writeFileSync(script, options.script);
+  }
 }
 function serializeSimulatorSteps(steps) {
   const number = (value) => {

package/dist/ios/src/testing.d.ts

@@ -7,6 +7,8 @@ export interface SimulatorDriverOptions {
     deploymentTarget?: string;
     controlUrl?: string;
     tabs?: readonly string[];
+    /** Bundle a wire-protocol journey and save native XCTest attachments. No control server is needed on physical devices. */
+    script?: string;
 }
 /** Generate the reusable XCUITest shell from package templates. No app-owned Swift. */
 export declare function initSimulatorDriver(options: SimulatorDriverOptions): void;

package/dist/ios/templates/CraftNativeFlatList.swift

@@ -348,6 +348,10 @@ final class CraftNativeFlatList: UICollectionView, UICollectionViewDelegateFlowL
         }
     }
 
+    func setRefreshAppearance(_ props: [String: Any]) {
+        nativeRefreshControl.tintColor = (props["tintColor"] as? String).flatMap { UIColor(hex: $0) }
+    }
+
     @objc private func refreshTriggered() {
         refreshHandler?()
         DispatchQueue.main.async { [weak self] in

package/dist/ios/templates/CraftNativeScreen.swift

@@ -3318,6 +3318,7 @@ private final class CraftNativeSvgView: UIView {
         var linejoin: String?
         var dashes: [CGFloat]?
         var vectorEffect: String?
+        var fontWeight: String?
         var dominantBaseline: String?
 
         func merged(_ node: [String: Any]) -> Paint {
@@ -3330,6 +3331,11 @@ private final class CraftNativeSvgView: UIView {
                 let value = CGFloat(truncating: number)
                 return value.isFinite ? value : nil
             }
+            func string(_ raw: Any?) -> String? {
+                if let value = raw as? String { return value }
+                if let number = raw as? NSNumber { return number.stringValue }
+                return nil
+            }
             if let color = style["color"] as? String { next.color = color }
             if let fill = style["fill"] as? String ?? props["fill"] as? String { next.fill = fill }
             if let stroke = style["stroke"] as? String ?? props["stroke"] as? String { next.stroke = stroke }
@@ -3346,6 +3352,7 @@ private final class CraftNativeSvgView: UIView {
             if let join = value("strokeLinejoin") as? String { next.linejoin = join }
             if let dashes = value("strokeDasharray") as? [Any] { next.dashes = dashes.compactMap(finite).filter { $0 >= 0 } }
             if let vectorEffect = value("vectorEffect") as? String { next.vectorEffect = vectorEffect }
+            if let fontWeight = string(value("fontWeight")) { next.fontWeight = fontWeight }
             if let baseline = value("dominantBaseline") as? String { next.dominantBaseline = baseline }
             return next
         }
@@ -3446,7 +3453,14 @@ private final class CraftNativeSvgView: UIView {
         let props = node["props"] as? [String: Any] ?? [:]
         let style = node["style"] as? [String: Any] ?? [:]
         let size = number(props["fontSize"]) ?? number(style["fontSize"]) ?? 12
-        let weight: UIFont.Weight = (props["fontWeight"] as? String ?? style["fontWeight"] as? String).map { ["500": .medium, "600": .semibold, "700": .bold, "bold": .bold][$0] ?? .regular } ?? .regular
+        let weight: UIFont.Weight = {
+            switch paint.fontWeight?.lowercased() {
+            case "500": return .medium
+            case "600": return .semibold
+            case "bold", "700", "800", "900": return .bold
+            default: return .regular
+            }
+        }()
         let font = UIFont.systemFont(ofSize: size, weight: weight)
         let resolvedTextColor = paint.resolve(paint.fill) ?? UIColor.label
         let textAlpha = max(0, min(1, paint.opacity * paint.fillOpacity))
@@ -5779,6 +5793,15 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
             updateImage(image, source: props["source"], defaultSource: props["defaultSource"])
         case "ImageBackground":
             let background = result as! CraftNativeImageBackgroundView
+            let backgroundID = ObjectIdentifier(background)
+            if let tint = color(style["tintColor"]) {
+                tintedImages.insert(backgroundID)
+                background.tintColor = tint
+            } else {
+                tintedImages.remove(backgroundID)
+                background.tintColor = nil
+            }
+            if let current = background.image { background.image = imageForDisplay(current, view: background) }
             let requestedResizeMode = style["resizeMode"] as? String ?? props["resizeMode"] as? String
             background.contentMode = imageContentMode(requestedResizeMode)
             background.clipsToBounds = background.contentMode == .scaleAspectFill
@@ -6139,6 +6162,11 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         let owner = parent.protocolId ?? path
         flatListOwners = flatListOwners.filter { $0.value != owner }
         for child in children { registerFlatListOwnership(child, owner: owner) }
+        let propRefresh = props["refreshControl"] as? [String: Any] ?? [:]
+        let propRefreshEvents = propRefresh["events"] as? [String: String] ?? [:]
+        let refreshHandler = nonEmptyHandler(propRefreshEvents["onRefresh"])
+            ?? nonEmptyHandler(events["onRefresh"])
+        let refreshing = (propRefresh["refreshing"] ?? props["refreshing"]) as? Bool == true
         list.bounces = props["bounces"] as? Bool ?? true
         list.isScrollEnabled = props["scrollEnabled"] as? Bool != false
         list.onFittingHeightChanged = { [weak list] in
@@ -6147,9 +6175,10 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         }
         list.setKeyboardShouldPersistTaps(props["keyboardShouldPersistTaps"])
         list.setContentContainerStyle(props["contentContainerStyle"] as? [String: Any])
-        list.setRefreshHandler(nonEmptyHandler(events["onRefresh"]).map { [weak self] handler in
+        list.setRefreshHandler(refreshHandler.map { [weak self] handler in
             { self?.send(type: "EVENT", payload: ["handlerName": handler, "nativeEvent": [:]]) }
-        }, refreshing: props["refreshing"] as? Bool == true)
+        }, refreshing: refreshing)
+        list.setRefreshAppearance(propRefresh)
         list.keyboardDismissMode = keyboardDismissMode(props["keyboardDismissMode"])
         list.onScrollEvent = nonEmptyHandler(events["onScroll"]).map { handler in
             { [weak self] scrollView in self?.send(type: "EVENT", payload: ["handlerName": handler, "nativeEvent": self?.scrollEvent(scrollView) ?? [:]]) }

package/dist/ios/templates/testing/DriverTests.swift.template

@@ -42,11 +42,14 @@ import XCTest
 ///   ifid <id> <command…>  runs the command only when that element is there (a screen shown the first time)
 ///   log <text>
 ///
-/// Checks log `PASS …` / `FAIL …` lines into driver.log; matrix.sh counts them.
+/// With a bundled journey.txt, evidence is kept as native XCTest attachments
+/// and PASS/FAIL lines appear in the test log. Control-server journeys also
+/// write driver.log; matrix.sh counts those checks.
 final class DriverTests: XCTestCase {
     let control = ProcessInfo.processInfo.environment["CRAFT_TEST_CONTROL"] ?? {{CONTROL_URL}}
     let app = XCUIApplication(bundleIdentifier: {{BUNDLE_ID}})
     let tabs: [String] = {{TABS}}
+    private var bundledJourney = false
 
     func get(_ path: String, timeout: Double = 15) -> Data? {
         var result: Data?
@@ -57,6 +60,15 @@ final class DriverTests: XCTestCase {
     }
 
     func post(_ path: String, _ body: Data) {
+        if bundledJourney {
+            guard path.hasPrefix("/save?"),
+                  let name = URLComponents(string: path)?.queryItems?.first(where: { $0.name == "name" })?.value else { return }
+            let attachment = XCTAttachment(data: body, uniformTypeIdentifier: name.hasSuffix(".png") ? "public.png" : "public.plain-text")
+            attachment.name = name
+            attachment.lifetime = .keepAlways
+            add(attachment)
+            return
+        }
         var request = URLRequest(url: URL(string: control + path)!)
         request.httpMethod = "POST"
         request.httpBody = body
@@ -67,7 +79,7 @@ final class DriverTests: XCTestCase {
 
     func note(_ text: String) {
         print("DRIVER \(text)")
-        post("/note", Data(text.utf8))
+        if !bundledJourney { post("/note", Data(text.utf8)) }
     }
 
     func check(_ ok: Bool, _ what: String) {
@@ -156,7 +168,14 @@ final class DriverTests: XCTestCase {
 
     func testScript() throws {
         continueAfterFailure = true
-        guard let data = get("/script"), let script = String(data: data, encoding: .utf8) else {
+        let data: Data?
+        if let resource = Bundle(for: DriverTests.self).url(forResource: "journey", withExtension: "txt") {
+            bundledJourney = true
+            data = try Data(contentsOf: resource)
+        } else {
+            data = get("/script")
+        }
+        guard let data, let script = String(data: data, encoding: .utf8) else {
             XCTFail("no script")
             return
         }
@@ -171,6 +190,10 @@ final class DriverTests: XCTestCase {
         let parts = line.split(separator: " ", maxSplits: 1).map(String.init)
         let command = parts[0]
         let arg = parts.count > 1 ? parts[1] : ""
+        if bundledJourney && ["net", "delay", "exec"].contains(command) {
+            check(false, "\(command) requires a control-server journey")
+            return
+        }
         switch command {
         case "ifid":
             let rest = arg.split(separator: " ", maxSplits: 1).map(String.init)

package/package.json

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