Skip to content

Commit

Permalink
feat(plugin-inquirer): checkbox and list support use tab key move dow…
Browse files Browse the repository at this point in the history 
…n list

link #32
  • Loading branch information
@Zhengqbbb
Zhengqbbb committed Jun 2, 2022
1 parent 9e95ee5 commit e38ed9f
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 14 deletions.
33 changes: 25 additions & 8 deletions packages/@cz-git/plugin-inquirer/src/checkbox/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import type { Interface as ReadlineInterface } from "readline";
import type { Answers, Question } from "inquirer";
import type Separator from "inquirer/lib/objects/separator";
import { style, figures } from "../shared";
import type { CZPromptQuestionOptions, ChoicesType, ChoiceType } from "../shared";
import type { SearchPromptQuestionOptions, ChoicesType, ChoiceType } from "../shared";

export type { CZPromptQuestionOptions } from "../shared";
export type { SearchPromptQuestionOptions } from "../shared";
export class SearchCheckbox extends Base {
private renderChoices: ChoicesType;
private originChoices: ChoiceType<string>[] = [];
Expand All @@ -37,7 +37,7 @@ export class SearchCheckbox extends Base {
constructor(questions: Question, readline: ReadlineInterface, answers: Answers) {
super(questions, readline, answers);
const { source, separator, isInitDefault, themeColorCode } = this
.opt as unknown as CZPromptQuestionOptions;
.opt as unknown as SearchPromptQuestionOptions;
if (!source) this.throwParamError("source");
if (typeof separator === "string") this.separator = separator;
if (isInitDefault) this.initialValue = this.opt.default;
Expand Down Expand Up @@ -99,7 +99,7 @@ export class SearchCheckbox extends Base {
realIndexPosition += name ? name.split("\n").length : 0;
return true;
});
const { pageSize } = this.opt as unknown as CZPromptQuestionOptions;
const { pageSize } = this.opt as unknown as SearchPromptQuestionOptions;
bottomContent += this.paginator.paginate(choicesStr, realIndexPosition, pageSize);
} else {
content += this.rl.line;
Expand Down Expand Up @@ -136,7 +136,7 @@ export class SearchCheckbox extends Base {

let thisPromise: Promise<any[]>;
try {
const { source } = this.opt as unknown as CZPromptQuestionOptions;
const { source } = this.opt as unknown as SearchPromptQuestionOptions;
const res = source(this.answers, input?.trim());
thisPromise = Promise.resolve(res);
} catch (err) {
Expand Down Expand Up @@ -180,7 +180,6 @@ export class SearchCheckbox extends Base {
* @description: resolve choice
*/
onChoice() {
// @ FIXME: wait to fix tty and stdin <space> trim
const item = this.renderChoices.realChoices[this.pointer];
if (item && item.value) {
const checked = !item.checked;
Expand Down Expand Up @@ -242,11 +241,29 @@ export class SearchCheckbox extends Base {
onKeypress(e: { key: { name?: string; ctrl?: boolean }; value: string }) {
let len;
const keyName = e.key?.name || "";

/**
* NOTE: use ansiEscapes and write move cursor can't work in this.rl
* so force change this.rl
*/
if (keyName === "space") {
return true;
const input = this.rl.line?.trim();
// @ts-ignore
this.rl.line = input;
// @ts-ignore
this.rl.cursor = input.length;
this.render();
} else if (keyName === "right") {
this.onChoice();
} else if (keyName === "down" || (keyName === "n" && e.key.ctrl)) {
} else if (keyName === "tab" || keyName === "down" || (keyName === "n" && e.key.ctrl)) {
if (keyName === "tab") {
const input = this.rl.line?.trim();
// @ts-ignore
this.rl.line = input;
// @ts-ignore
this.rl.cursor = input.length;
this.render();
}
len = this.choicesLen;
this.pointer = this.pointer < len - 1 ? this.pointer + 1 : 0;
this.ensureSelectedInRange();
Expand Down
25 changes: 19 additions & 6 deletions packages/@cz-git/plugin-inquirer/src/list/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ import type { Interface as ReadlineInterface } from "readline";
import type { Answers, Question } from "inquirer";
import type Separator from "inquirer/lib/objects/separator";
import { style, figures } from "../shared";
import type { CZPromptQuestionOptions, ChoicesType, ChoiceType } from "../shared";
import type { SearchPromptQuestionOptions, ChoicesType, ChoiceType } from "../shared";

export type { CZPromptQuestionOptions } from "../shared";
export type { SearchPromptQuestionOptions } from "../shared";
export class SearchList extends Base {
private renderChoices: ChoicesType;
private pointer = 0;
Expand All @@ -35,7 +35,7 @@ export class SearchList extends Base {
constructor(questions: Question, readline: ReadlineInterface, answers: Answers) {
super(questions, readline, answers);
const { source, isInitDefault, themeColorCode } = this
.opt as unknown as CZPromptQuestionOptions;
.opt as unknown as SearchPromptQuestionOptions;
if (!source) this.throwParamError("source");
if (isInitDefault) this.initialValue = this.opt.default;
if (themeColorCode) this.themeColorCode = themeColorCode;
Expand Down Expand Up @@ -91,7 +91,7 @@ export class SearchList extends Base {
realIndexPosition += name ? name.split("\n").length : 0;
return true;
});
const { pageSize } = this.opt as unknown as CZPromptQuestionOptions;
const { pageSize } = this.opt as unknown as SearchPromptQuestionOptions;
bottomContent += this.paginator.paginate(choicesStr, realIndexPosition, pageSize);
} else {
content += this.rl.line;
Expand Down Expand Up @@ -128,7 +128,7 @@ export class SearchList extends Base {

let thisPromise: Promise<any[]>;
try {
const { source } = this.opt as unknown as CZPromptQuestionOptions;
const { source } = this.opt as unknown as SearchPromptQuestionOptions;
const res = source(this.answers, input?.trim());
thisPromise = Promise.resolve(res);
} catch (err) {
Expand Down Expand Up @@ -205,7 +205,20 @@ export class SearchList extends Base {
onKeypress(e: { key: { name?: string; ctrl?: boolean }; value: string }) {
let len;
const keyName = e.key?.name || "";
if (keyName === "down" || (keyName === "n" && e.key.ctrl)) {

/**
* NOTE: use ansiEscapes and write move cursor can't work in this.rl
* so force change this.rl
*/
if (keyName === "tab" || keyName === "down" || (keyName === "n" && e.key.ctrl)) {
if (keyName === "tab") {
const input = this.rl.line?.trim();
// @ts-ignore
this.rl.line = input;
// @ts-ignore
this.rl.cursor = input.length;
this.render();
}
len = this.choicesLen;
this.pointer = this.pointer < len - 1 ? this.pointer + 1 : 0;
this.ensureSelectedInRange();
Expand Down

0 comments on commit e38ed9f

Please sign in to comment.