From 3cbd993521a26fe1b8b4ebcbdb5249f21dff8261 Mon Sep 17 00:00:00 2001 From: Jakub Sobon Date: Sat, 14 Nov 2020 01:09:07 -0500 Subject: [PATCH 1/5] Making tcell the default in all demos and examples. --- container/grid/grid_test.go | 6 +++--- termdash_test.go | 6 +++--- termdashdemo/termdashdemo.go | 4 ++-- terminal/termbox/termbox.go | 4 ++++ widgets/barchart/barchartdemo/barchartdemo.go | 4 ++-- widgets/button/buttondemo/buttondemo.go | 4 ++-- widgets/donut/donutdemo/donutdemo.go | 4 ++-- widgets/gauge/gaugedemo/gaugedemo.go | 4 ++-- widgets/linechart/linechartdemo/linechartdemo.go | 4 ++-- .../segmentdisplay/segmentdisplaydemo/segmentdisplaydemo.go | 4 ++-- widgets/sparkline/sparklinedemo/sparklinedemo.go | 4 ++-- widgets/textinput/textinputdemo/textinputdemo.go | 4 ++-- 12 files changed, 28 insertions(+), 24 deletions(-) diff --git a/container/grid/grid_test.go b/container/grid/grid_test.go index 3b889d7..a7c10d3 100644 --- a/container/grid/grid_test.go +++ b/container/grid/grid_test.go @@ -30,7 +30,7 @@ import ( "github.com/mum4k/termdash/private/draw/testdraw" "github.com/mum4k/termdash/private/faketerm" "github.com/mum4k/termdash/private/fakewidget" - "github.com/mum4k/termdash/terminal/termbox" + "github.com/mum4k/termdash/terminal/tcell" "github.com/mum4k/termdash/widgetapi" "github.com/mum4k/termdash/widgets/barchart" ) @@ -38,7 +38,7 @@ import ( // Shows how to create a simple 4x4 grid with four widgets. // All the cells in the grid contain the same widget in this example. func Example() { - tbx, err := termbox.New() + t, err := tcell.New() if err != nil { panic(err) } @@ -82,7 +82,7 @@ func Example() { // Shows how to create rows iteratively. Each row contains two columns and each // column contains the same widget. func Example_iterative() { - tbx, err := termbox.New() + t, err := tcell.New() if err != nil { panic(err) } diff --git a/termdash_test.go b/termdash_test.go index 7be6a7d..7165eb2 100644 --- a/termdash_test.go +++ b/termdash_test.go @@ -32,7 +32,7 @@ import ( "github.com/mum4k/termdash/private/event/testevent" "github.com/mum4k/termdash/private/faketerm" "github.com/mum4k/termdash/private/fakewidget" - "github.com/mum4k/termdash/terminal/termbox" + "github.com/mum4k/termdash/terminal/tcell" "github.com/mum4k/termdash/terminal/terminalapi" "github.com/mum4k/termdash/widgetapi" "github.com/mum4k/termdash/widgets/barchart" @@ -42,7 +42,7 @@ import ( // Example shows how to setup and run termdash with periodic redraw. func Example() { // Create the terminal. - t, err := termbox.New() + t, err := tcell.New() if err != nil { panic(err) } @@ -86,7 +86,7 @@ func Example() { // Example shows how to setup and run termdash with manually triggered redraw. func Example_triggered() { // Create the terminal. - t, err := termbox.New() + t, err := tcell.New() if err != nil { panic(err) } diff --git a/termdashdemo/termdashdemo.go b/termdashdemo/termdashdemo.go index 647ab05..36c5ad0 100644 --- a/termdashdemo/termdashdemo.go +++ b/termdashdemo/termdashdemo.go @@ -477,8 +477,8 @@ const ( func main() { terminalPtr := flag.String("terminal", - "termbox", - "The terminal implementation to use. Available implementations are 'termbox' and 'tcell' (default = termbox).") + "tcell", + "The terminal implementation to use. Available implementations are 'termbox' and 'tcell' (default = tcell).") flag.Parse() var t terminalapi.Terminal diff --git a/terminal/termbox/termbox.go b/terminal/termbox/termbox.go index 2d88c87..3b3a627 100644 --- a/terminal/termbox/termbox.go +++ b/terminal/termbox/termbox.go @@ -13,6 +13,7 @@ // limitations under the License. // Package termbox implements terminal using the nsf/termbox-go library. +// Prefer to use tcell instead, nsf/termbox-go is no longer maintained. package termbox import ( @@ -52,6 +53,9 @@ func ColorMode(cm terminalapi.ColorMode) Option { // Terminal provides input and output to a real terminal. Wraps the // nsf/termbox-go terminal implementation. This object is not thread-safe. +// +// Prefer to use tcell instead, nsf/termbox-go is no longer maintained. +// // Implements terminalapi.Terminal. type Terminal struct { // events is a queue of input events. diff --git a/widgets/barchart/barchartdemo/barchartdemo.go b/widgets/barchart/barchartdemo/barchartdemo.go index ab46ac6..72fa681 100644 --- a/widgets/barchart/barchartdemo/barchartdemo.go +++ b/widgets/barchart/barchartdemo/barchartdemo.go @@ -25,7 +25,7 @@ import ( "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/container" "github.com/mum4k/termdash/linestyle" - "github.com/mum4k/termdash/terminal/termbox" + "github.com/mum4k/termdash/terminal/tcell" "github.com/mum4k/termdash/terminal/terminalapi" "github.com/mum4k/termdash/widgets/barchart" ) @@ -56,7 +56,7 @@ func playBarChart(ctx context.Context, bc *barchart.BarChart, delay time.Duratio } func main() { - t, err := termbox.New() + t, err := tcell.New() if err != nil { panic(err) } diff --git a/widgets/button/buttondemo/buttondemo.go b/widgets/button/buttondemo/buttondemo.go index 2df1530..8f585fc 100644 --- a/widgets/button/buttondemo/buttondemo.go +++ b/widgets/button/buttondemo/buttondemo.go @@ -25,14 +25,14 @@ import ( "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/container" "github.com/mum4k/termdash/linestyle" - "github.com/mum4k/termdash/terminal/termbox" + "github.com/mum4k/termdash/terminal/tcell" "github.com/mum4k/termdash/terminal/terminalapi" "github.com/mum4k/termdash/widgets/button" "github.com/mum4k/termdash/widgets/segmentdisplay" ) func main() { - t, err := termbox.New() + t, err := tcell.New() if err != nil { panic(err) } diff --git a/widgets/donut/donutdemo/donutdemo.go b/widgets/donut/donutdemo/donutdemo.go index acadc1a..6944643 100644 --- a/widgets/donut/donutdemo/donutdemo.go +++ b/widgets/donut/donutdemo/donutdemo.go @@ -24,7 +24,7 @@ import ( "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/container" "github.com/mum4k/termdash/linestyle" - "github.com/mum4k/termdash/terminal/termbox" + "github.com/mum4k/termdash/terminal/tcell" "github.com/mum4k/termdash/terminal/terminalapi" "github.com/mum4k/termdash/widgets/donut" ) @@ -79,7 +79,7 @@ func playDonut(ctx context.Context, d *donut.Donut, start, step int, delay time. } func main() { - t, err := termbox.New() + t, err := tcell.New() if err != nil { panic(err) } diff --git a/widgets/gauge/gaugedemo/gaugedemo.go b/widgets/gauge/gaugedemo/gaugedemo.go index c65651f..a7b77e3 100644 --- a/widgets/gauge/gaugedemo/gaugedemo.go +++ b/widgets/gauge/gaugedemo/gaugedemo.go @@ -24,7 +24,7 @@ import ( "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/container" "github.com/mum4k/termdash/linestyle" - "github.com/mum4k/termdash/terminal/termbox" + "github.com/mum4k/termdash/terminal/tcell" "github.com/mum4k/termdash/terminal/terminalapi" "github.com/mum4k/termdash/widgets/gauge" ) @@ -79,7 +79,7 @@ func playGauge(ctx context.Context, g *gauge.Gauge, step int, delay time.Duratio } func main() { - t, err := termbox.New() + t, err := tcell.New() if err != nil { panic(err) } diff --git a/widgets/linechart/linechartdemo/linechartdemo.go b/widgets/linechart/linechartdemo/linechartdemo.go index 9402623..c234ee6 100644 --- a/widgets/linechart/linechartdemo/linechartdemo.go +++ b/widgets/linechart/linechartdemo/linechartdemo.go @@ -25,7 +25,7 @@ import ( "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/container" "github.com/mum4k/termdash/linestyle" - "github.com/mum4k/termdash/terminal/termbox" + "github.com/mum4k/termdash/terminal/tcell" "github.com/mum4k/termdash/terminal/terminalapi" "github.com/mum4k/termdash/widgets/linechart" ) @@ -74,7 +74,7 @@ func playLineChart(ctx context.Context, lc *linechart.LineChart, delay time.Dura } func main() { - t, err := termbox.New() + t, err := tcell.New() if err != nil { panic(err) } diff --git a/widgets/segmentdisplay/segmentdisplaydemo/segmentdisplaydemo.go b/widgets/segmentdisplay/segmentdisplaydemo/segmentdisplaydemo.go index 7b69cbd..fad00ee 100644 --- a/widgets/segmentdisplay/segmentdisplaydemo/segmentdisplaydemo.go +++ b/widgets/segmentdisplay/segmentdisplaydemo/segmentdisplaydemo.go @@ -24,7 +24,7 @@ import ( "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/container" "github.com/mum4k/termdash/linestyle" - "github.com/mum4k/termdash/terminal/termbox" + "github.com/mum4k/termdash/terminal/tcell" "github.com/mum4k/termdash/terminal/terminalapi" "github.com/mum4k/termdash/widgets/segmentdisplay" ) @@ -113,7 +113,7 @@ func rollText(ctx context.Context, sd *segmentdisplay.SegmentDisplay) { } func main() { - t, err := termbox.New() + t, err := tcell.New() if err != nil { panic(err) } diff --git a/widgets/sparkline/sparklinedemo/sparklinedemo.go b/widgets/sparkline/sparklinedemo/sparklinedemo.go index b2575a9..b4631e2 100644 --- a/widgets/sparkline/sparklinedemo/sparklinedemo.go +++ b/widgets/sparkline/sparklinedemo/sparklinedemo.go @@ -25,7 +25,7 @@ import ( "github.com/mum4k/termdash/cell" "github.com/mum4k/termdash/container" "github.com/mum4k/termdash/linestyle" - "github.com/mum4k/termdash/terminal/termbox" + "github.com/mum4k/termdash/terminal/tcell" "github.com/mum4k/termdash/terminal/terminalapi" "github.com/mum4k/termdash/widgets/sparkline" ) @@ -76,7 +76,7 @@ func fillSparkLine(ctx context.Context, sl *sparkline.SparkLine, delay time.Dura } func main() { - t, err := termbox.New() + t, err := tcell.New() if err != nil { panic(err) } diff --git a/widgets/textinput/textinputdemo/textinputdemo.go b/widgets/textinput/textinputdemo/textinputdemo.go index e628c7f..ce0ce43 100644 --- a/widgets/textinput/textinputdemo/textinputdemo.go +++ b/widgets/textinput/textinputdemo/textinputdemo.go @@ -26,7 +26,7 @@ import ( "github.com/mum4k/termdash/container/grid" "github.com/mum4k/termdash/keyboard" "github.com/mum4k/termdash/linestyle" - "github.com/mum4k/termdash/terminal/termbox" + "github.com/mum4k/termdash/terminal/tcell" "github.com/mum4k/termdash/widgets/button" "github.com/mum4k/termdash/widgets/segmentdisplay" "github.com/mum4k/termdash/widgets/textinput" @@ -110,7 +110,7 @@ func rollText(ctx context.Context, sd *segmentdisplay.SegmentDisplay, updateText } func main() { - t, err := termbox.New() + t, err := tcell.New() if err != nil { panic(err) } From 20d07d05e84433c949efbbfa421bd683adb03c6e Mon Sep 17 00:00:00 2001 From: Jakub Sobon Date: Sat, 14 Nov 2020 01:10:55 -0500 Subject: [PATCH 2/5] Updating CHANGELOG. --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bf62654..fce8b83 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - `tcell` dependency was upgraded 1.4.0. +- made `tcell` terminal implementation the default in examples, demos and + documentation. - upgrading versions on all dependencies. - terminal cells now support font modifier options (bold, italic, underline, strikethrough) From 3e476963e8c7ce292f0c3df00c012eb1503d8cf8 Mon Sep 17 00:00:00 2001 From: Jakub Sobon Date: Sat, 14 Nov 2020 01:41:29 -0500 Subject: [PATCH 3/5] Changing Blue color in demos to a more readable shade. --- termdashdemo/termdashdemo.go | 8 ++++---- widgets/barchart/barchartdemo/barchartdemo.go | 4 ++-- widgets/donut/donutdemo/donutdemo.go | 2 +- widgets/gauge/gaugedemo/gaugedemo.go | 2 +- widgets/linechart/linechartdemo/linechartdemo.go | 2 +- .../segmentdisplaydemo/segmentdisplaydemo.go | 6 +++--- widgets/sparkline/sparklinedemo/sparklinedemo.go | 4 ++-- widgets/text/textdemo/textdemo.go | 2 +- widgets/textinput/textinputdemo/textinputdemo.go | 6 +++--- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/termdashdemo/termdashdemo.go b/termdashdemo/termdashdemo.go index 36c5ad0..78a184c 100644 --- a/termdashdemo/termdashdemo.go +++ b/termdashdemo/termdashdemo.go @@ -569,7 +569,7 @@ func textState(text string, capacity, step int) []rune { // SegmentDisplay. func newTextInput(updateText chan<- string) (*textinput.TextInput, error) { input, err := textinput.New( - textinput.Label("Change text to: ", cell.FgColor(cell.ColorBlue)), + textinput.Label("Change text to: ", cell.FgColor(cell.ColorNumber(33))), textinput.MaxWidthCells(20), textinput.PlaceHolder("enter any text"), textinput.OnSubmit(func(text string) error { @@ -593,10 +593,10 @@ func newSegmentDisplay(ctx context.Context, updateText <-chan string) (*segmentd } colors := []cell.Color{ - cell.ColorBlue, + cell.ColorNumber(33), cell.ColorRed, cell.ColorYellow, - cell.ColorBlue, + cell.ColorNumber(33), cell.ColorGreen, cell.ColorRed, cell.ColorGreen, @@ -854,7 +854,7 @@ func newSines(ctx context.Context) (left, right *button.Button, lc *linechart.Li go periodic(ctx, redrawInterval/3, func() error { step1 = (step1 + 1) % len(inputs) if err := lc.Series("first", rotateFloats(inputs, step1), - linechart.SeriesCellOpts(cell.FgColor(cell.ColorBlue)), + linechart.SeriesCellOpts(cell.FgColor(cell.ColorNumber(33))), ); err != nil { return err } diff --git a/widgets/barchart/barchartdemo/barchartdemo.go b/widgets/barchart/barchartdemo/barchartdemo.go index 72fa681..b1ca09b 100644 --- a/widgets/barchart/barchartdemo/barchartdemo.go +++ b/widgets/barchart/barchartdemo/barchartdemo.go @@ -75,10 +75,10 @@ func main() { barchart.ValueColors([]cell.Color{ cell.ColorRed, cell.ColorYellow, - cell.ColorBlue, + cell.ColorNumber(33), cell.ColorGreen, cell.ColorRed, - cell.ColorBlue, + cell.ColorNumber(33), }), barchart.ShowValues(), barchart.BarWidth(8), diff --git a/widgets/donut/donutdemo/donutdemo.go b/widgets/donut/donutdemo/donutdemo.go index 6944643..501551d 100644 --- a/widgets/donut/donutdemo/donutdemo.go +++ b/widgets/donut/donutdemo/donutdemo.go @@ -95,7 +95,7 @@ func main() { } go playDonut(ctx, green, 0, 1, 250*time.Millisecond, playTypePercent) - blue, err := donut.New(donut.CellOpts(cell.FgColor(cell.ColorBlue))) + blue, err := donut.New(donut.CellOpts(cell.FgColor(cell.ColorNumber(33)))) if err != nil { panic(err) } diff --git a/widgets/gauge/gaugedemo/gaugedemo.go b/widgets/gauge/gaugedemo/gaugedemo.go index a7b77e3..96696e9 100644 --- a/widgets/gauge/gaugedemo/gaugedemo.go +++ b/widgets/gauge/gaugedemo/gaugedemo.go @@ -98,7 +98,7 @@ func main() { absolute, err := gauge.New( gauge.Height(1), - gauge.Color(cell.ColorBlue), + gauge.Color(cell.ColorNumber(33)), gauge.Border(linestyle.Light), gauge.BorderTitle("Absolute progress"), ) diff --git a/widgets/linechart/linechartdemo/linechartdemo.go b/widgets/linechart/linechartdemo/linechartdemo.go index c234ee6..52298ca 100644 --- a/widgets/linechart/linechartdemo/linechartdemo.go +++ b/widgets/linechart/linechartdemo/linechartdemo.go @@ -53,7 +53,7 @@ func playLineChart(ctx context.Context, lc *linechart.LineChart, delay time.Dura i = (i + 1) % len(inputs) rotated := append(inputs[i:], inputs[:i]...) if err := lc.Series("first", rotated, - linechart.SeriesCellOpts(cell.FgColor(cell.ColorBlue)), + linechart.SeriesCellOpts(cell.FgColor(cell.ColorNumber(33))), linechart.SeriesXLabels(map[int]string{ 0: "zero", }), diff --git a/widgets/segmentdisplay/segmentdisplaydemo/segmentdisplaydemo.go b/widgets/segmentdisplay/segmentdisplaydemo/segmentdisplaydemo.go index fad00ee..5d04042 100644 --- a/widgets/segmentdisplay/segmentdisplaydemo/segmentdisplaydemo.go +++ b/widgets/segmentdisplay/segmentdisplaydemo/segmentdisplaydemo.go @@ -46,7 +46,7 @@ func clock(ctx context.Context, sd *segmentdisplay.SegmentDisplay) { spacer = ":" } chunks := []*segmentdisplay.TextChunk{ - segmentdisplay.NewChunk(parts[0], segmentdisplay.WriteCellOpts(cell.FgColor(cell.ColorBlue))), + segmentdisplay.NewChunk(parts[0], segmentdisplay.WriteCellOpts(cell.FgColor(cell.ColorNumber(33)))), segmentdisplay.NewChunk(spacer), segmentdisplay.NewChunk(parts[1], segmentdisplay.WriteCellOpts(cell.FgColor(cell.ColorRed))), } @@ -74,10 +74,10 @@ func rotate(inputs []rune, step int) []rune { func rollText(ctx context.Context, sd *segmentdisplay.SegmentDisplay) { const text = "Termdash" colors := map[rune]cell.Color{ - 'T': cell.ColorBlue, + 'T': cell.ColorNumber(33), 'e': cell.ColorRed, 'r': cell.ColorYellow, - 'm': cell.ColorBlue, + 'm': cell.ColorNumber(33), 'd': cell.ColorGreen, 'a': cell.ColorRed, 's': cell.ColorGreen, diff --git a/widgets/sparkline/sparklinedemo/sparklinedemo.go b/widgets/sparkline/sparklinedemo/sparklinedemo.go index b4631e2..a6b05b2 100644 --- a/widgets/sparkline/sparklinedemo/sparklinedemo.go +++ b/widgets/sparkline/sparklinedemo/sparklinedemo.go @@ -84,7 +84,7 @@ func main() { ctx, cancel := context.WithCancel(context.Background()) green, err := sparkline.New( - sparkline.Label("Green SparkLine", cell.FgColor(cell.ColorBlue)), + sparkline.Label("Green SparkLine", cell.FgColor(cell.ColorNumber(33))), sparkline.Color(cell.ColorGreen), ) if err != nil { @@ -92,7 +92,7 @@ func main() { } go playSparkLine(ctx, green, 250*time.Millisecond) red, err := sparkline.New( - sparkline.Label("Red SparkLine", cell.FgColor(cell.ColorBlue)), + sparkline.Label("Red SparkLine", cell.FgColor(cell.ColorNumber(33))), sparkline.Color(cell.ColorRed), ) if err != nil { diff --git a/widgets/text/textdemo/textdemo.go b/widgets/text/textdemo/textdemo.go index cf30ea9..6ae50ae 100644 --- a/widgets/text/textdemo/textdemo.go +++ b/widgets/text/textdemo/textdemo.go @@ -106,7 +106,7 @@ func main() { if err := wrapped.Write("Supports", text.WriteCellOpts(cell.FgColor(cell.ColorRed))); err != nil { panic(err) } - if err := wrapped.Write(" colors", text.WriteCellOpts(cell.FgColor(cell.ColorBlue))); err != nil { + if err := wrapped.Write(" colors", text.WriteCellOpts(cell.FgColor(cell.ColorNumber(33)))); err != nil { panic(err) } if err := wrapped.Write(" and"); err != nil { diff --git a/widgets/textinput/textinputdemo/textinputdemo.go b/widgets/textinput/textinputdemo/textinputdemo.go index ce0ce43..d4d468c 100644 --- a/widgets/textinput/textinputdemo/textinputdemo.go +++ b/widgets/textinput/textinputdemo/textinputdemo.go @@ -60,10 +60,10 @@ func textState(text string, capacity, step int) []rune { // Exists when the context expires. func rollText(ctx context.Context, sd *segmentdisplay.SegmentDisplay, updateText <-chan string) { colors := []cell.Color{ - cell.ColorBlue, + cell.ColorNumber(33), cell.ColorRed, cell.ColorYellow, - cell.ColorBlue, + cell.ColorNumber(33), cell.ColorGreen, cell.ColorRed, cell.ColorGreen, @@ -127,7 +127,7 @@ func main() { go rollText(ctx, rollingSD, updateText) input, err := textinput.New( - textinput.Label("New text:", cell.FgColor(cell.ColorBlue)), + textinput.Label("New text:", cell.FgColor(cell.ColorNumber(33))), textinput.MaxWidthCells(20), textinput.Border(linestyle.Light), textinput.PlaceHolder("Enter any text"), From 3541f4797fe2b7b520625f4a5d73a5f719b05f9c Mon Sep 17 00:00:00 2001 From: Jakub Sobon Date: Sat, 14 Nov 2020 01:42:08 -0500 Subject: [PATCH 4/5] Updating CHANGELOG. --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fce8b83..3101b7e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - addressing some lint issues. - coveralls again triggers and reports on PRs. - improving test coverage in some modules. +- changing the Blue color in demos to a more readable shade. ## [0.12.2] - 31-Aug-2020 From 034007e85fd7cb432eb876e8ef88e1f783994fb6 Mon Sep 17 00:00:00 2001 From: Jakub Sobon Date: Sat, 14 Nov 2020 02:29:09 -0500 Subject: [PATCH 5/5] Renaming `tbx` to `t` to fix compilation errors. --- container/grid/grid_test.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/container/grid/grid_test.go b/container/grid/grid_test.go index a7c10d3..3df9c1a 100644 --- a/container/grid/grid_test.go +++ b/container/grid/grid_test.go @@ -42,7 +42,7 @@ func Example() { if err != nil { panic(err) } - defer tbx.Close() + defer t.Close() bc, err := barchart.New() if err != nil { @@ -67,14 +67,14 @@ func Example() { panic(err) } - cont, err := container.New(tbx, gridOpts...) + cont, err := container.New(t, gridOpts...) if err != nil { panic(err) } ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second) defer cancel() - if err := termdash.Run(ctx, tbx, cont); err != nil { + if err := termdash.Run(ctx, t, cont); err != nil { panic(err) } } @@ -86,7 +86,7 @@ func Example_iterative() { if err != nil { panic(err) } - defer tbx.Close() + defer t.Close() bc, err := barchart.New() if err != nil { @@ -108,14 +108,14 @@ func Example_iterative() { panic(err) } - cont, err := container.New(tbx, gridOpts...) + cont, err := container.New(t, gridOpts...) if err != nil { panic(err) } ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second) defer cancel() - if err := termdash.Run(ctx, tbx, cont); err != nil { + if err := termdash.Run(ctx, t, cont); err != nil { panic(err) } }