@craft-native/android 0.0.206 → 0.0.209

package/package.json

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

package/templates/CraftNativeShell.kt.template

@@ -578,6 +578,11 @@ internal class CraftNativeChrome(context: Context, private val tabs: List<CraftN
     private val largeTitleView = TextView(context)
     private val buttons = LinearLayout(context)
     private val tabBar = LinearLayout(context)
+    private val tabRow = LinearLayout(context)
+    private val accessory = FrameLayout(context)
+    private val accessoryIcon = ImageView(context)
+    private val accessoryBadge = TextView(context)
+    private var accessorySpec: JSONObject? = null
     private val tabViews = mutableListOf<Pair<TextView, TextView>>()
     private val tabIconText = mutableMapOf<String, String>()
     private val tabImageURLs = mutableMapOf<String, String>()
@@ -596,6 +601,7 @@ internal class CraftNativeChrome(context: Context, private val tabs: List<CraftN
     var onBack: (() -> Unit)? = null
     var onButton: ((String) -> Unit)? = null
     var onTab: ((Int) -> Unit)? = null
+    var onAccessory: ((String) -> Unit)? = null
     var onTabSwipeStart: ((Float, Float, Float) -> Boolean)? = null
     var onTabSwipeMove: ((Float) -> Unit)? = null
     var onTabSwipeEnd: ((Float, Boolean) -> Unit)? = null
@@ -660,8 +666,22 @@ internal class CraftNativeChrome(context: Context, private val tabs: List<CraftN
             tabBar.addView(cell, LayoutParams(0, ViewGroup.LayoutParams.MATCH_PARENT, 1f))
             tabViews.add(icon to label)
         }
-        addView(tabBar, LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, dp(64)))
-        tabBar.visibility = if (tabs.isEmpty()) View.GONE else View.VISIBLE
+        tabRow.orientation = HORIZONTAL
+        tabRow.gravity = Gravity.CENTER_VERTICAL
+        tabRow.setPadding(dp(12), dp(4), dp(12), dp(4))
+        tabRow.addView(tabBar, LayoutParams(0, dp(64), 1f))
+        accessory.addView(accessoryIcon, FrameLayout.LayoutParams(dp(26), dp(26), Gravity.CENTER))
+        accessoryBadge.textSize = 10f
+        accessoryBadge.gravity = Gravity.CENTER
+        accessoryBadge.setTextColor(Color.WHITE)
+        accessoryBadge.setPadding(dp(4), 0, dp(4), 0)
+        accessoryBadge.background = GradientDrawable().apply { setColor(Color.RED); cornerRadius = dp(9).toFloat() }
+        accessory.addView(accessoryBadge, FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, dp(18), Gravity.TOP or Gravity.END))
+        accessory.setOnClickListener { accessorySpec?.optString("path")?.let { onAccessory?.invoke(it) } }
+        accessory.visibility = View.GONE
+        tabRow.addView(accessory, LayoutParams(dp(64), dp(64)).apply { marginStart = dp(8) })
+        addView(tabRow, LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, dp(72)))
+        tabRow.visibility = if (tabs.isEmpty()) View.GONE else View.VISIBLE
         refreshColors()
     }
 
