From e207d197f487f16707fc3e219c1ad88a3969bb7b Mon Sep 17 00:00:00 2001
From: Ben <howdu@users.noreply.github.com>
Date: Sat, 5 Jul 2025 06:57:38 +0100
Subject: [PATCH 1/3] Fix getExtraAttributes on builder

---
 packages/forms/resources/views/components/builder.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/forms/resources/views/components/builder.blade.php b/packages/forms/resources/views/components/builder.blade.php
index 23770f2df2..a8553e29d6 100644
--- a/packages/forms/resources/views/components/builder.blade.php
+++ b/packages/forms/resources/views/components/builder.blade.php
@@ -120,7 +120,7 @@
                         x-on:expand="isCollapsed = false"
                         x-sortable-item="{{ $itemKey }}"
                         {{
-                            $item->getParentComponent()->getExtraAttributes()
+                            $item->getParentComponent()->getExtraAttributeBag()
                                 ->class(['fi-fo-builder-item'])
                         }}
                         x-bind:class="{ 'fi-collapsed': isCollapsed }"

From a0c90d86583ed3d93ef82458770271944cefaa30 Mon Sep 17 00:00:00 2001
From: Ben <howdu@users.noreply.github.com>
Date: Sat, 5 Jul 2025 06:57:47 +0100
Subject: [PATCH 2/3] Add form builder test

---
 tests/src/Forms/Components/BuilderTest.php | 46 ++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 tests/src/Forms/Components/BuilderTest.php

diff --git a/tests/src/Forms/Components/BuilderTest.php b/tests/src/Forms/Components/BuilderTest.php
new file mode 100644
index 0000000000..f2331113c4
--- /dev/null
+++ b/tests/src/Forms/Components/BuilderTest.php
@@ -0,0 +1,46 @@
+<?php
+
+use Filament\Forms\Components\Builder;
+use Filament\Forms\Components\TextInput;
+use Filament\Schemas\Schema;
+use Filament\Tests\Fixtures\Livewire\Livewire;
+use Filament\Tests\TestCase;
+use function Filament\Tests\livewire;
+
+uses(TestCase::class);
+
+it('displays blocks in builder', function (): void {
+    $data = [
+        'builder' => [
+            [
+                'type' => 'one',
+                'data' => [
+                    'foo' => 'test',
+                ],
+            ],
+        ],
+    ];
+
+    livewire(TestComponentWithBuilder::class)
+        ->assertSuccessful()
+        ->fillForm($data)
+        ->assertSchemaStateSet($data);
+});
+
+class TestComponentWithBuilder extends Livewire
+{
+    public function form(Schema $form): Schema
+    {
+        return $form
+            ->components([
+                Builder::make('builder')
+                    ->blocks([
+                        Builder\Block::make('one')
+                            ->schema([
+                                TextInput::make('foo')
+                            ])
+                    ]),
+            ])
+            ->statePath('data');
+    }
+}

From 1a0268dfd0cd0b295204cfa138d6c61f8dea6fc5 Mon Sep 17 00:00:00 2001
From: howdu <howdu@users.noreply.github.com>
Date: Sat, 5 Jul 2025 06:12:16 +0000
Subject: [PATCH 3/3] chore: fix code style

---
 tests/src/Forms/Components/BuilderTest.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/src/Forms/Components/BuilderTest.php b/tests/src/Forms/Components/BuilderTest.php
index f2331113c4..fca1aa26d1 100644
--- a/tests/src/Forms/Components/BuilderTest.php
+++ b/tests/src/Forms/Components/BuilderTest.php
@@ -5,6 +5,7 @@ use Filament\Forms\Components\TextInput;
 use Filament\Schemas\Schema;
 use Filament\Tests\Fixtures\Livewire\Livewire;
 use Filament\Tests\TestCase;
+
 use function Filament\Tests\livewire;
 
 uses(TestCase::class);
@@ -37,8 +38,8 @@ class TestComponentWithBuilder extends Livewire
                     ->blocks([
                         Builder\Block::make('one')
                             ->schema([
-                                TextInput::make('foo')
-                            ])
+                                TextInput::make('foo'),
+                            ]),
                     ]),
             ])
             ->statePath('data');