Add fast paths for class/style string arguments in BlazeAttributeBag

src/Runtime/BlazeAttributeBag.php

@@ -49,6 +49,12 @@ public static function make(array $attributes, array $boundKeys = [], array $ori
     /** {@inheritdoc} */
     public function merge(array $attributeDefaults = [], $escape = true): static
     {
+        // Fast path: merge(['class' => 'string']) — the most common pattern. Skipped when the
+        // bag contains a style attribute, which merge() normalizes and reorders alongside class.
+        if (count($attributeDefaults) === 1 && isset($attributeDefaults['class']) && is_string($attributeDefaults['class']) && ! isset($this->attributes['style'])) {
+            return $this->withMergedClass($escape ? e($attributeDefaults['class']) : $attributeDefaults['class']);
+        }
+
         if ($escape) {
             foreach ($attributeDefaults as $key => $value) {
                 if ($this->shouldEscapeAttributeValue($escape, $value)) {
@@ -103,6 +109,10 @@ public function merge(array $attributeDefaults = [], $escape = true): static
     /** {@inheritdoc} */
     public function class($classList): static
     {
+        if (is_string($classList) && ! isset($this->attributes['style'])) {
+            return $this->withMergedClass(e($classList));
+        }
+
         $classes = $this->toCssClasses(Arr::wrap($classList));
 
         return $this->merge(['class' => $classes]);
@@ -111,11 +121,45 @@ public function class($classList): static
     /** {@inheritdoc} */
     public function style($styleList): static
     {
+        if (is_string($styleList) && ! isset($this->attributes['class'])) {
+            $default = e(rtrim($styleList, ';').';');
+            $current = $this->attributes['style'] ?? null;
+
+            if ($current !== null) {
+                $current = rtrim((string) $current, ';').';';
+                $style = $current === $default ? $default : $default.' '.$current;
+            } else {
+                $style = $default;
+            }
+
+            return new static(['style' => $style] + $this->attributes);
+        }
+
         $styles = $this->toCssStyles((array) $styleList);
 
         return $this->merge(['style' => $styles]);
     }
 
+    /**
+     * Return a new bag with the given class default merged into the current class attribute.
+     */
+    protected function withMergedClass(string $default): static
+    {
+        $current = $this->attributes['class'] ?? '';
+
+        if (! $current || $current === $default) {
+            $class = $default;
+        } elseif (! $default) {
+            $class = $current ?: '';
+        } else {
+            $class = $default.' '.$current;
+        }
+
+        // Array union places class first, matching merge()'s
+        // array_merge($attributeDefaults, $attributes) key ordering.
+        return new static(['class' => $class] + $this->attributes);
+    }
+
     /**
      * Convert class list to CSS classes string.
      */

tests/ComparisonTest.php

@@ -95,6 +95,24 @@
     BLADE
 ));
 
+test('merge preserves attribute ordering', fn () => compare(<<<'BLADE'
+    <x-merge-class wire:model="data" class="extra" wire:ignore />
+    BLADE
+));
+
+test('merge class with style attribute present', fn () => compare(<<<'BLADE'
+    <x-merge-class wire:model="data" style="color:blue" class="extra" />
+    BLADE
+));
+
+test('class and style string arguments', fn () => compare(<<<'BLADE'
+    <x-class-style-string wire:model="data" class="extra" style="color:blue" />
+    <x-class-style-string wire:model="data" class="extra" />
+    <x-class-style-string wire:model="data" style="color:blue" />
+    <x-class-style-string data-x="1" />
+    BLADE
+));
+
 test('deeply nested same component with different components interleaved', fn () => compare(<<<'BLADE'
     <x-card class="outer">
         <x-wrapper>

tests/fixtures/views/components/class-style-string.blade.php

@@ -0,0 +1,4 @@
+@blaze
+
+<div {{ $attributes->class('base') }}></div>
+<div {{ $attributes->style('color: red') }}></div>

tests/fixtures/views/components/merge-class.blade.php

@@ -0,0 +1,3 @@
+@blaze
+
+<div {{ $attributes->merge(['class' => 'default-class']) }}></div>