Fix #3004: Tree arrow keys with dragdrop enabled (#3005)

primefaces · Jul 1, 2022 · 9226b89 · 9226b89
1 parent 156255b
commit 9226b89
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/components/lib/tree/UITreeNode.js b/components/lib/tree/UITreeNode.js
@@ -81,7 +81,14 @@ export const UITreeNode = React.memo((props) => {
                     focusNode(listElement.children[0]);
                 }
                 else {
-                    const nextNodeElement = nodeElement.nextElementSibling;
+                    let nextNodeElement = nodeElement.nextElementSibling;
+                    while (nextNodeElement) {
+                        if (!DomHandler.hasClass(nextNodeElement, 'p-treenode-droppoint')) {
+                            break;
+                        }
+                        nextNodeElement = nextNodeElement.nextElementSibling;
+                    }
+
                     if (nextNodeElement) {
                         focusNode(nextNodeElement);
                     }
@@ -159,7 +166,7 @@ export const UITreeNode = React.memo((props) => {
     }
 
     const focusNode = (element) => {
-        element.children[0].focus();
+        element && element.children[0] && element.children[0].focus();
     }
 
     const onClick = (event) => {