Skip to content

Commit

Permalink
fix: render subtasks of the subtasks if parent has no title
Browse files Browse the repository at this point in the history
fix #663
  • Loading branch information
cenk1cenk2 committed Mar 11, 2023
1 parent 52623a5 commit 7b443f9
Show file tree
Hide file tree
Showing 2 changed files with 1,252 additions and 1,480 deletions.
10 changes: 5 additions & 5 deletions src/renderer/default.renderer.ts
Expand Up @@ -162,11 +162,11 @@ export class DefaultRenderer implements ListrRenderer {
private readonly spinner: string[] = !isUnicodeSupported() ? [ '-', '\\', '|', '/' ] : [ '⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏' ]
private spinnerPosition = 0

constructor (public tasks: Task<any, typeof DefaultRenderer>[], public options: typeof DefaultRenderer['rendererOptions'], public renderHook$?: Task<any, any>['renderHook$']) {
constructor (public tasks: Task<any, typeof DefaultRenderer>[], public options: (typeof DefaultRenderer)['rendererOptions'], public renderHook$?: Task<any, any>['renderHook$']) {
this.options = { ...DefaultRenderer.rendererOptions, ...this.options }
}

public getTaskOptions (task: Task<any, typeof DefaultRenderer>): typeof DefaultRenderer['rendererTaskOptions'] {
public getTaskOptions (task: Task<any, typeof DefaultRenderer>): (typeof DefaultRenderer)['rendererTaskOptions'] {
return { ...DefaultRenderer.rendererTaskOptions, ...task.rendererTaskOptions }
}

Expand All @@ -184,10 +184,10 @@ export class DefaultRenderer implements ListrRenderer {
return this.getTaskOptions(task).showTimer === true
}

public getSelfOrParentOption<T extends keyof typeof DefaultRenderer['rendererOptions']>(
public getSelfOrParentOption<T extends keyof (typeof DefaultRenderer)['rendererOptions']>(
task: Task<any, typeof DefaultRenderer>,
key: T
): typeof DefaultRenderer['rendererOptions'][T] {
): (typeof DefaultRenderer)['rendererOptions'][T] {
return task?.rendererOptions?.[key] ?? this.options?.[key]
}

Expand Down Expand Up @@ -392,7 +392,7 @@ export class DefaultRenderer implements ListrRenderer {
// render the subtasks as in the same way
const subtaskRender = this.multiLineRenderer(task.subtasks, subtaskLevel)

if (subtaskRender?.trim() !== '' && !task.subtasks.every((subtask) => !subtask.hasTitle())) {
if (subtaskRender?.trim() !== '') {
output = [ ...output, subtaskRender ]
}
}
Expand Down

0 comments on commit 7b443f9

Please sign in to comment.