improve: focusable original primitive

skanehira · Feb 21, 2021 · b4bd1eb · b4bd1eb
1 parent 5cd5aa4
commit b4bd1eb
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 10 deletions.
diff --git a/ui/filter.go b/ui/filter.go
@@ -10,14 +10,15 @@ var IssueFilterUI *FilterUI
 type (
 	SetFilterOpt func(ui *FilterUI)
 	FilterUI     struct {
-		*tview.Form
+		*tview.InputField
 	}
 )
 
 func NewFilterUI() {
 	ui := &FilterUI{
-		Form: tview.NewForm().AddInputField("Filters", "", 100, nil, nil),
+		InputField: tview.NewInputField().SetLabel("Filters").SetLabelWidth(8),
 	}
+	ui.SetBorderPadding(0, 0, 1, 0)
 
 	ui.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
 		switch event.Key() {
@@ -29,16 +30,12 @@ func NewFilterUI() {
 	IssueFilterUI = ui
 }
 
-func (ui *FilterUI) GetInputField() *tview.InputField {
-	return ui.GetFormItem(0).(*tview.InputField)
-}
-
 func (ui *FilterUI) SetQuery(query string) {
-	ui.GetInputField().SetText(query)
+	ui.SetText(query)
 }
 
 func (ui *FilterUI) GetQuery() string {
-	return ui.GetInputField().GetText()
+	return ui.GetText()
 }
 
 func (ui *FilterUI) focus() {

diff --git a/ui/issues.go b/ui/issues.go
@@ -176,7 +176,7 @@ func NewIssueUI() {
 func createIssueForm() {
 	// repo
 	var repo string
-	input := IssueFilterUI.GetFormItem(0).(*tview.InputField).GetText()
+	input := IssueFilterUI.GetQuery()
 	for _, word := range strings.Split(input, " ") {
 		if strings.Contains(word, "repo:") {
 			repo = strings.TrimPrefix(word, "repo:")

diff --git a/ui/ui.go b/ui/ui.go
@@ -36,7 +36,22 @@ func New() *ui {
 	return ui
 }
 
+func (ui *ui) canFocus() bool {
+	fs := ui.app.GetFocus()
+	if fs == nil {
+		return false
+	}
+	switch fs.(type) {
+	case *FilterUI, *SelectUI, *viewUI:
+		return true
+	}
+	return false
+}
+
 func (ui *ui) toNextUI() {
+	if !ui.canFocus() {
+		return
+	}
 	ui.primitives[ui.current].blur()
 	if ui.primitiveLen-1 > ui.current {
 		ui.current++
@@ -49,6 +64,9 @@ func (ui *ui) toNextUI() {
 }
 
 func (ui *ui) toPrevUI() {
+	if !ui.canFocus() {
+		return
+	}
 	ui.primitives[ui.current].blur()
 	if ui.current == 0 {
 		ui.current = ui.primitiveLen - 1
@@ -86,7 +104,7 @@ func (ui *ui) Start() error {
 	// for readability
 	row, col, rowSpan, colSpan := 0, 0, 0, 0
 
-	grid := tview.NewGrid().SetRows(3, 0, 0, 0, 0, 0, 0, 0, 0, 1).
+	grid := tview.NewGrid().SetRows(1, 0, 0, 0, 0, 0, 0, 0, 0, 1).
 		AddItem(IssueFilterUI, row, col, rowSpan+1, colSpan+3, 0, 0, true).
 		AddItem(IssueUI, row+1, col+1, rowSpan+4, colSpan+3, 0, 0, true).
 		AddItem(AssigneesUI, row+1, col, rowSpan+1, colSpan+1, 0, 0, true).