@onekeyfe/react-native-native-list 3.0.124 → 3.0.126

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

@@ -1442,6 +1442,16 @@ internal class NativeListRowView(
     restoreRestingBackground()
   }
 
+  fun canStartWalletGroupReorder(localY: Float): Boolean {
+    if ((tag as? NativeListItem)?.type != "walletGroup") return true
+    walletGroupRows.forEach { row ->
+      if (localY >= row.top && localY < row.bottom) {
+        return (row.tag as? NativeListItem)?.json?.optBoolean("draggable", true) != false
+      }
+    }
+    return true
+  }
+
   fun finishWalletGroupReorder(
     durationMs: Long,
     interpolator: TimeInterpolator,
@@ -1533,11 +1543,14 @@ internal class NativeListRowView(
       }
     }
     if (members.first().has("height")) setPadding(dp(1), dp(1), dp(1), dp(1))
-    walletGroupDragChildCount = members.size - 1
+    val childCount = members.size - 1
+    walletGroupDragChildCount = members.drop(1).count {
+      it.optBoolean("draggable", true)
+    }
     walletGroupExpandedHeightPx =
       // OneKey patch: expanded groups include individual wallet badge heights.
       // dp(members.size * 68 + walletGroupDragChildCount * 12)
-      dp(members.sumOf { it.optInt("height", if ((it.optJSONArray("badges")?.length() ?: 0) > 0) 92 else 68) } + walletGroupDragChildCount * 12 + if (members.first().has("height")) 2 else 0)
+      dp(members.sumOf { it.optInt("height", if ((it.optJSONArray("badges")?.length() ?: 0) > 0) 92 else 68) } + childCount * 12 + if (members.first().has("height")) 2 else 0)
     walletGroupDragBadgeBackgroundPaint.color = color(
       theme,
       "inverseBackground",

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

@@ -1839,7 +1839,10 @@ class NativeListView(
                   // item.type != "walletGroup" ||
                   // event.rawY in holderLocation[1].toFloat()..(holderLocation[1] + dp(68)).toFloat()
                   // )
-                  item.isReorderable
+                  item.isReorderable &&
+                    (holder as? NativeListViewHolder)?.rowView?.canStartWalletGroupReorder(
+                      event.y - holder.itemView.top,
+                    ) != false
                 } == true
               }
             if (candidate != null) handler.postDelayed(startDrag, REORDER_LONG_PRESS_MS)

package/ios/NativeListCell.swift

@@ -1519,7 +1519,9 @@ final class NativeListCell: UICollectionViewCell {
         checkboxState: checkboxState
       )
     }
