refactor: clean up Theme

charmbracelet · Jan 7, 2025 · 152f09d · 152f09d
1 parent d5b26eb
commit 152f09d
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 28 deletions.
diff --git a/field_confirm.go b/field_confirm.go
@@ -229,11 +229,10 @@ func (c *Confirm) activeStyles() *FieldStyles {
 
 // Theme returns the theme of the field.
 func (c *Confirm) Theme() *Theme {
-	theme := c.theme
-	if theme == nil {
-		theme = ThemeCharm()
+	if c.theme != nil {
+		return c.theme
 	}
-	return theme
+	return ThemeCharm()
 }
 
 // View renders the confirm field.

diff --git a/field_filepicker.go b/field_filepicker.go
@@ -256,11 +256,10 @@ func (f *FilePicker) activeStyles() *FieldStyles {
 
 // Theme returns the theme of the field.
 func (f *FilePicker) Theme() *Theme {
-	theme := f.theme
-	if theme == nil {
-		theme = ThemeCharm()
+	if f.theme != nil {
+		return f.theme
 	}
-	return theme
+	return ThemeCharm()
 }
 
 // View renders the file field.

diff --git a/field_input.go b/field_input.go
@@ -370,11 +370,10 @@ func (i *Input) activeStyles() *FieldStyles {
 
 // Theme returns the theme of the field.
 func (i *Input) Theme() *Theme {
-	theme := i.theme
-	if theme == nil {
-		theme = ThemeCharm()
+	if i.theme != nil {
+		return i.theme
 	}
-	return theme
+	return ThemeCharm()
 }
 
 // View renders the input field.

diff --git a/field_multiselect.go b/field_multiselect.go
@@ -510,11 +510,10 @@ func (m *MultiSelect[T]) activeStyles() *FieldStyles {
 
 // Theme returns the theme of the field.
 func (m *MultiSelect[T]) Theme() *Theme {
-	theme := m.theme
-	if theme == nil {
-		theme = ThemeCharm()
+	if m.theme != nil {
+		return m.theme
 	}
-	return theme
+	return ThemeCharm()
 }
 
 func (m *MultiSelect[T]) titleView() string {

diff --git a/field_note.go b/field_note.go
@@ -213,11 +213,10 @@ func (n *Note) activeStyles() *FieldStyles {
 
 // Theme returns the theme of the field.
 func (n *Note) Theme() *Theme {
-	theme := n.theme
-	if theme == nil {
-		theme = ThemeCharm()
+	if n.theme != nil {
+		return n.theme
 	}
-	return theme
+	return ThemeCharm()
 }
 
 // View renders the note field.

diff --git a/field_select.go b/field_select.go
@@ -523,11 +523,10 @@ func (s *Select[T]) activeStyles() *FieldStyles {
 
 // Theme returns the theme of the field.
 func (s *Select[T]) Theme() *Theme {
-	theme := s.theme
-	if theme == nil {
-		theme = ThemeCharm()
+	if s.theme != nil {
+		return s.theme
 	}
-	return theme
+	return ThemeCharm()
 }
 
 func (s *Select[T]) titleView() string {

diff --git a/field_text.go b/field_text.go
@@ -351,11 +351,10 @@ func (t *Text) activeStyles() *FieldStyles {
 
 // Theme returns the theme of the field.
 func (t *Text) Theme() *Theme {
-	theme := t.theme
-	if theme == nil {
-		theme = ThemeCharm()
+	if t.theme != nil {
+		return t.theme
 	}
-	return theme
+	return ThemeCharm()
 }
 
 func (t *Text) activeTextAreaStyles() *textarea.Style {