[terminal] Improve panel rendering

essentialkaos · Jul 17, 2023 · e535779 · e535779
1 parent d5f6d41
commit e535779
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 ## Changelog
 
+### 12.71.0
+
+* `[terminal]` Added panel size configuration feature
+* `[terminal]` Improved panel rendering for messages with newlines
+
 ### 12.70.0
 
 * `[terminal]` Added flag `HidePassword` for masking passwords while typing

diff --git a/ek.go b/ek.go
@@ -20,7 +20,7 @@ import (
 // ////////////////////////////////////////////////////////////////////////////////// //
 
 // VERSION is current ek package version
-const VERSION = "12.70.0"
+const VERSION = "12.71.0"
 
 // ////////////////////////////////////////////////////////////////////////////////// //
 

diff --git a/terminal/terminal.go b/terminal/terminal.go
@@ -12,6 +12,7 @@ package terminal
 // ////////////////////////////////////////////////////////////////////////////////// //
 
 import (
+	"bytes"
 	"fmt"
 	"os"
 	"strings"
@@ -74,6 +75,9 @@ var (
 	InfoPrefix = ""
 )
 
+// PanelWidth is panel width (≥ 40)
+var PanelWidth = 88
+
 // ////////////////////////////////////////////////////////////////////////////////// //
 
 var tmux int8
@@ -196,10 +200,19 @@ func InfoPanel(title, message string) {
 func Panel(label, colorTag, title, message string) {
 	fmtc.Printf(colorTag+"{@*} %s {!} "+colorTag+"%s{!}\n", label, title)
 
-	fmtc.Print(fmtutil.Wrap(
-		fmtc.Sprint(message),
-		fmtc.Sprint(colorTag+"┃{!} "), 88,
-	) + "\n")
+	buf := bytes.NewBufferString(
+		fmtutil.Wrap(fmtc.Sprint(message), "", mathutil.Max(38, PanelWidth-2)) + "\n",
+	)
+
+	for {
+		line, err := buf.ReadString('\n')
+
+		if err != nil {
+			break
+		}
+
+		fmtc.Print(colorTag + "┃{!} " + line)
+	}
 }
 
 // AddHistory adds line to input history