Merge pull request #34498 from stancl/varied-dynamic-calls

Allow for dynamic calls of anonymous component with varied attributes
laravel · Sep 23, 2020 · aabd2c9 · aabd2c9
2 parents 689b172 + 9b8f94e
commit aabd2c9
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 13 deletions.
diff --git a/src/Illuminate/View/DynamicComponent.php b/src/Illuminate/View/DynamicComponent.php
@@ -29,13 +29,6 @@ class DynamicComponent extends Component
      */
     protected static $componentClasses = [];
 
-    /**
-     * The cached binding keys for component classes.
-     *
-     * @var array
-     */
-    protected static $bindings = [];
-
     /**
      * Create a new component instance.
      *
@@ -153,13 +146,9 @@ protected function classForComponent()
      */
     protected function bindings(string $class)
     {
-        if (! isset(static::$bindings[$class])) {
-            [$data, $attributes] = $this->compiler()->partitionDataAndAttributes($class, $this->attributes->getAttributes());
-
-            static::$bindings[$class] = array_keys($data->all());
-        }
+        [$data, $attributes] = $this->compiler()->partitionDataAndAttributes($class, $this->attributes->getAttributes());
 
-        return static::$bindings[$class];
+        return array_keys($data->all());
     }
 
     /**

diff --git a/tests/Integration/View/BladeTest.php b/tests/Integration/View/BladeTest.php
@@ -35,6 +35,19 @@ public function test_rendering_a_dynamic_component()
 </div>', trim($view));
     }
 
+    public function test_rendering_the_same_dynamic_component_with_different_attributes()
+    {
+        $view = View::make('varied-dynamic-calls')->render();
+
+        $this->assertEquals('<span class="text-medium">
+    Hello Taylor
+</span>
+  
+ <span >
+    Hello Samuel
+</span>', trim($view));
+    }
+
     protected function getEnvironmentSetUp($app)
     {
         $app['config']->set('view.paths', [__DIR__.'/templates']);

diff --git a/tests/Integration/View/templates/components/hello-span.blade.php b/tests/Integration/View/templates/components/hello-span.blade.php
@@ -0,0 +1,7 @@
+@props([
+    'name',
+])
+
+<span {{ $attributes }}>
+    Hello {{ $name }}
+</span>
diff --git a/tests/Integration/View/templates/varied-dynamic-calls.blade.php b/tests/Integration/View/templates/varied-dynamic-calls.blade.php
@@ -0,0 +1,2 @@
+<x-dynamic-component component="hello-span" name="Taylor" class="text-medium" />
+<x-dynamic-component component="hello-span" name="Samuel" />
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		<x-dynamic-component component="hello-span" name="Taylor" class="text-medium" />
		<x-dynamic-component component="hello-span" name="Samuel" />