craft-native 0.0.251 → 0.0.262

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

@@ -226,6 +226,8 @@ private data class CraftNativeLayoutStyle(
     val bottom: Int? = null,
     val left: Int? = null,
     val alignSelf: String? = null,
+    /** CSS/Yoga order; Kotlin's stable sort preserves source order for ties. */
+    val order: Int = 0,
     val flexGrow: Double = 0.0,
     val flexShrink: Double? = null,
     val flexBasis: CraftNativeLength? = null,
@@ -252,6 +254,7 @@ private data class CraftNativeLayoutStyle(
                 position = craftNativeOptionalString(raw.opt("position")) ?: "relative",
                 top = number("top"), right = number("right"), bottom = number("bottom"), left = number("left"),
                 alignSelf = craftNativeOptionalString(raw.opt("alignSelf"))?.takeUnless { it == "auto" },
+                order = decimal("order")?.toInt() ?: 0,
                 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")
@@ -759,6 +762,42 @@ internal class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
     private var safeAreaPadding = intArrayOf(0, 0, 0, 0)
     private var applyingPadding = false
     private var safeAreaEdges = setOf("top", "right", "bottom", "left")
+    private var shieldedModalTouch = false
+    private var dismissibleModalTouch: CraftNativeModalView? = null
+
+    override fun dispatchTouchEvent(event: MotionEvent): Boolean {
+        if (event.actionMasked == MotionEvent.ACTION_DOWN) {
+            val x = event.x.roundToInt()
+            val y = event.y.roundToInt()
+            dismissibleModalTouch = (childCount - 1 downTo 0).asSequence()
+                .map { getChildAt(it) }
+                .filterIsInstance<CraftNativeModalView>()
+                .firstOrNull { child ->
+                    child.dismissOnOutsideTap && child.visibility == View.VISIBLE && child.alpha > 0.01f
+                        && (x < child.left || x >= child.right || y < child.top || y >= child.bottom)
+                }
+            shieldedModalTouch = (childCount - 1 downTo 0).any { index ->
+                val child = getChildAt(index)
+                child is CraftNativeModalView && !child.blocksBackground && child.visibility == View.VISIBLE
+                    && (x < child.left || x >= child.right || y < child.top || y >= child.bottom)
+                    && child.hasBlockingModalBelow()
+            }
+        }
+        dismissibleModalTouch?.let { modal ->
+            if (event.actionMasked == MotionEvent.ACTION_UP) {
+                modal.requestClose(reason = "backdrop")
+                dismissibleModalTouch = null
+            } else if (event.actionMasked == MotionEvent.ACTION_CANCEL) {
+                dismissibleModalTouch = null
+            }
+            return true
+        }
+        if (shieldedModalTouch) {
+            if (event.actionMasked == MotionEvent.ACTION_UP || event.actionMasked == MotionEvent.ACTION_CANCEL) shieldedModalTouch = false
+            return true
+        }
+        return super.dispatchTouchEvent(event)
+    }
 
     override fun setPadding(left: Int, top: Int, right: Int, bottom: Int) {
         if (!applyingPadding) authoredPadding = intArrayOf(left, top, right, bottom)
@@ -991,6 +1030,11 @@ internal class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
         invalidateMeasurementAncestors(parent)
     }
 
+    /** Flex/grid order with Kotlin's stable sort retaining source order for ties. */
+    private fun orderedChildIndices(): List<Int> = (0 until childCount).sortedWith(
+        compareBy<Int> { styles[getChildAt(it)]?.order ?: 0 }.thenBy { it },
+    )
+
     private data class Entry(val view: View, val style: CraftNativeLayoutStyle, val width: Int, val height: Int)
     private data class Line(val entries: MutableList<Entry> = mutableListOf(), var main: Float = 0f, var cross: Float = 0f)
     private data class GridLayout(val rows: List<List<Entry>>, val absolute: List<Entry>, val cellWidth: Float, val rowHeights: List<Float>)
@@ -1002,7 +1046,7 @@ internal class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
         val lines = mutableListOf<Line>()
         val absolute = mutableListOf<Entry>()
         val pending = mutableListOf<Entry>()
-        for (index in 0 until childCount) {
+        for (index in orderedChildIndices()) {
             val child = getChildAt(index)
             if (child.visibility == GONE) continue
             val style = styles[child] ?: CraftNativeLayoutStyle()
@@ -1010,13 +1054,25 @@ internal class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
             val horizontalMargins = (lp?.leftMargin ?: 0) + (lp?.rightMargin ?: 0)
             val verticalMargins = (lp?.topMargin ?: 0) + (lp?.bottomMargin ?: 0)
             if (child is CraftNativeModalView) {
-                val modalWidth = max(0, width - paddingLeft - paddingRight)
-                val modalHeight = max(0, height - paddingTop - paddingBottom)
-                child.measure(
-                    View.MeasureSpec.makeMeasureSpec(modalWidth, View.MeasureSpec.EXACTLY),
-                    View.MeasureSpec.makeMeasureSpec(modalHeight, View.MeasureSpec.EXACTLY),
-                )
-                absolute += Entry(child, style, modalWidth, modalHeight)
+                if (child.blocksBackground) {
+                    val modalWidth = max(0, width - paddingLeft - paddingRight)
+                    val modalHeight = max(0, height - paddingTop - paddingBottom)
+                    child.measure(
+                        View.MeasureSpec.makeMeasureSpec(modalWidth, View.MeasureSpec.EXACTLY),
+                        View.MeasureSpec.makeMeasureSpec(modalHeight, View.MeasureSpec.EXACTLY),
+                    )
+                    absolute += Entry(child, style, modalWidth, modalHeight)
+                } else {
+                    // A non-modal popup is still promoted to the screen root,
+                    // but its authored absolute style controls its viewport
+                    // frame instead of turning it into a full-screen child.
+                    // The root content box is the same screenViewport origin
+                    // returned by View.measure; safe-area padding is not
+                    // injected a second time here.
+                    val childWidth = measureChildWidth(child, style, width - paddingLeft - paddingRight, horizontalMargins)
+                    val childHeight = measureChildHeight(child, style, height - paddingTop - paddingBottom, verticalMargins)
+                    absolute += Entry(child, style, childWidth, childHeight)
+                }
                 continue
             }
             val childWidth = measureChildWidth(child, style, width - paddingLeft - paddingRight, horizontalMargins)
@@ -1101,7 +1157,7 @@ internal class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
         val cellWidth = max(0f, (availableWidth.toFloat() - max(0, gridColumns - 1) * gap) / max(1, gridColumns).toFloat())
         val rows = mutableListOf<MutableList<Entry>>()
         val absolute = mutableListOf<Entry>()
-        for (index in 0 until childCount) {
+        for (index in orderedChildIndices()) {
             val child = getChildAt(index)
             if (child.visibility == GONE) continue
             val style = styles[child] ?: CraftNativeLayoutStyle()
@@ -1109,13 +1165,19 @@ internal class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
             val horizontalMargins = (lp?.leftMargin ?: 0) + (lp?.rightMargin ?: 0)
             val verticalMargins = (lp?.topMargin ?: 0) + (lp?.bottomMargin ?: 0)
             if (child is CraftNativeModalView) {
-                val modalWidth = max(0, width - paddingLeft - paddingRight)
-                val modalHeight = max(0, height - paddingTop - paddingBottom)
-                child.measure(
-                    View.MeasureSpec.makeMeasureSpec(modalWidth, View.MeasureSpec.EXACTLY),
-                    View.MeasureSpec.makeMeasureSpec(modalHeight, View.MeasureSpec.EXACTLY),
-                )
-                absolute += Entry(child, style, modalWidth, modalHeight)
+                if (child.blocksBackground) {
+                    val modalWidth = max(0, width - paddingLeft - paddingRight)
+                    val modalHeight = max(0, height - paddingTop - paddingBottom)
+                    child.measure(
+                        View.MeasureSpec.makeMeasureSpec(modalWidth, View.MeasureSpec.EXACTLY),
+                        View.MeasureSpec.makeMeasureSpec(modalHeight, View.MeasureSpec.EXACTLY),
+                    )
+                    absolute += Entry(child, style, modalWidth, modalHeight)
+                } else {
+                    val childWidth = measureChildWidth(child, style, width - paddingLeft - paddingRight, horizontalMargins)
+                    val childHeight = measureChildHeight(child, style, height - paddingTop - paddingBottom, verticalMargins)
+                    absolute += Entry(child, style, childWidth, childHeight)
+                }
                 continue
             }
             val childWidth = measureChildWidth(child, style, cellWidth.roundToInt(), horizontalMargins)
@@ -1136,9 +1198,9 @@ internal class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
         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 available = max(0f, (height - paddingTop - paddingBottom).toFloat() - max(0, count - 1) * rowGap)
             val equal = available / max(1, count).toFloat()
-            (naturalRowHeights + List(count - naturalRowHeights.size) { equal })
+            (naturalRowHeights + List(count - naturalRowHeights.size) { 0f })
                 .map { max(it, equal) }
         } else naturalRowHeights
         return GridLayout(rows, absolute, cellWidth, rowHeights)
@@ -1149,7 +1211,7 @@ internal class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
         val columnWidths = IntArray(columns)
         val rowHeights = mutableListOf<Int>()
         var flowIndex = 0
-        for (index in 0 until childCount) {
+        for (index in orderedChildIndices()) {
             val child = getChildAt(index)
             if (child.visibility == GONE) continue
             val style = styles[child] ?: CraftNativeLayoutStyle()
@@ -1438,12 +1500,12 @@ internal class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
             put(base, 26, node.padding[3].toFloat())
             put(base, 27, node.padding[0].toFloat())
             putEnum(base, 28, if (node.grid) 1 else 0)
-            put(base, 29, node.gridColumns.toFloat())
+            putEnum(base, 29, node.gridColumns)
             put(base, 30, node.rowGap)
             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())
+            if (explicitRowsAware) putEnum(base, 34, node.gridRows ?: 0)
             val firstChild = cursor
             node.children.forEach { child -> write(child, contentWidth, contentHeight, false, node.direction) }
             treeMeta[index * 2] = firstChild.toFloat()
@@ -1527,7 +1589,7 @@ internal class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
             put(base, 26, padding[3].toFloat())
             put(base, 27, padding[0].toFloat())
             putEnum(base, 28, 0)
-            put(base, 29, 1f)
+            putEnum(base, 29, 1)
             put(base, 30, if (root) rowGapValue else 0f)
             put(base, 31, if (root) columnGapValue else 0f)
         }
@@ -1796,7 +1858,7 @@ internal class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
         if (absolute.isEmpty() && lines.isNotEmpty() && (lines.size == 1 || wrap)) {
             val sharedEntries = if (wrap) lines.flatMap { it.entries } else lines[0].entries
             val sharedTree = sharedTreeFrames(sharedEntries, width, height)
-            if (sharedTree != null && (sharedTree.nodes.size > sharedEntries.size + 1 || grid)) {
+            if (sharedTree != null && (sharedTree.nodes.size > sharedEntries.size + 1 || grid || reverse || wrapReverse || gridAutoRows != null || gridRows != null)) {
                 for (index in 1 until sharedTree.nodes.size) {
                     val view = sharedTree.nodes[index].view ?: continue
                     val offset = index * 4
@@ -2560,6 +2622,8 @@ private class CraftNativeModalView(context: Context) : FrameLayout(context) {
     private var animationGeneration = 0
     var focusToRestore: View? = null
     var onRequestClose: ((String) -> Unit)? = null
+    var viewportStyle = JSONObject()
+    var declarationPath = ""
 
     var transparent: Boolean = false
         set(value) {
@@ -2567,6 +2631,18 @@ private class CraftNativeModalView(context: Context) : FrameLayout(context) {
             blocker.setBackgroundColor(if (value) Color.TRANSPARENT else Color.argb(82, 0, 0, 0))
         }
 
+    /** Existing Modal nodes block by default; non-modal popups let outside taps through. */
+    var blocksBackground: Boolean = true
+        set(value) {
+            field = value
+            isClickable = value
+            blocker.isClickable = value
+            blocker.isEnabled = value
+        }
+
+    /** A non-modal popup may opt into consuming an outside tap for dismissal. */
+    var dismissOnOutsideTap: Boolean = false
+
     init {
         isClickable = true
         blocker.isClickable = true
@@ -2580,6 +2656,7 @@ private class CraftNativeModalView(context: Context) : FrameLayout(context) {
     }
 
     fun requestClose(reason: String = "backdrop") {
+        if (!blocksBackground && !dismissOnOutsideTap) return
         val handler = onRequestClose ?: return
         isClickable = false
         blocker.isEnabled = false
@@ -2588,8 +2665,8 @@ private class CraftNativeModalView(context: Context) : FrameLayout(context) {
 
     fun setVisible(visible: Boolean, opacity: Float, animationType: String?) {
         if (visible) {
-            isClickable = true
-            blocker.isEnabled = true
+            isClickable = blocksBackground
+            blocker.isEnabled = blocksBackground
         }
         if (renderedVisible == visible && visibility == if (visible) View.VISIBLE else View.GONE) {
             if (visible && alpha != opacity) alpha = opacity
@@ -2643,9 +2720,33 @@ private class CraftNativeModalView(context: Context) : FrameLayout(context) {
         translationY = 0f
         alpha = 0f
         isClickable = true
+        blocksBackground = true
+        dismissOnOutsideTap = false
         blocker.isEnabled = true
         onRequestClose = null
     }
+
+    override fun onTouchEvent(event: MotionEvent): Boolean {
+        if (!blocksBackground) {
+            if (dismissOnOutsideTap && event.action == MotionEvent.ACTION_UP) {
+                requestClose(reason = "backdrop")
+                return true
+            }
+            // Do not let an outside popup tap fall through to a blocking modal
+            // below it; a normal non-modal popup remains pass-through.
+            return hasBlockingModalBelow()
+        }
+        return super.onTouchEvent(event)
+    }
+
+    fun hasBlockingModalBelow(): Boolean {
+        val group = parent as? ViewGroup ?: return false
+        val index = group.indexOfChild(this)
+        return index > 0 && (0 until index).any { siblingIndex ->
+            val sibling = group.getChildAt(siblingIndex)
+            sibling is CraftNativeModalView && sibling.blocksBackground && sibling.visibility == View.VISIBLE && sibling.alpha > 0.01f
+        }
+    }
 }
 
 private data class LayoutBounds(
@@ -2902,7 +3003,8 @@ internal class CraftNativeInputEcho {
  * A native screen's `<Video>`: the platform's VideoView.
  *
  * It plays without taking audio focus, so the person's music carries on
- * under it, as on iOS. `onLoad`, `onPlay`, `onPause`, `onEnd` and `onError`
+ * under it, as on iOS. `onLoadStart`, `onLoad`, `onLoadEnd`, `onPlay`,
+ * `onPause`, `onEnd` and `onError`
  * reach the screen in the web's names, from the controls as well as from
  * props. With `pictureInPicture` the activity takes it into a floating
  * window when the person leaves the app while it plays (MainActivity
@@ -2918,6 +3020,8 @@ private class CraftNativeVideoView(context: Context) : VideoView(context) {
     private var ended = false
     private var muted = false
     private var resizeMode = "contain"
+    private var requestedTimeSeconds: Double? = null
+    private var pendingSeekSeconds: Double? = null
     private var preparedPlayer: MediaPlayer? = null
     /** The screen's handlers by event name, and how an event reaches them. */
     var handlers: JSONObject = JSONObject()
@@ -2946,12 +3050,25 @@ private class CraftNativeVideoView(context: Context) : VideoView(context) {
         setAudioFocusRequest(AudioManager.AUDIOFOCUS_NONE)
     }
 
-    fun configure(source: Any?, autoplay: Boolean, paused: Boolean, loop: Boolean, muted: Boolean, controls: Boolean, resizeMode: String?, pictureInPicture: Boolean = false) {
+    private fun applyPendingSeek() {
+        val target = pendingSeekSeconds ?: return
+        if (preparedPlayer == null) return
+        val current = currentPosition.coerceAtLeast(0) / 1000.0
+        pendingSeekSeconds = null
+        if (kotlin.math.abs(current - target) > 0.25) seekTo((target * 1000.0).roundToInt().coerceAtLeast(0))
+    }
+
+    fun configure(source: Any?, autoplay: Boolean, paused: Boolean, loop: Boolean, muted: Boolean, currentTime: Any?, controls: Boolean, resizeMode: String?, pictureInPicture: Boolean = false) {
         val uri = when (source) {
             is String -> source
             is JSONObject -> craftNativeOptionalString(source.opt("uri")).orEmpty()
             else -> ""
         }
+        val nextTime = craftNativeNumber(currentTime)?.takeIf { it.isFinite() && it >= 0.0 }
+        if (nextTime != requestedTimeSeconds) {
+            requestedTimeSeconds = nextTime
+            pendingSeekSeconds = nextTime
+        }
         shouldLoop = loop
         val nextShouldPlay = autoplay && !paused
         if (playIntent != nextShouldPlay) {
@@ -2971,6 +3088,7 @@ private class CraftNativeVideoView(context: Context) : VideoView(context) {
         setMediaController(if (controls) MediaController(context).also { it.setAnchorView(this) } else null)
         if (uri != sourceUri) {
             sourceUri = uri
+            pendingSeekSeconds = requestedTimeSeconds
             userPaused = false
             ended = false
             stopPlayback()
@@ -2980,6 +3098,7 @@ private class CraftNativeVideoView(context: Context) : VideoView(context) {
             // A copy kept on the phone (craft.media.keep) plays in place of
             // the address: offline in a gym with no signal.
             val kept = CraftNativeMedia.local(context, uri)
+            fire("onLoadStart")
             setVideoURI(if (kept != null) Uri.fromFile(kept) else Uri.parse(uri))
             setOnPreparedListener { mediaPlayer ->
                 preparedPlayer = mediaPlayer
@@ -2987,7 +3106,9 @@ private class CraftNativeVideoView(context: Context) : VideoView(context) {
                 mediaPlayer.isLooping = shouldLoop
                 val volume = if (this.muted) 0f else 1f
                 mediaPlayer.setVolume(volume, volume)
+                applyPendingSeek()
                 fire("onLoad", JSONObject().put("duration", duration / 1000.0))
+                fire("onLoadEnd")
                 if (shouldPlay) start()
             }
             setOnCompletionListener {
@@ -3005,6 +3126,7 @@ private class CraftNativeVideoView(context: Context) : VideoView(context) {
             }
         }
         if (uri.isBlank()) return
+        applyPendingSeek()
         runCatching {
             if (shouldPlay && !isPlaying && !userPaused && !ended) start()
             else if (!shouldPlay && isPlaying) pause()
@@ -3074,6 +3196,8 @@ private class CraftNativeVideoView(context: Context) : VideoView(context) {
         stopPlayback()
         setPlaying(false)
         sourceUri = ""
+        requestedTimeSeconds = null
+        pendingSeekSeconds = null
         playIntent = null
         userPaused = false
         ended = false
@@ -4619,6 +4743,7 @@ class MainActivity : AppCompatActivity() {
         put("viewMeasure")
         put("viewScroll")
         put("viewReparent")
+        put("viewNonModalPresentation")
     }
 
     private fun appVersion(): Pair<String, String> = runCatching {
@@ -4906,6 +5031,9 @@ class MainActivity : AppCompatActivity() {
             if (!updateParentLayoutStyle(updated, document.optJSONObject("style") ?: JSONObject())) return false
         }
         if (applied.isNotEmpty()) {
+            // Updating a modal's content may reattach its nested popups to
+            // their declaration parent. Restore the screen overlay contract.
+            promoteModalOverlays(screen)
             scheduleLayoutEvents(screen)
         }
         return true
@@ -4995,6 +5123,7 @@ class MainActivity : AppCompatActivity() {
         screen.controls.putAll(next)
         screen.handlers.keys.retainAll(retainedViews(screen))
         screen.view.setChildStyle(tree, document.optJSONObject("style") ?: JSONObject(), resources.displayMetrics.density)
+        promoteModalOverlays(screen)
         updateSafeAreaViews()
         // A full render can change a view's custom layout style without
         // changing the root bounds. Ensure native @layout observers still see
@@ -5003,6 +5132,45 @@ class MainActivity : AppCompatActivity() {
         if (visibleScreen === screen) applyStatusBar(screen)
     }
 
+    /** Keep Modal nodes in the screen viewport even when declared in a clipped subtree. */
+    private fun promoteModalOverlays(screen: Screen) {
+        if (screen.modalVisibility.isEmpty()) 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.
+        val overlays = mutableListOf<CraftNativeModalView>()
+        fun collect(view: View) {
+            if (view is CraftNativeModalView) overlays.add(view)
+            if (view is ViewGroup) for (index in 0 until view.childCount) collect(view.getChildAt(index))
+        }
+        collect(screen.view)
+        // A previous targeted update may already have promoted siblings in a
+        // different order. Use declaration paths, with numeric child indices,
+        // so a nested popup stays above its parent after every update.
+        overlays.sortWith(Comparator { first, second ->
+            val firstPath = first.declarationPath.split('.')
+            val secondPath = second.declarationPath.split('.')
+            for (index in 0 until min(firstPath.size, secondPath.size)) {
+                val left = firstPath[index]
+                val right = secondPath[index]
+                val leftIndex = left.toIntOrNull()
+                val rightIndex = right.toIntOrNull()
+                val order = if (leftIndex != null && rightIndex != null) leftIndex.compareTo(rightIndex) else left.compareTo(right)
+                if (order != 0) return@Comparator order
+            }
+            firstPath.size.compareTo(secondPath.size)
+        })
+        overlays.forEach { modal ->
+            if (modal.parent !== screen.view) {
+                (modal.parent as? ViewGroup)?.removeView(modal)
+                screen.view.addView(modal)
+                // Removing a view clears its old parent's flex style.
+                screen.view.setChildStyle(modal, modal.viewportStyle, resources.displayMetrics.density)
+            }
+            modal.bringToFront()
+        }
+    }
+
     private fun applyStatusBar(screen: Screen) {
         val controller = WindowCompat.getInsetsController(window, window.decorView)
         val night = (resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES
@@ -5365,6 +5533,15 @@ class MainActivity : AppCompatActivity() {
             "Modal" -> (previous as? CraftNativeModalView ?: CraftNativeModalView(this)).apply {
                 val focusBeforeContent = screen.view.findFocus()
                 transparent = craftNativeBoolean(props.opt("transparent"))
+                blocksBackground = !craftNativeBoolean(props.opt("nonModal"))
+                dismissOnOutsideTap = craftNativeBoolean(props.opt("dismissOnOutsideTap"))
+                // Modal nodes are promoted from their declaration parent to
+                // the screen root. Keep the authored layout style with that
+                // promoted child so non-modal absolute coordinates remain in
+                // the screen viewport rather than the old clipped parent.
+                viewportStyle = style
+                declarationPath = path
+                screen.view.setChildStyle(this, style, resources.displayMetrics.density)
                 content.configure(style, resources.displayMetrics.density)
                 reconcileChildren(screen, content, children, identity, next, style, previousControls)
                 // Dynamic :visible bindings arrive as a display style mutation;
@@ -5598,6 +5775,7 @@ class MainActivity : AppCompatActivity() {
                     paused = craftNativeBoolean(props.opt("paused")),
                     loop = craftNativeBoolean(props.opt("loop")),
                     muted = craftNativeBoolean(props.opt("muted")),
+                    currentTime = props.opt("currentTime"),
                     controls = craftNativeBoolean(props.opt("controls")),
                     resizeMode = craftNativeResizeMode(style, props),
                     pictureInPicture = craftNativeBoolean(props.opt("pictureInPicture")),
@@ -6001,6 +6179,7 @@ class MainActivity : AppCompatActivity() {
             if (layout.getChildAt(index) is CraftNativeFlexSpacer) layout.removeViewAt(index)
         }
         val desired = mutableListOf<View>()
+        val desiredOrder = mutableMapOf<View, Int>()
         for (index in 0 until children.length()) {
             val child = children.opt(index)
             val childView = when (child) {
@@ -6013,9 +6192,12 @@ class MainActivity : AppCompatActivity() {
             }
             if (childView != null) desired.add(childView)
             if (childView != null && child is JSONObject) {
-                layout.setChildStyle(childView, child.optJSONObject("style") ?: JSONObject(), resources.displayMetrics.density)
+                val childStyle = child.optJSONObject("style") ?: JSONObject()
+                layout.setChildStyle(childView, childStyle, resources.displayMetrics.density)
+                desiredOrder[childView] = craftNativeFiniteNumber(childStyle, "order", 0.0).toInt()
             }
         }
+        desired.sortWith(compareBy { desiredOrder[it] ?: 0 })
         if (craftNativeOptionalString(style.opt("flexDirection"))?.endsWith("-reverse") == true) desired.reverse()
         val desiredSet = desired.toSet()
         for (index in layout.childCount - 1 downTo 0) {
@@ -6754,6 +6936,7 @@ class MainActivity : AppCompatActivity() {
                 linkedControl -> "link"
                 type in setOf("TouchableOpacity", "TouchableHighlight", "Pressable") -> "button"
                 type == "Icon" -> "image"
+                type in setOf("FlatList", "SectionList") -> "list"
                 else -> type.lowercase()
             }
         }
@@ -7467,6 +7650,12 @@ 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 {
+            // 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;
+            // detach every released view so an open popup cannot survive as
+            // an orphan after its owner unmounts.
+            (it.parent as? ViewGroup)?.removeView(it)
             // AdapterView (including Spinner, our native Picker) rejects
             // setOnClickListener altogether. Its selection callback is
             // detached below; ordinary Views still need their click target

package/dist/android/templates/build.gradle.kts.app.template

@@ -111,6 +111,11 @@ dependencies {
     // Android Health Connect (included only when enabled)
 {{HEALTH_CONNECT_DEPENDENCIES}}
 
+    // Android Health Services live exercise tracking (included only when enabled)
+{{HEALTH_SERVICES_DEPENDENCIES}}
+
+{{WALLET_DEPENDENCY}}
+
     // On-device computer vision APIs exposed by CraftBridge
     implementation("com.google.mlkit:barcode-scanning:17.3.0")
     implementation("com.google.mlkit:image-labeling:17.0.9")

package/dist/api/mobile.d.ts

@@ -1227,6 +1227,11 @@ export interface NativeTabBarOptions {
     tintDark?: string;
     /** Whether Craft's horizontal tab-switch gesture may begin over the page. Defaults to true. */
     swipeEnabled?: boolean;
+    /** The selected tab highlight. Omit to keep the default capsule. */
+    selection?: {
+        /** Continuous corner radius in points. The highlight height is the upper bound. */
+        cornerRadius?: number;
+    };
 }
 /**
  * The phone's own tab bar, floating over the page: Liquid Glass on iOS 26 and
@@ -1698,10 +1703,13 @@ export interface HealthLiveWorkoutResult {
 }
 export interface HealthLiveWorkoutEvent {
     id: string;
-    event: 'state' | 'error';
+    event: 'state' | 'metrics' | 'error';
     state?: 'notStarted' | 'prepared' | 'running' | 'paused' | 'stopped' | 'ended' | 'unknown';
     /** Epoch milliseconds for a state transition. */
     date?: number;
+    heartRateBpm?: number;
+    activeEnergyCalories?: number;
+    distanceMeters?: number;
     message?: string;
 }
 /** The health reads and writes a host may or may not have, depending on the app build it runs in. */

package/dist/cli.js

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

package/dist/components/index.d.ts

@@ -38,6 +38,8 @@ export interface FlexStyle {
     flexDirection?: 'row' | 'column' | 'row-reverse' | 'column-reverse';
     /** Flex wrap */
     flexWrap?: 'nowrap' | 'wrap' | 'wrap-reverse';
+    /** Flex/grid sibling order; equal values retain source order */
+    order?: number;
     /** Justify content (main axis) */
     justifyContent?: 'flex-start' | 'flex-end' | 'center' | 'space-between' | 'space-around' | 'space-evenly';
     /** Align items (cross axis); baseline aligns text-bearing children by their first baseline */
@@ -309,6 +311,8 @@ export interface BaseProps {
     accessibilityState?: AccessibilityState;
     /** Accessibility role */
     accessibilityRole?: 'none' | 'button' | 'link' | 'image' | 'text' | 'header' | 'search' | 'adjustable' | 'menu' | 'summary' | 'alert' | 'checkbox' | 'combobox' | 'menuitem' | 'progressbar' | 'radio' | 'tablist' | 'radiogroup' | 'list' | 'menubar' | 'spinbutton' | 'switch' | 'tab' | 'timer' | 'toolbar' | 'scrollbar';
+    /** Native list chrome slot for keyed FlatList/SectionList children. */
+    listRole?: 'header' | 'item' | 'separator' | 'empty' | 'footer';
     /** Matches a view across an animated state change. */
     transitionID?: string;
     /** Children elements */
@@ -454,8 +458,14 @@ export interface VideoProps extends BaseProps {
     autoPlay?: boolean;
     loop?: boolean;
     muted?: boolean;
+    /** Controlled playback position in seconds. */
+    currentTime?: number;
     paused?: boolean;
     resizeMode?: 'contain' | 'cover' | 'stretch';
+    /** The source began loading. */
+    onLoadStart?: () => void;
+    /** The source became ready for playback. */
+    onLoadEnd?: () => void;
     /**
      * Carries on in a floating window (Picture in Picture) when the app goes to
      * the background or another app opens while it plays, and comes back into
@@ -848,16 +858,7 @@ export interface ActivityIndicatorProps extends BaseProps {
  * FlatList component props.
  */
 export interface FlatListProps<T> extends ScrollViewBaseProps {
-    /** Data array */
-    data: T[];
-    /** Render item function */
-    renderItem: (info: {
-        item: T;
-        index: number;
-    }) => any;
-    /** Key extractor function */
-    keyExtractor?: (item: T, index: number) => string;
-    /** Number of columns */
+    /** Number of columns in the keyed child tree. */
     numColumns?: number;
     /** Render rows in reverse order along the scroll axis. */
     inverted?: boolean;
@@ -870,6 +871,10 @@ export interface FlatListProps<T> extends ScrollViewBaseProps {
     /** Refreshing state */
     refreshing?: boolean;
 }
+/**
+ * @deprecated Grouped SectionList data is deferred until the versioned native
+ * list-data protocol exists. Use keyed child rows with `listRole` instead.
+ */
 export interface SectionListSection<T> {
     data: T[];
     key?: string;
@@ -881,6 +886,10 @@ export interface ModalProps extends BaseProps {
     style?: StyleValue<ViewStyle>;
     visible?: boolean;
     transparent?: boolean;
+    /** Keep the popup interactive without blocking the screen behind it. */
+    nonModal?: boolean;
+    /** When non-modal, consume an outside tap and call onRequestClose. */
+    dismissOnOutsideTap?: boolean;
     animationType?: 'none' | 'fade' | 'slide';
     onShow?: () => void;
     onDismiss?: () => void;

package/dist/index.cjs

@@ -373,7 +373,7 @@ function craftBinaryNotFoundMessage(triedPath) {
 `);
 }
 // package.json
-var version = "0.0.251";
+var version = "0.0.262";
 
 // src/sdk-version.ts
 var SDK_VERSION = version;

package/dist/index.js

@@ -117,7 +117,7 @@ function craftBinaryNotFoundMessage(triedPath) {
 `);
 }
 // package.json
-var version = "0.0.251";
+var version = "0.0.262";
 
 // src/sdk-version.ts
 var SDK_VERSION = version;