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

V7.0.1 #82

Closed
wants to merge 2 commits into from
Closed

V7.0.1 #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf44f75
Now using newline as line separator in all cases
Caesarovich Dec 18, 2022
ecca892
v7.0.1
Caesarovich Dec 20, 2022
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
6 changes: 2 additions & 4 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,13 +218,11 @@ const boxContent = (content, contentWidth, options) => {
const top = colorizeBorder(NEWLINE.repeat(options.margin.top) + marginLeft + chars.topLeft + (options.title ? makeTitle(options.title, chars.top.repeat(contentWidth), options.titleAlignment) : chars.top.repeat(contentWidth)) + chars.topRight);
const bottom = colorizeBorder(marginLeft + chars.bottomLeft + chars.bottom.repeat(contentWidth) + chars.bottomRight + NEWLINE.repeat(options.margin.bottom));

const LINE_SEPARATOR = (contentWidth + BORDERS_WIDTH + options.margin.left >= columns) ? '' : NEWLINE;

const lines = content.split(NEWLINE);

const middle = lines.map(line => marginLeft + colorizeBorder(chars.left) + colorizeContent(line) + colorizeBorder(chars.right)).join(LINE_SEPARATOR);
const middle = lines.map(line => marginLeft + colorizeBorder(chars.left) + colorizeContent(line) + colorizeBorder(chars.right)).join(NEWLINE);

return top + LINE_SEPARATOR + middle + LINE_SEPARATOR + bottom;
return top + NEWLINE + middle + NEWLINE + bottom;
};

