fix(prompt): key symbols in prompt info are hardcoded (#274)

c4spar · Aug 22, 2021 · a6138b2 · a6138b2
1 parent 57e7434
commit a6138b2
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 16 deletions.
diff --git a/prompt/_generic_list.ts b/prompt/_generic_list.ts
@@ -6,7 +6,7 @@ import {
   GenericInputPromptSettings,
 } from "./_generic_input.ts";
 import { blue, bold, dim, stripColor } from "./deps.ts";
-import { Figures } from "./figures.ts";
+import { Figures, getFiguresByKeys } from "./figures.ts";
 import { distance } from "../_utils/distance.ts";
 
 /** Select key options. */
@@ -160,17 +160,20 @@ export abstract class GenericList<T, V, S extends GenericListSettings<T, V>>
     }
     const selected: number = this.listIndex + 1;
     const actions: Array<[string, Array<string>]> = [
-      ["Next", [Figures.ARROW_DOWN]],
-      ["Previous", [Figures.ARROW_UP]],
-      ["Next Page", [Figures.PAGE_DOWN]],
-      ["Previous Page", [Figures.PAGE_UP]],
-      ["Submit", [Figures.ENTER]],
+      ["Next", getFiguresByKeys(this.settings.keys?.next ?? [])],
+      ["Previous", getFiguresByKeys(this.settings.keys?.previous ?? [])],
+      ["Next Page", getFiguresByKeys(this.settings.keys?.nextPage ?? [])],
+      [
+        "Previous Page",
+        getFiguresByKeys(this.settings.keys?.previousPage ?? []),
+      ],
+      ["Submit", getFiguresByKeys(this.settings.keys?.submit ?? [])],
     ];
 
     return "\n" + this.settings.indent + blue(Figures.INFO) +
       bold(` ${selected}/${this.options.length} `) +
       actions
-        .map((cur) => `${cur[0]}: ${bold(cur[1].join(" "))}`)
+        .map((cur) => `${cur[0]}: ${bold(cur[1].join(", "))}`)
         .join(", ");
   }
 

diff --git a/prompt/_generic_suggestions.ts b/prompt/_generic_suggestions.ts
@@ -6,7 +6,7 @@ import {
   GenericInputPromptSettings,
 } from "./_generic_input.ts";
 import { blue, bold, dim, stripColor, underline } from "./deps.ts";
-import { Figures } from "./figures.ts";
+import { Figures, getFiguresByKeys } from "./figures.ts";
 import { distance } from "../_utils/distance.ts";
 
 interface LocalStorage {
@@ -183,23 +183,26 @@ export abstract class GenericSuggestions<
     if (this.settings.suggestions?.length) {
       if (this.settings.list) {
         actions.push(
-          ["Next", [Figures.ARROW_DOWN]],
-          ["Previous", [Figures.ARROW_UP]],
-          ["Next Page", [Figures.PAGE_DOWN]],
-          ["Previous Page", [Figures.PAGE_UP]],
+          ["Next", getFiguresByKeys(this.settings.keys?.next ?? [])],
+          ["Previous", getFiguresByKeys(this.settings.keys?.previous ?? [])],
+          ["Next Page", getFiguresByKeys(this.settings.keys?.nextPage ?? [])],
+          [
+            "Previous Page",
+            getFiguresByKeys(this.settings.keys?.previousPage ?? []),
+          ],
         );
       } else {
         actions.push(
-          ["Next", [Figures.ARROW_UP]],
-          ["Previous", [Figures.ARROW_DOWN]],
+          ["Next", getFiguresByKeys(this.settings.keys?.next ?? [])],
+          ["Previous", getFiguresByKeys(this.settings.keys?.previous ?? [])],
         );
       }
       actions.push(
-        ["Complete", [Figures.TAB_RIGHT, dim(" or"), Figures.ARROW_RIGHT]],
+        ["Complete", getFiguresByKeys(this.settings.keys?.complete ?? [])],
       );
     }
     actions.push(
-      ["Submit", [Figures.ENTER]],
+      ["Submit", getFiguresByKeys(this.settings.keys?.submit ?? [])],
     );
 
     let info = this.settings.indent;

diff --git a/prompt/figures.ts b/prompt/figures.ts
@@ -37,3 +37,24 @@ const win = {
 
 /** Prompt icons. */
 export const Figures = Deno.build.os === "windows" ? win : main;
+
+const keyMap: Record<string, keyof typeof Figures> = {
+  up: "ARROW_UP",
+  down: "ARROW_DOWN",
+  pageup: "PAGE_UP",
+  pagedown: "PAGE_DOWN",
+  tab: "TAB_RIGHT",
+  enter: "ENTER",
+  return: "ENTER",
+};
+
+export function getFiguresByKeys(keys: Array<string>): Array<string> {
+  const figures: Array<string> = [];
+  for (const key of keys) {
+    const figure = Figures[keyMap[key]] ?? key;
+    if (!figures.includes(figure)) {
+      figures.push(figure);
+    }
+  }
+  return figures;
+}