-    let childCount = item.data.dictionaries("children").count
+    let childCount = item.data.dictionaries("children").filter {
+      ($0["draggable"] as? Bool) != false
+    }.count
     walletGroupDragBadge.text = childCount > 0 ? "+\(childCount)" : nil
     walletGroupDragBadge.isHidden = childCount == 0
     walletGroupDragBadge.backgroundColor = nativeListColor(
@@ -1565,6 +1567,16 @@ final class NativeListCell: UICollectionViewCell {
     isHighlighted = pressed && isUserInteractionEnabled
   }
 
+  func canStartWalletGroupReorder(at point: CGPoint) -> Bool {
+    guard currentItem?.type == "walletGroup" else { return true }
+    let groupPoint = rootStack.convert(point, from: self)
+    for (index, cell) in walletGroupCells.prefix(walletGroupMembers.count).enumerated()
+      where cell.frame.contains(groupPoint) {
+      return (walletGroupMembers[index].data["draggable"] as? Bool) != false
+    }
+    return true
+  }
+
   func setWalletGroupReorderCompact(_ compact: Bool) {
     guard currentItem?.type == "walletGroup" else { return }
     walletGroupCompactAppearanceActive = compact

package/ios/RNCNativeListView.swift

@@ -66,7 +66,7 @@ final class NativeListView: UIView {
   private let sectionIndexView = NativeListSectionIndexView()
   private let sectionIndexPreview = NativeListSectionIndexPreviewView()
   private var sectionIndexLayoutConstraints: [NSLayoutConstraint] = []
-  private var sectionIndexWindowHeightConstraint: NSLayoutConstraint?
+  private var sectionIndexHostHeightConstraint: NSLayoutConstraint?
   private var footerHeightConstraint: NSLayoutConstraint!
   private var dataSource: UICollectionViewDiffableDataSource<Int, String>!
   private var config: NativeListConfig?
@@ -609,7 +609,8 @@ final class NativeListView: UIView {
             let indexPath = collectionView.indexPathForItem(at: point),
             let item = item(at: indexPath),
             item.isReorderable,
-            let cell = collectionView.cellForItem(at: indexPath) as? NativeListCell else {
+            let cell = collectionView.cellForItem(at: indexPath) as? NativeListCell,
+            cell.canStartWalletGroupReorder(at: gesture.location(in: cell)) else {
         interactiveReorderSource = nil
         interactiveReorderCell = nil
         interactiveReorderTargetIndex = nil
@@ -1065,11 +1066,24 @@ final class NativeListView: UIView {
           bounds.width > 0,
           bounds.height > 0,
           isVisibleInHierarchy,
-          let window else {
+          let window,
+          let hostView = sectionIndexHostView,
+          hostView.window === window else {
       attachSectionIndexToList()
       return
     }
-    attachSectionIndex(to: window)
+    attachSectionIndex(to: hostView)
+  }
+
+  private var sectionIndexHostView: UIView? {
+    var responder: UIResponder? = self
+    while let current = responder {
+      if let viewController = current as? UIViewController {
+        return viewController.view
+      }
+      responder = current.next
+    }
+    return nil
   }
 
   private var isVisibleInHierarchy: Bool {
@@ -1084,7 +1098,7 @@ final class NativeListView: UIView {
   private func attachSectionIndexToList() {
     guard sectionIndexView.superview !== self || sectionIndexLayoutConstraints.isEmpty else { return }
     NSLayoutConstraint.deactivate(sectionIndexLayoutConstraints)
-    sectionIndexWindowHeightConstraint = nil
+    sectionIndexHostHeightConstraint = nil
     sectionIndexView.removeFromSuperview()
     addSubview(sectionIndexView)
     sectionIndexLayoutConstraints = [
@@ -1096,20 +1110,20 @@ final class NativeListView: UIView {
     NSLayoutConstraint.activate(sectionIndexLayoutConstraints)
   }
 
-  private func attachSectionIndex(to window: UIWindow) {
-    let railHeight = sectionIndexView.preferredHeight(constrainedTo: window.bounds.height)
-    if sectionIndexView.superview === window {
-      sectionIndexWindowHeightConstraint?.constant = railHeight
+  private func attachSectionIndex(to hostView: UIView) {
+    let railHeight = sectionIndexView.preferredHeight(constrainedTo: hostView.bounds.height)
+    if sectionIndexView.superview === hostView {
+      sectionIndexHostHeightConstraint?.constant = railHeight
       return
     }
     NSLayoutConstraint.deactivate(sectionIndexLayoutConstraints)
     sectionIndexView.removeFromSuperview()
-    window.addSubview(sectionIndexView)
+    hostView.addSubview(sectionIndexView)
     let heightConstraint = sectionIndexView.heightAnchor.constraint(equalToConstant: railHeight)
-    sectionIndexWindowHeightConstraint = heightConstraint
+    sectionIndexHostHeightConstraint = heightConstraint
     sectionIndexLayoutConstraints = [
       sectionIndexView.trailingAnchor.constraint(equalTo: safeAreaLayoutGuide.trailingAnchor),
-      sectionIndexView.centerYAnchor.constraint(equalTo: window.centerYAnchor),
+      sectionIndexView.centerYAnchor.constraint(equalTo: hostView.centerYAnchor),
       sectionIndexView.widthAnchor.constraint(equalToConstant: Self.sectionIndexRailWidth),
       heightConstraint,
     ]

package/lib/module/web/NativeListWebEngine.js

@@ -360,7 +360,13 @@ export function computeWebListLayout(snapshot, viewportWidth, viewportHeight, co
   };
 }
 export function webWalletGroupReorderBadge(row) {
-  return row.type === 'walletGroup' && row.children.length > 0 ? '+' + String(row.children.length) : undefined;
+  const draggableChildCount = row.type === 'walletGroup' ? row.children.filter(child => child.draggable !== false).length : 0;
+  return draggableChildCount > 0 ? '+' + String(draggableChildCount) : undefined;
+}
+export function canStartWebWalletGroupReorder(row, memberKey) {
+  if (row.type !== 'walletGroup' || !memberKey) return true;
+  const member = [row.parent, ...row.children].find(candidate => candidate.key === memberKey);
+  return member?.draggable !== false;
 }
 function itemStart(item, horizontal) {
   return horizontal ? item.x : item.y;
@@ -3246,6 +3252,8 @@ export class NativeListWebEngine {
     const index = Number(rowElement?.dataset.nativeListRowIndex);
     const row = this.rows[index];
     if (!row || !this.isReorderable(row)) return;
+    const memberKey = target.closest('[data-native-list-group-member-key]')?.dataset.nativeListGroupMemberKey;
+    if (!canStartWebWalletGroupReorder(row, memberKey)) return;
     // OneKey patch: a child drag reorders its parent wallet group as one item.
     // if (
     // row.type === 'walletGroup' &&

package/lib/typescript/src/web/NativeListWebEngine.d.ts

@@ -65,6 +65,7 @@ export declare function hasExceededWebReorderMouseThreshold(deltaX: number, delt
 export declare function estimateWebRowHeight(row: RowModel, snapshot: NativeListSnapshot, availableWidth: number): number;
 export declare function computeWebListLayout(snapshot: NativeListSnapshot, viewportWidth: number, viewportHeight: number, compactRowKey?: string): WebListLayout;
 export declare function webWalletGroupReorderBadge(row: RowModel): string | undefined;
+export declare function canStartWebWalletGroupReorder(row: RowModel, memberKey: string | undefined): boolean;
 export declare function visibleWebLayoutItems(layout: WebListLayout, offset: number, viewportLength: number, overscan?: number): readonly WebLayoutItem[];
 export type WebCollapsiblePagerScrollMetrics = Readonly<{
     offset: number;

package/package.json

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

package/src/web/NativeListWebEngine.ts

@@ -715,11 +715,26 @@ export function computeWebListLayout(
 }
 
 export function webWalletGroupReorderBadge(row: RowModel): string | undefined {
-  return row.type === 'walletGroup' && row.children.length > 0
-    ? '+' + String(row.children.length)
+  const draggableChildCount =
+    row.type === 'walletGroup'
+      ? row.children.filter((child) => child.draggable !== false).length
+      : 0;
+  return draggableChildCount > 0
+    ? '+' + String(draggableChildCount)
     : undefined;
 }
 
+export function canStartWebWalletGroupReorder(
+  row: RowModel,
+  memberKey: string | undefined
+): boolean {
+  if (row.type !== 'walletGroup' || !memberKey) return true;
+  const member = [row.parent, ...row.children].find(
+    (candidate) => candidate.key === memberKey
+  );
+  return member?.draggable !== false;
+}
+
 function itemStart(item: WebLayoutItem, horizontal: boolean): number {
   return horizontal ? item.x : item.y;
 }
@@ -5404,6 +5419,10 @@ export class NativeListWebEngine {
     const index = Number(rowElement?.dataset.nativeListRowIndex);
     const row = this.rows[index];
     if (!row || !this.isReorderable(row)) return;
+    const memberKey = target.closest<HTMLElement>(
+      '[data-native-list-group-member-key]'
+    )?.dataset.nativeListGroupMemberKey;
+    if (!canStartWebWalletGroupReorder(row, memberKey)) return;
     // OneKey patch: a child drag reorders its parent wallet group as one item.
     // if (
     // row.type === 'walletGroup' &&