feat(view): improve boolean attributes (#1111)

brendt · web-flow · commit 35f85e949513 · 2025-04-03T10:28:53.000+02:00
diff --git a/src/Tempest/View/src/Attributes/AttributeFactory.php b/src/Tempest/View/src/Attributes/AttributeFactory.php
@@ -5,19 +5,17 @@
 namespace Tempest\View\Attributes;
 
 use Tempest\View\Attribute;
-use Tempest\View\Element;
 
 final readonly class AttributeFactory
 {
-    public function make(Element $element, string $attributeName): Attribute
+    public function make(string $attributeName): Attribute
     {
         return match (true) {
             $attributeName === ':if' => new IfAttribute(),
             $attributeName === ':elseif' => new ElseIfAttribute(),
             $attributeName === ':else' => new ElseAttribute(),
             $attributeName === ':foreach' => new ForeachAttribute(),
             $attributeName === ':forelse' => new ForelseAttribute(),
-            BooleanAttribute::matches($element, $attributeName) => new BooleanAttribute($attributeName),
             str_starts_with($attributeName, ':') => new ExpressionAttribute($attributeName),
             default => new DataAttribute($attributeName),
         };
diff --git a/src/Tempest/View/src/Attributes/BooleanAttribute.php b/src/Tempest/View/src/Attributes/BooleanAttribute.php
diff --git a/src/Tempest/View/src/Elements/GenericElement.php b/src/Tempest/View/src/Elements/GenericElement.php
@@ -66,6 +66,7 @@ public function compile(): string
 
         if ($attributes !== '') {
             $attributes = ' ' . $attributes;
+            $attributes = str_replace('?> <?php', '?><?php', $attributes);
         }
 
         // Void elements
diff --git a/src/Tempest/View/src/Elements/PhpDataElement.php b/src/Tempest/View/src/Elements/PhpDataElement.php
@@ -4,9 +4,7 @@
 
 namespace Tempest\View\Elements;
 
-use Stringable;
 use Tempest\View\Element;
-use Tempest\View\Renderers\TempestViewCompiler;
 use Tempest\View\WrapsElement;
 
 use function Tempest\Support\str;
@@ -49,6 +47,25 @@ public function compile(): string
             $name,
         );
 
+        // Support for boolean attributes. When an expression attribute has a falsy value, it won't be rendered at all.
+        // When it's "true", it will only render the attribute name and not the "true" value
+        $coreElement = $this->unwrap(GenericElement::class);
+
+        if ($isExpression && $coreElement instanceof GenericElement) {
+            $coreElement
+                ->addRawAttribute(
+                    sprintf(
+                        '<?php if($%s === true) {?>%s<?php } elseif($%s) { ?>%s="%s"<?php } ?>',
+                        $name,
+                        str($name)->kebab(),
+                        $name,
+                        str($name)->kebab(),
+                        $coreElement->getAttribute($name),
+                    ),
+                )
+                ->unsetAttribute($name);
+        }
+
         return sprintf(
             '<?php %s ?>
 %s
diff --git a/src/Tempest/View/src/Renderers/TempestViewCompiler.php b/src/Tempest/View/src/Renderers/TempestViewCompiler.php
@@ -195,7 +195,7 @@ private function applyAttributes(array $elements): array
                 ->setChildren($children);
 
             foreach ($element->getAttributes() as $name => $value) {
-                $attribute = $this->attributeFactory->make($element, $name);
+                $attribute = $this->attributeFactory->make($name);
 
                 $element = $attribute->apply($element);
 
diff --git a/tests/Integration/View/TempestViewRendererDataPassingTest.php b/tests/Integration/View/TempestViewRendererDataPassingTest.php
@@ -4,6 +4,7 @@
 
 namespace Tests\Tempest\Integration\View;
 
+use PHPUnit\Framework\Attributes\TestWith;
 use Tempest\View\Exceptions\InvalidExpressionAttribute;
 use Tempest\View\ViewCache;
 use Tests\Tempest\Integration\FrameworkIntegrationTestCase;
@@ -267,6 +268,45 @@ public function test_boolean_attributes(): void
         );
     }
 
+    #[TestWith(['false'])]
+    #[TestWith(['null'])]
+    #[TestWith(['0'])]
+    #[TestWith(['$show'])]
+    public function test_falsy_bool_attribute(mixed $value): void
+    {
+        $html = $this->render(<<<HTML
+        <div :data-active="{$value}"></div>
+        HTML, show: false);
+
+        $this->assertStringEqualsStringIgnoringLineEndings(<<<'HTML'
+        <div ></div>
+        HTML, $html);
+    }
+
+    #[TestWith(['true'])]
+    #[TestWith(['$show'])]
+    public function test_truthy_bool_attribute(mixed $value): void
+    {
+        $html = $this->render(<<<HTML
+        <div :data-active="{$value}"></div>
+        HTML, show: true);
+
+        $this->assertStringEqualsStringIgnoringLineEndings(<<<'HTML'
+        <div data-active></div>
+        HTML, $html);
+    }
+
+    public function test_multiple_boolean_attribute(): void
+    {
+        $html = $this->render(<<<HTML
+        <div :data-a="false" :data-b="false" :data-c="true"></div>
+        HTML);
+
+        $this->assertStringEqualsStringIgnoringLineEndings(<<<'HTML'
+        <div data-c></div>
+        HTML, $html);
+    }
+
     public function test_expression_attribute_in_raw_element(): void
     {
         $this->registerViewComponent(

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@ public function compile(): string`
`66`	`66`
`67`	`67`	`if ($attributes !== '') {`
`68`	`68`	`$attributes = ' ' . $attributes;`
	`69`	`+ $attributes = str_replace('?> <?php', '?><?php', $attributes);`
`69`	`70`	`}`
`70`	`71`
`71`	`72`	`// Void elements`