Reworking Keymaps

wdgt_datepicker.go

@@ -45,7 +45,7 @@ type DatePicker struct {
 	dateFld *Field
 	dateNow *Button
 
-	keyMap, customKeyMap KeyMap
+	keyMap *KeyMap
 
 	logger func(string, ...any)
 }
@@ -96,38 +96,15 @@ func (w *DatePicker) HandleResize(ev *tcell.EventResize) {
 	w.dateNow.SetPos(Coord{X: wd - 6, Y: 0})
 }
 
-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.customKeyMap.Remove(k)
-	}
-	for r := range km.Runes {
-		w.customKeyMap.RemoveRune(r)
-	}
-}
+func (w *DatePicker) GetKeyMap() *KeyMap   { return w.keyMap }
+func (w *DatePicker) SetKeyMap(km *KeyMap) { w.keyMap = km }
 
 func (w *DatePicker) HandleKey(ev *tcell.EventKey) bool {
 	if !w.active {
 		return false
 	}
-	if ev.Key() == tcell.KeyTab {
-		if w.dateFld.Active() {
-			w.dateFld.SetActive(false)
-			w.dateNow.SetActive(true)
-			return true
-		} else if w.dateNow.Active() {
-			w.dateFld.SetActive(false)
-			w.dateNow.SetActive(false)
-			return false
-		}
-		return false
+	if w.keyMap.Handle(ev) {
+		return true
 	}
 	if w.dateFld.Active() {
 		if w.dateFld.HandleKey(ev) {
@@ -140,9 +117,7 @@ func (w *DatePicker) HandleKey(ev *tcell.EventKey) bool {
 	} else if w.dateNow.Active() {
 		return w.dateNow.HandleKey(ev)
 	}
-	b1 := w.keyMap.Handle(ev)
-	b2 := w.customKeyMap.Handle(ev)
-	return b1 || b2
+	return false
 }
 func (w *DatePicker) HandleTime(ev *tcell.EventTime) {}
 func (w *DatePicker) Draw(screen tcell.Screen) {
@@ -198,8 +173,20 @@ func (w *DatePicker) updateUI() {
 }
 
 func (w *DatePicker) initKeyMap() {
-	w.keyMap = NewKeyMap(map[tcell.Key]func(ev *tcell.EventKey) bool{})
-	w.customKeyMap = BlankKeyMap()
+	w.keyMap = NewKeyMap(
+		NewKey(BuildEK(tcell.KeyTab), func(ev *tcell.EventKey) bool {
+			if w.dateFld.Active() {
+				w.dateFld.SetActive(false)
+				w.dateNow.SetActive(true)
+				return true
+			} else if w.dateNow.Active() {
+				w.dateFld.SetActive(false)
+				w.dateNow.SetActive(false)
+				return true
+			}
+			return false
+		}),
+	)
 }
 
 func (w *DatePicker) Format() string { return w.format }