Fixed bug with alternative screen buffer and cursor save/restore

null93 · Jun 20, 2024 · bbfaa55 · bbfaa55
1 parent 116a43d
commit bbfaa55
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 31 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@
 
 # Directories
 /dist
+/private
diff --git a/cmd/aws-knox/test.go b/cmd/aws-knox/test.go
diff --git a/pkg/ansi/ansi.go b/pkg/ansi/ansi.go
@@ -41,3 +41,7 @@ func AlternativeBuffer() {
 func NormalBuffer() {
 	fmt.Fprint(Writer, "\033[?1049l")
 }
+
+func MoveCursorUp(n int) {
+	fmt.Fprintf(Writer, "\033[%dA", n)
+}
diff --git a/sdk/picker/picker.go b/sdk/picker/picker.go
@@ -114,8 +114,6 @@ func (p *picker) filter() {
 }
 
 func (p *picker) render() {
-	ansi.SaveCursor()
-	defer ansi.RestoreCursor()
 	ansi.ClearDown()
 	lightGray := color.ToForeground(LightGrayColor).Decorator()
 	darkGray := color.ToForeground(DarkGrayColor).Decorator()
@@ -165,14 +163,13 @@ func (p *picker) render() {
 			color.ResetStyle,
 	)
 	DefaultStyle.Printfln("")
+	ansi.MoveCursorUp(7 + len(p.filtered))
 }
 
 func (p *picker) Pick() *option {
-	ansi.AlternativeBuffer()
 	ansi.HideCursor()
-	defer ansi.ShowCursor()
 	defer ansi.ClearDown()
-	defer ansi.NormalBuffer()
+	defer ansi.ShowCursor()
 	p.render()
 	keyboard.Listen(func(key keys.Key) (stop bool, err error) {
 		if key.Code == keys.CtrlC || key.Code == keys.Escape {