fix: Modal assets

Issue #1468
moonshine-software · Jan 14, 2025 · af9cd7e · af9cd7e
1 parent 85e6e55
commit af9cd7e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/src/Laravel/src/Buttons/CreateButton.php b/src/Laravel/src/Buttons/CreateButton.php
@@ -25,6 +25,9 @@ public static function for(
         $action = $resource->getFormPageUrl();
 
         if ($resource->isCreateInModal()) {
+            // required to create field entities and load assets
+            $resource->getFormFields();
+
             $action = $resource->getFormPageUrl(
                 params: [
                     '_component_name' => $componentName ?? $resource->getListComponentName(),

diff --git a/src/Laravel/src/Buttons/EditButton.php b/src/Laravel/src/Buttons/EditButton.php
@@ -27,6 +27,11 @@ public static function for(
 
         $action = static fn (mixed $item, ?DataWrapperContract $data): string => $resource->getFormPageUrl($data?->getKey());
 
+        // required to create field entities and load assets
+        if(!$resource->isCreateInModal() && $resource->isEditInModal()) {
+            $resource->getFormFields();
+        }
+
         if ($resource->isEditInModal()) {
             $action = static fn (mixed $item, ?DataWrapperContract $data): string => $resource->getFormPageUrl(
                 $data?->getKey(),

diff --git a/src/UI/resources/views/components/layout/assets.blade.php b/src/UI/resources/views/components/layout/assets.blade.php
@@ -7,7 +7,9 @@
 @stack('styles')
 
 {!! $colors !!}
+@fragment('moonshine-assets')
 {!! $assets !!}
+@endfragment
 
 {{ $slot ?? '' }}