Wonkiness on layout

wdgt_top_menu_layout.go

@@ -43,8 +43,8 @@ type TopMenuLayout struct {
 	visible   bool
 	focusable bool
 
-	layoutFlags LayoutFlag
-	keyMap      KeyMap
+	layoutFlags          LayoutFlag
+	keyMap, customKeyMap KeyMap
 
 	logger func(string, ...any)
 }
@@ -79,6 +79,7 @@ func (w *TopMenuLayout) Init(id string, s tcell.Style) {
 		}
 		return false
 	})
+	w.customKeyMap = BlankKeyMap()
 }
 
 func (w *TopMenuLayout) ToggleMenu() bool {
@@ -121,14 +122,20 @@ func (w *TopMenuLayout) HandleResize(ev *tcell.EventResize) {
 	}
 }
 
-func (w *TopMenuLayout) SetKeyMap(km KeyMap)   { w.keyMap = km }
-func (w *TopMenuLayout) AddToKeyMap(km KeyMap) { w.keyMap.Merge(km) }
+func (w *TopMenuLayout) SetKeyMap(km KeyMap, def bool) {
+	if def {
+		w.keyMap = km
+	} else {
+		w.customKeyMap = km
+	}
+}
+func (w *TopMenuLayout) AddToKeyMap(km KeyMap) { w.customKeyMap.Merge(km) }
 func (w *TopMenuLayout) RemoveFromKeyMap(km KeyMap) {
 	for k := range km.Keys {
-		w.keyMap.Remove(k)
+		w.customKeyMap.Remove(k)
 	}
 	for r := range km.Runes {
-		w.keyMap.RemoveRune(r)
+		w.customKeyMap.RemoveRune(r)
 	}
 }
 
@@ -136,8 +143,8 @@ func (w *TopMenuLayout) HandleKey(ev *tcell.EventKey) bool {
 	if !w.active {
 		return false
 	}
-
-	if w.keyMap.Handle(ev) {
+	b1, b2 := w.keyMap.Handle(ev), w.customKeyMap.Handle(ev)
+	if b1 || b2 {
 		return true
 	}
 	if w.menu != nil && w.menu.Active() {