Fix self-closing tags with newlines

spatie · Oct 8, 2018 · 44c3dd5 · 44c3dd5
1 parent 94d2f7d
commit 44c3dd5
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/src/Compiler.php b/src/Compiler.php
@@ -38,7 +38,7 @@ protected function parseSelfClosingTags(string $viewContents, Component $compone
     {
         $prefix = $this->bladeX->getPrefix();
 
-        $pattern = "/<\s*{$prefix}{$component->tag}\s*(?<attributes>.*)\s*\/>/";
+        $pattern = "/<\s*{$prefix}{$component->tag}\s*(?<attributes>(?:\s+[\w\-:]+(=(?:\\\"[^\\\"]+\\\"|\'[^\']+\'|[^\'\\\"=<>]+))?)*\s*)\/>/";
 
         return preg_replace_callback($pattern, function (array $matches) use ($component) {
             $attributes = $this->getAttributesFromAttributeString($matches['attributes']);

diff --git a/...ation/__snapshots__/ComponentCompilationTest__it_compiles_a_self_closing_component__1.xml b/...ation/__snapshots__/ComponentCompilationTest__it_compiles_a_self_closing_component__1.xml
@@ -2,5 +2,8 @@
 <div>
   <div class="error">
     my message
+</div>
+  <div class="error">
+    my message
 </div>
 </div>
diff --git a/...ation/__snapshots__/ComponentCompilationTest__it_compiles_a_self_closing_component__2.xml b/...ation/__snapshots__/ComponentCompilationTest__it_compiles_a_self_closing_component__2.xml
@@ -7,4 +7,10 @@
            ['type' => 'error','message' => $message])
         ); ?>
   <?php echo $__env->renderComponent(); ?>
+  <?php $__env->startComponent(
+           'components.alert',
+           array_merge(app(Spatie\BladeX\ContextStack::class)->read(),
+           ['type' => 'error','message' => $message])
+        ); ?>
+  <?php echo $__env->renderComponent(); ?>
 </div>
diff --git a/tests/Features/ComponentCompilation/stubs/views/selfClosingComponent.blade.php b/tests/Features/ComponentCompilation/stubs/views/selfClosingComponent.blade.php
@@ -1,3 +1,8 @@
 <?php $message = 'my message' ?>
 
 <alert type="error" :message="$message" />
+
+<alert
+    type="error"
+    :message="$message"
+/>