fix: possible nil panics

charmbracelet · Dec 7, 2023 · 612f646 · 612f646
1 parent aeb5620
commit 612f646
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/field_multiselect.go b/field_multiselect.go
@@ -40,6 +40,7 @@ type MultiSelect[T any] struct {
 // NewMultiSelect returns a new multi-select field.
 func NewMultiSelect[T any]() *MultiSelect[T] {
 	return &MultiSelect[T]{
+		options:  []Option[T]{},
 		value:    new([]T),
 		validate: func([]T) error { return nil },
 	}
@@ -72,6 +73,9 @@ func (m *MultiSelect[T]) Description(description string) *MultiSelect[T] {
 
 // Options sets the options of the multi-select field.
 func (m *MultiSelect[T]) Options(options ...Option[T]) *MultiSelect[T] {
+	if len(options) <= 0 {
+		return m
+	}
 	m.options = options
 	return m
 }

diff --git a/field_select.go b/field_select.go
@@ -45,6 +45,7 @@ func NewSelect[T any]() *Select[T] {
 	filter.Prompt = "/"
 
 	return &Select[T]{
+		options:   []Option[T]{},
 		value:     new(T),
 		validate:  func(T) error { return nil },
 		filtering: false,
@@ -79,6 +80,9 @@ func (s *Select[T]) Description(description string) *Select[T] {
 
 // Options sets the options of the select field.
 func (s *Select[T]) Options(options ...Option[T]) *Select[T] {
+	if len(options) <= 0 {
+		return s
+	}
 	s.options = options
 	s.filteredOptions = options