fix: apply theme/keymap in form constructor for Bubble Tea

Since Bubble Tea doesn't call Run() the theme would never be set.
charmbracelet · Oct 24, 2023 · b8a2ba8 · b8a2ba8
1 parent ac6df59
commit b8a2ba8
Showing 1 changed file with 14 additions and 11 deletions.
diff --git a/form.go b/form.go
@@ -23,12 +23,25 @@ func NewForm(groups ...*Group) *Form {
 	p := paginator.New()
 	p.SetTotalPages(len(groups))
 
-	return &Form{
+	f := Form{
 		groups:    groups,
 		paginator: p,
 		theme:     NewCharmTheme(),
 		keymap:    NewDefaultKeyMap(),
 	}
+
+	// NB: If dynamic forms come into play this will need to be applied when
+	// groups and fields are added.
+	for _, group := range f.groups {
+		group.Theme(f.theme)
+		group.KeyMap(f.keymap)
+		for _, field := range group.fields {
+			field.Theme(f.theme)
+			field.KeyMap(f.keymap)
+		}
+	}
+
+	return &f
 }
 
 // Field is a form field.
@@ -160,16 +173,6 @@ func (f *Form) Run() error {
 		return nil
 	}
 
-	// Make theme and keymap available to groups and fields
-	for _, group := range f.groups {
-		group.Theme(f.theme)
-		group.KeyMap(f.keymap)
-		for _, field := range group.fields {
-			field.Theme(f.theme)
-			field.KeyMap(f.keymap)
-		}
-	}
-
 	if f.accessible {
 		for _, group := range f.groups {
 			for _, field := range group.fields {