Merge pull request #155 from xiCO2k/fix/truncate-with-w-full-bug

fix: Truncate to work well with `w-full` or `w-division`.
nunomaduro · Oct 17, 2022 · 24ee35e · 24ee35e
2 parents cd2d170 + 2c2123b
commit 24ee35e
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 0 deletions.
diff --git a/src/ValueObjects/Styles.php b/src/ValueObjects/Styles.php
@@ -416,6 +416,15 @@ final public function truncate(int $limit = 0, string $end = '…'): self
     {
         $this->textModifiers[__METHOD__] = function ($text, $styles) use ($limit, $end): string {
             $width = $styles['width'] ?? 0;
+
+            if (is_string($width)) {
+                $width = self::calcWidthFromFraction(
+                    $width,
+                    $styles,
+                    $this->properties['parentStyles'] ?? []
+                );
+            }
+
             [, $paddingRight, , $paddingLeft] = $this->getPaddings();
             $width -= $paddingRight + $paddingLeft;
 

diff --git a/tests/classes.php b/tests/classes.php
@@ -186,6 +186,28 @@
     expect($html)->toBe(' te… ');
 });
 
+test('truncate with w-full', function () {
+    putenv('COLUMNS=5');
+
+    $html = parse(<<<'HTML'
+        <span class="w-full truncate">texttext</span>
+    HTML);
+
+    expect($html)->toBe('text…');
+});
+
+test('truncate with w-division', function () {
+    putenv('COLUMNS=6');
+
+    $html = parse(<<<'HTML'
+        <div class="w-full">
+            <span class="w-1/2 truncate">texttext</span>
+        </div>
+    HTML);
+
+    expect($html)->toBe('te…   ');
+});
+
 test('w', function () {
     $html = parse(<<<'HTML'
         <span>