@onekeyfe/react-native-native-list 3.0.167 → 3.0.169

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

@@ -185,6 +185,8 @@ class NativeListView(
   private val adapter = NativeListAdapter(reactContext)
   private val containerSlots = mutableListOf<View>()
   private val slotHeights = IntArray(3)
+  private var containerSlotRelayoutPending = false
+  private var containerSlotRelayoutScheduled = false
   private val headerSlotAdapter = NativeListContainerSlotAdapter()
   private val emptySlotAdapter = NativeListContainerSlotAdapter()
   private val footerSlotAdapter = NativeListContainerSlotAdapter()
@@ -193,6 +195,7 @@ class NativeListView(
   fun mountContainerSlot(view: View, index: Int) {
     containerSlots.add(index.coerceIn(0, containerSlots.size), view)
     updateContainerSlots()
+    scheduleContainerSlotRelayout()
   }
 
   fun containerSlotCount(): Int = containerSlots.size
@@ -201,6 +204,7 @@ class NativeListView(
     val view = containerSlots.removeAt(index)
     (view.parent as? ViewGroup)?.removeView(view)
     updateContainerSlots()
+    scheduleContainerSlotRelayout()
   }
 
   fun setContainerSlotHeightsJson(json: String) {
@@ -210,8 +214,32 @@ class NativeListView(
       val value = values.optDouble(index)
       if (!value.isFinite() || value < 0) return
     }
-    for (index in 0..2) slotHeights[index] = (values.getDouble(index) * density).roundToInt()
+    var changed = false
+    for (index in 0..2) {
+      val height = (values.getDouble(index) * density).roundToInt()
+      if (slotHeights[index] != height) changed = true
+      slotHeights[index] = height
+    }
     updateContainerSlots()
+    if (changed) scheduleContainerSlotRelayout()
+  }
+
+  private fun scheduleContainerSlotRelayout() {
+    if (disposed) return
+    containerSlotRelayoutPending = true
+    if (containerSlotRelayoutScheduled) return
+    containerSlotRelayoutScheduled = true
+    recyclerView.post {
+      containerSlotRelayoutScheduled = false
+      if (disposed) {
+        containerSlotRelayoutPending = false
+        return@post
+      }
+      if (!containerSlotRelayoutPending || recyclerView.width <= 0 ||
+        recyclerView.height <= 0 || recyclerView.isComputingLayout) return@post
+      containerSlotRelayoutPending = false
+      relayoutRecyclerViewImmediately()
+    }
   }
 
   private fun updateContainerSlots() {
@@ -487,7 +515,10 @@ class NativeListView(
     recyclerView.addItemDecoration(SelectorBackgroundDecoration(adapter))
     recyclerView.addItemDecoration(ContainerSlotInsetDecoration { slotInsetPx })
     layoutManager.onChildLaidOut = ::recordLaidOutRowExtent
-    layoutManager.onLayoutPassCompleted = { emitScrollPositionThresholdIfNeeded(resync = true) }
+    layoutManager.onLayoutPassCompleted = {
+      emitScrollPositionThresholdIfNeeded(resync = true)
+      if (containerSlotRelayoutPending) scheduleContainerSlotRelayout()
+    }
     recyclerView.setHasFixedSize(false)
     layoutManager.spanSizeLookup = object : GridLayoutManager.SpanSizeLookup() {
       override fun getSpanSize(position: Int): Int {
@@ -641,6 +672,7 @@ class NativeListView(
 
   override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
     super.onLayout(changed, left, top, right, bottom)
+    if (containerSlotRelayoutPending) scheduleContainerSlotRelayout()
     val first = config?.items?.firstOrNull()
     if (recyclerView.isLayoutRequested && (first?.type == "market" || first?.json?.optString("presentation") == "market")) {
       // A retained Market page can keep cached parent measurements after its diff.
@@ -675,6 +707,7 @@ class NativeListView(
 
   override fun onAttachedToWindow() {
     super.onAttachedToWindow()
+    if (containerSlotRelayoutPending) scheduleContainerSlotRelayout()
     recyclerView.setTag(R.id.onekey_native_scroll_coordinator_offset_listener, coordinatorOffsetListener)
     emitScrollPositionThresholdIfNeeded()
     startStickyHeaderTracking()
@@ -1364,6 +1397,7 @@ class NativeListView(
   fun dispose() {
     if (disposed) return
     disposed = true
+    containerSlotRelayoutPending = false
     onScrollPositionThresholdChange = null
     if (!isAttachedToWindow) disposeResources()
   }

package/docs/SPEC.md

@@ -507,6 +507,15 @@ data adapter; adapter binding indices stay local while layout-manager positions
 are explicitly translated. Slots span all grid columns, do not select/reorder,
 and do not emit row actions, visible-row indices, or image-prefetch work.
 
+On Android, mounting/unmounting a slot or changing its actual rounded native
+height MUST request one coalesced RecyclerView measurement/layout repair. The
+repair runs after the current layout completes and only with a positive viewport
+size. A zero-sized or currently computing viewport retains the pending repair
+for the next layout/attachment opportunity rather than posting an unbounded
+retry loop. Disposal cancels the pending work. Equal height reports MUST NOT
+request another repair. This leaves Fabric-owned slot content and row indices
+unchanged; source checks alone do not establish first-layout visibility.
+
 Fabric mount/unmount ownership remains explicit even when RecyclerView detaches a
 slot holder. The native manager retains at most three roots until Fabric unmount;
 recycling detaches slot content without disposing its React tree. Unmount removes

package/package.json

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