stop support menu filtering for simplicity
Jesse Duffield
2 years ago
parent
e6d4a97545
commit
f7beb6e83f
@ -0,0 +1,80 @@
|
||||
package gui
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
"github.com/jesseduffield/gocui"
|
||||
)
|
||||
|
||||
func (gui *Gui) handleOpenFilter() error {
|
||||
panel, ok := gui.currentListPanel()
|
||||
if !ok {
|
||||
return nil
|
||||
}
|
||||
|
||||
if panel.IsFilterDisabled() {
|
||||
return nil
|
||||
}
|
||||
|
||||
gui.State.Filter.active = true
|
||||
gui.State.Filter.panel = panel
|
||||
|
||||
return gui.switchFocus(gui.Views.Filter)
|
||||
}
|
||||
|
||||
func (gui *Gui) onNewFilterNeedle(value string) error {
|
||||
gui.State.Filter.needle = value
|
||||
gui.ResetOrigin(gui.State.Filter.panel.View())
|
||||
return gui.State.Filter.panel.RerenderList()
|
||||
}
|
||||
|
||||
func (gui *Gui) wrapEditor(f func(v *gocui.View, key gocui.Key, ch rune, mod gocui.Modifier) bool) func(v *gocui.View, key gocui.Key, ch rune, mod gocui.Modifier) bool {
|
||||
return func(v *gocui.View, key gocui.Key, ch rune, mod gocui.Modifier) bool {
|
||||
matched := f(v, key, ch, mod)
|
||||
if matched {
|
||||
if err := gui.onNewFilterNeedle(v.TextArea.GetContent()); err != nil {
|
||||
gui.Log.Error(err)
|
||||
}
|
||||
}
|
||||
return matched
|
||||
}
|
||||
}
|
||||
|
||||
func (gui *Gui) escapeFilterPrompt() error {
|
||||
if err := gui.clearFilter(); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return gui.returnFocus()
|
||||
}
|
||||
|
||||
func (gui *Gui) clearFilter() error {
|
||||
gui.State.Filter.needle = ""
|
||||
gui.State.Filter.active = false
|
||||
panel := gui.State.Filter.panel
|
||||
gui.State.Filter.panel = nil
|
||||
gui.Views.Filter.ClearTextArea()
|
||||
|
||||
if panel == nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
gui.ResetOrigin(panel.View())
|
||||
|
||||
return panel.RerenderList()
|
||||
}
|
||||
|
||||
// returns to the list view with the filter still applied
|
||||
func (gui *Gui) commitFilter() error {
|
||||
if gui.State.Filter.needle == "" {
|
||||
if err := gui.clearFilter(); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
return gui.returnFocus()
|
||||
}
|
||||
|
||||
func (gui *Gui) filterPrompt() string {
|
||||
return fmt.Sprintf("%s: ", gui.Tr.FilterPrompt)
|
||||
}
|
||||
@ -0,0 +1,146 @@
|
||||
package gui
|
||||
|
||||
import (
|
||||
"github.com/jesseduffield/gocui"
|
||||
"github.com/samber/lo"
|
||||
)
|
||||
|
||||
func (gui *Gui) newLineFocused(v *gocui.View) error {
|
||||
if v == nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
currentListPanel, ok := gui.currentListPanel()
|
||||
if ok {
|
||||
return currentListPanel.HandleSelect()
|
||||
}
|
||||
|
||||
switch v.Name() {
|
||||
case "confirmation":
|
||||
return nil
|
||||
case "main":
|
||||
v.Highlight = false
|
||||
return nil
|
||||
case "filter":
|
||||
return nil
|
||||
default:
|
||||
panic(gui.Tr.NoViewMachingNewLineFocusedSwitchStatement)
|
||||
}
|
||||
}
|
||||
|
||||
// TODO: move some of this logic into our onFocusLost and onFocus hooks
|
||||
func (gui *Gui) switchFocus(newView *gocui.View) error {
|
||||
gui.Mutexes.ViewStackMutex.Lock()
|
||||
defer gui.Mutexes.ViewStackMutex.Unlock()
|
||||
|
||||
return gui.switchFocusAux(newView)
|
||||
}
|
||||
|
||||
func (gui *Gui) switchFocusAux(newView *gocui.View) error {
|
||||
gui.pushView(newView.Name())
|
||||
gui.Log.Info("setting highlight to true for view " + newView.Name())
|
||||
gui.Log.Info("new focused view is " + newView.Name())
|
||||
if _, err := gui.g.SetCurrentView(newView.Name()); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
gui.g.Cursor = newView.Editable
|
||||
|
||||
if err := gui.renderPanelOptions(); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
newViewStack := gui.State.ViewStack
|
||||
|
||||
if gui.State.Filter.panel != nil && !lo.Contains(newViewStack, gui.State.Filter.panel.View().Name()) {
|
||||
if err := gui.clearFilter(); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
// TODO: add 'onFocusLost' hook
|
||||
if !lo.Contains(newViewStack, "menu") {
|
||||
gui.Views.Menu.Visible = false
|
||||
}
|
||||
|
||||
return gui.newLineFocused(newView)
|
||||
}
|
||||
|
||||
func (gui *Gui) returnFocus() error {
|
||||
gui.Mutexes.ViewStackMutex.Lock()
|
||||
defer gui.Mutexes.ViewStackMutex.Unlock()
|
||||
|
||||
if len(gui.State.ViewStack) <= 1 {
|
||||
return nil
|
||||
}
|
||||
|
||||
previousViewName := gui.State.ViewStack[len(gui.State.ViewStack)-2]
|
||||
previousView, err := gui.g.View(previousViewName)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return gui.switchFocusAux(previousView)
|
||||
}
|
||||
|
||||
func (gui *Gui) removeViewFromStack(view *gocui.View) {
|
||||
gui.Mutexes.ViewStackMutex.Lock()
|
||||
defer gui.Mutexes.ViewStackMutex.Unlock()
|
||||
|
||||
gui.State.ViewStack = lo.Filter(gui.State.ViewStack, func(viewName string, _ int) bool {
|
||||
return viewName != view.Name()
|
||||
})
|
||||
}
|
||||
|
||||
// Not to be called directly. Use `switchFocus` instead
|
||||
func (gui *Gui) pushView(name string) {
|
||||
// No matter what view we're pushing, we first remove all popup panels from the stack
|
||||
// (unless it's the search view because we may be searching the menu panel)
|
||||
if name != "filter" {
|
||||
gui.State.ViewStack = lo.Filter(gui.State.ViewStack, func(viewName string, _ int) bool {
|
||||
return !gui.isPopupPanel(viewName)
|
||||
})
|
||||
}
|
||||
|
||||
// If we're pushing a side panel, we remove all other panels
|
||||
if lo.Contains(gui.sideViewNames(), name) {
|
||||
gui.State.ViewStack = []string{}
|
||||
}
|
||||
|
||||
// If we're pushing a panel that's already in the stack, we remove it
|
||||
gui.State.ViewStack = lo.Filter(gui.State.ViewStack, func(viewName string, _ int) bool {
|
||||
return viewName != name
|
||||
})
|
||||
|
||||
gui.State.ViewStack = append(gui.State.ViewStack, name)
|
||||
}
|
||||
|
||||
// excludes popups
|
||||
func (gui *Gui) currentStaticViewName() string {
|
||||
gui.Mutexes.ViewStackMutex.Lock()
|
||||
defer gui.Mutexes.ViewStackMutex.Unlock()
|
||||
|
||||
for i := len(gui.State.ViewStack) - 1; i >= 0; i-- {
|
||||
if !lo.Contains(gui.popupViewNames(), gui.State.ViewStack[i]) {
|
||||
return gui.State.ViewStack[i]
|
||||
}
|
||||
}
|
||||
|
||||
return gui.initiallyFocusedViewName()
|
||||
}
|
||||
|
||||
func (gui *Gui) currentSideViewName() string {
|
||||
gui.Mutexes.ViewStackMutex.Lock()
|
||||
defer gui.Mutexes.ViewStackMutex.Unlock()
|
||||
|
||||
// we expect that there is a side window somewhere in the view stack, so we will search from top to bottom
|
||||
for idx := range gui.State.ViewStack {
|
||||
reversedIdx := len(gui.State.ViewStack) - 1 - idx
|
||||
viewName := gui.State.ViewStack[reversedIdx]
|
||||
if lo.Contains(gui.sideViewNames(), viewName) {
|
||||
return viewName
|
||||
}
|
||||
}
|
||||
|
||||
return gui.initiallyFocusedViewName()
|
||||
}
|
||||
@ -1,60 +0,0 @@
|
||||
package gui
|
||||
|
||||
import (
|
||||
"github.com/jesseduffield/gocui"
|
||||
)
|
||||
|
||||
func (gui *Gui) handleOpenSearch() error {
|
||||
panel, ok := gui.currentListPanel()
|
||||
if !ok {
|
||||
return nil
|
||||
}
|
||||
|
||||
gui.State.Searching.isSearching = true
|
||||
gui.State.Searching.panel = panel
|
||||
|
||||
return gui.switchFocus(gui.Views.Search)
|
||||
}
|
||||
|
||||
func (gui *Gui) onNewSearchString(value string) error {
|
||||
// need to refresh the right list panel.
|
||||
gui.State.Searching.searchString = value
|
||||
gui.ResetOrigin(gui.State.Searching.panel.View())
|
||||
return gui.State.Searching.panel.RerenderList()
|
||||
}
|
||||
|
||||
func (gui *Gui) wrapEditor(f func(v *gocui.View, key gocui.Key, ch rune, mod gocui.Modifier) bool) func(v *gocui.View, key gocui.Key, ch rune, mod gocui.Modifier) bool {
|
||||
return func(v *gocui.View, key gocui.Key, ch rune, mod gocui.Modifier) bool {
|
||||
matched := f(v, key, ch, mod)
|
||||
if matched {
|
||||
// TODO: handle error
|
||||
_ = gui.onNewSearchString(v.TextArea.GetContent())
|
||||
}
|
||||
return matched
|
||||
}
|
||||
}
|
||||
|
||||
func (gui *Gui) escapeSearchPrompt() error {
|
||||
if err := gui.clearSearch(); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return gui.returnFocus()
|
||||
}
|
||||
|
||||
func (gui *Gui) clearSearch() error {
|
||||
gui.State.Searching.searchString = ""
|
||||
gui.State.Searching.isSearching = false
|
||||
panel := gui.State.Searching.panel
|
||||
gui.State.Searching.panel = nil
|
||||
gui.Views.Search.ClearTextArea()
|
||||
|
||||
gui.ResetOrigin(panel.View())
|
||||
|
||||
return panel.RerenderList()
|
||||
}
|
||||
|
||||
// returns to the list view with the filter still applied
|
||||
func (gui *Gui) commitSearch() error {
|
||||
return gui.returnFocus()
|
||||
}
|
||||
Loading…
Reference in New Issue