craft-native 0.0.246 → 0.0.248

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

@@ -12,6 +12,7 @@ import androidx.recyclerview.widget.PagerSnapHelper
 import androidx.recyclerview.widget.RecyclerView
 import org.json.JSONObject
 import kotlin.math.ceil
+import kotlin.math.max
 
 internal typealias CraftNativeRenderItem = (node: JSONObject, identity: String, previous: View?) -> View
 
@@ -96,6 +97,7 @@ internal class CraftNativeFlatList(context: Context) : RecyclerView(context) {
 
     private var renderItem: CraftNativeRenderItem? = null
     private var recycleItem: ((String) -> Unit)? = null
+    private var removeItem: ((String) -> Unit)? = null
     private var endReached: (() -> Unit)? = null
     private var threshold = 0.1
     private var endReachedSignature: String? = null
@@ -120,6 +122,49 @@ internal class CraftNativeFlatList(context: Context) : RecyclerView(context) {
     var onMomentumScrollBegin: (() -> Unit)? = null
     var onMomentumScrollEnd: (() -> Unit)? = null
     var onLayoutChanged: (() -> Unit)? = null
+    var onContentSizeChanged: (() -> Unit)? = null
+    private var lastIntrinsicHeight = Int.MIN_VALUE
+    private var lastReportedContentHeight = Int.MIN_VALUE
+
+    private val scrollListener = object : OnScrollListener() {
+        private var dragging = false
+        private var momentum = false
+
+        override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
+            onScrollEvent?.invoke()
+            onLayoutChanged?.invoke()
+            evaluateEndReached()
+        }
+
+        override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
+            when (newState) {
+                RecyclerView.SCROLL_STATE_DRAGGING -> if (!dragging) {
+                    dragging = true
+                    onScrollBeginDrag?.invoke()
+                }
+                RecyclerView.SCROLL_STATE_SETTLING -> {
+                    if (dragging) {
+                        dragging = false
+                        onScrollEndDrag?.invoke()
+                    }
+                    if (!momentum) {
+                        momentum = true
+                        onMomentumScrollBegin?.invoke()
+                    }
+                }
+                RecyclerView.SCROLL_STATE_IDLE -> {
+                    if (dragging) {
+                        dragging = false
+                        onScrollEndDrag?.invoke()
+                    }
+                    if (momentum) {
+                        momentum = false
+                        onMomentumScrollEnd?.invoke()
+                    }
+                }
+            }
+        }
+    }
 
     private fun holderLayoutParams() = LayoutParams(
         if (horizontal) LayoutParams.WRAP_CONTENT else LayoutParams.MATCH_PARENT,
@@ -132,7 +177,11 @@ internal class CraftNativeFlatList(context: Context) : RecyclerView(context) {
     }
 
     fun setScrollEnabled(enabled: Boolean) {
+        if (scrollEnabled == enabled) return
         scrollEnabled = enabled
+        lastIntrinsicHeight = Int.MIN_VALUE
+        lastReportedContentHeight = Int.MIN_VALUE
+        requestLayout()
     }
 
     val isScrollEnabledForTest: Boolean
@@ -151,6 +200,26 @@ internal class CraftNativeFlatList(context: Context) : RecyclerView(context) {
     val isScrollTargetPendingForTest: Boolean
         get() = pendingScrollTarget != null
 
+    /** Stable identities currently mounted, in their adapter order. */
+    val visibleItemIdentities: List<String>
+        get() = (0 until childCount)
+            .mapNotNull { index ->
+                val child = getChildAt(index)
+                val position = getChildAdapterPosition(child)
+                val order = if (position == RecyclerView.NO_POSITION) {
+                    // ListAdapter can briefly report NO_POSITION while an
+                    // async diff is dispatching. Keep the mounted holder in
+                    // the snapshot instead of making the entire list appear
+                    // empty to host-side reconciliation tests.
+                    Int.MAX_VALUE - childCount + index
+                } else {
+                    position
+                }
+                (getChildViewHolder(child) as? Holder)?.identity?.let { order to it }
+            }
+            .sortedBy { it.first }
+            .map { it.second }
+
     override fun onInterceptTouchEvent(event: android.view.MotionEvent): Boolean {
         if (!scrollEnabled) return false
         return super.onInterceptTouchEvent(event)
@@ -161,6 +230,29 @@ internal class CraftNativeFlatList(context: Context) : RecyclerView(context) {
         return super.onTouchEvent(event)
     }
 
+    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
+        val heightMode = MeasureSpec.getMode(heightMeasureSpec)
+        if (!scrollEnabled && !horizontal && heightMode != MeasureSpec.EXACTLY) {
+            // A non-scrolling FlatList is content-sized on iOS. Let the
+            // RecyclerView measure its full adapter range instead of keeping
+            // the viewport height, which otherwise clips the list when it is
+            // nested in an outer native ScrollView.
+            super.onMeasure(widthMeasureSpec, MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED))
+            val contentHeight = max(measuredHeight, computeVerticalScrollRange())
+            val resolvedHeight = resolveSize(contentHeight, heightMeasureSpec)
+            val contentChanged = resolvedHeight != lastIntrinsicHeight
+            lastIntrinsicHeight = resolvedHeight
+            setMeasuredDimension(
+                resolveSize(measuredWidth, widthMeasureSpec),
+                resolvedHeight,
+            )
+            if (contentChanged) reportContentSizeChanged()
+            return
+        }
+        lastIntrinsicHeight = Int.MIN_VALUE
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec)
+    }
+
     fun setBounceOptions(enabled: Boolean, vertical: Boolean, horizontal: Boolean) {
         bounces = enabled
         alwaysBounceVertical = vertical
@@ -182,51 +274,21 @@ internal class CraftNativeFlatList(context: Context) : RecyclerView(context) {
     override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
         super.onLayout(changed, left, top, right, bottom)
         scrollToPendingTarget(0)
+        if (!scrollEnabled && !horizontal) reportContentSizeChanged()
         onLayoutChanged?.invoke()
     }
 
+    private fun reportContentSizeChanged() {
+        val height = measuredHeight
+        if (height <= 0 || height == lastReportedContentHeight) return
+        lastReportedContentHeight = height
+        post { onContentSizeChanged?.invoke() }
+    }
+
     init {
         adapter = listAdapter
         itemAnimator = null
-        addOnScrollListener(object : OnScrollListener() {
-            private var dragging = false
-            private var momentum = false
-
-            override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
-                onScrollEvent?.invoke()
-                onLayoutChanged?.invoke()
-                evaluateEndReached()
-            }
-
-            override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
-                when (newState) {
-                    RecyclerView.SCROLL_STATE_DRAGGING -> if (!dragging) {
-                        dragging = true
-                        onScrollBeginDrag?.invoke()
-                    }
-                    RecyclerView.SCROLL_STATE_SETTLING -> {
-                        if (dragging) {
-                            dragging = false
-                            onScrollEndDrag?.invoke()
-                        }
-                        if (!momentum) {
-                            momentum = true
-                            onMomentumScrollBegin?.invoke()
-                        }
-                    }
-                    RecyclerView.SCROLL_STATE_IDLE -> {
-                        if (dragging) {
-                            dragging = false
-                            onScrollEndDrag?.invoke()
-                        }
-                        if (momentum) {
-                            momentum = false
-                            onMomentumScrollEnd?.invoke()
-                        }
-                    }
-                }
-            }
-        })
+        addOnScrollListener(scrollListener)
     }
 
     fun setKeyboardDismissMode(mode: String, dismissKeyboard: () -> Unit) {
@@ -291,10 +353,12 @@ internal class CraftNativeFlatList(context: Context) : RecyclerView(context) {
         endReachedThreshold: Double,
         renderItem: CraftNativeRenderItem,
         recycleItem: (String) -> Unit,
+        removeItem: (String) -> Unit,
         endReached: (() -> Unit)?,
     ) {
         this.renderItem = renderItem
         this.recycleItem = recycleItem
+        this.removeItem = removeItem
         this.endReached = endReached
         threshold = endReachedThreshold.takeIf { it.isFinite() }?.coerceAtLeast(0.0) ?: 0.1
 
@@ -321,7 +385,7 @@ internal class CraftNativeFlatList(context: Context) : RecyclerView(context) {
 
         val oldIds = listAdapter.currentList.mapTo(mutableSetOf()) { it.identity }
         val nextIds = next.mapTo(mutableSetOf()) { it.identity }
-        (oldIds - nextIds).forEach(recycleItem)
+        (oldIds - nextIds).forEach(removeItem)
         val dataItems = next.filterNot { it.chrome }
         val contentSignature = dataItems.joinToString("") {
             "${it.identity.length}:${it.identity}${it.signature.length}:${it.signature}"
@@ -386,6 +450,7 @@ internal class CraftNativeFlatList(context: Context) : RecyclerView(context) {
         }
         renderItem = null
         recycleItem = null
+        removeItem = null
         endReached = null
         setPagingEnabled(false)
         scrollTargetKey = null
@@ -397,6 +462,16 @@ internal class CraftNativeFlatList(context: Context) : RecyclerView(context) {
         onMomentumScrollBegin = null
         onMomentumScrollEnd = null
         onLayoutChanged = null
+        onContentSizeChanged = null
+        lastIntrinsicHeight = Int.MIN_VALUE
+        lastReportedContentHeight = Int.MIN_VALUE
+    }
+
+    /** Releases callbacks owned by a permanently removed native list node. */
+    fun resetForTeardown() {
+        discardAll()
+        removeOnScrollListener(scrollListener)
+        setOnTouchListener(null)
     }
 
     fun refreshThemeDefaults() {

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

@@ -1,5 +1,6 @@
 /** The Android host for the small, host-neutral native trail map contract. */
 private class CraftNativeMapView(context: Context) : FrameLayout(context), OnMapReadyCallback {
+    private data class PolygonValue(val points: List<LatLng>, val fillColor: Int, val strokeColor: Int, val strokeWidth: Float)
     private val mapView = MapView(context)
     private val scaleView = LinearLayout(context).apply {
         orientation = LinearLayout.VERTICAL
@@ -17,6 +18,7 @@ private class CraftNativeMapView(context: Context) : FrameLayout(context), OnMap
     private var pendingChildren = JSONArray()
     private val markers = mutableMapOf<String, Marker>()
     private val polylines = mutableMapOf<String, Polyline>()
+    private val polygons = mutableMapOf<String, Polygon>()
     private val markerHandlers = mutableMapOf<String, String>()
     private var onMarkerTap: ((String) -> Unit)? = null
     var onMapPress: ((LatLng) -> Unit)? = null
@@ -40,10 +42,23 @@ private class CraftNativeMapView(context: Context) : FrameLayout(context), OnMap
         })
         scaleView.visibility = View.GONE
         addView(tileAttribution, LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT, Gravity.BOTTOM or Gravity.END).apply { rightMargin = (8 * resources.displayMetrics.density).roundToInt(); bottomMargin = (8 * resources.displayMetrics.density).roundToInt() })
+        refreshThemeDefaults()
         mapView.onCreate(null)
         mapView.getMapAsync(this)
     }
 
+    fun refreshThemeDefaults() {
+        val dark = resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES
+        val foreground = if (dark) Color.rgb(245, 245, 245) else Color.rgb(37, 51, 33)
+        val surface = if (dark) Color.argb(230, 38, 38, 38) else Color.argb(230, 255, 255, 255)
+        scaleView.background = GradientDrawable().apply { setColor(surface); cornerRadius = 4f }
+        scaleLabel.setTextColor(foreground)
+        scaleLine.setBackgroundColor(foreground)
+        tileAttribution.setTextColor(foreground)
+        tileAttribution.setBackgroundColor(surface)
+        applyPending(refreshCamera = false)
+    }
+
     override fun onMapReady(map: GoogleMap) {
         if (destroyed) return
         googleMap = map
@@ -85,7 +100,7 @@ private class CraftNativeMapView(context: Context) : FrameLayout(context), OnMap
 
     fun markerHandler(id: String): String? = markerHandlers[id]
 
-    private fun applyPending() {
+    private fun applyPending(refreshCamera: Boolean = true) {
         val map = googleMap ?: return
         applyMapPadding()
         map.uiSettings.isCompassEnabled = craftNativeBoolean(pendingProps.opt("showsCompass"))
@@ -109,6 +124,31 @@ private class CraftNativeMapView(context: Context) : FrameLayout(context), OnMap
         val nextPinColors = mutableMapOf<String, Int>()
         val nextHandlers = mutableMapOf<String, String>()
         val nextPolylines = mutableMapOf<String, Triple<List<LatLng>, Int, Float>>()
+        val nextPolygons = mutableMapOf<String, PolygonValue>()
+        val dataMarkers = pendingProps.optJSONArray("markers")
+        for (index in 0 until (dataMarkers?.length() ?: 0)) {
+            val overlay = dataMarkers?.optJSONObject(index) ?: continue
+            val id = craftNativeOptionalString(overlay.opt("id")) ?: continue
+            val point = coordinates(overlay.optJSONArray("geometry")).firstOrNull() ?: continue
+            nextMarkers[id] = point to (overlay.opt("title") as? String)
+            (overlay.opt("pinColor") as? String)?.let { nextPinColors[id] = color(it) }
+            (overlay.opt("bearing") as? Number)?.toDouble()?.takeIf { it.isFinite() }?.let { nextBearings[id] = (it % 360).toFloat() }
+        }
+        val dataPolylines = pendingProps.optJSONArray("polylines")
+        for (index in 0 until (dataPolylines?.length() ?: 0)) {
+            val overlay = dataPolylines?.optJSONObject(index) ?: continue
+            val id = craftNativeOptionalString(overlay.opt("id")) ?: continue
+            val points = coordinates(overlay.optJSONArray("geometry"))
+            if (points.size <= 1) continue
+            val authoredWidth = when (val rawWidth = overlay.opt("strokeWidth")) {
+                null, JSONObject.NULL -> 3.0
+                is Number -> rawWidth.toDouble()
+                else -> 3.0
+            }
+            val width = (authoredWidth * resources.displayMetrics.density).toFloat()
+            if (!authoredWidth.isFinite() || !width.isFinite() || width <= 0f) continue
+            nextPolylines[id] = Triple(points, color(craftNativeOptionalString(overlay.opt("strokeColor")).orEmpty()), width)
+        }
         for (index in 0 until pendingChildren.length()) {
             val child = pendingChildren.optJSONObject(index) ?: continue
             val type = child.optString("type").lowercase()
@@ -121,7 +161,7 @@ private class CraftNativeMapView(context: Context) : FrameLayout(context), OnMap
             if (type == "mapmarker" || type == "marker") {
                 points.firstOrNull()?.let { point ->
                     nextMarkers[id] = point to (props.opt("title") as? String)
-                    (props.opt("pinColor") as? String)?.let { value -> runCatching { craftNativeColor(value) }.getOrNull()?.let { nextPinColors[id] = it } }
+                    (props.opt("pinColor") as? String)?.let { value -> nextPinColors[id] = color(value) }
                     (props.opt("bearing") as? Number)?.toDouble()?.takeIf { it.isFinite() }?.let { nextBearings[id] = (it % 360).toFloat() }
                     listOf(events.opt("onPress"), events.opt("onMarkerPress"))
                         .firstNotNullOfOrNull(::craftNativeOptionalString)
@@ -147,6 +187,18 @@ private class CraftNativeMapView(context: Context) : FrameLayout(context), OnMap
                     if (!authoredWidth.isFinite() || !width.isFinite() || width <= 0f) continue
                     nextPolylines[id] = Triple(points, color(craftNativeOptionalString(props.opt("strokeColor")).orEmpty()), width)
                 }
+            } else if (type == "mappolygon" || type == "polygon") {
+                if (points.size > 2) {
+                    val rawWidth = props.opt("strokeWidth")
+                    val authoredWidth = when (rawWidth) {
+                        null, JSONObject.NULL -> 2.0
+                        is Number -> rawWidth.toDouble()
+                        else -> 2.0
+                    }
+                    val width = (authoredWidth * resources.displayMetrics.density).toFloat()
+                    if (!authoredWidth.isFinite() || !width.isFinite() || width <= 0f) continue
+                    nextPolygons[id] = PolygonValue(points, color(craftNativeOptionalString(props.opt("fillColor")).orEmpty(), Color.argb(72, 33, 150, 83)), color(craftNativeOptionalString(props.opt("strokeColor")).orEmpty()), width)
+                }
             }
         }
         markerBearings = nextBearings
@@ -181,6 +233,22 @@ private class CraftNativeMapView(context: Context) : FrameLayout(context), OnMap
                 map.addPolyline(PolylineOptions().addAll(value.first).color(value.second).width(value.third))?.let { polylines[id] = it }
             }
         }
+        polygons.keys.filter { nextPolygons[it] == null }.forEach { id -> polygons.remove(id)?.remove() }
+        for ((id, value) in nextPolygons) {
+            val polygon = polygons[id]
+            if (polygon != null) {
+                polygon.points = value.points
+                polygon.fillColor = value.fillColor
+                polygon.strokeColor = value.strokeColor
+                polygon.strokeWidth = value.strokeWidth
+            } else {
+                map.addPolygon(PolygonOptions().addAll(value.points).fillColor(value.fillColor).strokeColor(value.strokeColor).strokeWidth(value.strokeWidth))?.let { polygons[id] = it }
+            }
+        }
+        if (!refreshCamera) {
+            updateScale()
+            return
+        }
         val explicitRegion = region(pendingProps.optJSONObject("region"))
         val initialRegion = region(pendingProps.optJSONObject("initialRegion"))
         if (explicitRegion != null) {
@@ -196,7 +264,7 @@ private class CraftNativeMapView(context: Context) : FrameLayout(context), OnMap
                 initialCameraKey = key
             }
         } else if (craftNativeBoolean(pendingProps.opt("fitToBounds"))) {
-            val key = "fit:${overlayKey(nextMarkers, nextPolylines)}:${pendingProps.optJSONObject("edgePadding")}"
+            val key = "fit:${overlayKey(nextMarkers, nextPolylines, nextPolygons)}:${pendingProps.optJSONObject("edgePadding")}"
             if (initialCameraKey != key) {
                 if (fitToBounds()) initialCameraKey = key
             }
@@ -323,6 +391,7 @@ private class CraftNativeMapView(context: Context) : FrameLayout(context), OnMap
     private fun overlayKey(
         markers: Map<String, Pair<LatLng, String?>>,
         polylines: Map<String, Triple<List<LatLng>, Int, Float>>,
+        polygons: Map<String, PolygonValue>,
     ): String {
         val markerKey = markers.toSortedMap().entries.joinToString("|") { (id, value) ->
             "$id:${value.first.latitude},${value.first.longitude}"
@@ -330,7 +399,10 @@ private class CraftNativeMapView(context: Context) : FrameLayout(context), OnMap
         val polylineKey = polylines.toSortedMap().entries.joinToString("|") { (id, value) ->
             "$id:" + value.first.joinToString(";") { point -> "${point.latitude},${point.longitude}" }
         }
-        return "m[$markerKey]p[$polylineKey]"
+        val polygonKey = polygons.toSortedMap().entries.joinToString("|") { (id, value) ->
+            "$id:" + value.points.joinToString(";") { point -> "${point.latitude},${point.longitude}" }
+        }
+        return "m[$markerKey]p[$polylineKey]g[$polygonKey]"
     }
 
     private fun fitToBounds(): Boolean {
@@ -340,6 +412,8 @@ private class CraftNativeMapView(context: Context) : FrameLayout(context), OnMap
         var count = 0
         markers.values.forEach { builder.include(it.position); count++ }
         polylines.values.flatMap { it.points }.forEach { builder.include(it); count++ }
+        polygons.values.flatMap { it.points }.forEach { builder.include(it); count++ }
+        polygons.values.flatMap { it.points }.forEach { builder.include(it); count++ }
         if (count == 0) return false
         post {
             if (width > 0 && height > 0) {
@@ -388,6 +462,8 @@ private class CraftNativeMapView(context: Context) : FrameLayout(context), OnMap
         markers.clear()
         polylines.values.forEach { it.remove() }
         polylines.clear()
+        polygons.values.forEach { it.remove() }
+        polygons.clear()
         mapView.onDestroy()
         googleMap = null
     }
@@ -435,6 +511,17 @@ private class CraftNativeMapView(context: Context) : FrameLayout(context), OnMap
     private fun finiteNumber(value: Any?): Double? =
         (value as? Number)?.toDouble()?.takeIf { it.isFinite() }
 
-    private fun color(value: String): Int = runCatching { craftNativeColor(value) }.getOrDefault(Color.BLUE)
+    private fun color(value: String): Int {
+        return color(value, Color.BLUE)
+    }
+
+    private fun color(value: String, fallback: Int): Int {
+        val dark = resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES
+        return when (value.trim().lowercase()) {
+            "label" -> if (dark) Color.WHITE else Color.BLACK
+            "secondarylabel", "secondary-label" -> if (dark) Color.LTGRAY else Color.DKGRAY
+            else -> runCatching { craftNativeColor(value) }.getOrDefault(fallback)
+        }
+    }
 }
 

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

@@ -57,11 +57,24 @@ internal class CraftNativeMapView(context: Context) : FrameLayout(context), OnMa
             rightMargin = (8 * resources.displayMetrics.density).roundToInt()
             bottomMargin = (8 * resources.displayMetrics.density).roundToInt()
         })
+        refreshThemeDefaults()
         mapView.onCreate(null)
         mapView.addOnDidFinishLoadingMapListener { if (!destroyed && initialCameraKey == null) applyPending() }
         mapView.getMapAsync(this)
     }
 
+    fun refreshThemeDefaults() {
+        val dark = resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES
+        val foreground = if (dark) Color.rgb(245, 245, 245) else Color.rgb(37, 51, 33)
+        val surface = if (dark) Color.argb(230, 38, 38, 38) else Color.argb(230, 255, 255, 255)
+        attribution.setTextColor(foreground)
+        attribution.setBackgroundColor(surface)
+        scale.setBackgroundColor(surface)
+        scaleLabel.setTextColor(foreground)
+        scaleLine.setBackgroundColor(foreground)
+        readyStyle?.let { updateOverlays(it) }
+    }
+
     override fun onMapReady(nativeMap: MapLibreMap) {
         if (destroyed) return
         map = nativeMap
@@ -109,6 +122,14 @@ internal class CraftNativeMapView(context: Context) : FrameLayout(context), OnMa
     fun markerHandler(id: String): String? = markerHandlers[id]
 
     private fun applyPending() {
+        // MapLibre may deliver style and render callbacks from its worker
+        // thread. All map, style, and GeoJSON source mutations must happen on
+        // Android's UI thread, so marshal the whole reconciliation before
+        // touching the native map object.
+        if (Looper.myLooper() != Looper.getMainLooper()) {
+            post { applyPending() }
+            return
+        }
         val nativeMap = map ?: return
         if (destroyed) return
         nativeMap.uiSettings.isCompassEnabled = craftNativeBoolean(pendingProps.opt("showsCompass"))
@@ -200,6 +221,12 @@ internal class CraftNativeMapView(context: Context) : FrameLayout(context), OnMa
         style.addLayer(LineLayer("craft-map-routes", "craft-map-overlays")
             .withFilter(Expression.eq(Expression.get("kind"), "line"))
             .withProperties(lineColor(Expression.toColor(Expression.get("color"))), lineWidth(Expression.get("width")), lineCap("round"), lineJoin("round")))
+        style.addLayer(FillLayer("craft-map-polygons", "craft-map-overlays")
+            .withFilter(Expression.eq(Expression.get("kind"), "polygon"))
+            .withProperties(fillColor(Expression.toColor(Expression.get("fillColor")))))
+        style.addLayer(LineLayer("craft-map-polygon-strokes", "craft-map-overlays")
+            .withFilter(Expression.eq(Expression.get("kind"), "polygon"))
+            .withProperties(lineColor(Expression.toColor(Expression.get("strokeColor"))), lineWidth(Expression.get("strokeWidth")), lineCap("round"), lineJoin("round")))
         style.addLayer(CircleLayer("craft-map-markers", "craft-map-overlays")
             .withFilter(Expression.eq(Expression.get("kind"), "marker"))
             .withProperties(circleColor(Expression.toColor(Expression.get("color"))), circleRadius(7f), circleStrokeColor(Color.WHITE), circleStrokeWidth(2f)))
@@ -212,6 +239,42 @@ internal class CraftNativeMapView(context: Context) : FrameLayout(context), OnMa
         val features = JSONArray()
         val pointsForFit = mutableListOf<LatLng>()
         markerHandlers.clear()
+        val dataMarkers = pendingProps.optJSONArray("markers")
+        for (index in 0 until (dataMarkers?.length() ?: 0)) {
+            val overlay = dataMarkers?.optJSONObject(index) ?: continue
+            val id = craftNativeOptionalString(overlay.opt("id")) ?: continue
+            val point = coordinates(overlay.optJSONArray("geometry")).firstOrNull() ?: continue
+            val bearing = finiteNumber(overlay.opt("bearing"))
+            val properties = JSONObject()
+                .put("craftOverlayId", id)
+                .put("kind", if (bearing == null) "marker" else "direction")
+                .put("craftMarkerId", id)
+                .put("bearing", (bearing ?: 0.0) % 360)
+                .put("color", cssColor(overlay.opt("pinColor"), Color.rgb(36, 114, 75)))
+            val geometry = JSONObject().put("type", "Point").put("coordinates", JSONArray().put(point.longitude).put(point.latitude))
+            features.put(JSONObject().put("type", "Feature").put("properties", properties).put("geometry", geometry))
+            pointsForFit.add(point)
+        }
+        val dataPolylines = pendingProps.optJSONArray("polylines")
+        for (index in 0 until (dataPolylines?.length() ?: 0)) {
+            val overlay = dataPolylines?.optJSONObject(index) ?: continue
+            val id = craftNativeOptionalString(overlay.opt("id")) ?: continue
+            val points = coordinates(overlay.optJSONArray("geometry"))
+            if (points.size <= 1) continue
+            val rawWidth = overlay.opt("strokeWidth")
+            val logicalWidth = if (rawWidth == null || rawWidth == JSONObject.NULL) 3.0 else finiteNumber(rawWidth) ?: continue
+            val width = (logicalWidth * resources.displayMetrics.density).takeIf { it.isFinite() && it > 0 } ?: continue
+            val properties = JSONObject()
+                .put("craftOverlayId", id)
+                .put("kind", "line")
+                .put("color", cssColor(overlay.opt("strokeColor"), Color.BLUE))
+                .put("width", width)
+            val geometry = JSONObject().put("type", "LineString").put("coordinates", JSONArray().apply {
+                points.forEach { put(JSONArray().put(it.longitude).put(it.latitude)) }
+            })
+            features.put(JSONObject().put("type", "Feature").put("properties", properties).put("geometry", geometry))
+            pointsForFit.addAll(points)
+        }
         for (index in 0 until pendingChildren.length()) {
             val child = pendingChildren.optJSONObject(index) ?: continue
             val type = child.optString("type").lowercase()
@@ -231,11 +294,25 @@ internal class CraftNativeMapView(context: Context) : FrameLayout(context), OnMa
                 pointsForFit.add(point)
             } else if ((type == "mappolyline" || type == "polyline") && points.size > 1) {
                 val authoredWidth = props.opt("strokeWidth")
-                val width = if (authoredWidth == null || authoredWidth == JSONObject.NULL) 3.0 else finiteNumber(authoredWidth) ?: continue
-                if (width <= 0 || !width.toFloat().isFinite()) continue
+                val logicalWidth = if (authoredWidth == null || authoredWidth == JSONObject.NULL) 3.0 else finiteNumber(authoredWidth) ?: continue
+                // The shared contract is expressed in logical points. MapLibre's
+                // style line-width is in physical pixels, just like the Google
+                // Maps polyline width, so convert only at this host boundary.
+                val width = (logicalWidth * resources.displayMetrics.density)
+                    .takeIf { it.isFinite() && it > 0 } ?: continue
                 properties.put("kind", "line").put("color", cssColor(props.opt("strokeColor"), Color.BLUE)).put("width", width)
                 geometry.put("type", "LineString").put("coordinates", JSONArray().apply { points.forEach { put(JSONArray().put(it.longitude).put(it.latitude)) } })
                 pointsForFit.addAll(points)
+            } else if ((type == "mappolygon" || type == "polygon") && points.size > 2) {
+                val rawWidth = props.opt("strokeWidth")
+                val logicalWidth = if (rawWidth == null || rawWidth == JSONObject.NULL) 2.0 else finiteNumber(rawWidth) ?: continue
+                val width = (logicalWidth * resources.displayMetrics.density).takeIf { it.isFinite() && it > 0 } ?: continue
+                val fill = cssColor(props.opt("fillColor"), Color.argb(72, 33, 150, 83))
+                val stroke = cssColor(props.opt("strokeColor"), Color.rgb(33, 150, 83))
+                properties.put("kind", "polygon").put("fillColor", fill).put("strokeColor", stroke).put("strokeWidth", width)
+                val ring = points + points.first()
+                geometry.put("type", "Polygon").put("coordinates", JSONArray().put(JSONArray().apply { ring.forEach { put(JSONArray().put(it.longitude).put(it.latitude)) } }))
+                pointsForFit.addAll(points)
             } else continue
             features.put(JSONObject().put("type", "Feature").put("properties", properties).put("geometry", geometry))
         }
@@ -244,10 +321,20 @@ internal class CraftNativeMapView(context: Context) : FrameLayout(context), OnMa
     }
 
     private fun cssColor(value: Any?, fallback: Int): String {
-        val color = (value as? String)?.let { runCatching { craftNativeColor(it) }.getOrNull() } ?: fallback
+        val color = (value as? String)?.let { mapColor(it, fallback) } ?: fallback
         return "rgba(${Color.red(color)},${Color.green(color)},${Color.blue(color)},${Color.alpha(color) / 255.0})"
     }
 
+    private fun mapColor(raw: String, fallback: Int): Int {
+        val value = raw.trim().lowercase()
+        val dark = resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES
+        return when (value) {
+            "label" -> if (dark) Color.WHITE else Color.BLACK
+            "secondarylabel", "secondary-label" -> if (dark) Color.LTGRAY else Color.DKGRAY
+            else -> runCatching { craftNativeColor(raw) }.getOrDefault(fallback)
+        }
+    }
+
     private fun directionBitmap(): Bitmap {
         val size = (26 * resources.displayMetrics.density).roundToInt().coerceAtLeast(24)
         val bitmap = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888)

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

@@ -111,6 +111,14 @@ class CraftNativeMutationDocument {
                         moveChild(operation, candidateNodes)
                         operation.optString("parentId").takeIf { it !in affectedNodeIds }?.let { affectedNodeIds.add(it) }
                     }
+                    "reparentChild" -> {
+                        val previousParent = reparentChild(operation, candidateNodes)
+                        operation.optString("parentId").takeIf { it !in affectedNodeIds }?.let { affectedNodeIds.add(it) }
+                        previousParent.takeIf { it !in affectedNodeIds }?.let { affectedNodeIds.add(it) }
+                        // A child crossing parents needs the committed tree to
+                        // be reconciled so the host can move its existing view.
+                        requiresFullRender = true
+                    }
                     "removeNode" -> {
                         val parent = candidateNodes[operation.optString("id")]?.parent
                         if (parent == null) requiresFullRender = true
@@ -152,6 +160,9 @@ class CraftNativeMutationDocument {
 
     fun node(id: String): JSONObject? = materialize(id, nodes)
 
+    /** Reserve surviving protocol nodes before reusing an authored keyed slot. */
+    fun containsNode(id: String): Boolean = nodes.containsKey(id)
+
     /** The committed parent used to redraw a child that has no native view. */
     fun parentId(id: String): String? = nodes[id]?.parent
 
@@ -225,6 +236,27 @@ class CraftNativeMutationDocument {
         parent.children.add(insertionIndex(operation, parent.children.size), childId)
     }
 
+    private fun reparentChild(operation: JSONObject, nodes: MutableMap<String, Node>): String {
+        val parentId = requiredId(operation, "parentId", "reparentChild")
+        val childId = requiredId(operation, "childId", "reparentChild")
+        val parent = nodes[parentId] ?: fail("UNKNOWN_PARENT", "node $parentId does not exist")
+        val child = nodes[childId] ?: fail("UNKNOWN_NODE", "node $childId does not exist")
+        val previousParentId = child.parent
+            ?: fail("NOT_ATTACHED", "node $childId is not attached to a parent")
+        val previousParent = nodes[previousParentId]
+            ?: fail("INVALID_TREE", "node $childId has a missing parent")
+        if (!acceptsChildren(parent.type)) fail("INVALID_PARENT", "node $parentId cannot contain child nodes")
+        if (parentId == childId || parentId in descendants(childId, nodes)) {
+            fail("CYCLE", "reparenting node $childId would create a cycle")
+        }
+        if (parentId == previousParentId) fail("SAME_PARENT", "node $childId is already a child of $parentId")
+        val index = insertionIndex(operation, parent.children.size)
+        previousParent.children.remove(childId)
+        parent.children.add(index, childId)
+        child.parent = parentId
+        return previousParentId
+    }
+
     private fun removeNode(
         operation: JSONObject,
         nodes: MutableMap<String, Node>,

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

@@ -22,6 +22,12 @@ internal class CraftNativeRefreshableFlatList(context: Context) : SwipeRefreshLa
         if (handler == null) isRefreshing = false
     }
 
+    fun resetForTeardown() {
+        refreshHandler = null
+        isRefreshing = false
+        isEnabled = false
+    }
+
     fun setRefreshAppearance(props: JSONObject, fallback: Int) {
         val tint = props.optString("tintColor").takeIf { it.isNotBlank() }
         val resolved = tint?.let { runCatching { craftNativeColor(it) }.getOrNull() } ?: fallback
@@ -29,8 +35,7 @@ internal class CraftNativeRefreshableFlatList(context: Context) : SwipeRefreshLa
     }
 
     override fun onDetachedFromWindow() {
-        refreshHandler = null
-        isRefreshing = false
+        resetForTeardown()
         super.onDetachedFromWindow()
     }
 }