From c174ab83d25e1bf3dce4c120fa7ba94001044d30 Mon Sep 17 00:00:00 2001
From: Arthur Monney <monneylobe@gmail.com>
Date: Wed, 8 Oct 2025 13:52:50 +0200
Subject: [PATCH] fix: update PageBuilder for Filament v4 compatibility

---
 .../forms/components/page-builder.blade.php     |  7 ++++++-
 .../dropdown-block-picker.blade.php             | 17 +++++------------
 .../page-builder/modal-block-picker.blade.php   |  9 +++++----
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/resources/views/components/forms/components/page-builder.blade.php b/resources/views/components/forms/components/page-builder.blade.php
index 82bd143..dd5ad3a 100644
--- a/resources/views/components/forms/components/page-builder.blade.php
+++ b/resources/views/components/forms/components/page-builder.blade.php
@@ -1,5 +1,5 @@
 @php
-    use Filament\Forms\Components\Actions\Action;
+    use Filament\Actions\Action;
     use Z3d0X\FilamentFabricator\Enums\BlockPickerStyle;
 
     $containers = $getChildComponentContainers();
@@ -26,6 +26,7 @@
     $isReorderableWithButtons = $isReorderableWithButtons();
     $isReorderableWithDragAndDrop = $isReorderableWithDragAndDrop();
 
+    $key = $getKey();
     $statePath = $getStatePath();
 @endphp
 
@@ -209,6 +210,7 @@ class="fi-fo-builder-block-picker-ctn rounded-lg bg-white dark:bg-gray-900"
                                                 :after-item="$uuid"
                                                 :columns="$blockPickerColumns"
                                                 :blocks="$blockPickerBlocks"
+                                                :key="$key"
                                                 :state-path="$statePath"
                                                 :width="$blockPickerWidth"
                                             >
@@ -222,6 +224,7 @@ class="fi-fo-builder-block-picker-ctn rounded-lg bg-white dark:bg-gray-900"
                                                 :after-item="$uuid"
                                                 :columns="$blockPickerColumns"
                                                 :blocks="$blockPickerBlocks"
+                                                :key="$key"
                                                 :state-path="$statePath"
                                                 :width="$blockPickerWidth"
                                             >
@@ -255,6 +258,7 @@ class="absolute -top-3 left-3 px-1 text-sm font-medium"
                     :action="$addAction"
                     :blocks="$blockPickerBlocks"
                     :columns="$blockPickerColumns"
+                    :key="$key"
                     :state-path="$statePath"
                     :width="$blockPickerWidth"
                     class="flex justify-center"
@@ -268,6 +272,7 @@ class="flex justify-center"
                     :action="$addAction"
                     :blocks="$blockPickerBlocks"
                     :columns="$blockPickerColumns"
+                    :key="$key"
                     :state-path="$statePath"
                     :width="$blockPickerWidth"
                     class="flex justify-center"
diff --git a/resources/views/components/forms/components/page-builder/dropdown-block-picker.blade.php b/resources/views/components/forms/components/page-builder/dropdown-block-picker.blade.php
index a1a5c04..f7f4daa 100644
--- a/resources/views/components/forms/components/page-builder/dropdown-block-picker.blade.php
+++ b/resources/views/components/forms/components/page-builder/dropdown-block-picker.blade.php
@@ -3,6 +3,7 @@
     'afterItem' => null,
     'blocks',
     'columns' => null,
+    'key',
     'statePath',
     'trigger',
     'width' => null,
@@ -17,26 +18,18 @@
     </x-slot>
 
     <x-filament::dropdown.list>
-        <x-filament::grid
-            :default="$columns['default'] ?? 1"
-            :sm="$columns['sm'] ?? null"
-            :md="$columns['md'] ?? null"
-            :lg="$columns['lg'] ?? null"
-            :xl="$columns['xl'] ?? null"
-            :two-xl="$columns['2xl'] ?? null"
-            direction="column"
-        >
+        <div class="grid gap-1 {{ $columns ? 'grid-cols-' . ($columns['default'] ?? 1) : 'grid-cols-1' }}">
             @foreach ($blocks as $block)
                 @php
                     $wireClickActionArguments = ['block' => $block->getName()];
 
-                    if ($afterItem) {
+                    if (filled($afterItem)) {
                         $wireClickActionArguments['afterItem'] = $afterItem;
                     }
 
                     $wireClickActionArguments = \Illuminate\Support\Js::from($wireClickActionArguments);
 
-                    $wireClickAction = "mountFormComponentAction('{$statePath}', '{$action->getName()}', {$wireClickActionArguments})";
+                    $wireClickAction = "mountAction('{$action->getName()}', {$wireClickActionArguments}, { schemaComponent: '{$key}' })";
                 @endphp
 
                 <x-filament::dropdown.list.item
@@ -47,6 +40,6 @@
                     {{ $block->getLabel() }}
                 </x-filament::dropdown.list.item>
             @endforeach
-        </x-filament::grid>
+        </div>
     </x-filament::dropdown.list>
 </x-filament::dropdown>
diff --git a/resources/views/components/forms/components/page-builder/modal-block-picker.blade.php b/resources/views/components/forms/components/page-builder/modal-block-picker.blade.php
index dfc99b8..bc3458b 100644
--- a/resources/views/components/forms/components/page-builder/modal-block-picker.blade.php
+++ b/resources/views/components/forms/components/page-builder/modal-block-picker.blade.php
@@ -3,6 +3,7 @@
     'afterItem' => null,
     'blocks',
     'columns' => null,
+    'key',
     'statePath',
     'trigger',
     'width' => null,
@@ -23,26 +24,26 @@
             @php
                 $wireClickActionArguments = ['block' => $block->getName()];
 
-                if ($afterItem) {
+                if (filled($afterItem)) {
                     $wireClickActionArguments['afterItem'] = $afterItem;
                 }
 
                 $wireClickActionArguments = \Illuminate\Support\Js::from($wireClickActionArguments);
 
-                $wireClickAction = "mountFormComponentAction('{$statePath}', '{$action->getName()}', {$wireClickActionArguments})";
+                $wireClickAction = "mountAction('{$action->getName()}', {$wireClickActionArguments}, { schemaComponent: '{$key}' })";
             @endphp
 
 
             <button
                 type="button"
-                class="flex flex-col items-center justify-center border border-gray-200 dark:border-white/10 w-full h-full gap-4 whitespace-nowrap rounded-md p-2 text-sm transition-colors duration-75 outline-none hover:bg-gray-50 focus-visible:bg-gray-50 dark:hover:bg-white/5 dark:focus-visible:bg-white/5"
+                class="flex flex-col items-center justify-center border border-gray-200 dark:border-white/10 size-full gap-4 whitespace-nowrap rounded-md p-2 text-sm transition-colors duration-75 outline-none hover:bg-gray-50 focus-visible:bg-gray-50 dark:hover:bg-white/5 dark:focus-visible:bg-white/5"
                 x-on:click="close"
                 wire:click="{{ $wireClickAction }}"
             >
                 @if ($icon = $block->getIcon())
                     <x-filament::icon
                         :icon="$icon"
-                        class="h-8 w-8 text-gray-400 dark:text-gray-500"
+                        class="size-8 text-gray-400 dark:text-gray-500"
                     />
                 @endif
                 <div>