Refactor #7062

primefaces · Feb 20, 2025 · 44064c5 · 44064c5
1 parent 73bfa10
commit 44064c5
Showing 1 changed file with 14 additions and 13 deletions.
diff --git a/packages/primevue/src/datepicker/DatePicker.vue b/packages/primevue/src/datepicker/DatePicker.vue
@@ -2568,22 +2568,23 @@ export default {
                             if (this.timeOnly) {
                                 focusableElements[0].focus();
                             } else {
-                                let spanIndex = null;
-
-                                for (let i = 0; i < focusableElements.length; i++) {
-                                    if (focusableElements[i].tagName === 'SPAN') {
-                                        spanIndex = i;
-                                        break;
-                                    } else if (focusableElements[i].tagName === 'BUTTON') {
-                                        spanIndex = i;
-                                        break;
-                                    }
+                                let elementIndex = focusableElements.findIndex((el) => el.tagName === 'SPAN');
+
+                                if (elementIndex === -1) {
+                                    elementIndex = focusableElements.findIndex((el) => el.tagName === 'BUTTON');
                                 }
 
-                                focusableElements[spanIndex].focus();
+                                if (elementIndex !== -1) {
+                                    focusableElements[elementIndex].focus();
+                                } else {
+                                    focusableElements[0].focus();
+                                }
                             }
-                        } else if (focusedIndex === focusableElements.length - 1) focusableElements[0].focus();
-                        else focusableElements[focusedIndex + 1].focus();
+                        } else if (focusedIndex === focusableElements.length - 1) {
+                            focusableElements[0].focus();
+                        } else {
+                            focusableElements[focusedIndex + 1].focus();
+                        }
                     }
                 }
             }