Skip to content

fix: improved navigation with tab key and UI for writeonce #176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gchiesa merged 1 commit into from
Jan 21, 2026
Merged

fix: improved navigation with tab key and UI for writeonce #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 30 additions & 27 deletions internal/tui/adapter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ type Model struct {
// inputEntry represents a single input in the form (either text or list)
type inputEntry struct {
inputType InputType
textInput textinput.Model
textModel textinput.Model
listModel list.Model
label string
prompt string // formatted prompt (e.g., "Label : ")
Expand Down Expand Up @@ -61,39 +61,42 @@ func NewModelFromInteractiveForm(iForm InteractiveForm, header string, showBanne
m.readonlyLabelMap[entry.label] = false
}

// Create text input (default)
t := textinput.New()

// Prompt
t.Prompt = fmt.Sprintf(promptFormat, iForm.Inputs[i].Label)

// Placeholder
t.Placeholder = iForm.Inputs[i].Help
t.PlaceholderStyle = helpStyle

// Validation
t.Validate = validator(iForm.Inputs[i].MinLength, iForm.Inputs[i].RegExp)
if iForm.Inputs[i].MaxLength > 0 {
t.CharLimit = iForm.Inputs[i].MaxLength
}

// Default
if iForm.Inputs[i].Default != "" {
t.SetValue(iForm.Inputs[i].Default)
}

// First Item
if i == 0 {
t.Focus()
t.PromptStyle = focusedStyle
t.TextStyle = noStyle
}
entry.textModel = t

if inputType == InputTypeList {
// Create list input
entry.listModel = createListWidget(iForm.Inputs[i])
// Set default selection if provided
if iForm.Inputs[i].Default != "" {
entry.selected = iForm.Inputs[i].Default
}
} else {
// Create text input (default)
t := textinput.New()

// Prompt
t.Prompt = fmt.Sprintf(promptFormat, iForm.Inputs[i].Label)

// Placeholder
t.Placeholder = iForm.Inputs[i].Help
t.PlaceholderStyle = helpStyle
// Validation
t.Validate = validator(iForm.Inputs[i].MinLength, iForm.Inputs[i].RegExp)
if iForm.Inputs[i].MaxLength > 0 {
t.CharLimit = iForm.Inputs[i].MaxLength
}
// Default
if iForm.Inputs[i].Default != "" {
t.SetValue(iForm.Inputs[i].Default)
}
// First Item
if i == 0 {
t.Focus()
t.PromptStyle = focusedStyle
t.TextStyle = noStyle
}
entry.textInput = t
}
m.entries[i] = entry
}
Expand Down
78 changes: 40 additions & 38 deletions internal/tui/collector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,17 @@ var (
BorderStyle(lipgloss.NormalBorder()).
PaddingLeft(2).PaddingRight(2).Foreground(special)

focusedStyle = lipgloss.NewStyle().Bold(true).Foreground(highlight)
blurredStyle = lipgloss.NewStyle().Bold(false).Foreground(subtle)
noStyle = lipgloss.NewStyle()
helpStyle = blurredStyle.AlignHorizontal(lipgloss.Right).Italic(true)
errorStyle = lipgloss.NewStyle().Foreground(bad).MarginTop(2).MarginBottom(1)
goodTick = lipgloss.NewStyle().Foreground(good)
badTick = lipgloss.NewStyle().Foreground(bad)
focusedStyle = lipgloss.NewStyle().Bold(true).Foreground(highlight)
blurredStyle = lipgloss.NewStyle().Bold(false).Foreground(subtle)
readonlyStyle = lipgloss.NewStyle().Bold(false).Foreground(subtle).Faint(true)
readonlyValueStyle = lipgloss.NewStyle().Bold(true).Foreground(subtle).Faint(true).Transform(func(s string) string {
return "🔒 " + strings.TrimSpace(s)
})
noStyle = lipgloss.NewStyle()
helpStyle = blurredStyle.AlignHorizontal(lipgloss.Right).Italic(true)
errorStyle = lipgloss.NewStyle().Foreground(bad).MarginTop(2).MarginBottom(1)
goodTick = lipgloss.NewStyle().Foreground(good)
badTick = lipgloss.NewStyle().Foreground(bad)

listLabelStyle = lipgloss.NewStyle().Bold(true).Foreground(highlight)

Expand Down Expand Up @@ -75,7 +79,7 @@ func (m *Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
}
} else {
var cmd tea.Cmd
m.entries[i].textInput, cmd = m.entries[i].textInput.Update(msg)
m.entries[i].textModel, cmd = m.entries[i].textModel.Update(msg)
cmds = append(cmds, cmd)
}
}
Expand All @@ -90,7 +94,7 @@ func (m *Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
var i int
for i = range m.entries {
if m.entries[i].inputType == InputTypeText {
if err := m.entries[i].textInput.Validate(m.entries[i].textInput.Value()); err != nil {
if err := m.entries[i].textModel.Validate(m.entries[i].textModel.Value()); err != nil {
m.err = err
break
}
Expand Down Expand Up @@ -139,19 +143,6 @@ func (m *Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
m.exitWithCtrlC = true
return m, tea.Quit
}

case tea.KeyUp, tea.KeyDown:
// For list inputs, let the list handle up/down
if currentEntry.inputType == InputTypeList {
// Already handled above in the list update
} else {
// For text inputs, navigate between entries
if msg.Type == tea.KeyDown {
m.nextEntryIfNoError()
} else {
m.prevEntryIfNoError()
}
}
}

// Update focus styles
Expand All @@ -167,11 +158,22 @@ func (m *Model) updateFocusStyles() {
for i := range m.entries {
if m.entries[i].inputType == InputTypeText {
if i == m.focusIndex {
m.entries[i].textInput.PromptStyle = focusedStyle
m.entries[i].textInput.Focus()
m.entries[i].textModel.PromptStyle = focusedStyle
m.entries[i].textModel.Focus()
} else {
m.entries[i].textInput.PromptStyle = noStyle
m.entries[i].textInput.Blur()
m.entries[i].textModel.PromptStyle = noStyle
m.entries[i].textModel.Blur()
}
}
// style differently the readonly
if readonly, ok := m.readonlyLabelMap[m.entries[i].label]; ok {
if readonly {
if m.entries[i].inputType == InputTypeList {
m.entries[i].inputType = InputTypeText
m.entries[i].textModel.SetValue(m.entries[i].selected)
}
m.entries[i].textModel.PromptStyle = readonlyStyle
m.entries[i].textModel.TextStyle = readonlyValueStyle
}
}
}
Expand Down Expand Up @@ -229,18 +231,18 @@ func (m *Model) View() string {
}
} else {
// Render text input
if entry.textInput.Validate(entry.textInput.Value()) == nil {
if entry.textModel.Validate(entry.textModel.Value()) == nil {
builder.WriteString(goodTick.Render("✔"))
} else {
builder.WriteString(badTick.Render("✖"))
}
builder.WriteString(fmt.Sprintf(" %s ", entry.textInput.View()))
builder.WriteString(fmt.Sprintf(" %s ", entry.textModel.View()))
builder.WriteRune('\n')
}
}

builder.WriteRune('\n')
builder.WriteString(helpStyle.Render(" ↑, ↓: navigate, enter: confirm, ctrl+c: quit, ctrl+s: save"))
builder.WriteString(helpStyle.Render(" tab/shift+tab: navigate, enter: confirm, ctrl+c: quit, ctrl+s: save"))
if m.err != nil {
builder.WriteString(errorStyle.Render(m.err.Error()))
}
Expand All @@ -257,28 +259,28 @@ func (m *Model) Execute() error {
func (m *Model) focusEntry(id int) {
// Blur current entry
if m.entries[m.focusIndex].inputType == InputTypeText {
m.entries[m.focusIndex].textInput.Blur()
m.entries[m.focusIndex].textModel.Blur()
}
m.focusIndex = id
// Focus new entry
if m.entries[m.focusIndex].inputType == InputTypeText {
m.entries[m.focusIndex].textInput.Focus()
m.entries[m.focusIndex].textModel.Focus()
}
}

// nextEntryIfNoError focuses the next entry
func (m *Model) nextEntryIfNoError() {
// Check for errors on current entry
if m.entries[m.focusIndex].inputType == InputTypeText {
m.err = m.entries[m.focusIndex].textInput.Err
m.err = m.entries[m.focusIndex].textModel.Err
if m.err != nil {
return
}
}

// Blur current entry
if m.entries[m.focusIndex].inputType == InputTypeText {
m.entries[m.focusIndex].textInput.Blur()
m.entries[m.focusIndex].textModel.Blur()
}

// move the focus to the next non-readonly entry
Expand All @@ -294,23 +296,23 @@ func (m *Model) nextEntryIfNoError() {

// Focus new entry
if m.entries[m.focusIndex].inputType == InputTypeText {
m.entries[m.focusIndex].textInput.Focus()
m.entries[m.focusIndex].textModel.Focus()
}
}

// prevEntryIfNoError focuses the previous entry
func (m *Model) prevEntryIfNoError() {
// Check for errors on current entry
if m.entries[m.focusIndex].inputType == InputTypeText {
m.err = m.entries[m.focusIndex].textInput.Err
m.err = m.entries[m.focusIndex].textModel.Err
if m.err != nil {
return
}
}

// Blur current entry
if m.entries[m.focusIndex].inputType == InputTypeText {
m.entries[m.focusIndex].textInput.Blur()
m.entries[m.focusIndex].textModel.Blur()
}

// move the focus to the next non-readonly entry
Expand All @@ -329,7 +331,7 @@ func (m *Model) prevEntryIfNoError() {

// Focus new entry
if m.entries[m.focusIndex].inputType == InputTypeText {
m.entries[m.focusIndex].textInput.Focus()
m.entries[m.focusIndex].textModel.Focus()
}
}

Expand All @@ -339,7 +341,7 @@ func (m *Model) GetVariablesForInteractiveForm(iForm InteractiveForm) map[string
if m.entries[i].inputType == InputTypeList {
variables[iForm.Inputs[i].Placeholder] = m.entries[i].selected
} else {
variables[iForm.Inputs[i].Placeholder] = m.entries[i].textInput.Value()
variables[iForm.Inputs[i].Placeholder] = m.entries[i].textModel.Value()
}
}
return variables
Expand Down
Loading