@@ -671,7 +691,7 @@ internal class CraftNativeChrome(context: Context, private val tabs: List<CraftN
                 val overHorizontalScroll = onTabSwipeShouldDefer?.invoke(event.x, event.y) == true
                 horizontalScrollDeferred = overHorizontalScroll
                 if (overHorizontalScroll) parent?.requestDisallowInterceptTouchEvent(true)
-                swipeTracking = tabs.size > 1 && tabSwipeEnabled && !overHorizontalScroll && tabBar.visibility == View.VISIBLE && event.y < tabBar.top
+                swipeTracking = tabs.size > 1 && tabSwipeEnabled && !overHorizontalScroll && tabRow.visibility == View.VISIBLE && event.y < tabRow.top
                 swipeIntercepted = false
                 swipeDownX = event.x
                 swipeDownY = event.y
@@ -742,7 +762,17 @@ internal class CraftNativeChrome(context: Context, private val tabs: List<CraftN
             buttons.addView(navButton(button))
         }
         val tabBarHidden = options.optBoolean("tabBarHidden", false) || depth > 0 && options.optBoolean("tabBarHiddenWhenPushed", false)
-        tabBar.visibility = if (tabs.isEmpty() || tabBarHidden) View.GONE else View.VISIBLE
+        tabRow.visibility = if (tabs.isEmpty() || tabBarHidden) View.GONE else View.VISIBLE
+        accessorySpec = options.optJSONObject("tabAccessory")?.takeIf {
+            val path = it.optString("path")
+            path.startsWith("/") && !path.startsWith("//") && it.has("title")
+        }
+        accessory.visibility = if (accessorySpec == null) View.GONE else View.VISIBLE
+        accessorySpec?.let {
+            accessory.contentDescription = it.optString("accessibilityLabel").ifBlank { it.optString("title") } + it.optString("badge").takeIf { badge -> badge.isNotBlank() && badge != "null" }?.let { badge -> ", $badge" }.orEmpty()
+            accessoryBadge.text = it.optString("badge").takeUnless { badge -> badge == "null" }.orEmpty().take(8)
+            accessoryBadge.visibility = if (accessoryBadge.text.isEmpty()) View.GONE else View.VISIBLE
+        }
         tabSwipeEnabled = options.optBoolean("tabSwipeEnabled", true)
         refreshColors()
     }
