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

Jump to bottom

fix: Place strings properly on non-edges #278

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: Place strings properly on non-edges #278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
41 changes: 41 additions & 0 deletions place_test.go
View file
Open in desktop
@@ -0,0 +1,41 @@
package lipgloss

import "testing"

func TestPlace(t *testing.T) {
type test struct {
name string
result string
expected string
}
tests := []test{
{"pos Left,Top", Place(5, 3, Left, Top, "A", WithWhitespaceChars(".")), "A....\n.....\n....."},
{"pos Center,Top", Place(5, 3, Center, Top, "A", WithWhitespaceChars(".")), "..A..\n.....\n....."},
{"pos Right,Top", Place(5, 3, Right, Top, "A", WithWhitespaceChars(".")), "....A\n.....\n....."},

{"pos Left,Center", Place(5, 3, Left, Center, "A", WithWhitespaceChars(".")), ".....\nA....\n....."},
{"pos Center,Center", Place(5, 3, Center, Center, "A", WithWhitespaceChars(".")), ".....\n..A..\n....."},
{"pos Right,Center", Place(5, 3, Right, Center, "A", WithWhitespaceChars(".")), ".....\n....A\n....."},

{"pos Left,Bottom", Place(5, 3, Left, Bottom, "A", WithWhitespaceChars(".")), ".....\n.....\nA...."},
{"pos Center,Bottom", Place(5, 3, Center, Bottom, "A", WithWhitespaceChars(".")), ".....\n.....\n..A.."},
{"pos Right,Bottom", Place(5, 3, Right, Bottom, "A", WithWhitespaceChars(".")), ".....\n.....\n....A"},

{"pos 0.01,0.01", Place(5, 3, 0.01, 0.01, "A", WithWhitespaceChars(".")), "A....\n.....\n....."},
{"pos 0.99,0.99", Place(5, 3, 0.99, 0.99, "A", WithWhitespaceChars(".")), ".....\n.....\n....A"},

{"pos 0.2,Top", Place(5, 3, 0.2, Top, "A", WithWhitespaceChars(".")), ".A...\n.....\n....."},
{"pos 0.8,Top", Place(5, 3, 0.8, Top, "A", WithWhitespaceChars(".")), "...A.\n.....\n....."},

{"pos Right,0.2", Place(3, 5, Right, 0.2, "A", WithWhitespaceChars(".")), "...\n..A\n...\n...\n..."},
{"pos Right,0.8", Place(3, 5, Right, 0.8, "A", WithWhitespaceChars(".")), "...\n...\n...\n..A\n..."},
}

for _, test := range tests {
t.Run(test.name, func(t *testing.T) {
if test.result != test.expected {
t.Errorf("Got \n%s\n, expected \n%s\n", test.result, test.expected)
}
})
}
}
8 changes: 4 additions & 4 deletions position.go
View file
Open in desktop
Expand Up @@ -81,8 +81,8 @@ func (r *Renderer) PlaceHorizontal(width int, pos Position, str string, opts ...
totalGap := gap + short

split := int(math.Round(float64(totalGap) * pos.value()))
left := totalGap - split
right := totalGap - left
right := totalGap - split
left := totalGap - right

b.WriteString(ws.render(left))
b.WriteString(l)
Expand Down Expand Up @@ -138,8 +138,8 @@ func (r *Renderer) PlaceVertical(height int, pos Position, str string, opts ...W

default: // Somewhere in the middle
split := int(math.Round(float64(gap) * pos.value()))
top := gap - split
bottom := gap - top
bottom := gap - split
top := gap - bottom

b.WriteString(strings.Repeat(emptyLine+"\n", top))
b.WriteString(str)
Expand Down