🐛 Listbox: select next/previous option when opening a listbox with no…

… value
GavinJoyce · Sep 8, 2021 · 60ec9cf · 60ec9cf
1 parent c680092
commit 60ec9cf
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/addon/components/listbox.js b/addon/components/listbox.js
@@ -234,11 +234,11 @@ export default class ListboxComponent extends Component {
   }
 
   setNextOptionActive() {
-    for (
-      let i = this.activeOptionIndex + 1;
-      i < this.optionElements.length;
-      i++
-    ) {
+    let nextActiveOptionIndex = this.activeOptionIndex !== undefined
+      ? this.activeOptionIndex + 1
+      : 0;
+
+    for (let i = nextActiveOptionIndex; i < this.optionElements.length; i++) {
       if (!this.optionElements[i].hasAttribute('disabled')) {
         this.activeOptionIndex = i;
         break;
@@ -247,7 +247,11 @@ export default class ListboxComponent extends Component {
   }
 
   setPreviousOptionActive() {
-    for (let i = this.activeOptionIndex - 1; i >= 0; i--) {
+    let previousActiveOptionIndex = this.activeOptionIndex !== undefined
+      ? this.activeOptionIndex - 1
+      : this.optionElements.length - 1;
+
+    for (let i = previousActiveOptionIndex; i >= 0; i--) {
       if (!this.optionElements[i].hasAttribute('disabled')) {
         this.activeOptionIndex = i;
         break;