@@ -801,13 +831,10 @@ internal class CraftNativeChrome(context: Context, private val tabs: List<CraftN
         titleView.setTextColor(text)
         largeTitleView.setTextColor(text)
         backButton.imageTintList = ColorStateList.valueOf(accent)
-        tabBar.setBackgroundColor(if (dark) Color.parseColor("#121212") else Color.parseColor("#F9F9F9"))
-        val divider = GradientDrawable().apply { setColor(if (dark) Color.parseColor("#262626") else Color.parseColor("#D8D8DC")) }
-        tabBar.foreground = null
-        tabBar.background = android.graphics.drawable.LayerDrawable(arrayOf(
-            divider,
-            GradientDrawable().apply { setColor(if (dark) Color.parseColor("#121212") else Color.parseColor("#F9F9F9")) },
-        )).apply { setLayerInset(1, 0, maxOf(1, (density / 2).toInt()), 0, 0) }
+        val surface = if (dark) Color.parseColor("#1C1C1E") else Color.parseColor("#F9F9F9")
+        tabBar.background = GradientDrawable().apply { setColor(surface); cornerRadius = dp(32).toFloat() }
+        accessory.background = GradientDrawable().apply { setColor(surface); cornerRadius = dp(32).toFloat() }
+        accessorySpec?.let { accessoryIcon.setImageDrawable(CraftNativeIcons.drawable(context, null, it.optString("symbol"), text)) }
         tabViews.forEachIndexed { index, (icon, label) ->
             val color = if (index == selectedTab) accent else muted
             val number = tabIconText[tabs[index].id]

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,32 +240,25 @@ 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"),
                 aspectRatio = decimal("aspectRatio")?.takeIf { it.isFinite() && it > 0.0 },
                 minWidth = length("minWidth"), maxWidth = length("maxWidth"),
                 minHeight = length("minHeight"), maxHeight = length("maxHeight"),
-                position = raw.opt("position")
-                    ?.takeUnless { it == JSONObject.NULL }
-                    ?.toString()
-                    ?.takeIf { it.isNotBlank() }
-                    ?: "relative",
+                position = craftNativeOptionalString(raw.opt("position")) ?: "relative",
                 top = number("top"), right = number("right"), bottom = number("bottom"), left = number("left"),
-                alignSelf = raw.opt("alignSelf")
-                    ?.takeUnless { it == JSONObject.NULL }
-                    ?.toString()
-                    ?.takeIf { it.isNotBlank() && it != "auto" },
+                alignSelf = craftNativeOptionalString(raw.opt("alignSelf"))?.takeUnless { it == "auto" },
                 flexGrow = decimal("flexGrow") ?: flex?.coerceAtLeast(0.0) ?: 0.0,
                 flexShrink = decimal("flexShrink") ?: flex?.let { if (it != 0.0) 1.0 else 0.0 },
                 flexBasis = length("flexBasis")
@@ -364,11 +376,8 @@ private class CraftNativeSvgView(context: Context) : View(context) {
         fun merge(node: JSONObject): SvgPaint {
             val props = node.optJSONObject("props") ?: JSONObject()
             val style = node.optJSONObject("style") ?: JSONObject()
-            fun value(name: String): String? = when {
-                style.has(name) && !style.isNull(name) -> style.optString(name)
-                props.has(name) && !props.isNull(name) -> props.optString(name)
-                else -> null
-            }
+            fun value(name: String): String? = craftNativeOptionalString(style.opt(name))
+                ?: craftNativeOptionalString(props.opt(name))
             fun raw(name: String): Any? = when {
                 style.has(name) && !style.isNull(name) -> style.opt(name)
                 props.has(name) && !props.isNull(name) -> props.opt(name)
@@ -377,7 +386,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 +464,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)
     }
@@ -467,7 +476,7 @@ private class CraftNativeSvgView(context: Context) : View(context) {
         for (index in 0 until children.length()) {
             val node = children.optJSONObject(index) ?: continue
             val style = node.optJSONObject("style") ?: JSONObject()
-            if (style.optString("display") == "none") continue
+            if (craftNativeOptionalString(style.opt("display")) == "none") continue
             val paint = inherited.merge(node)
             when (node.optString("type")) {
                 "G" -> drawNodes(canvas, node.optJSONArray("children") ?: JSONArray(), paint)
@@ -480,12 +489,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 +560,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,9 +570,9 @@ 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
-        when (props.optString("textAnchor")) {
+        var x = craftNativeNumber(props.opt("x"))?.toFloat()?.takeIf { it.isFinite() } ?: 0f
+        val y = craftNativeNumber(props.opt("y"))?.toFloat()?.takeIf { it.isFinite() } ?: 0f
+        when (craftNativeOptionalString(props.opt("textAnchor"))) {
             "middle" -> x -= paint.measureText(text) / 2f
             "end" -> x -= paint.measureText(text)
         }
@@ -629,16 +638,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 +663,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 +726,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 +740,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()
         }
     }
@@ -1008,16 +1017,17 @@ private class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
     }
 
     fun configure(style: JSONObject, density: Float) {
-        orientation = if (style.optString("flexDirection") in setOf("row", "row-reverse")) HORIZONTAL else VERTICAL
-        reverse = style.optString("flexDirection").endsWith("-reverse")
-        val flexWrap = style.optString("flexWrap")
-        wrap = flexWrap == "wrap" || flexWrap == "wrap-reverse" || style.optBoolean("flexWrap", false)
+        val flexDirection = craftNativeOptionalString(style.opt("flexDirection")).orEmpty()
+        orientation = if (flexDirection in setOf("row", "row-reverse")) HORIZONTAL else VERTICAL
+        reverse = flexDirection.endsWith("-reverse")
+        val flexWrap = craftNativeOptionalString(style.opt("flexWrap")).orEmpty()
+        wrap = flexWrap == "wrap" || flexWrap == "wrap-reverse" || craftNativeBoolean(style.opt("flexWrap"))
         wrapReverse = flexWrap == "wrap-reverse"
-        alignItems = style.optString("alignItems", "stretch")
-        alignContent = style.optString("alignContent", "flex-start")
-        justifyContent = style.optString("justifyContent", "flex-start")
+        alignItems = craftNativeOptionalString(style.opt("alignItems")) ?: "stretch"
+        alignContent = craftNativeOptionalString(style.opt("alignContent")) ?: "flex-start"
+        justifyContent = craftNativeOptionalString(style.opt("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
@@ -1025,7 +1035,7 @@ private class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
         val gap = spacing("gap", 0f)
         rowGap = spacing("rowGap", gap)
         columnGap = spacing("columnGap", gap)
-        grid = style.optString("display") == "grid"
+        grid = craftNativeOptionalString(style.opt("display")) == "grid"
         gridColumns = craftNativeGridColumnCount(
             if (style.has("gridTemplateColumns")) style.opt("gridTemplateColumns") else style.opt("gridColumns")
         )
@@ -2076,7 +2086,7 @@ private class CraftNativeKeyboardAvoidingView(context: Context) : FrameLayout(co
     }
 
     fun configure(props: JSONObject, style: JSONObject, density: Float) {
-        behavior = props.optString("behavior", "padding").takeIf { it in setOf("height", "position", "padding") } ?: "padding"
+        behavior = craftNativeOptionalString(props.opt("behavior"))?.takeIf { it in setOf("height", "position", "padding") } ?: "padding"
         val authoredOffset = craftNativeFiniteDouble(props, "keyboardVerticalOffset", 0.0)
         val pixelOffset = (authoredOffset * density.toDouble()).takeIf { it.isFinite() } ?: 0.0
         keyboardVerticalOffset = pixelOffset.roundToInt()
@@ -2734,7 +2744,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 +2784,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 +2794,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
@@ -3939,6 +3949,7 @@ class MainActivity : AppCompatActivity() {
         val bars = CraftNativeChrome(this, routes.tabs)
         bars.layoutParams = FrameLayout.LayoutParams(-1, -1)
         bars.onBack = { onBackPressedDispatcherCompat() }
+        bars.onAccessory = { path -> navigateOpen(path) }
         bars.onButton = { id -> visibleScreen?.takeIf { it.active }?.let { send(it, "NAV_BUTTON", JSONObject().put("id", id)) } }
         bars.onTab = { index ->
             haptic()
@@ -4925,8 +4936,8 @@ 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
-                ellipsize = when (props.optString("ellipsizeMode")) {
+                maxLines = craftNativeInt(props.opt("numberOfLines"), 0).takeIf { it > 0 } ?: Int.MAX_VALUE
+                ellipsize = when (craftNativeOptionalString(props.opt("ellipsizeMode"))) {
                     "head" -> TextUtils.TruncateAt.START
                     "middle" -> TextUtils.TruncateAt.MIDDLE
                     "tail" -> TextUtils.TruncateAt.END
@@ -4936,7 +4947,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 +4955,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 +4987,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 +5002,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 +5018,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 +5047,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 +5066,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 +5098,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 +5142,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 +5172,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 +5180,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 +5199,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 +5229,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,9 +5238,9 @@ 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"
+                    style.has("display") && craftNativeOptionalString(style.opt("display")) != "none"
                 }
                 val wasVisible = screen.modalVisibility[this]
                 screen.modalVisibility[this] = visible
@@ -5260,7 +5274,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 +5295,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 +5323,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 +5341,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 +5359,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 +5393,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 +5451,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 +5472,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")) || craftNativeOptionalString(style.opt("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))
-                setKeyboardShouldPersistTaps(props.optString("keyboardShouldPersistTaps", "never"))
-                setBounces(props.optBoolean("bounces", true))
+                setScrollEnabled(craftNativeBoolean(props.opt("scrollEnabled"), true))
+                setKeyboardShouldPersistTaps(craftNativeOptionalString(props.opt("keyboardShouldPersistTaps")) ?: "never")
+                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 +5499,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)
@@ -5528,7 +5542,7 @@ class MainActivity : AppCompatActivity() {
                             send(screen, "EVENT", JSONObject().put("handlerName", current).put("nativeEvent", JSONObject()))
                         }
                     },
-                    keyboardDismissMode = props.optString("keyboardDismissMode"),
+                    keyboardDismissMode = craftNativeOptionalString(props.opt("keyboardDismissMode")).orEmpty(),
                     dismissKeyboard = {
                         (getSystemService(INPUT_METHOD_SERVICE) as? android.view.inputmethod.InputMethodManager)
                             ?.hideSoftInputFromWindow(nativeScroll.windowToken, 0)
@@ -5563,11 +5577,11 @@ 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.setKeyboardShouldPersistTaps(craftNativeOptionalString(props.opt("keyboardShouldPersistTaps")) ?: "never")
                 nativeList.setContentContainerStyle(props.optJSONObject("contentContainerStyle"), resources.displayMetrics.density)
-                nativeList.setKeyboardDismissMode(props.optString("keyboardDismissMode")) {
+                nativeList.setKeyboardDismissMode(craftNativeOptionalString(props.opt("keyboardDismissMode")).orEmpty()) {
                     (getSystemService(INPUT_METHOD_SERVICE) as? android.view.inputmethod.InputMethodManager)
                         ?.hideSoftInputFromWindow(windowToken, 0)
                 }
@@ -5576,6 +5590,7 @@ class MainActivity : AppCompatActivity() {
             "View", "SafeAreaView" -> (previous as? CraftNativeFlexLayout ?: CraftNativeFlexLayout(this)).apply {
                 configureContainer(this, style)
                 if (type == "SafeAreaView") setSafeAreaEdges(props.optJSONArray("edges"))
+                else setWindowSafeInsets(0, 0, 0, 0)
                 reconcileChildren(screen, this, children, identity, next, style, previousControls)
             }
             "KeyboardAvoidingView" -> (previous as? CraftNativeKeyboardAvoidingView ?: CraftNativeKeyboardAvoidingView(this)).apply {
@@ -5603,7 +5618,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 +5689,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,9 +5735,9 @@ class MainActivity : AppCompatActivity() {
         next[identity] = control
         applyViewStyle(control, style)
         if (type == "ActivityIndicator") {
-            val animating = props.optBoolean("animating", true)
-            val hidesWhenStopped = props.optBoolean("hidesWhenStopped", true)
-            control.visibility = if (style.optString("display") == "none" || (!animating && hidesWhenStopped)) {
+            val animating = craftNativeBoolean(props.opt("animating"), true)
+            val hidesWhenStopped = craftNativeBoolean(props.opt("hidesWhenStopped"), true)
+            control.visibility = if (craftNativeOptionalString(style.opt("display")) == "none" || (!animating && hidesWhenStopped)) {
                 View.GONE
             } else {
                 View.VISIBLE
@@ -5843,7 +5858,7 @@ class MainActivity : AppCompatActivity() {
                 layout.setChildStyle(childView, child.optJSONObject("style") ?: JSONObject(), resources.displayMetrics.density)
             }
         }
-        if (style.optString("flexDirection").endsWith("-reverse")) desired.reverse()
+        if (craftNativeOptionalString(style.opt("flexDirection"))?.endsWith("-reverse") == true) desired.reverse()
         val desiredSet = desired.toSet()
         for ((index, childView) in desired.withIndex()) {
             if (layout.getChildAt(index) !== childView) {
@@ -5892,12 +5907,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 +5932,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),
         )
     }
 
@@ -5970,7 +5985,7 @@ class MainActivity : AppCompatActivity() {
         }
         applyTransform(view, style.optJSONArray("transform"))
         if (view !is CraftNativeModalView) {
-            view.visibility = if (style.optString("display") == "none") View.GONE else View.VISIBLE
+            view.visibility = if (craftNativeOptionalString(style.opt("display")) == "none") View.GONE else View.VISIBLE
         }
         view.elevation = dp(craftNativeNonNegativeDouble(style, "elevation", 0.0)).toFloat()
         view.z = craftNativeFiniteFloat(style, "zIndex", 0f)
@@ -5979,13 +5994,13 @@ class MainActivity : AppCompatActivity() {
         // 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)
+            else color(craftNativeOptionalString(style.opt("backgroundColor")).orEmpty(), Color.TRANSPARENT)
         val border = craftNativeNonNegativeDouble(style, "borderWidth", 0.0)
         val radius = craftNativeNonNegativeDouble(style, "borderRadius", 0.0)
-        val gradientDirection = style.optString("gradientDirection").takeIf { it.isNotBlank() }
-        val gradientFrom = style.optString("gradientFrom").takeIf { it.isNotBlank() }
-        val gradientVia = style.optString("gradientVia").takeIf { it.isNotBlank() }
-        val gradientTo = style.optString("gradientTo").takeIf { it.isNotBlank() }
+        val gradientDirection = craftNativeOptionalString(style.opt("gradientDirection"))
+        val gradientFrom = craftNativeOptionalString(style.opt("gradientFrom"))
+        val gradientVia = craftNativeOptionalString(style.opt("gradientVia"))
+        val gradientTo = craftNativeOptionalString(style.opt("gradientTo"))
         val gradientColors = if (gradientDirection != null && gradientFrom != null && gradientTo != null) {
             listOfNotNull(
                 color(gradientFrom, Color.TRANSPARENT),
@@ -6003,7 +6018,7 @@ class MainActivity : AppCompatActivity() {
             listOf(radius, radius)
         }.toFloatArray()
         val sideColors = listOf("borderTopColor", "borderRightColor", "borderBottomColor", "borderLeftColor")
-            .map { color(style.optString(it).ifBlank { style.optString("borderColor") }, Color.TRANSPARENT) }
+            .map { color(craftNativeOptionalString(style.opt(it)) ?: craftNativeOptionalString(style.opt("borderColor")).orEmpty(), Color.TRANSPARENT) }
             .toIntArray()
         val defaultBackground = if (defaultBackgrounds.containsKey(view)) {
             defaultBackgrounds[view]
@@ -6017,7 +6032,7 @@ class MainActivity : AppCompatActivity() {
                     cornerRadii,
                     sideWidths,
                     sideColors,
-                    style.optString("borderStyle").takeIf { it == "dashed" || it == "dotted" },
+                    craftNativeOptionalString(style.opt("borderStyle"))?.takeIf { it == "dashed" || it == "dotted" },
                     gradientDirection,
                     gradientColors,
                 )
@@ -6029,8 +6044,8 @@ class MainActivity : AppCompatActivity() {
                     } else setColor(backgroundColor)
                     if (hasCornerRadii) setCornerRadii(cornerRadii) else cornerRadius = dp(radius).toFloat()
                     if (border > 0) {
-                        val borderColor = color(style.optString("borderColor"), Color.TRANSPARENT)
-                        when (style.optString("borderStyle")) {
+                        val borderColor = color(craftNativeOptionalString(style.opt("borderColor")).orEmpty(), Color.TRANSPARENT)
+                        when (craftNativeOptionalString(style.opt("borderStyle"))) {
                             "dashed" -> setStroke(dp(border), borderColor, dp(border * 3).toFloat(), dp(border * 2).toFloat())
                             "dotted" -> setStroke(dp(border), borderColor, dp(border).toFloat(), dp(border * 1.5).toFloat())
                             else -> setStroke(dp(border), borderColor)
@@ -6043,13 +6058,14 @@ class MainActivity : AppCompatActivity() {
             // and the web.
             null
         } else defaultBackground
-        view.clipToOutline = style.optString("overflow") == "hidden"
-        if (view is ViewGroup) view.clipChildren = style.optString("overflow") == "hidden"
+        val overflow = craftNativeOptionalString(style.opt("overflow"))
+        view.clipToOutline = overflow == "hidden"
+        if (view is ViewGroup) view.clipChildren = overflow == "hidden"
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P &&
             (style.has("shadowColor") || style.has("shadowOpacity") || style.has("shadowRadius"))
         ) {
             val shadowOpacity = craftNativeFiniteFloat(style, "shadowOpacity", 1f).coerceIn(0f, 1f)
-            val shadow = color(style.optString("shadowColor"), Color.BLACK)
+            val shadow = color(craftNativeOptionalString(style.opt("shadowColor")).orEmpty(), Color.BLACK)
             val alphaShadow = Color.argb((Color.alpha(shadow) * shadowOpacity).roundToInt(), Color.red(shadow), Color.green(shadow), Color.blue(shadow))
             view.outlineAmbientShadowColor = alphaShadow
             view.outlineSpotShadowColor = alphaShadow
@@ -6147,7 +6163,7 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun configureText(view: TextView, value: String, style: JSONObject) {
-        view.text = when (style.optString("textTransform")) {
+        view.text = when (craftNativeOptionalString(style.opt("textTransform"))) {
             "uppercase" -> value.uppercase()
             "lowercase" -> value.lowercase()
             "capitalize" -> value.split(' ').joinToString(" ") { word -> word.replaceFirstChar(Char::uppercase) }
@@ -6191,11 +6207,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) {
@@ -6246,20 +6273,22 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun configureTextStyle(view: TextView, style: JSONObject) {
-        view.setTextColor(color(style.optString("color"), defaultTextColor))
+        view.setTextColor(color(craftNativeOptionalString(style.opt("color")).orEmpty(), 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
         }
-        val italic = style.optString("fontStyle") == "italic"
-        val family = style.optString("fontFamily").takeIf { it.isNotBlank() }
+        val italic = craftNativeOptionalString(style.opt("fontStyle")) == "italic"
+        val family = craftNativeOptionalString(style.opt("fontFamily"))?.takeIf { it.isNotBlank() }
         view.typeface = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
             Typeface.create(Typeface.create(family, Typeface.NORMAL), weight, italic)
         } else Typeface.create(family, (if (weight >= 600) Typeface.BOLD else Typeface.NORMAL) or
             (if (italic) Typeface.ITALIC else Typeface.NORMAL))
-        view.textAlignment = when (style.optString("textAlign")) {
+        val textAlign = craftNativeOptionalString(style.opt("textAlign"))
+        view.textAlignment = when (textAlign) {
             "left" -> View.TEXT_ALIGNMENT_TEXT_START
             "right" -> View.TEXT_ALIGNMENT_TEXT_END
             "center" -> View.TEXT_ALIGNMENT_CENTER
@@ -6267,21 +6296,21 @@ class MainActivity : AppCompatActivity() {
             else -> View.TEXT_ALIGNMENT_INHERIT
         }
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            view.justificationMode = if (style.optString("textAlign") == "justify") {
+            view.justificationMode = if (textAlign == "justify") {
                 Layout.JUSTIFICATION_MODE_INTER_WORD
             } else {
                 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() }
+        val shadowColor = craftNativeOptionalString(style.opt("textShadowColor"))?.takeIf { it.isNotBlank() }
         if (shadowColor == null) {
             view.paint.clearShadowLayer()
         } else {
@@ -6298,16 +6327,16 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun applyTextDecoration(view: TextView, style: JSONObject) {
-        val line = style.optString("textDecorationLine")
+        val line = craftNativeOptionalString(style.opt("textDecorationLine")).orEmpty()
         if (view is EditText) {
             // A field's own text, spanned in place: replacing it would move
             // the caret to the start and tell the screen the text changed.
             val editable = view.text ?: return
             editable.getSpans(0, editable.length, CraftTextDecorationSpan::class.java).forEach(editable::removeSpan)
             if (line.isBlank() || line == "none" || editable.isEmpty()) return
-            val fieldColor = style.optString("textDecorationColor").takeIf { it.isNotBlank() }?.let { color(it, Color.TRANSPARENT) }
+            val fieldColor = craftNativeOptionalString(style.opt("textDecorationColor"))?.takeIf { it.isNotBlank() }?.let { color(it, Color.TRANSPARENT) }
             editable.setSpan(
-                CraftTextDecorationSpan(line, style.optString("textDecorationStyle").ifBlank { "solid" }, fieldColor),
+                CraftTextDecorationSpan(line, craftNativeOptionalString(style.opt("textDecorationStyle")).orEmpty().ifBlank { "solid" }, fieldColor),
                 0,
                 editable.length,
                 Spannable.SPAN_INCLUSIVE_INCLUSIVE,
@@ -6319,14 +6348,14 @@ class MainActivity : AppCompatActivity() {
             if (view.text is Spannable) view.text = text
             return
         }
-        val decorationColor = style.optString("textDecorationColor")
+        val decorationColor = craftNativeOptionalString(style.opt("textDecorationColor")).orEmpty()
             .takeIf { it.isNotBlank() }
             ?.let { color(it, Color.TRANSPARENT) }
         val decorated = SpannableString(text)
         decorated.setSpan(
             CraftTextDecorationSpan(
                 line,
-                style.optString("textDecorationStyle").ifBlank { "solid" },
+                craftNativeOptionalString(style.opt("textDecorationStyle")).orEmpty().ifBlank { "solid" },
                 decorationColor,
             ),
             0,
@@ -6510,7 +6539,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 +6563,16 @@ 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
+                // Keep the native widget state when no accessibilityState was
+                // authored. Overwriting it with the strict false fallback
+                // made a checked Switch/CheckBox announce as unchecked unless
+                // the screen redundantly mirrored its value into metadata.
+                if (state?.has("selected") == true) {
+                    info.isSelected = craftNativeBoolean(state.opt("selected"))
+                }
+                if (state?.has("checked") == true) {
+                    info.isChecked = craftNativeBoolean(state.opt("checked"))
+                }
             }
         })
         ViewCompat.setImportantForAccessibility(
@@ -6551,11 +6588,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 +6602,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 +6648,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