Merge pull request #34 from jacksleight/fix/merging-class-attributes

Fix merging class attributes
ueberdosis · Apr 26, 2023 · 1afc115 · 1afc115
2 parents 34c0b24 + 74b00ae
commit 1afc115
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/Utils/HTML.php b/src/Utils/HTML.php
@@ -18,7 +18,7 @@ public static function mergeAttributes()
             foreach ($moreAttributes as $key => $value) {
                 // class="foo bar"
                 if ($key === 'class') {
-                    $attributes['class'] = trim($attributes['class'] ?? '' . ' ' . $value);
+                    $attributes['class'] = trim(($attributes['class'] ?? '') . ' ' . $value);
 
                     continue;
                 }

diff --git a/tests/Utils/HTMLTest.php b/tests/Utils/HTMLTest.php
@@ -0,0 +1,14 @@
+<?php
+
+use Tiptap\Utils\HTML;
+
+test('classes are merged properly', function () {
+    $attributes = [
+        ['class' => 'a'],
+        ['class' => 'b'],
+    ];
+
+    $result = HTML::mergeAttributes(...$attributes);
+
+    expect($result)->toEqual(['class' => 'a b']);
+});