@craft-native/android 0.0.174 → 0.0.176

package/templates/CraftNativeFlatList.kt.template

@@ -49,8 +49,19 @@ internal class CraftNativeFlatList(context: Context) : RecyclerView(context) {
             holder.host.layoutParams = holderLayoutParams()
             val view = renderItem?.invoke(item.node, item.identity, holder.hostedView) ?: View(holder.host.context)
             val renderedLayout = view.layoutParams
+            // iOS pins every row root to the collection cell's content width.
+            // A freshly-rendered Android root normally carries WRAP_CONTENT,
+            // which otherwise shrinks a vertical row to its text width and
+            // makes the two hosts disagree on hit/background geometry. Keep an
+            // authored width when one exists; only the default is promoted.
+            val renderedWidth = renderedLayout?.width ?: LayoutParams.WRAP_CONTENT
+            val hostedWidth = if (!horizontal && renderedWidth == LayoutParams.WRAP_CONTENT) {
+                LayoutParams.MATCH_PARENT
+            } else {
+                renderedWidth
+            }
             val hostedLayout = FrameLayout.LayoutParams(
-                renderedLayout?.width ?: LayoutParams.MATCH_PARENT,
+                hostedWidth,
                 renderedLayout?.height ?: LayoutParams.WRAP_CONTENT,
             )
             if (renderedLayout is ViewGroup.MarginLayoutParams) {
@@ -202,14 +213,14 @@ internal class CraftNativeFlatList(context: Context) : RecyclerView(context) {
     }
 
     fun setContentContainerStyle(style: JSONObject?, density: Float) {
-        val padding = (style?.optDouble("padding", 0.0) ?: 0.0) * density
-        val horizontal = (style?.optDouble("paddingHorizontal", padding / density) ?: (padding / density)) * density
-        val vertical = (style?.optDouble("paddingVertical", padding / density) ?: (padding / density)) * density
+        val padding = craftNativePadding(style, "padding", 0, density)
+        val horizontal = craftNativePadding(style, "paddingHorizontal", padding, density)
+        val vertical = craftNativePadding(style, "paddingVertical", padding, density)
         setPadding(
-            ((style?.optDouble("paddingLeft", horizontal / density) ?: (horizontal / density)) * density).toInt(),
-            ((style?.optDouble("paddingTop", vertical / density) ?: (vertical / density)) * density).toInt(),
-            ((style?.optDouble("paddingRight", horizontal / density) ?: (horizontal / density)) * density).toInt(),
-            ((style?.optDouble("paddingBottom", vertical / density) ?: (vertical / density)) * density).toInt(),
+            craftNativePadding(style, "paddingLeft", horizontal, density),
+            craftNativePadding(style, "paddingTop", vertical, density),
+            craftNativePadding(style, "paddingRight", horizontal, density),
+            craftNativePadding(style, "paddingBottom", vertical, density),
         )
         clipToPadding = true
         requestLayout()
@@ -228,7 +239,7 @@ internal class CraftNativeFlatList(context: Context) : RecyclerView(context) {
         this.renderItem = renderItem
         this.recycleItem = recycleItem
         this.endReached = endReached
-        threshold = endReachedThreshold.coerceAtLeast(0.0)
+        threshold = endReachedThreshold.takeIf { it.isFinite() }?.coerceAtLeast(0.0) ?: 0.1
 
         val nextColumns = columns.coerceAtLeast(1)
         val layoutChanged = this.horizontal != horizontal || this.columns != nextColumns

package/templates/CraftNativeMutation.kt.template

@@ -151,6 +151,9 @@ class CraftNativeMutationDocument {
 
     fun node(id: String): JSONObject? = materialize(id, nodes)
 
+    /** The committed parent used to redraw a child that has no native view. */
+    fun parentId(id: String): String? = nodes[id]?.parent
+
     private fun createNode(
         operation: JSONObject,
         nodes: MutableMap<String, Node>,
@@ -271,7 +274,7 @@ class CraftNativeMutationDocument {
         val CONTAINER_TYPES = setOf(
             "View", "SafeAreaView", "ScrollView", "KeyboardAvoidingView", "Modal", "Pressable",
             "TouchableOpacity", "TouchableHighlight", "ImageBackground", "FlatList", "SectionList",
-            "Fragment", "Svg", "G",
+            "Fragment", "Svg", "G", "Map",
         )
     }
 

package/templates/CraftNativeServices.kt.template

@@ -84,11 +84,13 @@ internal class CraftNativeServices(
         if (config.optBoolean("enableKeepAwake")) add("keepAwake")
         if (config.optBoolean("enableGeolocation") || config.optBoolean("enableBackgroundLocation")) add("geolocation")
         if (config.optJSONObject("backgroundRefresh")?.optBoolean("enabled") == true || config.optBoolean("enablePushNotifications")) add("background")
+        // craft.crashReporter: the app's crash and error reporter (bughq).
+        if (CraftCrashReporter.enabled) add("crashReporter")
     }
 
     fun handles(module: String): Boolean = module in setOf(
         "Dialog", "Browser", "Linking", "Share", "Push", "Health", "KeepAwake", "Brightness", "StatusBar", "Speech", "Background",
-        "Location", "Media",
+        "Location", "Media", "CrashReporter",
     )
 
     fun perform(module: String, method: String, args: JSONArray, completion: (CraftNativeCapabilityResult) -> Unit) {
@@ -122,6 +124,7 @@ internal class CraftNativeServices(
                     onBackgroundComplete?.invoke(args.optBoolean(0, true), args.opt(1) as? String)
                     done(success(true))
                 }
+                "CrashReporter" -> crashReporter(method, args, done)
                 else -> done(failure("UNKNOWN_ACTION", "Unsupported native API"))
             }
         } catch (error: Exception) {
@@ -436,6 +439,33 @@ internal class CraftNativeServices(
         }
     }
 
+    // MARK: Crash reporting (CraftCrashReporter.kt)
+
+    private fun crashReporter(method: String, args: JSONArray, done: (CraftNativeCapabilityResult) -> Unit) {
+        if (!CraftCrashReporter.enabled && method != "context") return done(failure("CAPABILITY_DISABLED", "Crash reporting is not configured"))
+        when (method) {
+            "capture" -> {
+                val event = args.optJSONObject(0) ?: return done(failure("INVALID_ARGUMENT", "capture needs an event"))
+                done(success(CraftCrashReporter.capture(event)))
+            }
+            "setUser" -> {
+                CraftCrashReporter.setUser(if (args.isNull(0)) null else args.optString(0))
+                done(success(true))
+            }
+            "addBreadcrumb" -> {
+                val crumb = args.optJSONObject(0) ?: return done(failure("INVALID_ARGUMENT", "addBreadcrumb needs a breadcrumb"))
+                CraftCrashReporter.addBreadcrumb(crumb)
+                done(success(true))
+            }
+            "flush" -> {
+                CraftCrashReporter.requestFlush()
+                done(success(true))
+            }
+            "context" -> done(success(if (CraftCrashReporter.enabled) CraftCrashReporter.context() else JSONObject().put("enabled", false)))
+            else -> done(failure("UNKNOWN_ACTION", "Unsupported CrashReporter method"))
+        }
+    }
+
     // MARK: Health Connect
 
     fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?): Boolean =