@craft-native/android 0.0.206 → 0.0.207

package/package.json

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

package/templates/MainActivityNative.kt.template

@@ -148,6 +148,10 @@ private fun craftNativeOptionalString(value: Any?): String? = value
     ?.takeUnless { it == "null" || it == "undefined" }
     ?.takeIf { it.isNotBlank() }
 
+private fun craftNativeBoolean(value: Any?, fallback: Boolean = false): Boolean = (value as? Boolean) ?: fallback
+
+private fun craftNativeInt(value: Any?, fallback: Int): Int = (value as? Number)?.toInt() ?: fallback
+
 private fun craftNativePickerValue(value: Any?): String? = when (value) {
     is String -> value.takeIf { it.isNotEmpty() }
     is Number -> value.toDouble().takeIf { it.isFinite() }?.toString()
@@ -157,20 +161,35 @@ private fun craftNativePickerValue(value: Any?): String? = when (value) {
 private fun craftNativeEventName(events: JSONObject, vararg names: String): String =
     names.firstNotNullOfOrNull { name -> craftNativeOptionalString(events.opt(name)) }.orEmpty()
 
+private fun craftNativeNumber(value: Any?): Double? = (value as? Number)
+    ?.toDouble()
+    ?.takeIf { it.isFinite() }
+
+private fun craftNativeFontWeight(value: Any?): String? = when (value) {
+    is String -> value
+    is Number -> value.toDouble().takeIf { it.isFinite() && it % 1.0 == 0.0 }?.toInt()?.toString()
+    else -> null
+}
+
 internal fun craftNativePadding(style: JSONObject?, name: String, fallback: Int, density: Float): Int {
-    val value = style?.optDouble(name, Double.NaN) ?: Double.NaN
+    val value = craftNativeNumber(style?.opt(name)) ?: Double.NaN
     val pixels = value * density
     return if (value.isFinite() && value >= 0 && pixels.isFinite()) pixels.toInt() else fallback
 }
 
 internal fun craftNativeFiniteFloat(style: JSONObject?, name: String, fallback: Float): Float {
-    val value = style?.optDouble(name, Double.NaN) ?: Double.NaN
+    val value = craftNativeNumber(style?.opt(name)) ?: Double.NaN
     val narrowed = value.toFloat()
     return if (value.isFinite() && narrowed.isFinite()) narrowed else fallback
 }
 
 internal fun craftNativeFiniteDouble(style: JSONObject?, name: String, fallback: Double): Double {
-    val value = style?.optDouble(name, Double.NaN) ?: Double.NaN
+    val value = craftNativeNumber(style?.opt(name)) ?: Double.NaN
+    return value.takeIf { it.isFinite() } ?: fallback
+}
+
+internal fun craftNativeFiniteNumber(props: JSONObject?, name: String, fallback: Double): Double {
+    val value = (props?.opt(name) as? Number)?.toDouble() ?: Double.NaN
     return value.takeIf { it.isFinite() } ?: fallback
 }
 
@@ -221,16 +240,16 @@ private data class CraftNativeLayoutStyle(
     companion object {
         fun from(raw: JSONObject, density: Float): CraftNativeLayoutStyle {
             fun length(name: String): CraftNativeLength? = CraftNativeLength.from(raw.opt(name), density)
-            fun number(name: String): Int? {
+            fun numeric(name: String): Double? {
                 if (!raw.has(name) || raw.isNull(name)) return null
-                return raw.optDouble(name, Double.NaN).takeIf { it.isFinite() }?.let { points ->
+                return (raw.opt(name) as? Number)?.toDouble()?.takeIf { it.isFinite() }
+            }
+            fun number(name: String): Int? {
+                return numeric(name)?.let { points ->
                     (points * density).takeIf { it.isFinite() }?.roundToInt()
                 }
             }
-            fun decimal(name: String): Double? {
-                if (!raw.has(name) || raw.isNull(name)) return null
-                return raw.optDouble(name, Double.NaN).takeIf { it.isFinite() }
-            }
+            fun decimal(name: String): Double? = numeric(name)
             val flex = decimal("flex")
             return CraftNativeLayoutStyle(
                 width = length("width"), height = length("height"),
@@ -377,7 +396,7 @@ private class CraftNativeSvgView(context: Context) : View(context) {
             fun dashes(rawValue: Any?): List<Float>? {
                 val values = rawValue as? JSONArray ?: return null
                 return (0 until values.length()).mapNotNull {
-                    values.optDouble(it, Double.NaN).toFloat().takeIf { value -> value.isFinite() && value >= 0 }
+                    craftNativeNumber(values.opt(it))?.toFloat()?.takeIf { value -> value.isFinite() && value >= 0 }
                 }
             }
             // Keep the cascade explicit: computed style wins over a raw prop
@@ -455,10 +474,10 @@ private class CraftNativeSvgView(context: Context) : View(context) {
     private fun viewBox(): Quadruple<Float, Float, Float, Float>? {
         val values = drawing.optJSONObject("props")?.optJSONArray("viewBox") ?: return null
         if (values.length() != 4) return null
-        val x = values.optDouble(0, Double.NaN).toFloat()
-        val y = values.optDouble(1, Double.NaN).toFloat()
-        val width = values.optDouble(2, Double.NaN).toFloat()
-        val height = values.optDouble(3, Double.NaN).toFloat()
+        val x = craftNativeNumber(values.opt(0))?.toFloat() ?: Float.NaN
+        val y = craftNativeNumber(values.opt(1))?.toFloat() ?: Float.NaN
+        val width = craftNativeNumber(values.opt(2))?.toFloat() ?: Float.NaN
+        val height = craftNativeNumber(values.opt(3))?.toFloat() ?: Float.NaN
         if (!x.isFinite() || !y.isFinite() || !width.isFinite() || !height.isFinite() || width <= 0f || height <= 0f) return null
         return Quadruple(width, height, x, y)
     }
@@ -480,12 +499,12 @@ private class CraftNativeSvgView(context: Context) : View(context) {
     private fun drawPath(canvas: Canvas, node: JSONObject, style: SvgPaint) {
         val props = node.optJSONObject("props") ?: JSONObject()
         val geometry = props.optJSONArray("geometry") ?: return
-        if ((0 until geometry.length()).any { !geometry.optDouble(it, Double.NaN).toFloat().isFinite() }) return
+        if ((0 until geometry.length()).any { craftNativeNumber(geometry.opt(it))?.toFloat()?.isFinite() != true }) return
         val path = Path()
         var index = 0
         while (index < geometry.length()) {
-            val command = geometry.optDouble(index, Double.NaN).toInt()
-            fun number(offset: Int): Float = geometry.optDouble(index + offset, Double.NaN).toFloat()
+            val command = craftNativeNumber(geometry.opt(index))?.toInt() ?: break
+            fun number(offset: Int): Float = craftNativeNumber(geometry.opt(index + offset))?.toFloat() ?: Float.NaN
             when (command) {
                 0 -> if (index + 2 < geometry.length()) { path.moveTo(number(1), number(2)); index += 3 } else break
                 1 -> if (index + 2 < geometry.length()) { path.lineTo(number(1), number(2)); index += 3 } else break
@@ -551,9 +570,9 @@ private class CraftNativeSvgView(context: Context) : View(context) {
             for (index in 0 until children.length()) if (children.opt(index) is String) append(children.optString(index))
         }
         if (text.isEmpty()) return
-        val size = (if (props.has("fontSize")) props.optDouble("fontSize", 12.0) else nodeStyle.optDouble("fontSize", 12.0))
-            .takeIf { it.isFinite() }
+        val size = (if (props.has("fontSize")) craftNativeNumber(props.opt("fontSize")) else craftNativeNumber(nodeStyle.opt("fontSize")))
             ?.toFloat()
+            ?.takeIf { it.isFinite() }
             ?: 12f
         val paint = android.graphics.Paint(Paint.ANTI_ALIAS_FLAG).apply {
             color = resolveColor(style.fill, style.color, Color.BLACK)
@@ -561,8 +580,8 @@ private class CraftNativeSvgView(context: Context) : View(context) {
             textSize = size
             typeface = style.typeface
         }
-        var x = props.optDouble("x", 0.0).takeIf { it.isFinite() }?.toFloat() ?: 0f
-        val y = props.optDouble("y", 0.0).takeIf { it.isFinite() }?.toFloat() ?: 0f
+        var x = craftNativeNumber(props.opt("x"))?.toFloat()?.takeIf { it.isFinite() } ?: 0f
+        val y = craftNativeNumber(props.opt("y"))?.toFloat()?.takeIf { it.isFinite() } ?: 0f
         when (props.optString("textAnchor")) {
             "middle" -> x -= paint.measureText(text) / 2f
             "end" -> x -= paint.measureText(text)
@@ -629,16 +648,16 @@ private class CraftNativeMapView(context: Context) : FrameLayout(context), OnMap
 
     private fun applyPending() {
         val map = googleMap ?: return
-        map.uiSettings.isScrollGesturesEnabled = pendingProps.optBoolean("scrollEnabled", true)
-        map.uiSettings.isZoomGesturesEnabled = pendingProps.optBoolean("zoomEnabled", true)
-        map.uiSettings.isRotateGesturesEnabled = pendingProps.optBoolean("rotateEnabled", false)
+        map.uiSettings.isScrollGesturesEnabled = craftNativeBoolean(pendingProps.opt("scrollEnabled"), true)
+        map.uiSettings.isZoomGesturesEnabled = craftNativeBoolean(pendingProps.opt("zoomEnabled"), true)
+        map.uiSettings.isRotateGesturesEnabled = craftNativeBoolean(pendingProps.opt("rotateEnabled"))
         map.mapType = when (craftNativeOptionalString(pendingProps.opt("mapType")).orEmpty().lowercase()) {
             "satellite" -> GoogleMap.MAP_TYPE_SATELLITE
             "hybrid" -> GoogleMap.MAP_TYPE_HYBRID
             "terrain" -> GoogleMap.MAP_TYPE_TERRAIN
             else -> GoogleMap.MAP_TYPE_NORMAL
         }
-        val showUserLocation = pendingProps.optBoolean("showsUserLocation", false) && hasLocationPermission()
+        val showUserLocation = craftNativeBoolean(pendingProps.opt("showsUserLocation")) && hasLocationPermission()
         runCatching { map.isMyLocationEnabled = showUserLocation }
         val nextMarkers = mutableMapOf<String, Pair<LatLng, String?>>()
         val nextHandlers = mutableMapOf<String, String>()
@@ -654,7 +673,7 @@ private class CraftNativeMapView(context: Context) : FrameLayout(context), OnMap
             val points = coordinates(props.optJSONArray("geometry"))
             if (type == "mapmarker" || type == "marker") {
                 points.firstOrNull()?.let { point ->
-                    nextMarkers[id] = point to craftNativeOptionalString(props.opt("title"))
+                    nextMarkers[id] = point to (props.opt("title") as? String)
                     listOf(events.opt("onPress"), events.opt("onMarkerPress"))
                         .firstNotNullOfOrNull(::craftNativeOptionalString)
                         ?.let { nextHandlers[id] = it }
@@ -717,7 +736,7 @@ private class CraftNativeMapView(context: Context) : FrameLayout(context), OnMap
                 moveCamera(initialRegion)
                 initialCameraKey = key
             }
-        } else if (pendingProps.optBoolean("fitToBounds", false)) {
+        } else if (craftNativeBoolean(pendingProps.opt("fitToBounds"))) {
             val key = "fit:${overlayKey(nextMarkers, nextPolylines)}"
             if (initialCameraKey != key) {
                 if (fitToBounds()) initialCameraKey = key
@@ -731,7 +750,7 @@ private class CraftNativeMapView(context: Context) : FrameLayout(context), OnMap
         super.onSizeChanged(width, height, oldWidth, oldHeight)
         // MapView can become ready before its host has a usable viewport. Do
         // not mark a fit as complete until the camera update can be issued.
-        if (width > 0 && height > 0 && pendingProps.optBoolean("fitToBounds", false) && initialCameraKey == null) {
+        if (width > 0 && height > 0 && craftNativeBoolean(pendingProps.opt("fitToBounds")) && initialCameraKey == null) {
             applyPending()
         }
     }
@@ -1017,7 +1036,7 @@ private class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
         alignContent = style.optString("alignContent", "flex-start")
         justifyContent = style.optString("justifyContent", "flex-start")
         fun spacing(name: String, fallback: Float): Float {
-            val value = style.optDouble(name, Double.NaN)
+            val value = craftNativeNumber(style.opt(name)) ?: Double.NaN
             val pixels = value * density
             val narrowed = pixels.toFloat()
             return if (value.isFinite() && value >= 0 && pixels.isFinite() && narrowed.isFinite()) narrowed else fallback
@@ -2734,7 +2753,7 @@ private class CraftNativeDatePickerView(context: Context) : FrameLayout(context)
     }
 
     fun configure(props: JSONObject) {
-        val requestedMode = when (props.optString("mode")) {
+        val requestedMode = when (props.opt("mode") as? String) {
             "time" -> PickerMode.TIME
             "datetime", "dateAndTime", "datetime-local" -> PickerMode.DATE_TIME
             "countdown" -> PickerMode.COUNTDOWN
@@ -2774,7 +2793,7 @@ private class CraftNativeDatePickerView(context: Context) : FrameLayout(context)
         }
 
         suppressChanges = true
-        minuteInterval = props.optInt("minuteInterval", 1).takeIf { it in 1..30 && 60 % it == 0 } ?: 1
+        minuteInterval = craftNativeInt(props.opt("minuteInterval"), 1).takeIf { it in 1..30 && 60 % it == 0 } ?: 1
         val defaults = defaultDateBounds
         datePicker?.minDate = pickerDate(props.opt("minimumDate"))?.timeInMillis ?: defaults?.first ?: datePicker?.minDate ?: 0L
         datePicker?.maxDate = pickerDate(props.opt("maximumDate"))?.timeInMillis ?: defaults?.second ?: datePicker?.maxDate ?: Long.MAX_VALUE
@@ -2784,7 +2803,7 @@ private class CraftNativeDatePickerView(context: Context) : FrameLayout(context)
         } else {
             pickerDate(props.opt("value"))?.let { applyDate(it) }
         }
-        val enabled = !props.optBoolean("disabled", false)
+        val enabled = !craftNativeBoolean(props.opt("disabled"))
         isEnabled = enabled
         datePicker?.isEnabled = enabled
         timePicker?.isEnabled = enabled
@@ -4925,7 +4944,7 @@ class MainActivity : AppCompatActivity() {
         val control = when (type) {
             "Text" -> ((previous as? TextView)?.takeUnless { it is Button || it is EditText } ?: TextView(this)).apply {
                 includeFontPadding = false
-                maxLines = props.optInt("numberOfLines", 0).takeIf { it > 0 } ?: Int.MAX_VALUE
+                maxLines = craftNativeInt(props.opt("numberOfLines"), 0).takeIf { it > 0 } ?: Int.MAX_VALUE
                 ellipsize = when (props.optString("ellipsizeMode")) {
                     "head" -> TextUtils.TruncateAt.START
                     "middle" -> TextUtils.TruncateAt.MIDDLE
@@ -4936,7 +4955,7 @@ class MainActivity : AppCompatActivity() {
             }
             "StatusBar" -> (previous as? CraftNativeFlexLayout ?: CraftNativeFlexLayout(this)).apply {
                 screen.statusBarStyle = craftNativeOptionalString(props.opt("barStyle"))
-                screen.statusBarHidden = if (props.has("hidden") && !props.isNull("hidden")) props.optBoolean("hidden") else null
+                screen.statusBarHidden = if (props.has("hidden") && !props.isNull("hidden")) craftNativeBoolean(props.opt("hidden")) else null
                 visibility = View.GONE
             }
             "RefreshControl" -> (previous as? CraftNativeFlexLayout ?: CraftNativeFlexLayout(this)).apply {
@@ -4944,17 +4963,18 @@ class MainActivity : AppCompatActivity() {
             }
             "Link" -> ((previous as? TextView)?.takeUnless { it is Button } ?: TextView(this)).apply {
                 includeFontPadding = false
-                configureText(this, craftNativeOptionalString(props.opt("title")) ?: childText(children), style)
+                configureText(this, (props.opt("title") as? String) ?: childText(children), style)
                 val linkColor = craftNativeOptionalString(props.opt("color")) ?: craftNativeOptionalString(style.opt("color"))
                 setTextColor(color(linkColor.orEmpty(), Color.rgb(33, 150, 243)))
                 paintFlags = paintFlags or Paint.UNDERLINE_TEXT_FLAG
-                isEnabled = !props.optBoolean("disabled", false)
+                isEnabled = !craftNativeBoolean(props.opt("disabled"))
                 isClickable = true
                 isFocusable = true
                 val target = listOf(props.opt("href"), props.opt("to"))
-                    .firstNotNullOfOrNull(::craftNativeOptionalString)
+                    .mapNotNull { it as? String }
+                    .firstOrNull { it.trim().isNotEmpty() }
                     ?.trim()
-                    ?.takeIf { !props.optBoolean("disabled", false) }
+                    ?.takeIf { !craftNativeBoolean(props.opt("disabled")) }
                 if (target != null) screen.linkTargets[this] = target else screen.linkTargets.remove(this)
                 val handler = craftNativeEventName(events, "onPress", "onClick")
                 if (handler.isNotBlank()) screen.handlers[this] = handler else screen.handlers.remove(this)
@@ -4975,13 +4995,13 @@ class MainActivity : AppCompatActivity() {
                 minimumHeight = 0
                 setPadding(0, 0, 0, 0)
             }).apply {
-                val title = craftNativeOptionalString(props.opt("title")) ?: childText(children)
+                val title = (props.opt("title") as? String) ?: childText(children)
                 isAllCaps = false
                 configureText(this, title, style)
                 val buttonColor = craftNativeOptionalString(props.opt("color"))
                     ?: craftNativeOptionalString(style.opt("color"))
                 setTextColor(buttonColor?.let { color(it, defaultTextColor) } ?: defaultTextColor)
-                isEnabled = !props.optBoolean("disabled", false)
+                isEnabled = !craftNativeBoolean(props.opt("disabled"))
                 val handler = craftNativeEventName(events, "onPress", "onClick")
                 if (handler.isNotBlank()) screen.handlers[this] = handler else screen.handlers.remove(this)
                 setOnClickListener {
@@ -4990,7 +5010,7 @@ class MainActivity : AppCompatActivity() {
                 }
             }
             "Checkbox" -> (previous as? CheckBox ?: CheckBox(this)).apply {
-                text = craftNativeOptionalString(props.opt("label")) ?: childText(children)
+                text = (props.opt("label") as? String) ?: childText(children)
                 configureText(this, text.toString(), style)
                 val checkboxChecked = props.opt("checked")
                 val checkboxValue = props.opt("value")
@@ -5006,7 +5026,7 @@ class MainActivity : AppCompatActivity() {
                 isChecked = checked
                 val indeterminate = (props.opt("indeterminate") as? Boolean) == true
                 isActivated = indeterminate
-                isEnabled = !props.optBoolean("disabled", false)
+                isEnabled = !craftNativeBoolean(props.opt("disabled"))
                 val checkboxColor = craftNativeOptionalString(props.opt("color"))
                     ?: craftNativeOptionalString(style.opt("color"))
                 buttonTintList = checkboxColor
@@ -5035,17 +5055,17 @@ class MainActivity : AppCompatActivity() {
                 val defaultPadding = inputPaddingDefaults.getOrPut(this) {
                     intArrayOf(paddingLeft, paddingTop, paddingRight, paddingBottom)
                 }
-                hint = craftNativeOptionalString(props.opt("placeholder")).orEmpty()
+                hint = (props.opt("placeholder") as? String).orEmpty()
                 setHintTextColor(
-                    craftNativeOptionalString(props.opt("placeholderTextColor"))
+                    (props.opt("placeholderTextColor") as? String)
                         ?.let { runCatching { craftNativeColor(it) }.getOrNull() }
                         ?.let { ColorStateList.valueOf(it) }
                         ?: defaultHintColors,
                 )
-                highlightColor = craftNativeOptionalString(props.opt("selectionColor"))
+                highlightColor = (props.opt("selectionColor") as? String)
                     ?.let { runCatching { craftNativeColor(it) }.getOrNull() }
                     ?: defaultHighlightColor
-                val maxLength = props.optInt("maxLength", 0)
+                val maxLength = craftNativeInt(props.opt("maxLength"), 0)
                 val currentLength = (filters.firstOrNull { it is InputFilter.LengthFilter } as? InputFilter.LengthFilter)?.max ?: 0
                 if (currentLength != maxLength || (maxLength == 0 && filters.isNotEmpty())) {
                     filters = if (maxLength > 0) arrayOf(InputFilter.LengthFilter(maxLength)) else emptyArray()
@@ -5054,11 +5074,11 @@ class MainActivity : AppCompatActivity() {
                 if (inputType != wantedType) inputType = wantedType
                 val wantedIme = imeOptionsFor(props)
                 if (imeOptions != wantedIme) imeOptions = wantedIme
-                val multiline = props.optBoolean("multiline", false)
+                val multiline = craftNativeBoolean(props.opt("multiline"))
                 if (isSingleLine == multiline) isSingleLine = !multiline
-                val wantedLines = if (multiline) props.optInt("numberOfLines", Int.MAX_VALUE).coerceAtLeast(1) else 1
+                val wantedLines = if (multiline) craftNativeInt(props.opt("numberOfLines"), Int.MAX_VALUE).coerceAtLeast(1) else 1
                 if (maxLines != wantedLines) maxLines = wantedLines
-                isEnabled = props.optBoolean("editable", true)
+                isEnabled = craftNativeBoolean(props.opt("editable"), true)
                 configureTextStyle(this, style)
                 // The style's padding is where the text starts, as on iOS and
                 // the web; without one the field keeps its own.
@@ -5086,14 +5106,16 @@ class MainActivity : AppCompatActivity() {
                 // them after keyed reconciliation.
                 val autofillHint = autofillHintFor(props)
                 if (autofillHint == null) setAutofillHints(*emptyArray()) else setAutofillHints(autofillHint)
-                val controlledValue = props.opt("value")?.takeUnless { it == JSONObject.NULL }?.toString()
+                val controlledValue = props.opt("value") as? String
                 val echoes = screen.inputEchoes.getOrPut(this) { CraftNativeInputEcho() }
                 if (echoes.accept(controlledValue, text.toString()) && controlledValue != null) {
                     screen.suppressedTextChanges.add(this)
                     setTextPreservingSelection(this, controlledValue)
                 }
                 else if (this !== previous && screen.drafts.containsKey(identity)) setText(screen.drafts[identity])
-                else if (this !== previous && props.has("defaultValue") && !props.isNull("defaultValue")) setText(props.optString("defaultValue"))
+                else if (this !== previous && props.has("defaultValue") && !props.isNull("defaultValue")) {
+                    (props.opt("defaultValue") as? String)?.let(::setText)
+                }
                 applyTextDecoration(this, style)
                 screen.inputIdentities[this] = identity
                 val handler = craftNativeEventName(events, "onChange", "onChangeText")
@@ -5128,7 +5150,7 @@ class MainActivity : AppCompatActivity() {
                     send(screen, "EVENT", JSONObject().put("handlerName", current).put("nativeEvent", JSONObject().put("text", text.toString())))
                     true
                 }
-                if (props.optBoolean("autoFocus", false) && !isFocused) post {
+                if (craftNativeBoolean(props.opt("autoFocus")) && !isFocused) post {
                     if (!isFocused) {
                         requestFocus()
                         (getSystemService(INPUT_METHOD_SERVICE) as? android.view.inputmethod.InputMethodManager)
@@ -5158,7 +5180,7 @@ class MainActivity : AppCompatActivity() {
                 val itemOptions = props.optJSONArray("items")?.let { items ->
                     (0 until items.length()).mapNotNull { index ->
                         val item = items.optJSONObject(index) ?: return@mapNotNull null
-                        val label = craftNativeOptionalString(item.opt("label")) ?: return@mapNotNull null
+                        val label = (item.opt("label") as? String)?.takeIf { it.isNotEmpty() } ?: return@mapNotNull null
                         craftNativePickerValue(item.opt("value"))?.let { it to label } ?: (label to label)
                     }
                 }.orEmpty()
@@ -5166,7 +5188,7 @@ class MainActivity : AppCompatActivity() {
                     val option = children.optJSONObject(index) ?: return@mapNotNull null
                     if (option.optString("type") != "Text") return@mapNotNull null
                     val label = (option.optJSONArray("children") ?: JSONArray()).let { text ->
-                        (0 until text.length()).joinToString("") { text.optString(it) }
+                        (0 until text.length()).mapNotNull { text.opt(it) as? String }.joinToString("")
                     }
                     if (label.isBlank()) return@mapNotNull null
                     val optionProps = option.optJSONObject("props")
@@ -5185,7 +5207,7 @@ class MainActivity : AppCompatActivity() {
                 val requested = craftNativePickerValue(props.opt("selectedValue"))
                     ?: craftNativePickerValue(props.opt("value")).orEmpty()
                 val selected = options.indexOfFirst { it.first == requested }.takeIf { it >= 0 } ?: 0
-                isEnabled = !props.optBoolean("disabled", false)
+                isEnabled = !craftNativeBoolean(props.opt("disabled"))
                 // Mounting a controlled picker must not look like a user
                 // change. Android may dispatch the initial adapter selection
                 // during the first layout pass; iOS only reports a choice
@@ -5215,7 +5237,7 @@ class MainActivity : AppCompatActivity() {
                 }
             }
             "Modal" -> (previous as? CraftNativeModalView ?: CraftNativeModalView(this)).apply {
-                transparent = props.optBoolean("transparent", false)
+                transparent = craftNativeBoolean(props.opt("transparent"))
                 content.configure(style, resources.displayMetrics.density)
                 reconcileChildren(screen, content, children, identity, next, style, previousControls)
                 // Dynamic :visible bindings arrive as a display style mutation;
@@ -5224,7 +5246,7 @@ class MainActivity : AppCompatActivity() {
                     // An explicit visible prop owns modal visibility. The
                     // binding runtime may leave a stale display:none style
                     // from the previous hidden state when it patches props.
-                    props.optBoolean("visible", false)
+                    craftNativeBoolean(props.opt("visible"))
                 } else {
                     style.has("display") && style.optString("display") != "none"
                 }
@@ -5260,7 +5282,7 @@ class MainActivity : AppCompatActivity() {
             }
             "TouchableOpacity", "TouchableHighlight", "Pressable" -> (previous as? CraftNativeFlexLayout ?: CraftNativeFlexLayout(this)).apply {
                 configureContainer(this, style)
-                val disabled = props.optBoolean("disabled", false)
+                val disabled = craftNativeBoolean(props.opt("disabled"))
                 screen.pressActiveOpacities[this] = craftNativeFiniteFloat(props, "activeOpacity", 0.5f)
                 screen.pressBaseOpacities[this] = craftNativeFiniteFloat(style, "opacity", 1f)
                 if (type == "TouchableHighlight" && !disabled) {
@@ -5281,7 +5303,7 @@ class MainActivity : AppCompatActivity() {
                     requestedChecked is Boolean -> requestedChecked
                     else -> false
                 }
-                isEnabled = !props.optBoolean("disabled", false)
+                isEnabled = !craftNativeBoolean(props.opt("disabled"))
                 props.optJSONObject("trackColor")?.let { track ->
                     val falseRaw = craftNativeOptionalString(track.opt("false"))
                     val trueRaw = craftNativeOptionalString(track.opt("true"))
@@ -5309,11 +5331,11 @@ class MainActivity : AppCompatActivity() {
                 }
             }
             "Slider" -> (previous as? SeekBar ?: SeekBar(this)).apply {
-                val minimum = craftNativeFiniteDouble(props, "minimumValue", 0.0)
-                val maximumCandidate = craftNativeFiniteDouble(props, "maximumValue", 1.0)
+                val minimum = craftNativeFiniteNumber(props, "minimumValue", 0.0)
+                val maximumCandidate = craftNativeFiniteNumber(props, "maximumValue", 1.0)
                 val maximum = if (maximumCandidate > minimum) maximumCandidate else minimum + Double.MIN_VALUE
                 setOnSeekBarChangeListener(null)
-                val step = craftNativeFiniteDouble(props, "step", 0.0).takeIf { it > 0 }
+                val step = craftNativeFiniteNumber(props, "step", 0.0).takeIf { it > 0 }
                 // A stepped slider needs one native position per authored
                 // step; a fixed 1,000-position SeekBar silently made large
                 // ranges unable to represent most valid values. Continuous
@@ -5327,7 +5349,7 @@ class MainActivity : AppCompatActivity() {
                         .toInt()
                 } ?: 1000
                 max = progressMax
-                val requested = craftNativeFiniteDouble(props, "value", minimum)
+                val requested = craftNativeFiniteNumber(props, "value", minimum)
                 val value = (if (step != null) minimum + ((requested - minimum) / step).roundToInt() * step else requested)
                     .coerceIn(minimum, maximum)
                 progress = if (step != null) {
@@ -5345,7 +5367,7 @@ class MainActivity : AppCompatActivity() {
                 thumbTintList = craftNativeOptionalString(props.opt("thumbTintColor"))
                     ?.let { runCatching { craftNativeColor(it) }.getOrNull() }
                     ?.let { ColorStateList.valueOf(it) }
-                isEnabled = !props.optBoolean("disabled", false)
+                isEnabled = !craftNativeBoolean(props.opt("disabled"))
                 val handler = craftNativeEventName(events, "onValueChange", "onChange")
                 if (handler.isNotBlank()) screen.handlers[this] = handler else screen.handlers.remove(this)
                 val complete = craftNativeEventName(events, "onSlidingComplete")
@@ -5379,9 +5401,9 @@ class MainActivity : AppCompatActivity() {
                     else -> 1f
                 }
                 indicatorScale = scale
-                val animating = props.optBoolean("animating", true)
+                val animating = craftNativeBoolean(props.opt("animating"), true)
                 isIndeterminate = animating
-                visibility = if (!animating && props.optBoolean("hidesWhenStopped", true)) View.GONE else View.VISIBLE
+                visibility = if (!animating && craftNativeBoolean(props.opt("hidesWhenStopped"), true)) View.GONE else View.VISIBLE
                 indeterminateTintList = craftNativeOptionalString(props.opt("color"))
                     ?.let { runCatching { craftNativeColor(it) }.getOrNull() }
                     ?.let { ColorStateList.valueOf(it) }
@@ -5437,13 +5459,13 @@ class MainActivity : AppCompatActivity() {
                 onPictureInPictureChanged = { updatePictureInPicture() }
                 configure(
                     source = props.opt("source") ?: props.opt("src"),
-                    autoplay = props.optBoolean("autoplay", props.optBoolean("autoPlay", false)),
-                    paused = props.optBoolean("paused", false),
-                    loop = props.optBoolean("loop", false),
-                    muted = props.optBoolean("muted", false),
-                    controls = props.optBoolean("controls", false),
+                    autoplay = craftNativeBoolean(props.opt("autoplay"), craftNativeBoolean(props.opt("autoPlay"))),
+                    paused = craftNativeBoolean(props.opt("paused")),
+                    loop = craftNativeBoolean(props.opt("loop")),
+                    muted = craftNativeBoolean(props.opt("muted")),
+                    controls = craftNativeBoolean(props.opt("controls")),
                     resizeMode = craftNativeResizeMode(style, props),
-                    pictureInPicture = props.optBoolean("pictureInPicture", false),
+                    pictureInPicture = craftNativeBoolean(props.opt("pictureInPicture")),
                 )
             }
             "Map" -> (previous as? CraftNativeMapView ?: CraftNativeMapView(this)).apply {
@@ -5458,21 +5480,21 @@ class MainActivity : AppCompatActivity() {
                 drawing = node
             }
             "ScrollView", "SectionList" -> (previous as? CraftNativeScrollView ?: CraftNativeScrollView(this)).apply {
-                val horizontal = props.optBoolean("horizontal", false) || style.optString("flexDirection") in setOf("row", "row-reverse")
+                val horizontal = craftNativeBoolean(props.opt("horizontal")) || style.optString("flexDirection") in setOf("row", "row-reverse")
                 setHorizontal(horizontal)
                 setNativeNestedScrollingEnabled(true)
                 setScrollIndicators(
-                    props.optBoolean("showsVerticalScrollIndicator", true),
-                    props.optBoolean("showsHorizontalScrollIndicator", true),
+                    craftNativeBoolean(props.opt("showsVerticalScrollIndicator"), true),
+                    craftNativeBoolean(props.opt("showsHorizontalScrollIndicator"), true),
                 )
-                setScrollEnabled(props.optBoolean("scrollEnabled", true))
+                setScrollEnabled(craftNativeBoolean(props.opt("scrollEnabled"), true))
                 setKeyboardShouldPersistTaps(props.optString("keyboardShouldPersistTaps", "never"))
-                setBounces(props.optBoolean("bounces", true))
+                setBounces(craftNativeBoolean(props.opt("bounces"), true))
                 setAlwaysBounce(
-                    props.optBoolean("alwaysBounceVertical", !horizontal),
-                    props.optBoolean("alwaysBounceHorizontal", horizontal),
+                    craftNativeBoolean(props.opt("alwaysBounceVertical"), !horizontal),
+                    craftNativeBoolean(props.opt("alwaysBounceHorizontal"), horizontal),
                 )
-                setPagingEnabled(props.optBoolean("pagingEnabled", false))
+                setPagingEnabled(craftNativeBoolean(props.opt("pagingEnabled")))
                 val refreshNode = (0 until children.length()).asSequence()
                     .mapNotNull { children.optJSONObject(it) }
                     .firstOrNull { canonicalType(it.optString("type")) == "RefreshControl" }
@@ -5485,7 +5507,7 @@ class MainActivity : AppCompatActivity() {
                 val refreshHandler = refreshHandlerName?.let { handler ->
                     { send(screen, "EVENT", JSONObject().put("handlerName", handler).put("nativeEvent", JSONObject())) }
                 }
-                setRefreshHandler(refreshHandler, refreshProps.optBoolean("refreshing", props.optBoolean("refreshing", false)))
+                setRefreshHandler(refreshHandler, craftNativeBoolean(refreshProps.opt("refreshing"), craftNativeBoolean(props.opt("refreshing"))))
                 setRefreshAppearance(refreshProps, resources.displayMetrics.density, refreshTintFallback(screen))
                 val onScroll = craftNativeEventName(events, "onScroll")
                 if (onScroll.isNotBlank()) screen.scrollHandlers[this] = onScroll else screen.scrollHandlers.remove(this)
@@ -5563,7 +5585,7 @@ class MainActivity : AppCompatActivity() {
                     ?: craftNativeEventName(events, "onRefresh").takeIf { it.isNotBlank() }
                 configureRefresh(refreshHandlerName?.let { handler ->
                     { send(screen, "EVENT", JSONObject().put("handlerName", handler).put("nativeEvent", JSONObject())) }
-                }, propRefresh.optBoolean("refreshing", props.optBoolean("refreshing", false)))
+                }, craftNativeBoolean(propRefresh.opt("refreshing"), craftNativeBoolean(props.opt("refreshing"))))
                 setRefreshAppearance(propRefresh, refreshTintFallback(screen))
                 nativeList.setKeyboardShouldPersistTaps(props.optString("keyboardShouldPersistTaps", "never"))
                 nativeList.setContentContainerStyle(props.optJSONObject("contentContainerStyle"), resources.displayMetrics.density)
@@ -5603,7 +5625,7 @@ class MainActivity : AppCompatActivity() {
         if (underlayHideHandler != null) screen.pressUnderlayHideHandlers[control] = underlayHideHandler else screen.pressUnderlayHideHandlers.remove(control)
         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 disabled = craftNativeBoolean(props.opt("disabled"))
             val target = listOf(props.opt("href"), props.opt("to"))
                 .firstNotNullOfOrNull(::craftNativeOptionalString)
                 ?.trim()
@@ -5674,8 +5696,8 @@ class MainActivity : AppCompatActivity() {
             }
             control.isEnabled = !disabled
         }
-        val longPressDisabled = props.optBoolean("disabled", false) ||
-            props.optJSONObject("accessibilityState")?.optBoolean("disabled", false) == true
+        val longPressDisabled = craftNativeBoolean(props.opt("disabled")) ||
+            craftNativeBoolean(props.optJSONObject("accessibilityState")?.opt("disabled"))
         val longPressHandler = craftNativeEventName(events, "onLongPress").takeUnless { longPressDisabled } ?: ""
         if (longPressHandler.isNotBlank()) {
             screen.longPressHandlers[control] = longPressHandler
@@ -5720,8 +5742,8 @@ class MainActivity : AppCompatActivity() {
         next[identity] = control
         applyViewStyle(control, style)
         if (type == "ActivityIndicator") {
-            val animating = props.optBoolean("animating", true)
-            val hidesWhenStopped = props.optBoolean("hidesWhenStopped", true)
+            val animating = craftNativeBoolean(props.opt("animating"), true)
+            val hidesWhenStopped = craftNativeBoolean(props.opt("hidesWhenStopped"), true)
             control.visibility = if (style.optString("display") == "none" || (!animating && hidesWhenStopped)) {
                 View.GONE
             } else {
@@ -5892,12 +5914,12 @@ class MainActivity : AppCompatActivity() {
         }
         val threshold = craftNativeNonNegativeDouble(props, "threshold", 0.1)
         val authoredThreshold = craftNativeNonNegativeDouble(props, "onEndReachedThreshold", threshold)
-        val horizontal = props.optBoolean("horizontal", false)
+        val horizontal = craftNativeBoolean(props.opt("horizontal"))
         list.apply(
             nodes = nodes,
             horizontal = horizontal,
-            columns = props.optInt("numColumns", 1),
-            inverted = props.optBoolean("inverted", false),
+            columns = craftNativeInt(props.opt("numColumns"), 1),
+            inverted = craftNativeBoolean(props.opt("inverted")),
             endReachedThreshold = authoredThreshold,
             renderItem = { node, itemIdentity, _ ->
                 val rows = screen.flatListRows.getOrPut(list) { mutableMapOf() }
@@ -5917,16 +5939,16 @@ class MainActivity : AppCompatActivity() {
             },
         )
         list.setScrollIndicators(
-            props.optBoolean("showsVerticalScrollIndicator", true),
-            props.optBoolean("showsHorizontalScrollIndicator", true),
+            craftNativeBoolean(props.opt("showsVerticalScrollIndicator"), true),
+            craftNativeBoolean(props.opt("showsHorizontalScrollIndicator"), true),
         )
-        list.setScrollEnabled(props.optBoolean("scrollEnabled", true))
-        list.setPagingEnabled(props.optBoolean("pagingEnabled", false))
+        list.setScrollEnabled(craftNativeBoolean(props.opt("scrollEnabled"), true))
+        list.setPagingEnabled(craftNativeBoolean(props.opt("pagingEnabled")))
         list.setScrollTarget(props.opt("scrollTarget"))
         list.setBounceOptions(
-            props.optBoolean("bounces", true),
-            props.optBoolean("alwaysBounceVertical", !horizontal),
-            props.optBoolean("alwaysBounceHorizontal", horizontal),
+            craftNativeBoolean(props.opt("bounces"), true),
+            craftNativeBoolean(props.opt("alwaysBounceVertical"), !horizontal),
+            craftNativeBoolean(props.opt("alwaysBounceHorizontal"), horizontal),
         )
     }
 
@@ -6191,11 +6213,22 @@ class MainActivity : AppCompatActivity() {
         )
         view.vector = vector
         view.text = if (vector != null) "" else androidIconGlyph(symbol)
-        val weight = when (style.optString("fontWeight")) {
-            "bold", "700", "800", "900" -> Typeface.BOLD
-            else -> Typeface.NORMAL
+        val weight = when (craftNativeFontWeight(style.opt("fontWeight"))) {
+            "100" -> 100
+            "200" -> 200
+            "300" -> 300
+            "500" -> 500
+            "600" -> 600
+            "bold", "700" -> 700
+            "800" -> 800
+            "900" -> 900
+            else -> 400
+        }
+        view.typeface = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            Typeface.create("sans-serif", weight, false)
+        } else {
+            Typeface.create("sans-serif", if (weight >= 600) Typeface.BOLD else Typeface.NORMAL)
         }
-        view.typeface = Typeface.create("sans-serif", weight)
         val hasExplicitWidth = style.has("width") && !style.isNull("width")
         val hasExplicitHeight = style.has("height") && !style.isNull("height")
         if (!hasExplicitWidth && !hasExplicitHeight) {
@@ -6248,7 +6281,8 @@ class MainActivity : AppCompatActivity() {
     private fun configureTextStyle(view: TextView, style: JSONObject) {
         view.setTextColor(color(style.optString("color"), defaultTextColor))
         view.setTextSize(TypedValue.COMPLEX_UNIT_SP, craftNativeFiniteFloat(style, "fontSize", 16f))
-        val weight = when (style.optString("fontWeight")) {
+        val fontWeight = style.opt("fontWeight") as? String
+        val weight = when (fontWeight) {
             "bold" -> 700
             "100", "200", "300", "400", "500", "600", "700", "800", "900" -> style.optInt("fontWeight")
             else -> 400
@@ -6273,12 +6307,12 @@ class MainActivity : AppCompatActivity() {
                 Layout.JUSTIFICATION_MODE_NONE
             }
         }
-        view.letterSpacing = style.optDouble("letterSpacing", Double.NaN)
+        view.letterSpacing = craftNativeFiniteDouble(style, "letterSpacing", Double.NaN)
             .takeIf { it.isFinite() }
             ?.let { if (view.textSize > 0) dp(it).toFloat() / view.textSize else 0f }
             ?: 0f
         view.setLineSpacing(
-            style.optDouble("lineHeight", Double.NaN).takeIf { it.isFinite() }?.let { dp(it) - view.textSize } ?: 0f,
+            craftNativeFiniteDouble(style, "lineHeight", Double.NaN).takeIf { it.isFinite() }?.let { dp(it) - view.textSize } ?: 0f,
             1f
         )
         val shadowColor = style.optString("textShadowColor").takeIf { it.isNotBlank() }
@@ -6510,7 +6544,7 @@ class MainActivity : AppCompatActivity() {
             if (type == "Icon") "image" else type.lowercase()
         }
         val state = props.optJSONObject("accessibilityState")
-        val disabled = props.optBoolean("disabled", false) || state?.optBoolean("disabled", false) == true
+        val disabled = craftNativeBoolean(props.opt("disabled")) || craftNativeBoolean(state?.opt("disabled"))
         if (type !in setOf("Button", "Link", "Checkbox", "TextInput", "Picker", "DatePicker", "Modal", "Switch", "Slider", "ActivityIndicator")) {
             view.isEnabled = !disabled
         } else if (disabled) {
@@ -6534,8 +6568,8 @@ class MainActivity : AppCompatActivity() {
                 info.roleDescription = role.takeIf { it !in setOf("view", "text", "textinput", "scrollview") }
                 info.hintText = host.tooltipText
                 info.isEnabled = host.isEnabled && !disabled
-                info.isSelected = state?.optBoolean("selected", false) == true
-                info.isChecked = state?.optBoolean("checked", false) == true
+                info.isSelected = craftNativeBoolean(state?.opt("selected"))
+                info.isChecked = craftNativeBoolean(state?.opt("checked"))
             }
         })
         ViewCompat.setImportantForAccessibility(
@@ -6551,11 +6585,11 @@ class MainActivity : AppCompatActivity() {
     private fun color(raw: String, fallback: Int) = runCatching { craftNativeColor(raw) }.getOrDefault(fallback)
 
     private fun inputTypeFor(props: JSONObject): Int {
-        val base = if (props.optBoolean("multiline", false)) InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_MULTI_LINE
+        val base = if (craftNativeBoolean(props.opt("multiline"))) InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_MULTI_LINE
         else InputType.TYPE_CLASS_TEXT
         // Text variations do not carry their input class or multiline flag.
         // Preserve both when selecting an email, URL, or search keyboard.
-        val keyboard = when (props.optString("keyboardType")) {
+        val keyboard = when (props.opt("keyboardType") as? String) {
             "email-address" -> base or InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS
             "url" -> base or InputType.TYPE_TEXT_VARIATION_URI
             "numeric", "number-pad" -> InputType.TYPE_CLASS_NUMBER
@@ -6565,21 +6599,22 @@ class MainActivity : AppCompatActivity() {
             "visible-password" -> base or InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD
             else -> base
         }
-        val capitalization = when (props.optString("autoCapitalize")) {
+        val capitalization = when (props.opt("autoCapitalize") as? String) {
             "characters" -> InputType.TYPE_TEXT_FLAG_CAP_CHARACTERS
             "words" -> InputType.TYPE_TEXT_FLAG_CAP_WORDS
             "sentences" -> InputType.TYPE_TEXT_FLAG_CAP_SENTENCES
             else -> 0
         }
-        val correction = if (props.optBoolean("autoCorrect", true)) InputType.TYPE_TEXT_FLAG_AUTO_CORRECT else 0
-        val secure = if (props.optBoolean("secureTextEntry", false)) InputType.TYPE_TEXT_VARIATION_PASSWORD else 0
+        val correction = if (craftNativeBoolean(props.opt("autoCorrect"), true)) InputType.TYPE_TEXT_FLAG_AUTO_CORRECT else 0
+        val secure = if (craftNativeBoolean(props.opt("secureTextEntry"))) InputType.TYPE_TEXT_VARIATION_PASSWORD else 0
         return keyboard or capitalization or correction or secure
     }
 
     /// The autofill hint for `textContentType` (iOS's names) or `autoComplete`
     /// (HTML's), so a password manager fills the field.
     private fun autofillHintFor(props: JSONObject): String? {
-        val raw = props.optString("textContentType").ifBlank { props.optString("autoComplete") }
+        val raw = (props.opt("textContentType") as? String)?.takeIf { it.isNotBlank() }
+            ?: (props.opt("autoComplete") as? String).orEmpty()
         return when (raw.replace("-", "").replace("_", "").lowercase()) {
             "username" -> View.AUTOFILL_HINT_USERNAME
             "nickname" -> "personNickname"
@@ -6610,7 +6645,7 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
-    private fun imeOptionsFor(props: JSONObject): Int = when (props.optString("returnKeyType")) {
+    private fun imeOptionsFor(props: JSONObject): Int = when (props.opt("returnKeyType") as? String) {
         "done" -> EditorInfo.IME_ACTION_DONE
         "go" -> EditorInfo.IME_ACTION_GO
         "next" -> EditorInfo.IME_ACTION_NEXT