Merge pull request #32576 from laravel/parent-attributes

Properly Inherit Parent Attributes

Author: taylorotwell

src/Illuminate/View/Compilers/Concerns/CompilesComponents.php

@@ -3,6 +3,7 @@
 namespace Illuminate\View\Compilers\Concerns;
 
 use Illuminate\Support\Str;
+use Illuminate\View\ComponentAttributeBag;
 
 trait CompilesComponents
 {
@@ -167,7 +168,7 @@ protected function compileProps($expression)
     public static function sanitizeComponentAttribute($value)
     {
         return is_string($value) ||
-               (is_object($value) && method_exists($value, '__toString'))
+               (is_object($value) && ! $value instanceof ComponentAttributeBag && method_exists($value, '__toString'))
                         ? e($value)
                         : $value;
     }

src/Illuminate/View/ComponentAttributeBag.php

@@ -141,6 +141,15 @@ public function merge(array $attributeDefaults = [])
      */
     public function setAttributes(array $attributes)
     {
+        if (isset($attributes['attributes']) &&
+            $attributes['attributes'] instanceof self) {
+            $parentBag = $attributes['attributes'];
+
+            unset($attributes['attributes']);
+
+            $attributes = $parentBag->merge($attributes);
+        }
+
         $this->attributes = $attributes;
     }
 

tests/View/ViewComponentTest.php

@@ -3,6 +3,7 @@
 namespace Illuminate\Tests\View;
 
 use Illuminate\View\Component;
+use Illuminate\View\ComponentAttributeBag;
 use PHPUnit\Framework\TestCase;
 
 class ViewComponentTest extends TestCase
@@ -18,6 +19,15 @@ public function testDataExposure()
         $this->assertSame('taylor', $variables['hello']('taylor'));
     }
 
+    public function testAttributeParentInheritance()
+    {
+        $component = new TestViewComponent;
+
+        $component->withAttributes(['class' => 'foo', 'attributes' => new ComponentAttributeBag(['class' => 'bar', 'type' => 'button'])]);
+
+        $this->assertEquals('class="foo bar" type="button"', (string) $component->attributes);
+    }
+
     public function testPublicMethodsWithNoArgsAreConvertedToStringableCallablesInvokedAndNotCached()
     {
         $component = new TestSampleViewComponent;