Fixes focusing filter or editor was setting the keybinding as text value

jorgerojas26 · Oct 17, 2023 · 26bbccf · 26bbccf
1 parent 04daf6c
commit 26bbccf
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 18 deletions.
diff --git a/components/ResultsTable.go b/components/ResultsTable.go
@@ -2,14 +2,13 @@ package components
 
 import (
 	"fmt"
+	"lazysql/app"
+	"lazysql/drivers"
 	"strings"
 
 	"github.com/gdamore/tcell/v2"
 	"github.com/rivo/tview"
 	"golang.design/x/clipboard"
-
-	"lazysql/app"
-	"lazysql/drivers"
 )
 
 type ResultsTableState struct {
@@ -39,8 +38,10 @@ type ResultsTable struct {
 	Editor     *SQLEditor
 }
 
-var ErrorModal = tview.NewModal()
-var App = app.App
+var (
+	ErrorModal = tview.NewModal()
+	App        = app.App
+)
 
 func NewResultsTable() *ResultsTable {
 	state := &ResultsTableState{
@@ -109,7 +110,6 @@ func (table *ResultsTable) WithFilter() *ResultsTable {
 	go table.subscribeToFilterChanges()
 
 	return table
-
 }
 
 func (table *ResultsTable) WithEditor() *ResultsTable {
@@ -127,7 +127,6 @@ func (table *ResultsTable) WithEditor() *ResultsTable {
 	go table.subscribeToEditorChanges()
 
 	return table
-
 }
 
 func (table *ResultsTable) AddRows(rows [][]string) {
@@ -184,11 +183,10 @@ func (table *ResultsTable) tableInputCapture(event *tcell.EventKey) *tcell.Event
 	if event.Rune() == 47 { // / Key
 		if table.Editor != nil {
 			App.SetFocus(table.Editor)
+			table.Editor.Highlight()
 			table.RemoveHighlightTable()
 			table.SetIsFiltering(true)
-			if table.Editor.GetText() == "/" {
-				go table.Editor.SetText("", true)
-			}
+			return nil
 		} else {
 			App.SetFocus(table.Filter.Input)
 			table.RemoveHighlightTable()
@@ -740,5 +738,4 @@ func (table *ResultsTable) FetchRecords(tableName string) [][]string {
 	}
 
 	return [][]string{}
-
 }
diff --git a/pages/home.go b/pages/home.go
@@ -1,11 +1,11 @@
 package pages
 
 import (
-	"github.com/gdamore/tcell/v2"
-	"github.com/rivo/tview"
-
 	"lazysql/app"
 	"lazysql/components"
+
+	"github.com/gdamore/tcell/v2"
+	"github.com/rivo/tview"
 )
 
 type Home struct {
@@ -46,12 +46,16 @@ func NewHomePage(name string) *Home {
 
 		if event.Rune() == '[' {
 			focusTab(tabbedPane.SwitchToPreviousTab())
+			return nil
 		} else if event.Rune() == ']' {
 			focusTab(tabbedPane.SwitchToNextTab())
+			return nil
 		} else if event.Rune() == '{' {
 			focusTab(tabbedPane.SwitchToFirstTab())
+			return nil
 		} else if event.Rune() == '}' {
 			focusTab(tabbedPane.SwitchToLastTab())
+			return nil
 		} else if event.Rune() == 'X' {
 			tabbedPane.RemoveCurrentTab()
 
@@ -98,7 +102,6 @@ func NewHomePage(name string) *Home {
 	home.AddItem(rightWrapper, 0, 5, false)
 
 	home.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
-
 		tab := tabbedPane.GetCurrentTab()
 
 		var table *components.ResultsTable = nil
@@ -123,6 +126,7 @@ func NewHomePage(name string) *Home {
 			} else {
 				tableWithEditor := components.NewResultsTable().WithEditor()
 				tabbedPane.AppendTab("Editor", tableWithEditor)
+				tableWithEditor.SetIsFiltering(true)
 			}
 			home.focusRightWrapper()
 			App.ForceDraw()
@@ -182,7 +186,6 @@ func (home *Home) subscribeToTreeChanges() {
 			table.FetchRecords(tableName)
 
 			app.App.ForceDraw()
-
 		}
 	}
 }
@@ -209,8 +212,14 @@ func focusTab(tab *components.Tab) {
 
 		if table.GetIsFiltering() {
 			go func() {
-				App.SetFocus(table.Filter.Input)
-				table.Filter.HighlightLocal()
+				if table.Filter != nil {
+					App.SetFocus(table.Filter.Input)
+					table.Filter.HighlightLocal()
+				} else if table.Editor != nil {
+					App.SetFocus(table.Editor)
+					table.Editor.Highlight()
+				}
+
 				table.RemoveHighlightTable()
 				App.Draw()
 			}()