word wrap text first before clamping

go.mod

@@ -7,6 +7,7 @@ require (
 	github.com/creack/pty v1.1.11
 	github.com/gookit/color v1.3.1
 	github.com/mitchellh/go-testing-interface v1.14.1
+	github.com/mitchellh/go-wordwrap v1.0.1
 	github.com/morikuni/aec v1.0.0
 	github.com/stretchr/testify v1.6.1
 	github.com/tj/go-spin v1.1.0

go.sum

@@ -19,6 +19,8 @@ github.com/mattn/go-runewidth v0.0.7 h1:Ei8KR0497xHyKJPAv59M1dkC+rOZCMBJ+t3fZ+tw
 github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/mitchellh/go-testing-interface v1.14.1 h1:jrgshOhYAUVNMAJiKbEu7EqAwgJJ2JqpQmpLJOu07cU=
 github.com/mitchellh/go-testing-interface v1.14.1/go.mod h1:gfgS7OtZj6MA4U1UrDRp04twqAjfvlZyCfX3sDjEym8=
+github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0=
+github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0=
 github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
 github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=

measure.go

@@ -7,6 +7,7 @@ import (
 	"unicode/utf8"
 
 	"github.com/mitchellh/go-glint/flex"
+	"github.com/mitchellh/go-wordwrap"
 )
 
 // TextNodeContext is the *flex.Node.Context set for all *TextComponent flex nodes.
@@ -53,6 +54,18 @@ func MeasureTextNode(
 	// Otherwise, we have to render this.
 	ctx.Text = ctx.C.Render(uint(height), uint(width))
 
+	// Word wrap and truncate if we're beyond the width limit.
+	if !math.IsNaN(float64(width)) && width > 0 {
+		ctx.Text = clampTextWidth(
+			wordwrap.WrapString(ctx.Text, uint(width)),
+			int(width))
+	}
+
+	// Truncate height if we have a limit. This is a no-op if it fits.
+	if !math.IsNaN(float64(height)) && height > 0 {
+		ctx.Text = truncateTextHeight(ctx.Text, int(height))
+	}
+
 	// Calculate the size
 	ctx.Size = flex.Size{
 		Width:  float32(longestLine(ctx.Text)),
@@ -66,16 +79,6 @@ func MeasureTextNode(
 		ctx.Size.Height = 1
 	}
 
-	// Truncate height if we have a limit. This is a no-op if it fits.
-	if !math.IsNaN(float64(height)) && height > 0 {
-		ctx.Text = truncateTextHeight(ctx.Text, int(height))
-	}
-
-	// Truncate width if we have a limit. This is a no-op if it fits.
-	if !math.IsNaN(float64(width)) && width > 0 {
-		ctx.Text = clampTextWidth(ctx.Text, int(width))
-	}
-
 	return ctx.Size
 }