@onekeyfe/react-native-native-list 6.7.0-alpha.406 → 6.7.0-alpha.407

package/android/src/main/java/com/onekey/nativelist/NativeListActivityDetailsView.kt

@@ -18,6 +18,9 @@ internal class NativeListActivityDetailsView(private val reactContext: ThemedRea
   private val main = LinearLayout(context).apply { orientation = HORIZONTAL; gravity = Gravity.CENTER_VERTICAL }
   private val identityColumn = LinearLayout(context).apply { orientation = HORIZONTAL; gravity = Gravity.CENTER_VERTICAL }
   private val visual = NativeListLeadingVisual(reactContext, fonts)
+  /** Whether the bound leading visual lays a badge past its frame; see [setClipping]. */
+  var leadingOverhangs = false
+    private set
   private val identity = LinearLayout(context).apply { orientation = VERTICAL }
   private val titleLine = LinearLayout(context).apply { orientation = HORIZONTAL; gravity = Gravity.CENTER_VERTICAL }
   private val title = NativeListTextView(context)
@@ -49,6 +52,18 @@ internal class NativeListActivityDetailsView(private val reactContext: ThemedRea
     addView(main, LayoutParams(-1, -2))
     addView(actions, LayoutParams(-1, -2))
   }
+  /**
+   * Android clips a child to its own bounds while its parent clips children, so
+   * every view between the leading visual and the row host stops clipping when
+   * the visual's network badge overhangs its box (SPEC "Leading badge overhang",
+   * OK-66275); the host row applies the same policy to itself.
+   */
+  private fun setClipping(clips: Boolean) {
+    for (group in listOf(identityColumn, main, this)) {
+      group.clipChildren = clips
+      group.clipToPadding = clips
+    }
+  }
   private fun dp(value: Int) = if (sourceScale) (value * resources.displayMetrics.density).roundToInt() else NativeListScale.dp(resources, value)
   private fun px(value: Double) = (value * resources.displayMetrics.density).roundToInt()
   private fun color(tone: String, theme: JSONObject?): Int {
@@ -79,6 +94,8 @@ internal class NativeListActivityDetailsView(private val reactContext: ThemedRea
     visual.visibility = if (hideLeading) GONE else VISIBLE
     if (hideLeading) visual.recycle()
     else visual.bind(data.optJSONObject("leading") ?: JSONObject(), image, item.key, theme, false, sourceScale, data.optJSONObject("secondaryLeading"))
+    leadingOverhangs = !hideLeading && visual.requestsUnclippedHost
+    setClipping(nativeListActivityHostClips(leadingOverhangs))
     amounts.layoutParams = if (table) LayoutParams(0, -2, 1f).apply { marginStart = gap } else LayoutParams(-2, -2).apply { marginStart = gap }
     text(title, data.optString("title"), style.optJSONObject("title"), 16f, color("primary", theme), 24, "medium")
     text(description, data.optString("description"), style.optJSONObject("description"), 14f, color("secondary", theme), 20, lines = 2)
@@ -153,7 +170,11 @@ internal class NativeListActivityDetailsView(private val reactContext: ThemedRea
     }
     label.text = styled
   }
-  fun recycle() { visual.recycle(); visual.visibility = VISIBLE; amountViews.forEach { it.recycle() }; description.setOnClickListener(null); actions.removeAllViews() }
+  fun recycle() {
+    visual.recycle(); visual.visibility = VISIBLE; amountViews.forEach { it.recycle() }; description.setOnClickListener(null); actions.removeAllViews()
+    leadingOverhangs = false
+    setClipping(true)
+  }
   fun dispose() { recycle(); visual.dispose(); amountViews.forEach { it.dispose() } }
 
   private inner class AmountView : LinearLayout(context) {

package/android/src/main/java/com/onekey/nativelist/NativeListActivityRenderer.kt

@@ -83,10 +83,11 @@ internal class NativeListActivityRowView(context: ThemedReactContext, fonts: Nat
       setPadding(hp, vp, hp, vp)
       visual.recycle()
       details.bind(item, theme, sourceScale)
-      // This view may be reused from a legacy row whose overhanging badge
-      // switched clipping off; a rich row has no badge on the host, so restore
-      // the defaults before returning.
-      setHostClipping(nativeListActivityHostClips(rich = true, leadingOverhangs = false))
+      // The rich row's leading visual lives on the details view, where its
+      // network badge overhangs the box (OK-66275): this host must stop clipping
+      // as well, and a view reused from a badge row clips again when the bound
+      // row has no badge.
+      setHostClipping(nativeListActivityHostClips(details.leadingOverhangs))
       return
     }
     details.recycle()
@@ -174,12 +175,7 @@ internal class NativeListActivityRowView(context: ThemedReactContext, fonts: Nat
     // Stop clipping the content row and this row's padding exactly when the
     // bound visual reports such a badge (SPEC "Leading badge overhang"), as the
     // Identity renderer does.
-    setHostClipping(
-      nativeListActivityHostClips(
-        rich = false,
-        leadingOverhangs = !hideLeading && visual.requestsUnclippedHost,
-      )
-    )
+    setHostClipping(nativeListActivityHostClips(!hideLeading && visual.requestsUnclippedHost))
     bind(
       title,
       data.optString("title"),

package/android/src/main/java/com/onekey/nativelist/NativeListModels.kt

@@ -50,16 +50,17 @@ internal fun nativeListLeadingVisualOverhangsFrame(
 ): Boolean = kind == "token" && sourceCount > 1 || hasCornerIcon || overlayCount > 0
 
 /**
- * Whether an Activity row host clips its children and padding for this bind.
- * One row view serves both the legacy row and the rich (`amounts`) row and is
- * reused across binds, so clipping is derived from the bound item alone and
- * applied on every bind: only a legacy row whose leading visual lays a badge
- * past its frame ([nativeListLeadingVisualOverhangsFrame], OK-66071) opts out;
- * a rich row keeps Android's default clipping even when the view it reuses
- * last showed such a badge.
+ * Whether an Activity row host (and, for a rich `amounts` row, the details view
+ * with its nested columns) clips its children and padding for this bind. One
+ * row view serves both the legacy row and the rich row and is reused across
+ * binds, so clipping is derived from the bound item alone and applied on every
+ * bind: a row whose bound leading visual lays a badge past its frame
+ * ([nativeListLeadingVisualOverhangsFrame]) opts out, whether that visual sits
+ * on the host (legacy row, OK-66071) or on the details view (rich row,
+ * OK-66275); a row without such a badge clips again even when the view it
+ * reuses last showed one.
  */
-internal fun nativeListActivityHostClips(rich: Boolean, leadingOverhangs: Boolean): Boolean =
-  rich || !leadingOverhangs
+internal fun nativeListActivityHostClips(leadingOverhangs: Boolean): Boolean = !leadingOverhangs
 
 internal data class NativeListSlotFrame(val x: Int, val y: Int, val width: Int, val height: Int)
 

package/android/src/test/java/com/margelo/nitro/nativelist/NativeListActivityHostClipPolicyTest.kt

@@ -5,10 +5,12 @@ import org.junit.Test
 
 class NativeListActivityHostClipPolicyTest {
   // One Activity row view serves legacy and rich rows and is reused across
-  // binds. A legacy row with an overhanging network badge switches the host's
-  // clipping off (OK-66071); the next bind must derive clipping afresh, so a
-  // rich row reusing that view clips again instead of drawing its details over
-  // a neighbouring row (PR #185 review).
+  // binds. A row with an overhanging network badge switches the host's
+  // clipping off, whether the badge sits on the host's visual (legacy row,
+  // OK-66071) or on the details view's visual (rich row, OK-66275); the next
+  // bind must derive clipping afresh, so a row without a badge reusing that
+  // view clips again instead of drawing over a neighbouring row (PR #185
+  // review).
   @Test
   fun rebindSequenceDerivesClippingFromEachBoundItem() {
     data class Bind(val name: String, val rich: Boolean, val leadingOverhangs: Boolean, val clips: Boolean)
@@ -17,13 +19,17 @@ class NativeListActivityHostClipPolicyTest {
       Bind("legacy row, plain token", rich = false, leadingOverhangs = false, clips = true),
       Bind("legacy row, network badge", rich = false, leadingOverhangs = true, clips = false),
       Bind("rich row reusing the badge row's view", rich = true, leadingOverhangs = false, clips = true),
+      // The app's history rows carry `amounts`, so their badge lives on the
+      // details view's leading visual: a rich row with such a badge must stop
+      // clipping too (OK-66275).
+      Bind("rich row, network badge in details", rich = true, leadingOverhangs = true, clips = false),
       Bind("legacy row, badge again", rich = false, leadingOverhangs = true, clips = false),
       Bind("legacy row, hidden leading", rich = false, leadingOverhangs = false, clips = true),
     )
 
     assertEquals(
       binds.map(Bind::clips),
-      binds.map { nativeListActivityHostClips(rich = it.rich, leadingOverhangs = it.leadingOverhangs) },
+      binds.map { nativeListActivityHostClips(leadingOverhangs = it.leadingOverhangs) },
     )
   }
 }

package/docs/SPEC.md

@@ -778,7 +778,14 @@ Host clipping is per-bind state. A row view that serves several row shapes
 (the Android Activity view serves the legacy row and the rich `amounts` row) is
 reused across binds, so each bind MUST derive clipping from the item it binds
 (`nativeListActivityHostClips`): a view that last showed an overhanging badge
-clips again when it is rebound to a row without one.
+clips again when it is rebound to a row without one. The rule follows the
+visual, not the row shape: the rich row renders its leading visual on the
+details view, so that view and every column between the visual and the host
+stop clipping too, and the host derives its own clipping from the details
+view's visual (`leadingOverhangs`, OK-66275). Before this rule the rich branch
+forced the host's clipping back on and left the details view at Android's
+defaults, so the app's history rows (which always carry `amounts`) still showed
+the badge cut at the bottom-right after the legacy branch had been fixed.
 
 The row's own shape still clips on every platform: iOS masks the cell to its
 corner radius (`masksToBounds`), Web keeps the row `overflow: hidden`, and
@@ -815,9 +822,10 @@ over the badge. The per-source geometry is one pure function on Android
 `NativeListLeadingVisual.layoutSubviews` on iOS; both restore the stacking
 order by role on every bind because slots are reused across roles.
 
-The Android Activity renderer also applies the badge-overhang rule above
-(`requestsUnclippedHost` stops the content row and the row padding clipping),
-so the history rows' network badges render whole instead of cut flat.
+The Android Activity renderer also applies the badge-overhang rule above on
+both of its branches (`requestsUnclippedHost` stops the legacy content row, the
+rich details view with its columns, and the row padding clipping), so the
+history rows' network badges render whole instead of cut flat.
 
 ## Failures, fallback and limits
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/react-native-native-list",
-  "version": "6.7.0-alpha.406",
+  "version": "6.7.0-alpha.407",
   "description": "Template-driven native RecyclerView and UICollectionView for React Native",
   "source": "./src/index.ts",
   "main": "./lib/module/index.js",
@@ -86,8 +86,8 @@
     "typescript": "^5.9.2"
   },
   "peerDependencies": {
-    "@onekeyfe/react-native-image": "6.7.0-alpha.406",
-    "@onekeyfe/react-native-native-logger": "6.7.0-alpha.406",
+    "@onekeyfe/react-native-image": "6.7.0-alpha.407",
+    "@onekeyfe/react-native-native-logger": "6.7.0-alpha.407",
     "react": "*",
     "react-native": "*",
     "react-native-nitro-modules": "0.37.0"