const sanitizeOptions = options => {
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "boxen",
"version": "7.0.0",
"version": "7.0.1",
"description": "Create boxes in the terminal",
"license": "MIT",
"repository": "sindresorhus/boxen",
Expand Down
20 changes: 18 additions & 2 deletions tests/snapshots/tests/float-option.js.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,26 @@ Generated by [AVA](https://avajs.dev).

> Snapshot 1

'┌──────────────────────────────────────────────────────────┐│foobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoob││arfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfo││obarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobar││foobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoob││arfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfo││obarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobar││foobarfoobar │└──────────────────────────────────────────────────────────┘'
`┌──────────────────────────────────────────────────────────┐␊
│foobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoob│␊
│arfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfo│␊
│obarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobar│␊
│foobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoob│␊
│arfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfo│␊
│obarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobar│␊
│foobarfoobar │␊
└──────────────────────────────────────────────────────────┘`

## float option (right) when content > columns

> Snapshot 1

'┌──────────────────────────────────────────────────────────┐│foobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoob││arfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfo││obarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobar││foobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoob││arfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfo││obarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobar││foobarfoobar │└──────────────────────────────────────────────────────────┘'
`┌──────────────────────────────────────────────────────────┐␊
│foobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoob│␊
│arfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfo│␊
│obarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobar│␊
│foobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoob│␊
│arfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfo│␊
│obarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobar│␊
│foobarfoobar │␊
└──────────────────────────────────────────────────────────┘`
Binary file modified tests/snapshots/tests/float-option.js.snap
View file
Open in desktop
Binary file not shown.
Binary file modified tests/snapshots/tests/main.js.md
View file
Open in desktop
Binary file not shown.
Binary file modified tests/snapshots/tests/main.js.snap
View file
Open in desktop
Binary file not shown.
5 changes: 4 additions & 1 deletion tests/snapshots/tests/margin-option.js.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@ Generated by [AVA](https://avajs.dev).

`␊
␊
┌──────────────────────────────────────────────────────────┐│axaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxax││axaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxax│└──────────────────────────────────────────────────────────┘␊
┌──────────────────────────────────────────────────────────┐␊
│axaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxax│␊
│axaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxax│␊
└──────────────────────────────────────────────────────────┘␊
␊
`
Binary file modified tests/snapshots/tests/margin-option.js.snap
View file
Open in desktop
Binary file not shown.
54 changes: 50 additions & 4 deletions tests/snapshots/tests/text-align-option.js.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,24 +167,70 @@ Generated by [AVA](https://avajs.dev).

> Snapshot 1

'┌──────────────────────────────────────────────────────────┐│Lorem ipsum dolor sit amet, consectetur adipiscing elit. ││ Maecenas id erat arcu. Integer urna mauris, sodales vel ││ egestas eu, consequat id turpis. Vivamus faucibus est ││mattis tincidunt lobortis. In aliquam placerat nunc eget ││ viverra. Duis aliquet faucibus diam, blandit tincidunt ││ magna congue eu. Sed vel ante vestibulum, maximus risus ││eget, iaculis velit. Quisque id dapibus purus, ut sodales ││lorem. Aenean laoreet iaculis tellus at malesuada. Donec ││ imperdiet eu lacus vitae fringilla. │└──────────────────────────────────────────────────────────┘'
`┌──────────────────────────────────────────────────────────┐␊
│Lorem ipsum dolor sit amet, consectetur adipiscing elit. │␊
│ Maecenas id erat arcu. Integer urna mauris, sodales vel │␊
│ egestas eu, consequat id turpis. Vivamus faucibus est │␊
│mattis tincidunt lobortis. In aliquam placerat nunc eget │␊
│ viverra. Duis aliquet faucibus diam, blandit tincidunt │␊
│ magna congue eu. Sed vel ante vestibulum, maximus risus │␊
│eget, iaculis velit. Quisque id dapibus purus, ut sodales │␊
│lorem. Aenean laoreet iaculis tellus at malesuada. Donec │␊
│ imperdiet eu lacus vitae fringilla. │␊
└──────────────────────────────────────────────────────────┘`

## text alignement option (right) after wrapping

> Snapshot 1

'┌──────────────────────────────────────────────────────────┐│ Lorem ipsum dolor sit amet, consectetur adipiscing elit.││ Maecenas id erat arcu. Integer urna mauris, sodales vel││ egestas eu, consequat id turpis. Vivamus faucibus est││ mattis tincidunt lobortis. In aliquam placerat nunc eget││ viverra. Duis aliquet faucibus diam, blandit tincidunt││ magna congue eu. Sed vel ante vestibulum, maximus risus││ eget, iaculis velit. Quisque id dapibus purus, ut sodales││ lorem. Aenean laoreet iaculis tellus at malesuada. Donec││ imperdiet eu lacus vitae fringilla.│└──────────────────────────────────────────────────────────┘'
`┌──────────────────────────────────────────────────────────┐␊
│ Lorem ipsum dolor sit amet, consectetur adipiscing elit.│␊
│ Maecenas id erat arcu. Integer urna mauris, sodales vel│␊
│ egestas eu, consequat id turpis. Vivamus faucibus est│␊
│ mattis tincidunt lobortis. In aliquam placerat nunc eget│␊
│ viverra. Duis aliquet faucibus diam, blandit tincidunt│␊
│ magna congue eu. Sed vel ante vestibulum, maximus risus│␊
│ eget, iaculis velit. Quisque id dapibus purus, ut sodales│␊
│ lorem. Aenean laoreet iaculis tellus at malesuada. Donec│␊
│ imperdiet eu lacus vitae fringilla.│␊
└──────────────────────────────────────────────────────────┘`

## text alignement option (center) after wrapping + padding

> Snapshot 1

'┌──────────────────────────────────────────────────────────┐│ ││ Lorem ipsum dolor sit amet, consectetur adipiscing ││ elit. Maecenas id erat arcu. Integer urna mauris, ││ sodales vel egestas eu, consequat id turpis. Vivamus ││ faucibus est mattis tincidunt lobortis. In aliquam ││ placerat nunc eget viverra. Duis aliquet faucibus ││ diam, blandit tincidunt magna congue eu. Sed vel ││ ante vestibulum, maximus risus eget, iaculis velit. ││ Quisque id dapibus purus, ut sodales lorem. Aenean ││ laoreet iaculis tellus at malesuada. Donec imperdiet ││ eu lacus vitae fringilla. ││ │└──────────────────────────────────────────────────────────┘'
`┌──────────────────────────────────────────────────────────┐␊
│ │␊
│ Lorem ipsum dolor sit amet, consectetur adipiscing │␊
│ elit. Maecenas id erat arcu. Integer urna mauris, │␊
│ sodales vel egestas eu, consequat id turpis. Vivamus │␊
│ faucibus est mattis tincidunt lobortis. In aliquam │␊
│ placerat nunc eget viverra. Duis aliquet faucibus │␊
│ diam, blandit tincidunt magna congue eu. Sed vel │␊
│ ante vestibulum, maximus risus eget, iaculis velit. │␊
│ Quisque id dapibus purus, ut sodales lorem. Aenean │␊
│ laoreet iaculis tellus at malesuada. Donec imperdiet │␊
│ eu lacus vitae fringilla. │␊
│ │␊
└──────────────────────────────────────────────────────────┘`

## text alignement option (right) after wrapping + padding + margin

> Snapshot 1

`␊
┌──────────────────────────────────────────────────────────┐│ ││ Lorem ipsum dolor sit amet, consectetur adipiscing ││ elit. Maecenas id erat arcu. Integer urna mauris, ││ sodales vel egestas eu, consequat id turpis. Vivamus ││ faucibus est mattis tincidunt lobortis. In aliquam ││ placerat nunc eget viverra. Duis aliquet faucibus ││ diam, blandit tincidunt magna congue eu. Sed vel ││ ante vestibulum, maximus risus eget, iaculis velit. ││ Quisque id dapibus purus, ut sodales lorem. Aenean ││ laoreet iaculis tellus at malesuada. Donec imperdiet ││ eu lacus vitae fringilla. ││ │└──────────────────────────────────────────────────────────┘␊
┌──────────────────────────────────────────────────────────┐␊
│ │␊
│ Lorem ipsum dolor sit amet, consectetur adipiscing │␊
│ elit. Maecenas id erat arcu. Integer urna mauris, │␊
│ sodales vel egestas eu, consequat id turpis. Vivamus │␊
│ faucibus est mattis tincidunt lobortis. In aliquam │␊
│ placerat nunc eget viverra. Duis aliquet faucibus │␊
│ diam, blandit tincidunt magna congue eu. Sed vel │␊
│ ante vestibulum, maximus risus eget, iaculis velit. │␊
│ Quisque id dapibus purus, ut sodales lorem. Aenean │␊
│ laoreet iaculis tellus at malesuada. Donec imperdiet │␊
│ eu lacus vitae fringilla. │␊
│ │␊
└──────────────────────────────────────────────────────────┘␊
`
Binary file modified tests/snapshots/tests/text-align-option.js.snap
View file
Open in desktop
Binary file not shown.