Fix component attributes

Author: asika32764

packages/edge/src/Component/AbstractComponent.php

@@ -240,22 +240,26 @@ public function withName(string $name): static
      *
      * @return static
      *
-     * @deprecated  5.0 Use new method to merge attributes.
+     * @deprecated  5.0 This method is not immutable, use new method to merge attributes.
      */
     public function withAttributes(array $attributes, array|ComponentAttributes $binding = []): static
     {
         // if ($binding instanceof ComponentAttributes) {
         //     $binding = $binding->getAttributes();
         // }
 
-        $this->attributes = $this->attributes ?: $this->newAttributeBag();
+        $this->getComponentAttributes();
 
-        $this->attributes->setAttributes(
-            [
-                ...$this->attributes->getAttributes(),
-                ...$attributes
-            ]
-        );
+        $this->attributes->merge($attributes);
+
+        return $this;
+    }
+
+    public function mergeAttributes(array $attributes): static
+    {
+        $this->getComponentAttributes();
+
+        $this->attributes = $this->attributes->withMerge($attributes);
 
         return $this;
     }

packages/edge/src/Component/ComponentAttributes.php

@@ -253,7 +253,7 @@ public function class(mixed $classList): static
             }
         }
 
-        return $this->merge(['class' => implode(' ', $classes)]);
+        return $this->withMerge(['class' => implode(' ', $classes)]);
     }
 
     /**
@@ -264,7 +264,12 @@ public function class(mixed $classList): static
      *
      * @return static
      */
-    public function merge(array $attributeDefaults = [], bool $escape = true)
+    public function withMerge(array $attributeDefaults = [], bool $escape = true): static
+    {
+        return (clone $this)->merge($attributeDefaults, $escape);
+    }
+
+    public function merge(array $attributeDefaults = [], bool $escape = true): static
     {
         $attributeDefaults = array_map(
             function ($value) use ($escape) {
@@ -296,7 +301,9 @@ function ($value, $key) use ($attributeDefaults, $escape) {
             }
         )->merge($nonAppendableAttributes)->dump();
 
-        return new static(array_merge($attributeDefaults, $attributes));
+        $this->attributes = array_merge($attributeDefaults, $attributes);
+
+        return $this;
     }
 
     /**
@@ -377,7 +384,7 @@ public function setAttributes(array $attributes): void
 
             unset($attributes['attributes']);
 
-            $attributes = $parentBag->merge($attributes, $escape = false)->getAttributes();
+            $attributes = $parentBag->withMerge($attributes, $escape = false)->getAttributes();
         }
 
         $this->attributes = $attributes;
@@ -402,7 +409,7 @@ public function toHtml(): string
      */
     public function __invoke(array $attributeDefaults = []): string
     {
-        return (string) $this->merge($attributeDefaults);
+        return (string) $this->withMerge($attributeDefaults);
     }
 
     /**

packages/edge/test/tmpl/components/foo-component.blade.php

@@ -9,7 +9,7 @@
 ?>
 @props(['type' => 'info', 'message' => 'unknown message'])
 
-<div id="foo" {!! $attributes->merge(['class' => 'alert alert-' . $type]) !!}>
+<div id="foo" {!! $attributes->withMerge(['class' => 'alert alert-' . $type]) !!}>
     Foo Component: {{ $type }} - Message: {{ $message }}
 
     {!! $slot() !!}