Skip to content
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

feat(textinput): do not block input on validation #185

Merged
merged 2 commits into from
Mar 14, 2024
Merged

feat(textinput): do not block input on validation #185

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7b3760
feat(textinput): do not block input on validation
GabrielNagy Feb 29, 2024
7f0383b
fix: change name
maaslalani Mar 13, 2024
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
38 changes: 19 additions & 19 deletions textinput/textinput.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,19 +181,14 @@ func (m *Model) SetValue(s string) {
// Clean up any special characters in the input provided by the
// caller. This avoids bugs due to e.g. tab characters and whatnot.
runes := m.san().Sanitize([]rune(s))
m.setValueInternal(runes)
err := m.validate(runes)
m.setValueInternal(runes, err)
}

func (m *Model) setValueInternal(runes []rune) {
if m.Validate != nil {
if err := m.Validate(string(runes)); err != nil {
m.Err = err
return
}
}
func (m *Model) setValueInternal(runes []rune, err error) {
m.Err = err

empty := len(m.value) == 0
m.Err = nil

if m.CharLimit > 0 && len(runes) > m.CharLimit {
m.value = runes[:m.CharLimit]
Expand Down Expand Up @@ -307,8 +302,6 @@ func (m *Model) insertRunesFromUserInput(v []rune) {
tail := make([]rune, len(tailSrc))
copy(tail, tailSrc)

oldPos := m.pos

// Insert pasted runes
for _, r := range paste {
head = append(head, r)
Expand All @@ -323,11 +316,8 @@ func (m *Model) insertRunesFromUserInput(v []rune) {

// Put it all back together
value := append(head, tail...)
m.setValueInternal(value)

if m.Err != nil {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So essentially we just remove this line and never block.

m.pos = oldPos
}
inputErr := m.validate(value)
m.setValueInternal(value, inputErr)
}

// If a max width is defined, perform some logic to treat the visible area
Expand Down Expand Up @@ -378,6 +368,7 @@ func (m *Model) handleOverflow() {
// deleteBeforeCursor deletes all text before the cursor.
func (m *Model) deleteBeforeCursor() {
m.value = m.value[m.pos:]
m.Err = m.validate(m.value)
m.offset = 0
m.SetCursor(0)
}
Expand All @@ -387,6 +378,7 @@ func (m *Model) deleteBeforeCursor() {
// masked input.
func (m *Model) deleteAfterCursor() {
m.value = m.value[:m.pos]
m.Err = m.validate(m.value)
m.SetCursor(len(m.value))
}

Expand Down Expand Up @@ -432,6 +424,7 @@ func (m *Model) deleteWordBackward() {
} else {
m.value = append(m.value[:m.pos], m.value[oldPos:]...)
}
m.Err = m.validate(m.value)
}

// deleteWordForward deletes the word right to the cursor. If input is masked
Expand Down Expand Up @@ -471,6 +464,7 @@ func (m *Model) deleteWordForward() {
} else {
m.value = append(m.value[:oldPos], m.value[m.pos:]...)
}
m.Err = m.validate(m.value)

m.SetCursor(oldPos)
}
Expand Down Expand Up @@ -575,12 +569,12 @@ func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
case tea.KeyMsg:
switch {
case key.Matches(msg, m.KeyMap.DeleteWordBackward):
m.Err = nil
m.deleteWordBackward()
case key.Matches(msg, m.KeyMap.DeleteCharacterBackward):
m.Err = nil
if len(m.value) > 0 {
m.value = append(m.value[:max(0, m.pos-1)], m.value[m.pos:]...)
m.Err = m.validate(m.value)
if m.pos > 0 {
m.SetCursor(m.pos - 1)
}
Expand All @@ -597,13 +591,12 @@ func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
if m.pos < len(m.value) {
m.SetCursor(m.pos + 1)
}
case key.Matches(msg, m.KeyMap.DeleteWordBackward):
m.deleteWordBackward()
Comment on lines -600 to -601
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any reason for deleting this?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah I see it's a duplicate now.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, apologies should have pulled that to a separate commit. It confused me as well when re-reading the code. 😅

case key.Matches(msg, m.KeyMap.LineStart):
m.CursorStart()
case key.Matches(msg, m.KeyMap.DeleteCharacterForward):
if len(m.value) > 0 && m.pos < len(m.value) {
m.value = append(m.value[:m.pos], m.value[m.pos+1:]...)
m.Err = m.validate(m.value)
}
case key.Matches(msg, m.KeyMap.LineEnd):
m.CursorEnd()
Expand Down Expand Up @@ -884,3 +877,10 @@ func (m *Model) previousSuggestion() {
m.currentSuggestionIndex = len(m.matchedSuggestions) - 1
}
}

func (m Model) validate(v []rune) error {
if m.Validate != nil {
return m.Validate(string(v))
}
return nil
}
Loading