Wonkiness on layout

wdgt_field.go

@@ -47,7 +47,7 @@ type Field struct {
 	filter   func(tcell.EventKey) bool
 	onChange func(prev, curr string)
 
-	keyMap KeyMap
+	keyMap, customKeyMap KeyMap
 }
 
 var _ Widget = (*Field)(nil)
@@ -73,20 +73,27 @@ func (w *Field) Init(id string, style tcell.Style) {
 		tcell.KeyEnd:   w.handleEnd,
 		tcell.KeyCtrlU: w.clearValueBeforeCursor,
 	})
+	w.customKeyMap = BlankKeyMap()
 	w.focusable = true
 }
 
 func (w *Field) Id() string                         { return w.id }
 func (w *Field) HandleResize(ev *tcell.EventResize) { w.w, w.h = ev.Size() }
 
-func (w *Field) SetKeyMap(km KeyMap)   { w.keyMap = km }
-func (w *Field) AddToKeyMap(km KeyMap) { w.keyMap.Merge(km) }
+func (w *Field) SetKeyMap(km KeyMap, def bool) {
+	if def {
+		w.keyMap = km
+	} else {
+		w.customKeyMap = km
+	}
+}
+func (w *Field) AddToKeyMap(km KeyMap) { w.customKeyMap.Merge(km) }
 func (w *Field) 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)
 	}
 }
 
@@ -107,7 +114,9 @@ func (w *Field) HandleKey(ev *tcell.EventKey) bool {
 			return w.handleBackspace(ev)
 		}
 	}
-	if ok := w.keyMap.Handle(ev); ok {
+	b1 := w.keyMap.Handle(ev)
+	b2 := w.customKeyMap.Handle(ev)
+	if b1 || b2 {
 		return true
 	}
 	if w.filter != nil && !w.filter(*ev) {
@@ -250,6 +259,12 @@ func (w *Field) SetValue(v string) {
 	prev := w.value
 	w.value = v
 	w.doOnChange(prev, v)
+	if w.cursor > len(v) {
+		w.cursor = len(v)
+	}
+	if w.cursor < 0 {
+		w.cursor = 0
+	}
 }
 func (w *Field) Value() string { return w.value }