Reworking Keymaps

wdgt_searcher.go

@@ -54,7 +54,7 @@ type Searcher struct {
 	hideOnSelect bool
 	logger       func(string, ...any)
 
-	keyMap, customKeyMap KeyMap
+	keyMap *KeyMap
 }
 
 var _ Widget = (*Searcher)(nil)
@@ -74,16 +74,15 @@ func (w *Searcher) Init(id string, style tcell.Style) {
 	w.search.SetOnChange(func(prev, curr string) {
 		w.updateFilter()
 	})
-	w.keyMap = NewKeyMap(map[tcell.Key]func(ev *tcell.EventKey) bool{
-		tcell.KeyUp:    w.handleKeyUp,
-		tcell.KeyDown:  w.handleKeyDown,
-		tcell.KeyHome:  w.handleKeyHome,
-		tcell.KeyEnd:   w.handleKeyEnd,
-		tcell.KeyPgUp:  w.handleKeyPgUp,
-		tcell.KeyPgDn:  w.handleKeyPgDn,
-		tcell.KeyEnter: w.handleKeyEnter,
-	})
-	w.customKeyMap = BlankKeyMap()
+	w.keyMap = NewKeyMap(
+		NewKey(BuildEK(tcell.KeyUp), w.handleKeyUp),
+		NewKey(BuildEK(tcell.KeyDown), w.handleKeyDown),
+		NewKey(BuildEK(tcell.KeyHome), w.handleKeyHome),
+		NewKey(BuildEK(tcell.KeyEnd), w.handleKeyEnd),
+		NewKey(BuildEK(tcell.KeyPgUp), w.handleKeyPgUp),
+		NewKey(BuildEK(tcell.KeyPgDn), w.handleKeyPgDn),
+		NewKey(BuildEK(tcell.KeyEnter), w.handleKeyEnter),
+	)
 	w.focusable = true
 	w.filteredToTrue = make(map[int]int)
 }
@@ -101,41 +100,22 @@ func (w *Searcher) HandleResize(ev *tcell.EventResize) {
 	// w.buildBuffer()
 }
 
-func (w *Searcher) SetKeyMap(km KeyMap, def bool) {
-	if def {
-		w.keyMap = km
-	} else {
-		w.customKeyMap = km
-	}
-}
-func (w *Searcher) AddToKeyMap(km KeyMap) { w.customKeyMap.Merge(km) }
-func (w *Searcher) RemoveFromKeyMap(km KeyMap) {
-	for k := range km.Keys {
-		w.customKeyMap.Remove(k)
-	}
-	for r := range km.Runes {
-		w.customKeyMap.RemoveRune(r)
-	}
-}
+func (w *Searcher) GetKeyMap() *KeyMap   { return w.keyMap }
+func (w *Searcher) SetKeyMap(km *KeyMap) { w.keyMap = km }
 
 func (w *Searcher) HandleKey(ev *tcell.EventKey) bool {
 	if !w.active {
 		return false
 	}
 	sel := w.cursor
-	b1, b2 := w.keyMap.Handle(ev), w.customKeyMap.Handle(ev)
-	var ret bool
-	if !b1 && !b2 {
+	ret := w.keyMap.Handle(ev)
+	if !ret {
 		ret = w.search.HandleKey(ev)
 	}
 	if w.cursor != sel && w.onChange != nil {
 		w.onChange(w.cursor, w.filteredData[w.cursor])
 	}
-	if b1 || b2 || ret {
-		// w.buildBuffer()
-		return true
-	}
-	return false
+	return ret
 }
 
 func (w *Searcher) handleKeyUp(ev *tcell.EventKey) bool {