Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/orange-dragons-rescue.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@clack/prompts": patch
"@clack/core": patch
---

Fix that isCancelled returned after calling cancel and start methods in progress does not refresh.
4 changes: 3 additions & 1 deletion packages/prompts/src/progress-bar.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,9 @@ export function progress({
error: spin.error,
clear: spin.clear,
advance,
isCancelled: spin.isCancelled,
get isCancelled() {
return spin.isCancelled;
},
message: (msg: string) => advance(0, msg),
};
}
2 changes: 2 additions & 0 deletions packages/prompts/src/spinner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ export const spinner = ({

const start = (msg = ''): void => {
isSpinnerActive = true;
isCancelled = false;
_message = removeTrailingDots(msg);
_origin = performance.now();
registerHooks();
Expand Down Expand Up @@ -186,6 +187,7 @@ export const spinner = ({
const _stop = (msg = '', code = 0, silent: boolean = false): void => {
if (!isSpinnerActive) return;
isSpinnerActive = false;
isCancelled = code === 1;
clearInterval(loop);
if (!accessible) {
clearPrevMessage();
Expand Down
9 changes: 9 additions & 0 deletions packages/prompts/test/progress-bar.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,15 @@ describe.each(['true', 'false'])('prompts - progress (isCI = %s)', (isCI) => {
expect(output.buffer).toMatchSnapshot();
});

test('tracks cancellation', () => {
const result = prompts.progress({ output });

result.start();
result.cancel();

expect(result.isCancelled).toBe(true);
});

test('renders error symbol when calling error()', () => {
const result = prompts.progress({ output });

Expand Down
12 changes: 12 additions & 0 deletions packages/prompts/test/spinner.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,18 @@ describe.each(['true', 'false'])('spinner (isCI = %s)', (isCI) => {
expect(output.buffer).toMatchSnapshot();
});

test('tracks cancellation and resets it on restart', () => {
const result = prompts.spinner({ output });

result.start();
result.cancel();
expect(result.isCancelled).toBe(true);

result.start();
expect(result.isCancelled).toBe(false);
result.stop();
});

test('renders error symbol when calling error()', () => {
const result = prompts.spinner({ output });

Expand Down
Loading