CVA apply function accept null arguments

symfony · Mar 1, 2024 · 8ebf469 · 8ebf469
1 parent 2ddc47b
commit 8ebf469
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/src/TwigComponent/src/CVA.php b/src/TwigComponent/src/CVA.php
@@ -39,9 +39,9 @@ public function __construct(
     ) {
     }
 
-    public function apply(array $recipes, string ...$classes): string
+    public function apply(array $recipes, ?string ...$classes): string
     {
-        return trim($this->resolve($recipes).' '.implode(' ', $classes));
+        return trim($this->resolve($recipes).' '.implode(' ', array_filter($classes)));
     }
 
     public function resolve(array $recipes): string

diff --git a/src/TwigComponent/tests/Unit/CVATest.php b/src/TwigComponent/tests/Unit/CVATest.php
@@ -52,6 +52,29 @@ public function testApply(): void
         $this->assertEquals('font-semibold border rounded text-primary text-sm text-red-500', $recipe->apply(['colors' => 'primary', 'sizes' => 'sm']));
     }
 
+    public function testApplyWithNullString(): void
+    {
+        $recipe = new CVA('font-semibold border rounded', [
+            'colors' => [
+                'primary' => 'text-primary',
+                'secondary' => 'text-secondary',
+            ],
+            'sizes' => [
+                'sm' => 'text-sm',
+                'md' => 'text-md',
+                'lg' => 'text-lg',
+            ],
+        ], [
+            [
+                'colors' => ['primary'],
+                'sizes' => ['sm'],
+                'class' => 'text-red-500',
+            ],
+        ]);
+
+        $this->assertEquals('font-semibold border rounded text-primary text-sm text-red-500 flex justify-center', $recipe->apply(['colors' => 'primary', 'sizes' => 'sm'], 'flex', null, 'justify-center'));
+    }
+
     public static function recipeProvider(): iterable
     {
         yield 'base null' => [