@craft-native/android 0.0.451 → 0.0.467

package/templates/MainActivityNative.kt.template

@@ -286,6 +286,26 @@ private data class CraftNativeLayoutStyle(
     }
 }
 
+/** Component scope nodes preserve identity but lay out through their single non-modal root. */
+internal fun craftNativeComponentLayoutStyle(node: JSONObject): JSONObject {
+    val own = node.optJSONObject("style") ?: JSONObject()
+    if (node.optJSONObject("props")?.has("data-stx-component-wrapper") != true) return own
+    val children = node.optJSONArray("children") ?: return own
+    if (children.length() != 1) return own
+    val root = children.optJSONObject(0) ?: return own
+    if (root.optString("type").equals("Modal", ignoreCase = true)) return own
+    if (root.optJSONObject("style")?.optString("display") == "none") return own
+    val inner = craftNativeComponentLayoutStyle(root)
+    val merged = JSONObject(own.toString())
+    for (key in listOf("width", "height", "minWidth", "minHeight", "maxWidth", "maxHeight", "aspectRatio",
+        "flex", "flexGrow", "flexShrink", "flexBasis", "alignSelf", "order", "position", "zIndex",
+        "left", "right", "top", "bottom", "margin", "marginTop", "marginRight", "marginBottom", "marginLeft",
+        "marginHorizontal", "marginVertical")) {
+        if (!merged.has(key) && inner.has(key)) merged.put(key, inner.opt(key))
+    }
+    return merged
+}
+
 private fun craftNativeGridColumnCount(value: Any?): Int {
     if (value is Number) return max(1, value.toInt())
     val text = value as? String ?: return 1
@@ -1196,6 +1216,13 @@ internal class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
     private var applyingPadding = false
     private var safeAreaEdges = setOf("top", "right", "bottom", "left")
     private var overflowTouchTarget: View? = null
+    var componentScope = false
+
+    private fun componentRoot(): View? {
+        if (!componentScope || childCount != 1) return null
+        return getChildAt(0).takeIf { it !is CraftNativeModalView && it.visibility != View.GONE }
+    }
+
 
     private fun childEvent(child: View, event: MotionEvent): MotionEvent = MotionEvent.obtain(event).also {
         it.offsetLocation((scrollX - child.left).toFloat(), (scrollY - child.top).toFloat())
@@ -1877,6 +1904,7 @@ internal class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
 
     /** Flatten a flex or equal-track grid subtree for the shared ABI. */
     private fun sharedTreeChildren(width: Int, height: Int): List<Entry>? {
+        if (componentRoot() != null) return null
         if (grid) {
             val layout = gridLayout(width, height)
             if (layout.absolute.isNotEmpty()) return null
@@ -2229,6 +2257,11 @@ internal class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
     }
 
     override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
+        componentRoot()?.let { root ->
+            root.measure(widthMeasureSpec, heightMeasureSpec)
+            setMeasuredDimension(root.measuredWidth, root.measuredHeight)
+            return
+        }
         pageViewport?.let { (pageWidth, pageHeight) ->
             val pages = (0 until childCount).map { getChildAt(it) }.filter { it.visibility != View.GONE }
             pages.forEach { it.measure(MeasureSpec.makeMeasureSpec(pageWidth, MeasureSpec.EXACTLY), MeasureSpec.makeMeasureSpec(pageHeight, MeasureSpec.EXACTLY)) }
@@ -2271,6 +2304,11 @@ internal class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
 
     override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
         celebration?.layout()
+        componentRoot()?.let { root ->
+            place(root, 0, 0, right - left, bottom - top)
+            onLayoutChanged?.invoke()
+            return
+        }
         pageViewport?.let { (pageWidth, pageHeight) ->
             val pages = (0 until childCount).map { getChildAt(it) }.filter { it.visibility != View.GONE }
             pages.forEachIndexed { index, child -> child.layout(index * pageWidth, 0, (index + 1) * pageWidth, pageHeight) }
@@ -3350,6 +3388,104 @@ private class CraftNativeTextField(context: Context) : EditText(context) {
     }
 }
 
+/** Hide only siblings behind the top blocking modal, restoring authored values on every update. */
+private fun craftNativeModalAccessibility(root: ViewGroup, saved: MutableMap<View, Int>, blocks: (View) -> Boolean) {
+    saved.forEach { (view, previous) ->
+        // Reconciliation may already have replaced the old value with a new role.
+        if (view.importantForAccessibility == View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS) {
+            view.importantForAccessibility = previous
+        }
+    }
+    saved.clear()
+    val top = (0 until root.childCount).lastOrNull { blocks(root.getChildAt(it)) } ?: return
+    for (index in 0 until top) {
+        val view = root.getChildAt(index)
+        saved[view] = view.importantForAccessibility
+        view.importantForAccessibility = View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS
+    }
+}
+
+private fun craftNativeAccessibilityLanguage(value: Any?): Locale? =
+    (value as? String)?.trim()?.takeIf { it.isNotEmpty() }?.let(Locale::forLanguageTag)?.takeIf { it.language.isNotEmpty() }
+
+private fun craftNativeSpokenText(text: CharSequence?, language: Locale?): CharSequence? {
+    if (text == null || language == null || text.isEmpty()) return text
+    return SpannableString(text).apply {
+        setSpan(android.text.style.LocaleSpan(language), 0, length, android.text.Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
+    }
+}
+
+internal data class CraftNativeMenuItem(val id: String, val title: String, val symbol: String = "", val destructive: Boolean = false, val disabled: Boolean = false)
+
+/** One anchored popup per retained view; a reconciled popup can never dispatch. */
+internal class CraftNativeContextMenu(private val anchor: View) {
+    private var popup: android.widget.PopupMenu? = null
+    private var revision = 0
+    private var items: List<CraftNativeMenuItem> = emptyList()
+    private var dispatch: ((String) -> Unit)? = null
+    private var handlerIdentity: String? = null
+
+    fun update(next: List<CraftNativeMenuItem>, identity: String? = null, callback: (String) -> Unit) {
+        val valid = next.filter { it.id.isNotBlank() && it.title.isNotBlank() }.distinctBy { it.id }
+        if (identity != null && identity == handlerIdentity && valid == items) {
+            dispatch = callback
+            return
+        }
+        clear()
+        handlerIdentity = identity
+        items = valid
+        dispatch = callback
+    }
+
+    fun clear() {
+        revision++
+        popup?.dismiss()
+        popup = null
+        items = emptyList()
+        dispatch = null
+    }
+
+    fun show(decorate: (android.view.MenuItem, CraftNativeMenuItem) -> Unit): Boolean {
+        if (items.isEmpty() || dispatch == null || !anchor.isEnabled) return false
+        popup?.dismiss()
+        val expected = revision
+        val shown = android.widget.PopupMenu(anchor.context, anchor)
+        popup = shown
+        if (Build.VERSION.SDK_INT >= 29) shown.setForceShowIcon(true)
+        items.forEachIndexed { index, item ->
+            shown.menu.add(0, index, index, item.title).also {
+                it.isEnabled = !item.disabled
+                decorate(it, item)
+            }
+        }
+        shown.setOnMenuItemClickListener { choice ->
+            val item = items.getOrNull(choice.itemId)
+            if (revision != expected || item == null || item.disabled || !anchor.isEnabled) false
+            else { dispatch?.invoke(item.id); true }
+        }
+        shown.setOnDismissListener { if (popup === shown) popup = null }
+        shown.show()
+        return true
+    }
+}
+
+private fun craftNativeAnnounce(args: JSONArray, announce: (String) -> Unit): CraftNativeCapabilityResult {
+    val text = args.opt(0) as? String
+    if (text.isNullOrBlank()) return CraftNativeCapabilityResult(code = "INVALID_ARGUMENT", message = "Accessibility.announce needs nonempty text")
+    val options = args.opt(1)
+    if (options != null && options != JSONObject.NULL && options !is JSONObject) {
+        return CraftNativeCapabilityResult(code = "INVALID_ARGUMENT", message = "Accessibility.announce options must be an object")
+    }
+    val polite = (options as? JSONObject)?.opt("polite")
+    if (polite != null && polite !is Boolean) {
+        return CraftNativeCapabilityResult(code = "INVALID_ARGUMENT", message = "Accessibility.announce polite must be a Boolean")
+    }
+    // Android's announcement event has no queue-priority field. The service
+    // owns speech scheduling; never move focus to force it to speak.
+    announce(text)
+    return CraftNativeCapabilityResult(data = true)
+}
+
 private class CraftNativeModalView(context: Context) : FrameLayout(context) {
     override fun dispatchTouchEvent(event: MotionEvent): Boolean =
         CraftNativePointers.dispatch(this, event) { super.dispatchTouchEvent(it) }
@@ -4563,7 +4699,9 @@ class MainActivity : AppCompatActivity() {
         val pressUnderlayShowHandlers = mutableMapOf<View, String>()
         val pressUnderlayHideHandlers = mutableMapOf<View, String>()
         val longPressHandlers = mutableMapOf<View, String>()
+        val contextMenus = mutableMapOf<View, CraftNativeContextMenu>()
         val accessibilityActionHandlers = mutableMapOf<View, String>()
+        val accessibilityActionRevisions = mutableMapOf<View, Any>()
         // TalkBack actions are added by id, so removing them on a reconcile
         // needs the ids back; without this a renamed action stacks up beside
         // the old one every render.
@@ -4588,6 +4726,7 @@ class MainActivity : AppCompatActivity() {
         val pressUnderlayColors = mutableMapOf<View, Int>()
         val pressBaseBackgrounds = mutableMapOf<View, Drawable?>()
         val modalVisibility = mutableMapOf<View, Boolean>()
+        val modalAccessibility = mutableMapOf<View, Int>()
         val modalCloseHandlers = mutableMapOf<View, String>()
         val layoutHandlers = mutableMapOf<View, String>()
         val layoutListeners = mutableMapOf<View, View.OnLayoutChangeListener>()
@@ -4749,7 +4888,9 @@ class MainActivity : AppCompatActivity() {
         initialDeepLink = savedInstanceState?.getString("craft.initialDeepLink")?.let(Uri::parse) ?: intent?.data
         initialDeepLinkClaimed = savedInstanceState?.getBoolean("craft.initialDeepLinkClaimed", false) ?: false
         deliveredInitialDeepLink = savedInstanceState?.getBoolean("craft.deliveredInitialDeepLink", false) ?: false
-        if (savedInstanceState == null) pendingNotificationTap = notificationTap(intent)
+        if (savedInstanceState == null && !CraftNativeNotifications.receiveAction(this, intent)) {
+            pendingNotificationTap = notificationTap(intent)
+        }
         setContentView(R.layout.activity_main)
         root = findViewById(R.id.native_root)
         root.foreground = navigationBarProtection
@@ -5428,12 +5569,12 @@ class MainActivity : AppCompatActivity() {
                             "if (typeof globalThis.__craftInstallNativeDialog === 'function') globalThis.__craftInstallNativeDialog();"
                         ).get()
                         if (activeScreen.headless) {
-                            CraftNativeBackground.foreground = { event, id, done ->
+                            CraftNativeBackground.foreground = { event, id, detail, done ->
                                 val app = appScreen
                                 if (app == null || !app.active) false
                                 else {
                                     backgroundWaiters[id] = done
-                                    send(app, "CRAFT_EVENT", JSONObject().put("event", event).put("detail", JSONObject().put("id", id)))
+                                    send(app, "CRAFT_EVENT", JSONObject().put("event", event).put("detail", JSONObject(detail.toString()).put("id", id)))
                                     true
                                 }
                             }
@@ -5589,6 +5730,7 @@ class MainActivity : AppCompatActivity() {
         put("viewNonModalPresentation")
         put("nativePlatformControls")
         put("nativePager")
+        put("accessibility")
     }
 
     private fun appVersion(): Pair<String, String> = runCatching {
@@ -5897,7 +6039,7 @@ class MainActivity : AppCompatActivity() {
             makeView(screen, document, path, screen.controls, inheritedFontFamily = screen.inheritedFontFamilies[target])
             val updated = screen.nodeViews[target] ?: return false
             screen.lastLayoutBounds.remove(updated)
-            if (!updateParentLayoutStyle(updated, document.optJSONObject("style") ?: JSONObject())) return false
+            if (!updateParentLayoutStyle(updated, craftNativeComponentLayoutStyle(document))) return false
         }
         if (applied.isNotEmpty()) {
             // Updating a modal's content may reattach its nested popups to
@@ -5913,7 +6055,20 @@ class MainActivity : AppCompatActivity() {
         var current: String? = id
         while (current != null) {
             val target = screen.flatListOwners[current] ?: current
-            if (screen.nodeViews[target] != null) return target
+            if (screen.nodeViews[target] != null) {
+                // A root style mutation also changes its scope's layout in the
+                // outer parent. Reconcile that owner, including nested scopes.
+                var owner = target
+                while (true) {
+                    val parentId = screen.mutations.parentId(owner) ?: break
+                    val parentNode = screen.mutations.node(parentId) ?: break
+                    if (parentNode.optJSONObject("props")?.has("data-stx-component-wrapper") != true) break
+                    val children = parentNode.optJSONArray("children") ?: break
+                    if (children.length() != 1 || parentNode.optJSONArray("children")?.optJSONObject(0)?.optString("type")?.equals("Modal", ignoreCase = true) == true) break
+                    owner = parentId
+                }
+                return owner
+            }
             current = screen.mutations.parentId(current)
         }
         return null
@@ -5993,7 +6148,7 @@ class MainActivity : AppCompatActivity() {
         screen.controls.putAll(next)
         screen.handlers.keys.retainAll(retainedViews(screen))
         screen.view.setViewportChild(tree)
-        screen.view.setChildStyle(tree, document.optJSONObject("style") ?: JSONObject(), resources.displayMetrics.density)
+        screen.view.setChildStyle(tree, craftNativeComponentLayoutStyle(document), resources.displayMetrics.density)
         promoteModalOverlays(screen)
         updateSafeAreaViews()
         // A full render can change a view's custom layout style without
@@ -6005,7 +6160,10 @@ class MainActivity : AppCompatActivity() {
 
     /** Keep Modal nodes in the screen viewport even when declared in a clipped subtree. */
     private fun promoteModalOverlays(screen: Screen) {
-        if (screen.modalVisibility.isEmpty()) return
+        if (screen.modalVisibility.isEmpty()) {
+            craftNativeModalAccessibility(screen.view, screen.modalAccessibility) { false }
+            return
+        }
         // Snapshot parent-before-child order before moving anything. The
         // controls map registers descendants first, which would place a
         // parent modal above its own popup when brought forward in that order.
@@ -6040,6 +6198,9 @@ class MainActivity : AppCompatActivity() {
             }
             modal.bringToFront()
         }
+        craftNativeModalAccessibility(screen.view, screen.modalAccessibility) {
+            it is CraftNativeModalView && it.blocksBackground && screen.modalVisibility[it] == true
+        }
     }
 
     private fun updateStatusBarProps(screen: Screen, props: JSONObject) {
@@ -6066,6 +6227,7 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun clearRenderedTree(screen: Screen) {
+        craftNativeModalAccessibility(screen.view, screen.modalAccessibility) { false }
         releaseViewState(screen, retainedViews(screen).toList())
         screen.view.removeAllViews()
         screen.controls.clear()
@@ -6095,7 +6257,7 @@ class MainActivity : AppCompatActivity() {
     ): View {
         val type = canonicalType(node.optString("type", "View"))
         val props = node.optJSONObject("props") ?: JSONObject()
-        val style = craftNativeInheritFontFamily(node.optJSONObject("style") ?: JSONObject(), inheritedFontFamily)
+        val style = craftNativeInheritFontFamily(craftNativeComponentLayoutStyle(node), inheritedFontFamily)
         val events = node.optJSONObject("events") ?: JSONObject()
         val children = node.optJSONArray("children") ?: JSONArray()
         val protocolId = node.optString("id").takeIf { it.isNotBlank() }
@@ -6885,6 +7047,7 @@ class MainActivity : AppCompatActivity() {
                 reconcileFlatList(screen, nativeList, children, identity, protocolId ?: identity, props, events, craftNativeInheritableFontFamily(style))
             }
             "View", "SafeAreaView" -> (previous as? CraftNativeFlexLayout ?: CraftNativeFlexLayout(this)).apply {
+                componentScope = props.has("data-stx-component-wrapper")
                 configureContainer(this, style)
                 if (type == "SafeAreaView") setSafeAreaEdges(props.optJSONArray("edges"))
                 else setWindowSafeInsets(0, 0, 0, 0)
@@ -6997,6 +7160,33 @@ class MainActivity : AppCompatActivity() {
             control.setOnLongClickListener(null)
             control.isLongClickable = false
         }
+        // STX emits @contextmenu as onLongPress and lowercases unknown bound props.
+        val menuHandler = craftNativeEventName(events, "onContextMenuAction").ifBlank { longPressHandler }.takeUnless { longPressDisabled }.orEmpty()
+        val authoredMenu = props.optJSONArray("contextMenu") ?: props.optJSONArray("contextmenu")
+        val menuItems = (0 until (authoredMenu?.length() ?: 0)).mapNotNull { index ->
+            val item = authoredMenu?.optJSONObject(index) ?: return@mapNotNull null
+            val id = craftNativeOptionalString(item.opt("id"))?.takeIf { it.isNotBlank() } ?: return@mapNotNull null
+            val title = craftNativeOptionalString(item.opt("title"))?.takeIf { it.isNotBlank() } ?: return@mapNotNull null
+            CraftNativeMenuItem(id, title, craftNativeOptionalString(item.opt("symbol")).orEmpty(),
+                craftNativeBoolean(item.opt("destructive")), craftNativeBoolean(item.opt("disabled")))
+        }
+        if (menuHandler.isNotBlank() && menuItems.isNotEmpty()) {
+            val menu = screen.contextMenus.getOrPut(control) { CraftNativeContextMenu(control) }
+            menu.update(menuItems, menuHandler) { id ->
+                send(screen, "EVENT", JSONObject().put("handlerName", menuHandler).put("nativeEvent", JSONObject().put("id", id)))
+            }
+            // A configured menu owns the hold, rather than firing onLongPress too.
+            control.setOnLongClickListener {
+                menu.show { nativeItem, item ->
+                    nativeItem.icon = CraftNativeIcons.drawable(this, "", item.symbol, defaultTextColor)
+                    if (item.destructive) nativeItem.title = SpannableString(item.title).apply {
+                        setSpan(android.text.style.ForegroundColorSpan(Color.RED), 0, length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+                    }
+                }
+            }
+        } else {
+            screen.contextMenus.remove(control)?.clear()
+        }
         CraftNativePointers.configure(control, props, style, control is CraftNativeFlexLayout || control is CraftNativeImageBackgroundView ||
             control is CraftNativeKeyboardAvoidingView || control is CraftNativeScrollView || control is CraftNativeRefreshableFlatList || control is CraftNativeModalView)
         applyAccessibility(control, props, type, explicitKey ?: protocolId ?: path)
@@ -7164,7 +7354,7 @@ class MainActivity : AppCompatActivity() {
             }
             if (childView != null) desired.add(childView)
             if (childView != null && child is JSONObject) {
-                val childStyle = child.optJSONObject("style") ?: JSONObject()
+                val childStyle = craftNativeComponentLayoutStyle(child)
                 layout.setChildStyle(childView, childStyle, resources.displayMetrics.density)
                 desiredOrder[childView] = craftNativeFiniteNumber(childStyle, "order", 0.0).toInt()
             }
@@ -7916,6 +8106,12 @@ class MainActivity : AppCompatActivity() {
      * Runs after applyAccessibility, which installs its own delegate and
      * would drop actions added before it.
      */
+    private fun clearAccessibilityActions(screen: Screen, control: View) {
+        screen.accessibilityActionIds.remove(control)?.forEach { ViewCompat.removeAccessibilityAction(control, it) }
+        screen.accessibilityActionHandlers.remove(control)
+        screen.accessibilityActionRevisions.remove(control)
+    }
+
     private fun applyAccessibilityActions(
         screen: Screen,
         control: View,
@@ -7923,7 +8119,7 @@ class MainActivity : AppCompatActivity() {
         events: JSONObject,
         disabled: Boolean,
     ) {
-        screen.accessibilityActionIds.remove(control)?.forEach { ViewCompat.removeAccessibilityAction(control, it) }
+        clearAccessibilityActions(screen, control)
         val handler = craftNativeEventName(events, "onAccessibilityAction").takeUnless { disabled } ?: ""
         val authored = props.optJSONArray("accessibilityActions")
         if (handler.isBlank() || authored == null || authored.length() == 0) {
@@ -7931,6 +8127,8 @@ class MainActivity : AppCompatActivity() {
             return
         }
         screen.accessibilityActionHandlers[control] = handler
+        val revision = Any()
+        screen.accessibilityActionRevisions[control] = revision
         val ids = mutableListOf<Int>()
         for (index in 0 until authored.length()) {
             val entry = authored.optJSONObject(index) ?: continue
@@ -7940,7 +8138,7 @@ class MainActivity : AppCompatActivity() {
                 // Read the handler at firing time: a reconcile can rename it
                 // while the action sits in TalkBack's menu.
                 val current = screen.accessibilityActionHandlers[control]
-                if (current.isNullOrBlank()) {
+                if (current.isNullOrBlank() || screen.accessibilityActionRevisions[control] !== revision) {
                     false
                 } else {
                     send(screen, "EVENT", JSONObject().put("handlerName", current).put("nativeEvent", JSONObject().put("actionName", name)))
@@ -7952,6 +8150,10 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun applyAccessibility(view: View, props: JSONObject, type: String, fallbackLabel: String) {
+        val language = craftNativeAccessibilityLanguage(props.opt("accessibilityLanguage"))
+        if (view is TextView) {
+            view.textLocales = if (language == null) view.context.resources.configuration.locales else android.os.LocaleList(language)
+        }
         val testId = craftNativeOptionalString(props.opt("testID"))
         view.tag = testId?.takeIf { it.isNotBlank() } ?: fallbackLabel
         val label = craftNativeOptionalString(props.opt("accessibilityLabel"))
@@ -8020,6 +8222,9 @@ class MainActivity : AppCompatActivity() {
                 if (state?.has("checked") == true) {
                     info.isChecked = craftNativeBoolean(state.opt("checked"))
                 }
+                info.text = craftNativeSpokenText(info.text, language)
+                info.contentDescription = craftNativeSpokenText(info.contentDescription, language)
+                info.hintText = craftNativeSpokenText(info.hintText, language)
             }
         })
         ViewCompat.setImportantForAccessibility(
@@ -8316,6 +8521,10 @@ class MainActivity : AppCompatActivity() {
 
     internal fun performImmediateCapability(module: String, method: String, args: JSONArray): CraftNativeCapabilityResult =
         when (module to method) {
+            "Accessibility" to "announce" -> craftNativeAnnounce(args) { text ->
+                @Suppress("DEPRECATION")
+                window.decorView.announceForAccessibility(text)
+            }
             "Device" to "getInfo" -> CraftNativeCapabilityResult(data = JSONObject()
                 .put("platform", "android")
                 .put("osVersion", Build.VERSION.RELEASE)
@@ -8445,7 +8654,8 @@ class MainActivity : AppCompatActivity() {
     override fun onNewIntent(intent: Intent) {
         super.onNewIntent(intent)
         setIntent(intent)
-        notificationTap(intent)?.let { tap ->
+        val notificationAction = CraftNativeNotifications.receiveAction(this, intent)
+        (if (notificationAction) null else notificationTap(intent))?.let { tap ->
             val app = appScreen
             if (app != null && app.active) send(app, "CRAFT_EVENT", JSONObject().put("event", "craftNotificationResponse").put("detail", tap))
             else pendingNotificationTap = tap
@@ -8469,6 +8679,9 @@ class MainActivity : AppCompatActivity() {
     private fun notificationTap(intent: Intent?): JSONObject? {
         val extras = intent?.extras ?: return null
         if (!extras.containsKey("google.message_id") && !extras.containsKey("craft.notification")) return null
+        extras.getString("craft.notification.data")?.let { raw ->
+            return runCatching { JSONObject(raw) }.getOrNull()
+        }
         val detail = JSONObject()
         extras.keySet().forEach { key ->
             if (key.startsWith("google.") || key.startsWith("gcm.") || key == "from" || key == "collapse_key" || key == "craft.notification") return@forEach
@@ -8809,6 +9022,7 @@ class MainActivity : AppCompatActivity() {
         // released/recycled rows so a later identity cannot inherit a closure
         // that still captures the previous row's screen state.
         released.forEach {
+            clearAccessibilityActions(screen, it)
             // Modals are promoted out of their logical layout into the
             // screen overlay. Removing the logical node therefore does not
             // remove the native view through ordinary child reconciliation;
@@ -8850,6 +9064,7 @@ class MainActivity : AppCompatActivity() {
         screen.pressUnderlayHideHandlers.keys.removeAll(released)
         screen.pressUnderlayColors.keys.removeAll(released)
         screen.pressBaseBackgrounds.keys.removeAll(released)
+        released.forEach { screen.contextMenus.remove(it)?.clear() }
         screen.longPressHandlers.keys.removeAll(released)
         screen.layoutHandlers.keys.removeAll(released)
         screen.layoutListeners.forEach { (view, listener) ->

package/dist/testing.d.ts

@@ -1,2 +0,0 @@
-/** Uses the Android builder's Kotlin version, including its transitive compiler dependencies. */
-export declare function runKotlinFixture(source: string): Promise<void>;