craft-native 0.0.394 → 0.0.396

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

@@ -1,6 +1,7 @@
 package {{PACKAGE_NAME}}
 
 import android.content.Context
+import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
@@ -18,6 +19,9 @@ internal typealias CraftNativeRenderItem = (node: JSONObject, identity: String,
 
 /** A stable-key RecyclerView host for stx native FlatList nodes. */
 internal class CraftNativeFlatList(context: Context) : RecyclerView(context) {
+    override fun dispatchTouchEvent(event: MotionEvent): Boolean =
+        CraftNativePointers.dispatch(this, event) { super.dispatchTouchEvent(it) }
+
     private data class Item(
         val identity: String,
         val node: JSONObject,
@@ -96,6 +100,12 @@ internal class CraftNativeFlatList(context: Context) : RecyclerView(context) {
     }
 
     private var renderItem: CraftNativeRenderItem? = null
+    /**
+     * The `fontFamily` the rows inherit from the list's ancestors. Rows are
+     * rebound only when their own node changes, so the screen redraws them
+     * when this changes (`reconcileFlatList` in MainActivity).
+     */
+    var inheritedFontFamily: String? = null
     private var recycleItem: ((String) -> Unit)? = null
     private var removeItem: ((String) -> Unit)? = null
     private var endReached: (() -> Unit)? = null
@@ -221,11 +231,13 @@ internal class CraftNativeFlatList(context: Context) : RecyclerView(context) {
             .map { it.second }
 
     override fun onInterceptTouchEvent(event: android.view.MotionEvent): Boolean {
+        if (event.actionMasked != MotionEvent.ACTION_CANCEL && !CraftNativePointers.ownsTouch(this)) return false
         if (!scrollEnabled) return false
         return super.onInterceptTouchEvent(event)
     }
 
     override fun onTouchEvent(event: android.view.MotionEvent): Boolean {
+        if (event.actionMasked != MotionEvent.ACTION_CANCEL && !CraftNativePointers.ownsTouch(this)) return false
         if (!scrollEnabled) return false
         return super.onTouchEvent(event)
     }
@@ -298,6 +310,7 @@ internal class CraftNativeFlatList(context: Context) : RecyclerView(context) {
         }
         var dismissed = false
         setOnTouchListener { _, event ->
+            if (!CraftNativePointers.ownsTouch(this) && event.actionMasked != MotionEvent.ACTION_CANCEL) return@setOnTouchListener false
             when (event.actionMasked) {
                 android.view.MotionEvent.ACTION_DOWN -> dismissed = false
                 android.view.MotionEvent.ACTION_MOVE -> if (!dismissed) {

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

@@ -1,5 +1,8 @@
 /** The Android host for the small, host-neutral native trail map contract. */
 private class CraftNativeMapView(context: Context) : FrameLayout(context), OnMapReadyCallback {
+    override fun dispatchTouchEvent(event: MotionEvent): Boolean =
+        CraftNativePointers.dispatch(this, event) { super.dispatchTouchEvent(it) }
+
     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 {

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

@@ -1,5 +1,8 @@
 /** A key-free native Android map. STX geometry never enters a WebView. */
 internal class CraftNativeMapView(context: Context) : FrameLayout(context), OnMapReadyCallback {
+    override fun dispatchTouchEvent(event: MotionEvent): Boolean =
+        CraftNativePointers.dispatch(this, event) { super.dispatchTouchEvent(it) }
+
     private val mapView: MapView
     private var map: MapLibreMap? = null
     private var destroyed = false

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

@@ -1,11 +1,20 @@
 package {{PACKAGE_NAME}}
 
 import android.content.Context
+import android.view.MotionEvent
 import org.json.JSONObject
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 
 /** Swipe-to-refresh host for a native FlatList. */
 internal class CraftNativeRefreshableFlatList(context: Context) : SwipeRefreshLayout(context) {
+    override fun dispatchTouchEvent(event: MotionEvent): Boolean =
+        CraftNativePointers.dispatch(this, event) { super.dispatchTouchEvent(it) }
+
+    override fun onInterceptTouchEvent(event: MotionEvent): Boolean =
+        CraftNativePointers.ownsTouch(this) && super.onInterceptTouchEvent(event)
+    override fun onTouchEvent(event: MotionEvent): Boolean =
+        (event.actionMasked == MotionEvent.ACTION_CANCEL || CraftNativePointers.ownsTouch(this)) && super.onTouchEvent(event)
+
     val list = CraftNativeFlatList(context)
     private var refreshHandler: (() -> Unit)? = null