craft-native 0.0.247 → 0.0.248

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

@@ -113,6 +113,7 @@ import org.json.JSONArray
 import org.json.JSONObject
 import java.io.File
 import java.net.HttpURLConnection
+import java.net.URI
 import java.net.URL
 import java.text.SimpleDateFormat
 import java.util.Calendar
@@ -166,7 +167,7 @@ private fun craftNativeFontWeight(value: Any?): String? = when (value) {
 internal fun craftNativePadding(style: JSONObject?, name: String, fallback: Int, density: Float): Int {
     val value = craftNativeNumber(style?.opt(name)) ?: Double.NaN
     val pixels = value * density
-    return if (value.isFinite() && value >= 0 && pixels.isFinite()) pixels.toInt() else fallback
+    return if (value.isFinite() && value >= 0 && pixels.isFinite()) pixels.roundToInt() else fallback
 }
 
 internal fun craftNativeFiniteFloat(style: JSONObject?, name: String, fallback: Float): Float {
@@ -271,6 +272,18 @@ private fun craftNativeGridColumnCount(value: Any?): Int {
     return max(1, trimmed.split(Regex("\\s+")).count { it.isNotBlank() })
 }
 
+private fun craftNativeGridRowCount(value: Any?): Int? {
+    if (value is Number) return max(1, value.toInt())
+    val text = value as? String ?: return null
+    val trimmed = text.trim()
+    if (trimmed.isEmpty()) return null
+    if (trimmed.startsWith("repeat(")) {
+        val count = trimmed.removePrefix("repeat(").takeWhile { it.isDigit() }.toIntOrNull()
+        if (count != null) return max(1, count)
+    }
+    return max(1, trimmed.split(Regex("\\s+")).count { it.isNotBlank() })
+}
+
 /**
  * A CSS colour as Android's ARGB. STX writes `#RRGGBBAA` (and `#RGBA`) for a
  * colour with alpha, where Android's parser reads `#AARRGGBB`: a translucent
@@ -709,7 +722,7 @@ internal class CraftNativeCelebration(private val view: View) {
 }
 
 /** A deterministic flex-shaped container shared by normal views and scroll content. */
-private class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
+internal class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
     private var celebration: CraftNativeCelebration? = null
     fun configureCelebration(raw: JSONObject?, radius: Float) {
         if (raw != null && celebration == null) celebration = CraftNativeCelebration(this)
@@ -737,6 +750,7 @@ private class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
     private var columnGap = 0f
     private var grid = false
     private var gridColumns = 1
+    private var gridRows: Int? = null
     private var gridAutoRows: CraftNativeLength? = null
     private var reverse = false
     private var wrapReverse = false
@@ -873,6 +887,37 @@ private class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
         child.layout(left, top, right, bottom)
     }
 
+    /**
+     * Resolve an absolute child against the parent's content box before it is
+     * placed. In particular, left+right anchors define the child's width; an
+     * aspect-ratio child must be measured again at that width or Android can
+     * retain the parent's intrinsic height from its first, wider probe.
+     */
+    private fun absoluteSize(entry: Entry, contentWidth: Int, contentHeight: Int): Pair<Int, Int> {
+        val style = entry.style
+        val anchoredWidth = style.left != null && style.right != null
+        val anchoredHeight = style.top != null && style.bottom != null
+        var width = when {
+            anchoredWidth -> contentWidth - style.left!! - style.right!!
+            style.width != null -> style.width.resolve(contentWidth) ?: entry.width
+            style.aspectRatio != null && style.height != null ->
+                ((style.height.resolve(contentHeight) ?: entry.height) * style.aspectRatio).roundToInt()
+            else -> entry.width
+        }
+        var height = if (anchoredHeight) contentHeight - style.top!! - style.bottom!! else entry.height
+        width = clamp(width, style.minWidth?.resolve(contentWidth), style.maxWidth?.resolve(contentWidth))
+        if (!anchoredHeight) {
+            height = when {
+                style.height != null -> measureChildHeight(entry.view, style, contentHeight, 0, width)
+                anchoredWidth && style.aspectRatio != null && style.aspectRatio > 0 ->
+                    clamp((width / style.aspectRatio).roundToInt(), style.minHeight?.resolve(contentHeight), style.maxHeight?.resolve(contentHeight))
+                else -> measureChildHeight(entry.view, style, contentHeight, 0, width)
+            }
+        }
+        height = clamp(height, style.minHeight?.resolve(contentHeight), style.maxHeight?.resolve(contentHeight))
+        return max(0, width) to max(0, height)
+    }
+
     override fun drawChild(canvas: Canvas, child: View, drawingTime: Long): Boolean {
         val skew = CraftNativeSkewTransforms.matrix(child) ?: return super.drawChild(canvas, child, drawingTime)
         val save = canvas.save()
@@ -905,6 +950,7 @@ private class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
         gridColumns = craftNativeGridColumnCount(
             if (style.has("gridTemplateColumns")) style.opt("gridTemplateColumns") else style.opt("gridColumns")
         )
+        gridRows = craftNativeGridRowCount(style.opt("gridTemplateRows"))
         gridAutoRows = CraftNativeLength.from(style.opt("gridAutoRows"), density)
         val all = craftNativePadding(style, "padding", 0, density)
         val horizontal = craftNativePadding(style, "paddingHorizontal", all, density)
@@ -1081,12 +1127,20 @@ private class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
                 rows.last() += entry
             }
         }
-        val rowHeights = rows.map { row ->
+        val naturalRowHeights = rows.map { row ->
             max((gridAutoRows?.resolve(height - paddingTop - paddingBottom) ?: 0).toFloat(), row.maxOfOrNull { entry ->
                 val lp = entry.view.layoutParams as? MarginLayoutParams
                 (entry.height + (lp?.topMargin ?: 0) + (lp?.bottomMargin ?: 0)).toFloat()
             } ?: 0f)
         }
+        val rowHeights = if (gridRows != null) {
+            val count = max(gridRows ?: 0, naturalRowHeights.size)
+            while (rows.size < count) rows.add(mutableListOf())
+            val available = max(0f, height - paddingTop - paddingBottom - max(0, count - 1) * rowGap)
+            val equal = available / max(1, count).toFloat()
+            (naturalRowHeights + List(count - naturalRowHeights.size) { equal })
+                .map { max(it, equal) }
+        } else naturalRowHeights
         return GridLayout(rows, absolute, cellWidth, rowHeights)
     }
 
@@ -1236,6 +1290,7 @@ private class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
         val grid: Boolean,
         val gridColumns: Int,
         val gridAutoRows: CraftNativeLength?,
+        val gridRows: Int?,
         val reverse: Boolean,
         val wrapReverse: Boolean,
         val children: List<SharedTreeNode>,
@@ -1287,6 +1342,7 @@ private class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
             grid = nested?.grid ?: false,
             gridColumns = nested?.gridColumns ?: 1,
             gridAutoRows = nested?.gridAutoRows,
+            gridRows = nested?.gridRows,
             reverse = nested?.reverse ?: false,
             wrapReverse = nested?.wrapReverse ?: false,
             children = children.map { child -> sharedTreeNode(child) ?: return null },
@@ -1315,6 +1371,7 @@ private class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
             grid = grid,
             gridColumns = gridColumns,
             gridAutoRows = gridAutoRows,
+            gridRows = gridRows,
             reverse = reverse,
             wrapReverse = wrapReverse,
             children = children,
@@ -1331,7 +1388,9 @@ private class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
         val reverseAware = nodes.any { it.reverse || it.wrapReverse }
         val wrapReverseAware = nodes.any { it.wrapReverse }
         val autoRowsAware = nodes.any { it.gridAutoRows != null }
+        val explicitRowsAware = nodes.any { it.gridRows != null }
         val fields = when {
+            explicitRowsAware -> 35
             autoRowsAware -> 34
             reverseAware -> 33
             else -> 32
@@ -1384,13 +1443,16 @@ private class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
             put(base, 31, node.columnGap)
             if (fields >= 33) putEnum(base, 32, (if (node.reverse) 1 else 0) or (if (node.wrapReverse) 2 else 0))
             if (autoRowsAware) put(base, 33, sharedLength(node.gridAutoRows, contentHeight))
+            if (explicitRowsAware) put(base, 34, (node.gridRows ?: 0).toFloat())
             val firstChild = cursor
             node.children.forEach { child -> write(child, contentWidth, contentHeight, false, node.direction) }
             treeMeta[index * 2] = firstChild.toFloat()
             treeMeta[index * 2 + 1] = (cursor - firstChild).toFloat()
         }
         write(root, width, height, true, root.direction)
-        val frames = (if (autoRowsAware) {
+        val frames = (if (explicitRowsAware) {
+            CraftNative.layoutTreeV5(width.toFloat(), height.toFloat(), nodeData, treeMeta)
+        } else if (autoRowsAware) {
             CraftNative.layoutTreeV4(width.toFloat(), height.toFloat(), nodeData, treeMeta)
         } else if (wrapReverseAware) {
             CraftNative.layoutTreeV3(width.toFloat(), height.toFloat(), nodeData, treeMeta)
@@ -1638,7 +1700,7 @@ private class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
             val flow = layout.rows.flatten()
             // Older runtimes return null for the optional symbol; the local
             // layout below remains the compatibility path in that case.
-            val sharedFrames = CraftNative.grid(
+            val sharedFrames = if (gridRows == null) CraftNative.grid(
                 contentWidth.toFloat(), contentHeight.toFloat(), gridColumns, columnGap, rowGap,
                 flow.map { it.width.toFloat() }.toFloatArray(), flow.map { it.height.toFloat() }.toFloatArray(),
                 flow.map { it.style.width?.resolve(layout.cellWidth.roundToInt())?.toFloat() ?: Float.NaN }.toFloatArray(),
@@ -1657,7 +1719,7 @@ private class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
                 }.toFloatArray(),
                 gridAutoRows?.resolve(contentHeight)?.toFloat(),
                 alignContentCode(),
-            )
+            ) else null
             if (sharedFrames != null) {
                 for ((index, entry) in flow.withIndex()) {
                     val offset = index * 4
@@ -1720,11 +1782,10 @@ private class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
             }
             for (entry in layout.absolute) {
                 if (entry.view is CraftNativeModalView && entry.view.visibility == View.VISIBLE) entry.view.bringToFront()
-                val childWidth = if (entry.style.left != null && entry.style.right != null) contentWidth - entry.style.left!! - entry.style.right!! else entry.width
-                val childHeight = if (entry.style.top != null && entry.style.bottom != null) contentHeight - entry.style.top!! - entry.style.bottom!! else entry.height
+                val (childWidth, childHeight) = absoluteSize(entry, contentWidth, contentHeight)
                 val x = paddingLeft + (entry.style.left ?: (entry.style.right?.let { contentWidth - it - childWidth } ?: 0))
                 val y = paddingTop + (entry.style.top ?: (entry.style.bottom?.let { contentHeight - it - childHeight } ?: 0))
-                place(entry.view, x, y, x + max(0, childWidth), y + max(0, childHeight))
+                place(entry.view, x, y, x + childWidth, y + childHeight)
             }
             onLayoutChanged?.invoke()
             return
@@ -1906,11 +1967,10 @@ private class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
         }
         for (entry in absolute) {
             if (entry.view is CraftNativeModalView && entry.view.visibility == View.VISIBLE) entry.view.bringToFront()
-            val widthValue = if (entry.style.left != null && entry.style.right != null) contentWidth - entry.style.left!! - entry.style.right!! else entry.width
-            val heightValue = if (entry.style.top != null && entry.style.bottom != null) contentHeight - entry.style.top!! - entry.style.bottom!! else entry.height
+            val (widthValue, heightValue) = absoluteSize(entry, contentWidth, contentHeight)
             val x = paddingLeft + (entry.style.left ?: (entry.style.right?.let { contentWidth - it - widthValue } ?: 0))
             val y = paddingTop + (entry.style.top ?: (entry.style.bottom?.let { contentHeight - it - heightValue } ?: 0))
-            place(entry.view, x, y, x + max(0, widthValue), y + max(0, heightValue))
+            place(entry.view, x, y, x + widthValue, y + heightValue)
         }
         onLayoutChanged?.invoke()
     }
@@ -2015,6 +2075,7 @@ private class CraftNativeScrollView(context: Context) : SwipeRefreshLayout(conte
     private var stickyIndices = emptyList<Int>()
     private var scrollTargetKey: String? = null
     private var pendingScrollTarget: Pair<String, Boolean>? = null
+    private var scrollListenerGeneration = 0
 
     init {
         vertical.isNestedScrollingEnabled = true
@@ -2160,6 +2221,21 @@ private class CraftNativeScrollView(context: Context) : SwipeRefreshLayout(conte
         horizontal.isNestedScrollingEnabled = value
     }
 
+    fun scrollTo(x: Int?, y: Int?, animated: Boolean): Pair<Int, Int> {
+        val scroller: View = if (horizontalMode == true) horizontal else vertical
+        val maxX = max(0, content.width - horizontal.width)
+        val maxY = max(0, content.height - vertical.height)
+        val targetX = (x ?: scroller.scrollX).coerceIn(0, maxX)
+        val targetY = (y ?: scroller.scrollY).coerceIn(0, maxY)
+        if (animated) {
+            if (scroller is HorizontalScrollView) scroller.smoothScrollTo(targetX, targetY)
+            else (scroller as ScrollView).smoothScrollTo(targetX, targetY)
+        } else {
+            scroller.scrollTo(targetX, targetY)
+        }
+        return targetX to targetY
+    }
+
     fun setScrollEnabled(value: Boolean) {
         vertical.isEnabled = value
         horizontal.isEnabled = value
@@ -2286,7 +2362,10 @@ private class CraftNativeScrollView(context: Context) : SwipeRefreshLayout(conte
             return
         }
         val scrollY = vertical.scrollY
-        var pinnedBottom = 0
+        // Keep sticky content below the ScrollView's authored top inset,
+        // matching the native content viewport instead of pinning it to the
+        // raw window edge.
+        var pinnedBottom = content.paddingTop
         stickyIndices.forEachIndexed { position, index ->
             val header = content.getChildAt(index)
             if (header == null || header.visibility != View.VISIBLE || header.height <= 0) return@forEachIndexed
@@ -2362,6 +2441,7 @@ private class CraftNativeScrollView(context: Context) : SwipeRefreshLayout(conte
         keyboardDismissMode: String,
         dismissKeyboard: (() -> Unit)?,
     ) {
+        val generation = ++scrollListenerGeneration
         fun attach(scroller: View) {
             var dismissed = false
             var moved = false
@@ -2370,7 +2450,7 @@ private class CraftNativeScrollView(context: Context) : SwipeRefreshLayout(conte
             var lastY = 0
 
             fun pollMomentum() {
-                if (!momentumActive) return
+                if (generation != scrollListenerGeneration || !momentumActive) return
                 val x = scroller.scrollX
                 val y = scroller.scrollY
                 if (x == lastX && y == lastY) {
@@ -2426,6 +2506,14 @@ private class CraftNativeScrollView(context: Context) : SwipeRefreshLayout(conte
         attach(vertical)
         attach(horizontal)
     }
+
+    fun clearScrollListeners() {
+        scrollListenerGeneration += 1
+        vertical.setOnScrollChangeListener(null)
+        vertical.setOnTouchListener(null)
+        horizontal.setOnScrollChangeListener(null)
+        horizontal.setOnTouchListener(null)
+    }
 }
 
 private class CraftNativeFlexSpacer(context: Context) : View(context)
@@ -2471,7 +2559,8 @@ private class CraftNativeModalView(context: Context) : FrameLayout(context) {
     private var renderedVisible = false
     private var dismissSuppressedByRequest = false
     private var animationGeneration = 0
-    var onRequestClose: (() -> Unit)? = null
+    var focusToRestore: View? = null
+    var onRequestClose: ((String) -> Unit)? = null
 
     var transparent: Boolean = false
         set(value) {
@@ -2483,7 +2572,7 @@ private class CraftNativeModalView(context: Context) : FrameLayout(context) {
         isClickable = true
         blocker.isClickable = true
         blocker.setOnTouchListener { _, event ->
-            if (event.action == MotionEvent.ACTION_UP) requestClose()
+            if (event.action == MotionEvent.ACTION_UP) requestClose(reason = "backdrop")
             true
         }
         blocker.setBackgroundColor(Color.argb(82, 0, 0, 0))
@@ -2491,12 +2580,12 @@ private class CraftNativeModalView(context: Context) : FrameLayout(context) {
         addView(content, LayoutParams(-1, -1))
     }
 
-    fun requestClose() {
+    fun requestClose(reason: String = "backdrop") {
         val handler = onRequestClose ?: return
         dismissSuppressedByRequest = true
         isClickable = false
         blocker.isEnabled = false
-        handler()
+        handler(reason)
     }
 
     fun consumeDismissSuppression(): Boolean {
@@ -2693,6 +2782,11 @@ private class CraftNativeDatePickerView(context: Context) : FrameLayout(context)
         return JSONObject().put("value", value).put("iso", iso).put("timestamp", current.timeInMillis)
     }
 
+    fun resetForTeardown() {
+        suppressChanges = true
+        onValueChanged = null
+    }
+
     private fun changed() {
         if (suppressChanges) return
         // A date-only picker has no time half to snap, but its change is
@@ -2983,6 +3077,12 @@ private class CraftNativeVideoView(context: Context) : VideoView(context) {
     fun stop() {
         // Released with its screen: nothing more is told to it.
         emit = null
+        // VideoView otherwise keeps these listener objects until its media
+        // player is replaced. Clear them before stopping so an asynchronous
+        // prepare/completion/error callback cannot outlive the native node.
+        setOnPreparedListener(null)
+        setOnCompletionListener(null)
+        setOnErrorListener(null)
         progressHandler.removeCallbacks(progressTick)
         stopPlayback()
         setPlaying(false)
@@ -2995,6 +3095,8 @@ private class CraftNativeVideoView(context: Context) : VideoView(context) {
             pictureInPicture = false
             onPictureInPictureChanged?.invoke()
         }
+        onPictureInPictureChanged = null
+        handlers = JSONObject()
     }
 
     private fun applyScalingMode() {
@@ -3525,6 +3627,7 @@ class MainActivity : AppCompatActivity() {
     private class Screen(
         val route: String?,
         val params: JSONObject,
+        val props: JSONObject,
         val view: CraftNativeFlexLayout,
         val isolate: JavaScriptIsolate,
         val port: MessagePort?,
@@ -3549,6 +3652,7 @@ class MainActivity : AppCompatActivity() {
         val drafts = mutableMapOf<String, String>()
         val inputIdentities = mutableMapOf<EditText, String>()
         val suppressedTextChanges = mutableSetOf<EditText>()
+        val inputWatchers = mutableMapOf<EditText, TextWatcher>()
         /**
          * The texts a field sent the screen that its `value` has not come
          * back as yet, oldest first. Typing faster than the round trip makes
@@ -3562,6 +3666,7 @@ class MainActivity : AppCompatActivity() {
         // the original tree path without manufacturing a detached view.
         val nodeViews = mutableMapOf<String, View>()
         val nodePaths = mutableMapOf<String, String>()
+        val protocolIds = mutableMapOf<View, String>()
         val handlers = mutableMapOf<View, String>()
         val linkTargets = mutableMapOf<View, String>()
         val pressInHandlers = mutableMapOf<View, String>()
@@ -3709,8 +3814,6 @@ class MainActivity : AppCompatActivity() {
     private val imageJobs = mutableMapOf<ImageView, Future<*>>()
     private val imageErrors = mutableMapOf<ImageView, String>()
     private val inputHintDefaults = mutableMapOf<EditText, ColorStateList>()
-    /** Fields that already carry their text watcher. */
-    private val watchedInputs: MutableSet<EditText> = java.util.Collections.newSetFromMap(WeakHashMap())
     private val inputHighlightDefaults = mutableMapOf<EditText, Int>()
     private val inputPaddingDefaults = mutableMapOf<EditText, IntArray>()
     private val defaultBackgrounds = mutableMapOf<View, Drawable?>()
@@ -4060,7 +4163,7 @@ class MainActivity : AppCompatActivity() {
      * page on the app's site in the in-app browser. Another site's address
      * opens in the browser too.
      */
-    private fun navigateOpen(target: String, fromLink: Boolean = false, replace: Boolean = false) {
+    private fun navigateOpen(target: String, fromLink: Boolean = false, replace: Boolean = false, props: JSONObject = JSONObject()) {
         val path = routes.appPath(target, urlSchemes)
         if (path == null) {
             openExternal(target)
@@ -4072,7 +4175,7 @@ class MainActivity : AppCompatActivity() {
             val removed = stack.removeAt(stack.lastIndex)
             val previous = stack.lastOrNull()
             closeScreen(removed) {
-                if (screens === stack && stack.lastOrNull() === previous) navigateOpen(path, fromLink)
+                if (screens === stack && stack.lastOrNull() === previous) navigateOpen(path, fromLink, props = props)
             }
             return
         }
@@ -4081,8 +4184,8 @@ class MainActivity : AppCompatActivity() {
             selectTab(routes.tabs.indexOf(tab))
             popToRoot()
             val root = screens.firstOrNull()
-            if (root != null && match != null && match.params.length() > 0) {
-                send(root, "ROUTE_PARAMS", JSONObject().put("params", match.params))
+            if (root != null && match != null && (match.params.length() > 0 || props.length() > 0)) {
+                send(root, "ROUTE_PARAMS", JSONObject().put("params", match.params).put("props", props))
             }
             return
         }
@@ -4104,12 +4207,12 @@ class MainActivity : AppCompatActivity() {
             closeScreens(removed) {
                 if (screens === stack && stack.lastOrNull() === existing) {
                     show(existing)
-                    send(existing, "ROUTE_PARAMS", JSONObject().put("params", match.params))
+                    send(existing, "ROUTE_PARAMS", JSONObject().put("params", match.params).put("props", props))
                 }
             }
             return
         }
-        openScreen(match.screen, match.params)?.path = match.path
+        openScreen(match.screen, match.params, props = props)?.path = match.path
     }
 
     /** A page the app does not draw, in a Custom Tab over the app. */
@@ -4117,7 +4220,7 @@ class MainActivity : AppCompatActivity() {
         services.perform("Browser", "open", JSONArray().put(url), {})
     }
 
-    private fun openScreen(route: String?, params: JSONObject = JSONObject(), headless: Boolean = false, showImmediately: Boolean = true): Screen? {
+    private fun openScreen(route: String?, params: JSONObject = JSONObject(), props: JSONObject = JSONObject(), headless: Boolean = false, showImmediately: Boolean = true): Screen? {
         if (showImmediately && !headless) interruptTabSwipe()
         val engine = sandbox ?: return null
         val isolate = engine.createIsolate()
@@ -4145,7 +4248,7 @@ class MainActivity : AppCompatActivity() {
             })
             null
         }
-        val activeScreen = Screen(route, params, view, isolate, port, headless)
+        val activeScreen = Screen(route, params, props, view, isolate, port, headless)
         activeScreen.view.onLayoutChanged = {
             if (activeScreen.active) emitLayoutEvents(activeScreen)
         }
@@ -4160,6 +4263,7 @@ class MainActivity : AppCompatActivity() {
         val routePrelude = """
             globalThis.__stxNativeRoute = ${route?.let { JSONObject.quote(it) } ?: "undefined"};
             globalThis.__stxNativeParams = ${params};
+            globalThis.__stxNativeProps = ${props};
         """.trimIndent()
         val audioPrelude = """
             (function() {
@@ -4367,6 +4471,12 @@ class MainActivity : AppCompatActivity() {
                 load.addListener({
                     try {
                         load.get()
+                        // The STX runtime may install its browser-shaped
+                        // craft.dialog after the host prelude. Re-assert the
+                        // native capability once the bundle has finished.
+                        isolate.evaluateJavaScriptAsync(
+                            "if (typeof globalThis.__craftInstallNativeDialog === 'function') globalThis.__craftInstallNativeDialog();"
+                        ).get()
                         if (activeScreen.headless) {
                             CraftNativeBackground.foreground = { event, id, done ->
                                 val app = appScreen
@@ -4518,6 +4628,10 @@ class MainActivity : AppCompatActivity() {
     /** The bridge's capability names: Craft's core set and this host's services. */
     private fun capabilityNames(): JSONArray = capabilities.names().apply {
         services.names().forEach { name -> put(name) }
+        put("viewFocus")
+        put("viewMeasure")
+        put("viewScroll")
+        put("viewReparent")
     }
 
     private fun appVersion(): Pair<String, String> = runCatching {
@@ -4570,6 +4684,7 @@ class MainActivity : AppCompatActivity() {
         ViewCompat.requestApplyInsets(root)
         refreshInputDefaultsForTraitChange()
         chrome?.refreshColors()
+        mapViews().forEach { it.refreshThemeDefaults() }
         // Every screen follows light and dark, the ones in other tabs and
         // under the one on display too, and the app script hears it.
         val appearance = appearance()
@@ -4589,6 +4704,10 @@ class MainActivity : AppCompatActivity() {
                 else -> null
             }
         }.forEach { it.refreshThemeDefaults() }
+        // Appearance/configuration changes can arrive while this screen is
+        // retained in another tab. Keep its SafeAreaView measured with the
+        // current window insets before the next interactive transition.
+        updateSafeAreaInsets(screen)
         updateSafeAreaViews()
     }
 
@@ -4697,7 +4816,9 @@ class MainActivity : AppCompatActivity() {
                     .put("message", "mutation batch could not be applied")
                     .put("version", CRAFT_NATIVE_MUTATION_PROTOCOL_VERSION))
             }
-            "NAVIGATE_OPEN" -> payload.optString("path").takeIf { it.isNotBlank() }?.let(::navigateOpen)
+            "NAVIGATE_OPEN" -> payload.optString("path").takeIf { it.isNotBlank() }?.let {
+                navigateOpen(it, props = payload.optJSONObject("props") ?: JSONObject())
+            }
             "NAVIGATION_SET_OPTIONS" -> {
                 // The app script has no navigation bar of its own. Screen
                 // options remain valid while that screen is off-stack, so
@@ -4913,6 +5034,7 @@ class MainActivity : AppCompatActivity() {
         screen.controls.clear()
         screen.nodeViews.clear()
         screen.nodePaths.clear()
+        screen.protocolIds.clear()
         screen.handlers.clear()
         screen.linkTargets.clear()
         screen.flatListRows.clear()
@@ -4934,15 +5056,18 @@ class MainActivity : AppCompatActivity() {
         val children = node.optJSONArray("children") ?: JSONArray()
         val protocolId = node.optString("id").takeIf { it.isNotBlank() }
         val explicitKey = authoredKey(node, props)
-        // Descendants are scoped to this retained identity, not its sibling
-        // position. Moving a keyed parent must retain its nested inputs too.
-        // A test selector may intentionally identify several list rows. The
-        // compiler's unique protocol ID must win over that legacy fallback.
+        // Authored keys retain conditional replacements and scope their
+        // descendants. A protocol alias additionally finds the same live
+        // view when a popup moves to another parent.
         val identity = explicitKey?.let { "${path.substringBeforeLast('.', "")}/$it" }
             ?: protocolId?.let { "id:$it" }
             ?: props.optString("testID").takeIf { it.isNotBlank() }?.let { "${path.substringBeforeLast('.', "")}/$it" }
             ?: path
-        val previous = previousControls[identity]
+        val keyedPrevious = previousControls[identity]?.takeIf { candidate ->
+            val previousId = screen.protocolIds[candidate]
+            previousId == null || previousId == protocolId || !screen.mutations.containsNode(previousId)
+        }
+        val previous = protocolId?.let { previousControls["id:$it"] } ?: keyedPrevious
         val reusableInput = previous as? EditText
         val control = when (type) {
             "Text" -> ((previous as? TextView)?.takeUnless { it is Button || it is EditText } ?: TextView(this)).apply {
@@ -4955,6 +5080,11 @@ class MainActivity : AppCompatActivity() {
                     else -> null
                 }
                 configureText(this, childText(children), style)
+                val selectable = craftNativeBoolean(props.opt("selectable"))
+                setTextIsSelectable(selectable)
+                isFocusable = selectable
+                isFocusableInTouchMode = selectable
+                isLongClickable = selectable
             }
             "StatusBar" -> (previous as? CraftNativeFlexLayout ?: CraftNativeFlexLayout(this)).apply {
                 screen.statusBarStyle = craftNativeOptionalString(props.opt("barStyle"))
@@ -5163,21 +5293,27 @@ class MainActivity : AppCompatActivity() {
                 if (text.toString() == keptText && keptStart >= 0 && (selectionStart != keptStart || selectionEnd != keptEnd)) {
                     setSelection(keptStart.coerceAtMost(keptText.length), keptEnd.coerceAtMost(keptText.length))
                 }
-                // One watcher per field, however often it is reused.
-                if (watchedInputs.add(this)) addTextChangedListener(object : TextWatcher {
-                    override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
-                    override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-                        val updated = s?.toString().orEmpty()
-                        (screen.inputIdentities[this@apply] ?: identity).let { screen.drafts[it] = updated }
-                        if (screen.suppressedTextChanges.remove(this@apply)) return
-                        val current = screen.handlers[this@apply] ?: return
-                        screen.inputEchoes.getOrPut(this@apply) { CraftNativeInputEcho() }.record(updated)
-                        send(screen, "EVENT", JSONObject()
-                            .put("handlerName", current)
-                            .put("nativeEvent", JSONObject().put("text", updated)))
+                // One watcher per field, however often it is reused. Keep the
+                // instance so releaseViewState can detach the closure when a
+                // row or screen goes away.
+                if (screen.inputWatchers[this] == null) {
+                    val watcher = object : TextWatcher {
+                        override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
+                        override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+                            val updated = s?.toString().orEmpty()
+                            (screen.inputIdentities[this@apply] ?: identity).let { screen.drafts[it] = updated }
+                            if (screen.suppressedTextChanges.remove(this@apply)) return
+                            val current = screen.handlers[this@apply] ?: return
+                            screen.inputEchoes.getOrPut(this@apply) { CraftNativeInputEcho() }.record(updated)
+                            send(screen, "EVENT", JSONObject()
+                                .put("handlerName", current)
+                                .put("nativeEvent", JSONObject().put("text", updated)))
+                        }
+                        override fun afterTextChanged(s: Editable?) {}
                     }
-                    override fun afterTextChanged(s: Editable?) {}
-                })
+                    screen.inputWatchers[this] = watcher
+                    addTextChangedListener(watcher)
+                }
             }
             "Picker" -> (previous as? Spinner ?: Spinner(this)).apply {
                 val itemOptions = props.optJSONArray("items")?.let { items ->
@@ -5240,6 +5376,7 @@ class MainActivity : AppCompatActivity() {
                 }
             }
             "Modal" -> (previous as? CraftNativeModalView ?: CraftNativeModalView(this)).apply {
+                val focusBeforeContent = screen.view.findFocus()
                 transparent = craftNativeBoolean(props.opt("transparent"))
                 content.configure(style, resources.displayMetrics.density)
                 reconcileChildren(screen, content, children, identity, next, style, previousControls)
@@ -5255,14 +5392,24 @@ class MainActivity : AppCompatActivity() {
                 }
                 val wasVisible = screen.modalVisibility[this]
                 screen.modalVisibility[this] = visible
+                if (visible && wasVisible != true && focusBeforeContent != null && focusBeforeContent !is CraftNativeModalView) {
+                    focusToRestore = focusBeforeContent
+                }
                 val requestClose = craftNativeOptionalString(events.opt("onRequestClose")).orEmpty()
                 if (requestClose.isNotBlank()) screen.modalCloseHandlers[this] = requestClose else screen.modalCloseHandlers.remove(this)
                 onRequestClose = if (requestClose.isNotBlank()) {
-                    { send(screen, "EVENT", JSONObject().put("handlerName", requestClose).put("nativeEvent", JSONObject())) }
+                    { reason -> send(screen, "EVENT", JSONObject().put("handlerName", requestClose).put("nativeEvent", JSONObject().put("reason", reason))) }
                 } else {
                     null
                 }
                 setVisible(visible, craftNativeFiniteFloat(style, "opacity", 1f), craftNativeOptionalString(props.opt("animationType")))
+                if (!visible && wasVisible == true) {
+                    val restore = focusToRestore
+                    focusToRestore = null
+                    restore?.post {
+                        if (restore.isAttachedToWindow) restore.requestFocus()
+                    }
+                }
                 if (visible) clearDismissSuppression()
                 val suppressDismiss = !visible && consumeDismissSuppression()
                 if (wasVisible != visible && (visible || wasVisible == true)) {
@@ -5301,10 +5448,10 @@ class MainActivity : AppCompatActivity() {
                 setOnCheckedChangeListener(null)
                 val requestedValue = props.opt("value")
                 val requestedChecked = props.opt("checked")
-                isChecked = when {
-                    requestedValue != null && requestedValue != JSONObject.NULL -> requestedValue as? Boolean ?: false
-                    requestedChecked is Boolean -> requestedChecked
-                    else -> false
+                if (requestedValue != null && requestedValue != JSONObject.NULL) {
+                    isChecked = requestedValue as? Boolean ?: false
+                } else if (requestedChecked is Boolean) {
+                    isChecked = requestedChecked
                 }
                 isEnabled = !craftNativeBoolean(props.opt("disabled"))
                 props.optJSONObject("trackColor")?.let { track ->
@@ -5755,6 +5902,10 @@ class MainActivity : AppCompatActivity() {
             screen.nodePaths[it] = path
         }
         next[identity] = control
+        protocolId?.let {
+            next["id:$it"] = control
+            screen.protocolIds[control] = it
+        }
         applyViewStyle(control, style)
         if (type == "ActivityIndicator") {
             val animating = craftNativeBoolean(props.opt("animating"), true)
@@ -5916,6 +6067,9 @@ class MainActivity : AppCompatActivity() {
         list.onLayoutChanged = {
             if (screen.active) emitLayoutEvents(screen)
         }
+        list.onContentSizeChanged = {
+            if (screen.active) CraftNativeFlexLayout.invalidateMeasurementAncestors(list.parent)
+        }
         val nodes = (0 until children.length()).mapNotNull { children.optJSONObject(it) }
         nodes.forEach { registerFlatListOwnership(screen, it, owner) }
         list.onScrollEvent = craftNativeEventName(events, "onScroll").takeIf { it.isNotBlank() }?.let { handler ->
@@ -5955,6 +6109,10 @@ class MainActivity : AppCompatActivity() {
                 val controls = screen.flatListRows[list]?.remove(itemIdentity).orEmpty()
                 releaseViewState(screen, controls.values.toList(), preservingInputDrafts = true)
             },
+            removeItem = { itemIdentity ->
+                val controls = screen.flatListRows[list]?.remove(itemIdentity).orEmpty()
+                releaseViewState(screen, controls.values.toList(), preservingInputDrafts = false)
+            },
             endReached = craftNativeEventName(events, "onEndReached").takeIf { it.isNotBlank() }?.let { handler ->
                 { send(screen, "EVENT", JSONObject().put("handlerName", handler).put("nativeEvent", JSONObject())) }
             },
@@ -6411,6 +6569,13 @@ class MainActivity : AppCompatActivity() {
             host == "::1" || host.endsWith(".localhost")
     }
 
+    /** Resolve app paths against the configured site; bare names stay assets. */
+    private fun imageURI(uri: String): String {
+        if (!uri.startsWith("/")) return uri
+        val base = config.optString("devServerURL").takeIf { it.isNotBlank() } ?: return uri
+        return runCatching { URI(base).resolve(uri).toString() }.getOrDefault(uri)
+    }
+
     private fun imageUri(source: Any?): String = when (source) {
         is String -> source
         is JSONObject -> craftNativeOptionalString(source.opt("uri")).orEmpty()
@@ -6439,6 +6604,7 @@ class MainActivity : AppCompatActivity() {
 
     private fun updateImage(screen: Screen, view: ImageView, source: Any?, defaultSource: Any? = null) {
         val uri = imageUri(source)
+        val requestUri = imageURI(uri)
         val headers = imageHeaders(source)
         val requestKey = imageRequestKey(uri, headers)
         if (uri.isBlank()) {
@@ -6472,7 +6638,7 @@ class MainActivity : AppCompatActivity() {
             } else imageFailure(screen, view, uri, "Image data is invalid")
             return
         }
-        if (!uri.contains(':')) {
+        if (!uri.startsWith("/") && !uri.contains(':')) {
             val bitmap = runCatching { assets.open(uri).use { BitmapFactory.decodeStream(it) } }.getOrNull()
             if (bitmap != null) {
                 view.setImageBitmap(bitmap)
@@ -6482,22 +6648,23 @@ class MainActivity : AppCompatActivity() {
             } else imageFailure(screen, view, uri, "Bundled image was not found")
             return
         }
-        if (!loadsImage(Uri.parse(uri))) {
-            imageFailure(screen, view, uri, "Unsupported image source")
+        if (!loadsImage(Uri.parse(requestUri))) {
+            if (uri.startsWith("/")) imageFailure(screen, view, uri, "Relative image source requires devServerURL")
+            else imageFailure(screen, view, uri, "Unsupported image source")
             return
         }
         imageJobs[view] = imageExecutor.submit {
             val bitmap = runCatching {
-                val publicRequest = headers.isEmpty() && Uri.parse(uri).userInfo.isNullOrEmpty()
+                val publicRequest = headers.isEmpty() && Uri.parse(requestUri).userInfo.isNullOrEmpty()
                 if (publicRequest) {
-                    val bytes = imageCache.read(uri)
+                    val bytes = imageCache.read(requestUri)
                     if (bytes != null) {
                         val saved = BitmapFactory.decodeByteArray(bytes, 0, bytes.size)
                         if (saved != null) return@runCatching saved
-                        imageCache.remove(uri)
+                        imageCache.remove(requestUri)
                     }
                 }
-                val connection = (URL(uri).openConnection() as HttpURLConnection).apply {
+                val connection = (URL(requestUri).openConnection() as HttpURLConnection).apply {
                     connectTimeout = 10_000
                     readTimeout = 10_000
                     // This loader owns its bounded public cache. Do not let
@@ -6515,8 +6682,8 @@ class MainActivity : AppCompatActivity() {
                         if (downloaded != null && policy != null) {
                             // Encode only after a complete decode, then commit
                             // before onLoad so a cold offline reopen is safe.
-                            imageCache.write(uri, policy) { downloaded.compress(Bitmap.CompressFormat.PNG, 100, it) }
-                        } else imageCache.remove(uri)
+                            imageCache.write(requestUri, policy) { downloaded.compress(Bitmap.CompressFormat.PNG, 100, it) }
+                        } else imageCache.remove(requestUri)
                     }
                     downloaded
                 } finally { connection.disconnect() }
@@ -6593,8 +6760,17 @@ class MainActivity : AppCompatActivity() {
             else -> null
         }
         view.tooltipText = craftNativeOptionalString(props.opt("accessibilityHint"))
+        val hasLinkTarget = listOf("href", "to").any { key ->
+            !craftNativeOptionalString(props.opt(key)).isNullOrBlank()
+        }
+        val linkedControl = type in setOf("Link", "TouchableOpacity", "TouchableHighlight", "Pressable") && hasLinkTarget
         val role = craftNativeOptionalString(props.opt("accessibilityRole")) ?: run {
-            if (type == "Icon") "image" else type.lowercase()
+            when {
+                linkedControl -> "link"
+                type in setOf("TouchableOpacity", "TouchableHighlight", "Pressable") -> "button"
+                type == "Icon" -> "image"
+                else -> type.lowercase()
+            }
         }
         val state = props.optJSONObject("accessibilityState")
         val disabled = craftNativeBoolean(props.opt("disabled")) || craftNativeBoolean(state?.opt("disabled"))
@@ -6746,15 +6922,18 @@ class MainActivity : AppCompatActivity() {
             capabilityHandler.postDelayed(timeout, CRAFT_NATIVE_CAPABILITY_TIMEOUT_MS)
         }
         val module = payload.optString("module")
-        val perform: ((CraftNativeCapabilityResult) -> Unit) -> Unit = if (services.handles(module)) {
-            { completion -> services.perform(module, payload.optString("method"), args, completion) }
+        val method = payload.optString("method")
+        val perform: ((CraftNativeCapabilityResult) -> Unit) -> Unit = if (module == "View") {
+            { completion -> performView(screen, method, args, completion) }
+        } else if (services.handles(module)) {
+            { completion -> services.perform(module, method, args, completion) }
         } else {
             { completion ->
                 capabilities.perform(
                     token,
                     payload.optInt("version", CRAFT_NATIVE_CAPABILITY_PROTOCOL_VERSION),
                     module,
-                    payload.optString("method"),
+                    method,
                     args,
                     completion,
                 )
@@ -6772,6 +6951,97 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
+    /** View operations are screen-owned: node ids only exist while a route is mounted. */
+    private fun performView(
+        screen: Screen,
+        method: String,
+        args: JSONArray,
+        completion: (CraftNativeCapabilityResult) -> Unit,
+    ) {
+        val options = args.optJSONObject(0)
+        val nodeId = options?.optString("nodeId")?.takeIf { it.isNotBlank() } ?: args.optString(0)
+        if (nodeId.isBlank()) {
+            completion(CraftNativeCapabilityResult(code = "INVALID_ARGUMENT", message = "View.$method needs a nodeId"))
+            return
+        }
+        val target = screen.nodeViews[nodeId]
+        if (target == null) {
+            completion(CraftNativeCapabilityResult(code = "VIEW_NOT_FOUND", message = "View.$method could not find mounted node $nodeId"))
+            return
+        }
+        if (!target.isAttachedToWindow) {
+            completion(CraftNativeCapabilityResult(code = "VIEW_NOT_MOUNTED", message = "View.$method requires a mounted node"))
+            return
+        }
+        when (method) {
+            "focus" -> when (options?.optString("mode") ?: args.optString(1, "keyboard")) {
+                "keyboard" -> if (target is EditText) {
+                    if (!target.requestFocus()) {
+                        completion(CraftNativeCapabilityResult(code = "FOCUS_FAILED", message = "The mounted view refused keyboard focus"))
+                    } else {
+                        target.post {
+                            (getSystemService(INPUT_METHOD_SERVICE) as? android.view.inputmethod.InputMethodManager)
+                                ?.showSoftInput(target, android.view.inputmethod.InputMethodManager.SHOW_IMPLICIT)
+                        }
+                        completion(CraftNativeCapabilityResult(data = true))
+                    }
+                } else completion(CraftNativeCapabilityResult(code = "UNSUPPORTED_TARGET", message = "Keyboard focus is supported only for text inputs"))
+                "accessibility" -> {
+                    target.sendAccessibilityEvent(android.view.accessibility.AccessibilityEvent.TYPE_VIEW_FOCUSED)
+                    completion(CraftNativeCapabilityResult(data = true))
+                }
+                else -> completion(CraftNativeCapabilityResult(code = "INVALID_ARGUMENT", message = "View.focus mode must be keyboard or accessibility"))
+            }
+            "measure" -> {
+                screen.view.requestLayout()
+                screen.view.measure(
+                    View.MeasureSpec.makeMeasureSpec(screen.view.width, View.MeasureSpec.EXACTLY),
+                    View.MeasureSpec.makeMeasureSpec(screen.view.height, View.MeasureSpec.EXACTLY),
+                )
+                val targetLocation = IntArray(2)
+                val viewportLocation = IntArray(2)
+                target.getLocationOnScreen(targetLocation)
+                screen.view.getLocationOnScreen(viewportLocation)
+                val density = resources.displayMetrics.density.coerceAtLeast(0.1f)
+                completion(CraftNativeCapabilityResult(data = JSONObject()
+                    .put("x", (targetLocation[0] - viewportLocation[0]) / density)
+                    .put("y", (targetLocation[1] - viewportLocation[1]) / density)
+                    .put("width", target.width / density)
+                    .put("height", target.height / density)
+                    .put("viewportWidth", screen.view.width / density)
+                    .put("viewportHeight", screen.view.height / density)
+                    .put("unit", "dp")
+                    .put("coordinateSpace", "screenViewport")))
+            }
+            "scrollTo" -> {
+                val scroll = target as? CraftNativeScrollView
+                if (scroll == null) {
+                    completion(CraftNativeCapabilityResult(code = "UNSUPPORTED_TARGET", message = "View.scrollTo is supported only for scroll views"))
+                    return
+                }
+                val rawX = options?.opt("x")
+                val rawY = options?.opt("y")
+                val x = (rawX as? Number)?.toDouble()?.takeIf { it.isFinite() }
+                val y = (rawY as? Number)?.toDouble()?.takeIf { it.isFinite() }
+                if ((options?.has("x") == true && x == null) || (options?.has("y") == true && y == null)) {
+                    completion(CraftNativeCapabilityResult(code = "INVALID_ARGUMENT", message = "View.scrollTo coordinates must be finite numbers"))
+                    return
+                }
+                val density = resources.displayMetrics.density.coerceAtLeast(0.1f)
+                val position = scroll.scrollTo(
+                    x?.times(density)?.roundToInt(),
+                    y?.times(density)?.roundToInt(),
+                    options?.optBoolean("animated", false) == true,
+                )
+                completion(CraftNativeCapabilityResult(data = JSONObject()
+                    .put("x", position.first / density)
+                    .put("y", position.second / density)
+                    .put("unit", "dp")))
+            }
+            else -> completion(CraftNativeCapabilityResult(code = "UNKNOWN_ACTION", message = "Unsupported View operation"))
+        }
+    }
+
     internal fun performImmediateCapability(module: String, method: String, args: JSONArray): CraftNativeCapabilityResult =
         when (module to method) {
             "Device" to "getInfo" -> CraftNativeCapabilityResult(data = JSONObject()
@@ -7172,7 +7442,7 @@ class MainActivity : AppCompatActivity() {
         preservingInputDrafts: Boolean,
     ) {
         val owner = screen.flatListOwnerByView.remove(list)
-        list.discardAll()
+        list.resetForTeardown()
         screen.flatListRows.remove(list)?.values?.forEach {
             releaseViewState(screen, it.values, preservingInputDrafts)
         }
@@ -7196,13 +7466,39 @@ class MainActivity : AppCompatActivity() {
             releaseFlatList(screen, it, preservingInputDrafts)
         }
         released.filterIsInstance<CraftNativeModalView>().forEach { it.resetForTeardown() }
+        released.filterIsInstance<CraftNativeDatePickerView>().forEach { it.resetForTeardown() }
+        released.filterIsInstance<CraftNativeRefreshableFlatList>().forEach { it.resetForTeardown() }
         released.filterIsInstance<CraftNativeVideoView>().forEach { it.stop() }
         released.filterIsInstance<CraftNativeMapView>().forEach { it.destroy() }
         released.filterIsInstance<CraftNativeFlexLayout>().forEach { it.onLayoutChanged = null }
         released.filterIsInstance<CraftNativeKeyboardAvoidingView>().forEach { it.content.onLayoutChanged = null }
-        released.filterIsInstance<CraftNativeScrollView>().forEach { it.setRefreshHandler(null, false) }
+        released.filterIsInstance<CraftNativeScrollView>().forEach {
+            it.setRefreshHandler(null, false)
+            it.clearScrollListeners()
+        }
         releaseImages(released)
+        // Clearing the handler maps is not enough: Android Views retain the
+        // listener objects themselves. Detach every interaction callback from
+        // released/recycled rows so a later identity cannot inherit a closure
+        // that still captures the previous row's screen state.
+        released.forEach {
+            // AdapterView (including Spinner, our native Picker) rejects
+            // setOnClickListener altogether. Its selection callback is
+            // detached below; ordinary Views still need their click target
+            // cleared here.
+            if (it !is android.widget.AdapterView<*>) it.setOnClickListener(null)
+            it.setOnTouchListener(null)
+            it.setOnLongClickListener(null)
+            it.setOnFocusChangeListener(null)
+            it.isClickable = false
+            it.isLongClickable = false
+        }
+        released.filterIsInstance<android.widget.CompoundButton>().forEach { it.setOnCheckedChangeListener(null) }
+        released.filterIsInstance<SeekBar>().forEach { it.setOnSeekBarChangeListener(null) }
+        released.filterIsInstance<Spinner>().forEach { it.onItemSelectedListener = null }
+        released.filterIsInstance<EditText>().forEach { it.setOnEditorActionListener(null) }
         released.filterIsInstance<EditText>().forEach {
+            screen.inputWatchers.remove(it)?.let(it::removeTextChangedListener)
             inputHintDefaults.remove(it)
             inputHighlightDefaults.remove(it)
             inputPaddingDefaults.remove(it)
@@ -7213,6 +7509,7 @@ class MainActivity : AppCompatActivity() {
         }
         released.forEach(defaultBackgrounds::remove)
         screen.linkTargets.keys.removeAll(released)
+        screen.protocolIds.keys.removeAll(released)
         screen.handlers.keys.removeAll(released)
         screen.pressInHandlers.keys.removeAll(released)
         screen.pressOutHandlers.keys.removeAll(released)
@@ -7270,9 +7567,12 @@ class MainActivity : AppCompatActivity() {
         screen.pendingCapabilities.forEach(capabilities::cancel)
         screen.pendingCapabilities.clear()
         releaseViewState(screen, retainedViews(screen).toList())
+        screen.inputWatchers.forEach { (input, watcher) -> input.removeTextChangedListener(watcher) }
+        screen.inputWatchers.clear()
         screen.controls.clear()
         screen.nodeViews.clear()
         screen.nodePaths.clear()
+        screen.protocolIds.clear()
         screen.handlers.clear()
         screen.pressInHandlers.clear()
         screen.pressOutHandlers.clear()
@@ -7316,7 +7616,7 @@ class MainActivity : AppCompatActivity() {
         val screen = screens.lastOrNull() ?: return back()
         val modal = screen.modalVisibility.entries.lastOrNull { (view, visible) -> visible && view.visibility == View.VISIBLE }
         if (modal != null) {
-            (modal.key as? CraftNativeModalView)?.requestClose()
+            (modal.key as? CraftNativeModalView)?.requestClose(reason = "back")
             return
         }
         back()