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 incorrect spaces count of East Asian characters #186

Open
wants to merge 1 commit into
base: 2.x
Choose a base branch
from
+34 −4
Open

Fix incorrect spaces count of East Asian characters #186

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/ValueObjects/Styles.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -644,7 +644,7 @@ final public function contentRepeat(string $string): self
{
$string = preg_replace("/\[?'?([^'|\]]+)'?\]?/", '$1', $string) ?? '';

$this->textModifiers[__METHOD__] = static fn (): string => str_repeat($string, (int) floor(terminal()->width() / mb_strlen($string, 'UTF-8')));
$this->textModifiers[__METHOD__] = static fn (): string => str_repeat($string, (int) floor(terminal()->width() / mb_strwidth($string, 'UTF-8')));

return $this->with(['styles' => [
'contentRepeat' => true,
Expand Down Expand Up @@ -855,7 +855,7 @@ private function applyWidth(string $content): string
preg_match_all("/\n+/", $content, $matches);

$width *= count($matches[0] ?? []) + 1;
$width += mb_strlen($matches[0][0] ?? '', 'UTF-8');
$width += mb_strwidth($matches[0][0] ?? '', 'UTF-8');

if ($length <= $width) {
$space = $width - $length;
Expand Down Expand Up @@ -942,7 +942,7 @@ private function applyStyling(string $content): string
*/
public function getLength(?string $text = null): int
{
return mb_strlen(preg_replace(
return mb_strwidth(preg_replace(
self::STYLING_REGEX,
'',
$text ?? $this->element?->toString() ?? ''
Expand Down
32 changes: 31 additions & 1 deletion tests/render.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,37 @@
</div>
HTML);

expect($html)->toBe(" \n\n<fg=#ef4444> ⚽️ </> A ");
expect($html)->toBe(" \n\n<fg=#ef4444> ⚽️ </> A ");
});

it('renders East Asian characters chains of text-center with spaces correctly', function () {
$html = parse(<<<'HTML'
<div class="w-32">
<div class="w-full bg-yellow text-center">你好 世界</div>
<div class="w-full bg-yellow text-center">ハローワールド</div>
</div>
HTML);

expect($html)->toBe("<bg=yellow> 你好 世界 </>\n<bg=yellow> ハローワールド </>");
});

it('renders East Asian characters chains of space between with spaces correctly', function () {
$html = parse(<<<'HTML'
<div class="w-32">
<div class="flex mx-2">
<span>Termwind</span>
<span class="flex-1"></span>
<span>你好 世界</span>
</div>
<div class="flex mx-2">
<span>Termwind</span>
<span class="flex-1"></span>
<span>ハローワールド</span>
</div>
</div>
HTML);

expect($html)->toBe(" Termwind 你好 世界 \n Termwind ハローワールド ");
});

it('renders multiple chains of w-full with margins and text-alignment', function () {
Expand Down
Loading