Skip to content

Commit

Permalink
feat: tea.Batch returns nil if all cmds are nil (#217)
Browse files Browse the repository at this point in the history
Signed-off-by: Carlos A Becker <caarlos0@gmail.com>
  • Loading branch information
caarlos0 committed Feb 3, 2022
1 parent a09e0e8 commit 9a06319
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 2 deletions.
25 changes: 25 additions & 0 deletions commands_test.go
Expand Up @@ -80,3 +80,28 @@ func TestSequentially(t *testing.T) {
})
}
}

func TestBatch(t *testing.T) {
t.Run("nil cmd", func(t *testing.T) {
if b := Batch(nil); b != nil {
t.Fatalf("expected nil, got %+v", b)
}
})
t.Run("empty cmd", func(t *testing.T) {
if b := Batch(); b != nil {
t.Fatalf("expected nil, got %+v", b)
}
})
t.Run("single cmd", func(t *testing.T) {
b := Batch(Quit)()
if l := len(b.(batchMsg)); l != 1 {
t.Fatalf("expected a []Cmd with len 1, got %d", l)
}
})
t.Run("mixed nil cmds", func(t *testing.T) {
b := Batch(nil, Quit, nil, Quit, nil, nil)()
if l := len(b.(batchMsg)); l != 2 {
t.Fatalf("expected a []Cmd with len 2, got %d", l)
}
})
}
11 changes: 9 additions & 2 deletions tea.go
Expand Up @@ -119,11 +119,18 @@ type Program struct {
// }
//
func Batch(cmds ...Cmd) Cmd {
if len(cmds) == 0 {
var validCmds []Cmd
for _, c := range cmds {
if c == nil {
continue
}
validCmds = append(validCmds, c)
}
if len(validCmds) == 0 {
return nil
}
return func() Msg {
return batchMsg(cmds)
return batchMsg(validCmds)
}
}

Expand Down

0 comments on commit 9a06319

Please sign in to comment.