fix(readline): handle wrapped render rows

Author: inhere

go.mod

@@ -4,7 +4,7 @@ go 1.22
 
 require (
 	github.com/gookit/color v1.6.2-0.20260604125953-289d54c4470a
-	github.com/gookit/goutil v0.7.6
+	github.com/gookit/goutil v0.8.0
 	golang.org/x/term v0.29.0
 )
 

go.sum

@@ -1,11 +1,9 @@
 github.com/gookit/assert v0.1.1 h1:lh3GcawXe/p+cU7ESTZ5Ui3Sm/x8JWpIis4/1aF0mY0=
 github.com/gookit/assert v0.1.1/go.mod h1:jS5bmIVQZTIwk42uXl4lyj4iaaxx32tqH16CFj0VX2E=
-github.com/gookit/color v1.6.1 h1:KoTnDxJPRgrL0SoX0f8rCFg2zI0t4E3GZZBMo2nN8LU=
-github.com/gookit/color v1.6.1/go.mod h1:9ACFc7/1IpHGBW8RwuDm/0YEnhg3dwwXpoMsmtyHfjs=
 github.com/gookit/color v1.6.2-0.20260604125953-289d54c4470a h1:utlwkRKoYYXGEGyQBQSy7p/gYxOV9SQXvF9JhaRoLmA=
 github.com/gookit/color v1.6.2-0.20260604125953-289d54c4470a/go.mod h1:9ACFc7/1IpHGBW8RwuDm/0YEnhg3dwwXpoMsmtyHfjs=
-github.com/gookit/goutil v0.7.6 h1:700ZP6QPWhw5ms7X13JH9fUs4LTyYMmncFFMGpK73ns=
-github.com/gookit/goutil v0.7.6/go.mod h1:vJS9HXctYTCLtCsZot5L5xF+O1oR17cDYO9R0HxBmnU=
+github.com/gookit/goutil v0.8.0 h1:efZWxfesXw8+5tQfTfRMSIC6A0ax527/H+A/aIiaSrw=
+github.com/gookit/goutil v0.8.0/go.mod h1:vJS9HXctYTCLtCsZot5L5xF+O1oR17cDYO9R0HxBmnU=
 github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no=
 github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=
 golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 h1:MDc5xs78ZrZr3HMQugiXOAkSZtfTpbJLDr/lwfgO53E=

interact/backend/readline/readline.go

@@ -12,6 +12,7 @@ import (
 	"github.com/gookit/cliui/interact/backend"
 	"github.com/gookit/cliui/interact/backend/plain"
 	"github.com/gookit/color"
+	"github.com/gookit/goutil/strutil"
 	"golang.org/x/term"
 )
 
@@ -97,6 +98,7 @@ func (s *Session) Render(view backend.View) error {
 		}
 	}
 
+	currentRows := viewRows(view)
 	renderedLines := len(view.Lines)
 	if s.rendered > renderedLines {
 		renderedLines = s.rendered
@@ -113,7 +115,7 @@ func (s *Session) Render(view backend.View) error {
 	}
 
 	if view.CursorRow >= 0 && view.CursorRow < len(view.Lines) {
-		moveUp := renderedLines - 1 - view.CursorRow
+		moveUp := currentRows - 1 - cursorScreenRow(view)
 		if moveUp > 0 {
 			fmt.Fprintf(s.out, "\x1B[%dA", moveUp)
 		}
@@ -123,10 +125,36 @@ func (s *Session) Render(view backend.View) error {
 		}
 	}
 
-	s.rendered = len(view.Lines)
+	s.rendered = currentRows
 	return nil
 }
 
+func viewRows(view backend.View) int {
+	if view.Width <= 0 {
+		return len(view.Lines)
+	}
+
+	rows := 0
+	for _, line := range view.Lines {
+		width := strutil.TextWidth(color.ClearTag(line))
+		rows += 1 + (width-1)/view.Width
+	}
+	return rows
+}
+
+func cursorScreenRow(view backend.View) int {
+	if view.Width <= 0 {
+		return view.CursorRow
+	}
+
+	row := 0
+	for _, line := range view.Lines[:view.CursorRow] {
+		width := strutil.TextWidth(color.ClearTag(line))
+		row += 1 + (width-1)/view.Width
+	}
+	return row + view.CursorColumn/view.Width
+}
+
 // ReadEvent reads and normalizes one terminal event.
 func (s *Session) ReadEvent(ctx context.Context) (backend.Event, error) {
 	select {

interact/backend/readline/readline_test.go

@@ -73,6 +73,22 @@ func TestSession_RenderClearsStaleLinesWhenViewShrinks(t *testing.T) {
 	is.Eq(2, s.rendered)
 }
 
+func TestSession_RenderTracksWrappedRows(t *testing.T) {
+	is := assert.New(t)
+
+	buf := new(bytes.Buffer)
+	s := &Session{out: buf}
+
+	err := s.Render(backend.View{Lines: []string{"one", strings.Repeat("x", 11)}, CursorRow: 1, Width: 10})
+	is.Nil(err)
+	is.Eq(3, s.rendered)
+
+	buf.Reset()
+	err = s.Render(backend.View{Lines: []string{"one", "two"}, CursorRow: 1, Width: 10})
+	is.Nil(err)
+	is.Contains(buf.String(), "\x1B[2A")
+}
+
 func TestSession_RenderUsesCarriageReturnAfterNewline(t *testing.T) {
 	is := assert.New(t)