@onekeyfe/react-native-native-list 3.0.107 → 3.0.108

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

@@ -15,6 +15,7 @@ internal class NativeListAdapter(
   private val context: ThemedReactContext,
 ) : RecyclerView.Adapter<NativeListViewHolder>() {
   private var suppressDifferUpdates = false
+  private var needsThemeRebind = false
   private var reorderItems: MutableList<NativeListItem>? = null
   private val differ = AsyncListDiffer(
     object : ListUpdateCallback {
@@ -43,6 +44,10 @@ internal class NativeListAdapter(
   )
   var usesSelectorSourceScale = false
   var theme: JSONObject? = null
+    set(value) {
+      if (field?.toString() != value?.toString()) needsThemeRebind = true
+      field = value
+    }
   var layout: String = "linear"
   var orientation: String = "vertical"
   var selectedKeys: Set<String> = emptySet()
@@ -117,11 +122,20 @@ internal class NativeListAdapter(
     (reorderItems ?: differ.currentList).indexOfFirst { it.key == key }
 
   fun submitList(items: List<NativeListItem>, commitCallback: (() -> Unit)? = null) {
+    // A newer submission can discard the reorder diff and its completion callback.
+    suppressDifferUpdates = false
     if (reorderItems != null) {
       reorderItems = null
       notifyDataSetChanged()
     }
-    differ.submitList(items.toList()) { commitCallback?.invoke() }
+    differ.submitList(items.toList()) {
+      // Retain this invalidation across superseded submissions, even when rows are unchanged.
+      if (needsThemeRebind) {
+        needsThemeRebind = false
+        notifyItemRangeChanged(0, itemCount)
+      }
+      commitCallback?.invoke()
+    }
   }
 
   fun moveReordered(from: Int, to: Int): List<NativeListItem>? {
@@ -144,6 +158,7 @@ internal class NativeListAdapter(
   }
 
   fun cancelReorder() {
+    suppressDifferUpdates = false
     if (reorderItems == null) return
     reorderItems = null
     notifyDataSetChanged()

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

@@ -1345,6 +1345,7 @@ class NativeListView(
         val from = dragFrom
         val to = dragTo
         val reordered = pendingReorder
+        var reorderPayload: JSONObject? = null
         val destinationPosition = if (to != RecyclerView.NO_POSITION) {
           to
         } else {
@@ -1384,12 +1385,12 @@ class NativeListView(
               .put("toIndex", to)
             reordered.getOrNull(to - 1)?.let { payload.put("beforeKey", it.key) }
             reordered.getOrNull(to + 1)?.let { payload.put("afterKey", it.key) }
+            reorderPayload = payload
             adapter.commitReordered(reordered) {
               finishCompactWalletGroup()
               if (!wasCompactWalletGroupDrag) {
                 recyclerView.postOnAnimation(::relayoutRecyclerViewImmediately)
               }
-              emit(REORDER, payload)
             }
           }
         } else {
@@ -1399,6 +1400,8 @@ class NativeListView(
         dragFrom = RecyclerView.NO_POSITION
         dragTo = RecyclerView.NO_POSITION
         pendingReorder = null
+        // The gesture is committed now; a later snapshot may supersede its async diff.
+        reorderPayload?.let { emit(REORDER, it) }
       }
     }
     itemTouchHelper = ItemTouchHelper(callback).also { it.attachToRecyclerView(recyclerView) }

package/ios/RNCNativeListView.swift

@@ -253,6 +253,7 @@ final class NativeListView: UIView {
       return
     }
     let oldItems = itemsByKey
+    let themeChanged = !dictionariesEqual(config?.theme, next.theme)
     if config?.generation != next.generation { endReachedGeneration = nil }
     config = next
     itemsByKey = Dictionary(uniqueKeysWithValues: next.items.map { ($0.key, $0) })
@@ -267,7 +268,7 @@ final class NativeListView: UIView {
     snapshot.appendItems(keys, toSection: 0)
     let changedKeys = keys.filter { key in
       guard let old = oldItems[key], let new = itemsByKey[key] else { return false }
-      return old.revision != new.revision || old.content != new.content
+      return themeChanged || old.revision != new.revision || old.content != new.content
     }
     snapshot.reconfigureItems(changedKeys)
     dataSource.apply(snapshot, animatingDifferences: false) { [weak self] in

package/lib/module/NativeList.js

@@ -190,7 +190,7 @@ export const NativeList = /*#__PURE__*/forwardRef(function NativeList({
         emitIndexFailure(-1, 'item-not-found');
         return;
       }
-      dispatchIndexScroll(index, normalizePositionScroll(params, 'start'));
+      dispatchKeyScroll(params.item.key, normalizePositionScroll(params, 'start'));
     },
     scrollToOffset({
       offset,

package/lib/module/NativeList.web.js

@@ -144,7 +144,7 @@ export const NativeList = /*#__PURE__*/forwardRef(function NativeList({
         emitIndexFailure(-1, 'item-not-found');
         return;
       }
-      engineRef.current?.scrollToIndex(index, normalizePositionScroll(params, 'start'));
+      engineRef.current?.scrollToKey(params.item.key, normalizePositionScroll(params, 'start'));
     },
     scrollToOffset({
       offset,

package/package.json

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

package/src/NativeList.tsx

@@ -328,7 +328,10 @@ export const NativeList = forwardRef<NativeListRef, NativeListProps>(
           emitIndexFailure(-1, 'item-not-found');
           return;
         }
-        dispatchIndexScroll(index, normalizePositionScroll(params, 'start'));
+        dispatchKeyScroll(
+          params.item.key,
+          normalizePositionScroll(params, 'start')
+        );
       },
       scrollToOffset({ offset, animated = true }) {
         validateOffset(offset);

package/src/NativeList.web.tsx

@@ -234,8 +234,8 @@ export const NativeList = forwardRef<NativeListRef, NativeListProps>(
           emitIndexFailure(-1, 'item-not-found');
           return;
         }
-        engineRef.current?.scrollToIndex(
-          index,
+        engineRef.current?.scrollToKey(
+          params.item.key,
           normalizePositionScroll(params, 'start')
         );
       },