Fix primefaces#11513: Tree wrong dnd index for sibling going down

melloware · Feb 23, 2024 · 913d03a · 913d03a
1 parent b8c7175
commit 913d03a
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/primefaces/src/main/resources/META-INF/resources/primefaces/tree/tree.vertical.js b/primefaces/src/main/resources/META-INF/resources/primefaces/tree/tree.vertical.js
@@ -754,14 +754,23 @@ PrimeFaces.widget.VerticalTree = PrimeFaces.widget.BaseTree.extend({
                 draggedSourceKeys = draggedSourceKeys.filter(function(key) {
                     return $.inArray(key, $this.invalidSourceKeys) === -1;
                 });
+
+                // #11513 dndIndex is based on whether you are dragging up or down
+                var dndIndex = dropPoint.prevAll('li.ui-treenode').length;
+                if (parseInt(dragNodeKey) < dndIndex) {
+                    var nextDndIndex = dropPoint.nextAll('li.ui-treenode').length;
+                    if (nextDndIndex > 0) {
+                        dndIndex = nextDndIndex;
+                    }
+                }
 
                 if (draggedSourceKeys && draggedSourceKeys.length) {
                     draggedSourceKeys = draggedSourceKeys.reverse().join(',');
                     $this.fireDragDropEvent({
                         'dragNodeKey': draggedSourceKeys,
                         'dropNodeKey': dropNodeKey,
                         'dragSource': dragSource.id,
-                        'dndIndex': dropPoint.prevAll('li.ui-treenode').length,
+                        'dndIndex': dndIndex,
                         'transfer': transfer,
                         'isDroppedNodeCopy': isDroppedNodeCopy
                     });