fix(prompt): disabled item gets selected when it's the first option (#…

…137)
c4spar · Jan 13, 2021 · f5c9be5 · f5c9be5
1 parent ad779f4
commit f5c9be5
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 19 deletions.
diff --git a/prompt/_generic_list.ts b/prompt/_generic_list.ts
@@ -65,9 +65,9 @@ export interface GenericListSettings<T, V>
 /** Generic list prompt representation. */
 export abstract class GenericList<T, V, S extends GenericListSettings<T, V>>
   extends GenericInput<T, V, S> {
-  protected listOffset = 0;
-  protected listIndex = 0;
   protected options: S["options"] = this.settings.options;
+  protected listIndex: number = this.getListIndex();
+  protected listOffset: number = this.getPageOffset(this.listIndex);
 
   /**
    * Create list separator.
@@ -201,6 +201,24 @@ export abstract class GenericList<T, V, S extends GenericListSettings<T, V>>
     );
   }
 
+  protected getListIndex(value?: string) {
+    return typeof value === "undefined"
+      ? this.options.findIndex((item: GenericListOptionSettings) =>
+        !item.disabled
+      ) || 0
+      : this.options.findIndex((item: GenericListOptionSettings) =>
+        item.value === value
+      ) || 0;
+  }
+
+  protected getPageOffset(index: number) {
+    if (index === 0) {
+      return 0;
+    }
+    const height: number = this.getListHeight();
+    return Math.floor(index / height) * height;
+  }
+
   /**
    * Find option by value.
    * @param value Value of the option.

diff --git a/prompt/select.ts b/prompt/select.ts
@@ -40,7 +40,6 @@ export interface SelectSettings extends GenericListSettings<string, string> {
 export class Select<S extends SelectSettings = SelectSettings>
   extends GenericList<string, string, S> {
   protected listIndex: number = this.getListIndex(this.settings.default);
-  protected listOffset: number = this.getPageOffset(this.listIndex);
 
   /**
    * Inject prompt value. Can be used for unit tests or pre selections.
@@ -99,22 +98,6 @@ export class Select<S extends SelectSettings = SelectSettings>
     return this.options[this.listIndex]?.value ?? this.settings.default;
   }
 
-  protected getListIndex(value: string | undefined) {
-    return typeof value === "undefined"
-      ? 0
-      : this.options.findIndex((item: SelectOptionSettings) =>
-        item.value === value
-      ) || 0;
-  }
-
-  protected getPageOffset(index: number) {
-    if (index === 0) {
-      return 0;
-    }
-    const height: number = this.getListHeight();
-    return Math.floor(index / height) * height;
-  }
-
   /**
    * Validate input value.
    * @param value User input value.