Remove null and false attributes. Cast true attributes to "true". Closes

#2613, Fixes #2605
statamic · Oct 13, 2020 · 76213f4 · 76213f4
1 parent 16865fc
commit 76213f4
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/src/Tags/Concerns/RendersAttributes.php b/src/Tags/Concerns/RendersAttributes.php
@@ -14,10 +14,15 @@ protected function renderAttributes($attributes)
     {
         return collect($attributes)
             ->map(function ($value, $attribute) {
-                return $value === true
-                    ? $attribute
-                    : sprintf('%s="%s"', $attribute, $value);
+                if ($value === null || $value === false) {
+                    return;
+                }
+
+                $value = $value === true ? 'true' : $value;
+
+                return sprintf('%s="%s"', $attribute, $value);
             })
+            ->filter()
             ->implode(' ');
     }
 

diff --git a/tests/Tags/Concerns/RendersAttributesTest.php b/tests/Tags/Concerns/RendersAttributesTest.php
@@ -24,9 +24,13 @@ public function it_renders_attributes_from_array()
         $output = $this->tag->renderAttributes([
             'class' => 'm-0 mb-1',
             ':name' => 'first_name',
+            'disabled' => 'true',
+            'autocomplete' => true,
+            'dont_render_falses' => false,
+            'dont_render_nulls' => null,
         ]);
 
-        $this->assertEquals('class="m-0 mb-1" :name="first_name"', $output);
+        $this->assertEquals('class="m-0 mb-1" :name="first_name" disabled="true" autocomplete="true"', $output);
     }
 
     /** @test */
@@ -40,11 +44,14 @@ public function it_renders_attributes_from_params()
                 'class' => 'm-0 mb-1',
                 ':name' => 'first_name',
                 'attr:src' => 'avatar.jpg',
+                'dont_render_falses' => false,
+                'dont_render_nulls' => null,
                 'disabled' => 'true',
+                'autocomplete' => true,
             ])
             ->renderAttributesFromParams();
 
-        $this->assertEquals('class="m-0 mb-1" name="Han" src="avatar.jpg" disabled', $output);
+        $this->assertEquals('class="m-0 mb-1" name="Han" src="avatar.jpg" disabled="true" autocomplete="true"', $output);
     }
 
     /** @test */