Bugfix: Fix active list when switched from any other page to board page

singalhimanshu · Dec 2, 2020 · e53ad9f · e53ad9f
1 parent f5c45f6
commit e53ad9f
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 7 deletions.
diff --git a/ui/add.go b/ui/add.go
@@ -21,10 +21,12 @@ func NewAddPage(p *BoardPage) *tview.Form {
 		p.data.Save()
 		p.redraw()
 		pages.SwitchToPage("board")
+		app.SetFocus(p.lists[p.activeListIdx])
 	}).
 		AddButton("Cancel", func() {
 			pages.RemovePage("add")
 			pages.SwitchToPage("board")
+			app.SetFocus(p.lists[p.activeListIdx])
 		})
 
 	form.SetBorder(true).SetTitle("Create Task").SetTitleAlign(tview.AlignCenter)

diff --git a/ui/board.go b/ui/board.go
@@ -95,7 +95,7 @@ func (p *BoardPage) Page() tview.Primitive {
 				p.data.Save()
 				app.Stop()
 			case '?':
-				pages.SwitchToPage("help")
+				pages.AddAndSwitchToPage("help", NewHelpPage(p), true)
 			case ' ':
 				pages.AddAndSwitchToPage("info", NewInfoPage(p, p.activeListIdx, p.activeTaskIdxs[p.activeListIdx]), true)
 			default:

diff --git a/ui/edit.go b/ui/edit.go
@@ -29,10 +29,12 @@ func NewEditPage(p *BoardPage, listIdx, taskIdx int) *tview.Form {
 		p.data.Save()
 		p.redraw()
 		pages.SwitchToPage("board")
+		app.SetFocus(p.lists[p.activeListIdx])
 	}).
 		AddButton("Cancel", func() {
 			pages.RemovePage("edit")
 			pages.SwitchToPage("board")
+			app.SetFocus(p.lists[p.activeListIdx])
 		})
 
 	form.SetBorder(true).SetTitle("Edit Task").SetTitleAlign(tview.AlignCenter)

diff --git a/ui/help.go b/ui/help.go
@@ -18,7 +18,7 @@ q: quit
 `
 
 // NewHelpPage displays the help page that contains all the keybinds of the application
-func NewHelpPage() *tview.Modal {
+func NewHelpPage(p *BoardPage) *tview.Modal {
 	help := tview.NewModal().
 		SetText(helpText).
 		SetBackgroundColor(theme.PrimitiveBackgroundColor).
@@ -27,6 +27,7 @@ func NewHelpPage() *tview.Modal {
 			if buttonLabel == "OK" {
 				pages.HidePage("help")
 				pages.SwitchToPage("board")
+				app.SetFocus(p.lists[p.activeListIdx])
 			}
 		})
 

diff --git a/ui/info.go b/ui/info.go
@@ -22,6 +22,7 @@ func NewInfoPage(p *BoardPage, listIdx, taskIdx int) *tview.Modal {
 			if buttonLabel == "OK" {
 				pages.RemovePage("info")
 				pages.SwitchToPage("board")
+				app.SetFocus(p.lists[p.activeListIdx])
 			}
 		})
 

diff --git a/ui/ui.go b/ui/ui.go
@@ -65,11 +65,7 @@ func start() {
 	boardPage := NewBoardPage()
 	boardPageFrame := boardPage.Page()
 
-	helpPage := NewHelpPage()
-
 	pages = tview.NewPages().
-		AddPage("board", boardPageFrame, true, true).
-		AddPage("help", helpPage, false, false)
-
+		AddPage("board", boardPageFrame, true, true)
 	app.SetRoot(pages, true).SetFocus(boardPageFrame)
 }