Merge pull request #70 from tronsha/feature/remove-attribute-if-condition-false

Fix for more than one attribute with if in one tag

Author: tronsha

src/Compiler.php

@@ -576,6 +576,10 @@ private function handleAttributeBinding(DOMElement $node): void
                     )
                 );
                 $name = '__ATTRIBUTE_WITH_IF_CONDITION__';
+                $oldValue = $node->getAttribute($name);
+                if ($oldValue) {
+                    $value = $oldValue . ',' . $value;
+                }
             }
 
             $node->setAttribute($name, $value);
@@ -1312,20 +1316,21 @@ private function replaceScopedPlaceholders(string $html): string
      */
     private function replaceAttributeWithIfConditionPlaceholders(string $html): string
     {
-        $pattern = '/__ATTRIBUTE_WITH_IF_CONDITION__="([-a-zA-Z0-9]+)\|([a-zA-Z0-9+=]+)"/';
+        $pattern = '/__ATTRIBUTE_WITH_IF_CONDITION__="([^"]+)"/';
         if (preg_match_all($pattern, $html, $matches, PREG_SET_ORDER)) {
             foreach ($matches as $match) {
-                $name = $match[1];
-                $value = $this->replacePlaceholders(base64_decode($match[2]));
-                $condition = trim(str_replace(['{{', '}}'], '', $value));
-                if (in_array($name, ['checked', 'selected', 'disabled'])) {
-                    $value = $name;
+                $attributes = explode(',', $match[1]);
+                $replaceHtml = '';
+                foreach ($attributes as $attribute) {
+                    [$name, $encodedValue] = explode('|', $attribute);
+                    $value = $this->replacePlaceholders(base64_decode($encodedValue));
+                    $condition = trim(str_replace(['{{', '}}'], '', $value));
+                    if (in_array($name, ['checked', 'selected', 'disabled'])) {
+                        $value = $name;
+                    }
+                    $replaceHtml .= ' {% if ' . $condition . ' %}' . $name . '="' . $value . '"{% endif %}';
                 }
-                $html = str_replace(
-                    $match[0],
-                    '{% if ' . $condition . ' %}' . $name . '="' . $value . '"{% endif %}',
-                    $html
-                );
+                $html = str_replace($match[0], trim($replaceHtml), $html);
             }
         }
 

tests/AttributeIfTrueTest.php renamed to tests/AttributeWithIfTest.php

@@ -4,7 +4,7 @@
 
 use Exception;
 
-class IfAttributesTest extends AbstractTestCase
+class AttributeWithIfTest extends AbstractTestCase
 {
     /**
      * @dataProvider dataProvider
@@ -42,6 +42,10 @@ public function dataProvider()
                 '<template><form><input type="checkbox" :checked="foo === 1"></form></template>',
                 '<form class="{{ class|default(\'\') }}" style="{{ style|default(\'\') }}"><input type="checkbox" {% if foo == 1 %}checked="checked"{% endif %}></form>',
             ],
+            [
+                '<template><form><input type="checkbox" :disabled="foo === 0" :checked="foo === 1"></form></template>',
+                '<form class="{{ class|default(\'\') }}" style="{{ style|default(\'\') }}"><input type="checkbox" {% if foo == 0 %}disabled="disabled"{% endif %} {% if foo == 1 %}checked="checked"{% endif %}></form>',
+            ],
         ];
     }
 }