Wonkiness on layout

wdgt_datepicker.go

@@ -45,7 +45,7 @@ type DatePicker struct {
 	dateFld *Field
 	dateNow *Button
 
-	keyMap KeyMap
+	keyMap, customKeyMap KeyMap
 
 	logger func(string, ...any)
 }
@@ -96,14 +96,20 @@ func (w *DatePicker) HandleResize(ev *tcell.EventResize) {
 	w.dateNow.SetPos(Coord{X: wd - 6, Y: 0})
 }
 
-func (w *DatePicker) SetKeyMap(km KeyMap)   { w.keyMap = km }
-func (w *DatePicker) AddToKeyMap(km KeyMap) { w.keyMap.Merge(km) }
+func (w *DatePicker) SetKeyMap(km KeyMap, def bool) {
+	if def {
+		w.keyMap = km
+	} else {
+		w.customKeyMap = km
+	}
+}
+func (w *DatePicker) AddToKeyMap(km KeyMap) { w.customKeyMap.Merge(km) }
 func (w *DatePicker) 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)
 	}
 }
 
@@ -134,7 +140,9 @@ func (w *DatePicker) HandleKey(ev *tcell.EventKey) bool {
 	} else if w.dateNow.Active() {
 		return w.dateNow.HandleKey(ev)
 	}
-	return w.keyMap.Handle(ev)
+	b1 := w.keyMap.Handle(ev)
+	b2 := w.customKeyMap.Handle(ev)
+	return b1 || b2
 }
 func (w *DatePicker) HandleTime(ev *tcell.EventTime) {}
 func (w *DatePicker) Draw(screen tcell.Screen) {
@@ -191,6 +199,7 @@ func (w *DatePicker) updateUI() {
 
 func (w *DatePicker) initKeyMap() {
 	w.keyMap = NewKeyMap(map[tcell.Key]func(ev *tcell.EventKey) bool{})
+	w.customKeyMap = BlankKeyMap()
 }
 
 func (w *DatePicker) Format() string { return w.format }