Merge pull request #86 from tronsha/bugfix/class-for-component-on-root

Fix for include

Author: tronsha

.github/workflows/php.yml

@@ -26,6 +26,9 @@ jobs:
         restore-keys: |
           ${{ runner.os }}-php-
 
+    - name: Composer update
+      run: composer update
+
     - name: Install dependencies
       if: steps.composer-cache.outputs.cache-hit != 'true'
       run: composer install --prefer-dist --no-progress --no-suggest

src/Compiler.php

@@ -232,10 +232,7 @@ public function convert(): string
         }
 
         $this->rawBlocks[] = $this->createVariableBlock();
-
-        if (count($this->rawBlocks)) {
-            $html = implode("\n", $this->rawBlocks) . "\n" . $html;
-        }
+        $html = implode("\n", $this->rawBlocks) . "\n" . $html;
 
         $html = $this->replacePlaceholders($html);
         $html = $this->replaceScopedPlaceholders($html);
@@ -465,10 +462,6 @@ private function preparePropertiesForInclude(array $variables, bool $isRootNode
             $variables[] = new Property($attribute, $value, false);
         }
 
-        if ($isRootNode) {
-            $variables[] = new Property('dataScopedStyleAttribute', 'dataScopedStyleAttribute|default(\'\')', false);
-        }
-
         return $variables;
     }
 

tests/fixtures/vue-slot/include-child-component-with-component-on-root.twig

@@ -1 +1 @@
-{% include "/templates/ChildComponent.twig" with { 'slot_default': "", 'class': "foo" ~ " " ~ class|default(''), 'style': "color: black" ~ "; " ~ style|default(''), 'dataScopedStyleAttribute': dataScopedStyleAttribute|default('') } %}
+{% include "/templates/ChildComponent.twig" with { 'slot_default': "", 'class': "foo" ~ " " ~ class|default(''), 'style': "color: black" ~ "; " ~ style|default('') } %}

tests/fixtures/vue-slot/include-child-component-with-default-slot-and-props.twig

@@ -1,4 +1,4 @@
 {% set text = text|default('foo') %}
 {% set slot_default_fallback %}{{ text }}{% endset %}
 {% set slot_default_value %}{{ slot_default|default(slot_default_fallback) }}{% endset %}
-{% include "/templates/ChildComponent.twig" with { 'slot_default': slot_default_value, 'class': "", 'style': "" } %}
+{% include "/templates/ChildComponent.twig" with { 'slot_default': slot_default_value, 'class': "" ~ " " ~ class|default(''), 'style': "" ~ "; " ~ style|default('') } %}