Merge pull request #13 from DissNik/2.x

Fixed for release MoonShine

Author: lee-to

public/js/layouts.js

@@ -37,14 +37,14 @@ document.addEventListener('alpine:init', () => {
                 name: name,
                 counts: layoutsCount
             }, {}, {
-                beforeCallback: function(data) {
+                afterResponse: function(data) {
                     const tempContainer = document.createElement('div');
                     tempContainer.innerHTML = data.html ?? '';
 
                     while (tempContainer.firstChild) {
                         t.blocksContainer.appendChild(tempContainer.firstChild);
                     }
-                    
+
                     t._reindex()
                 }
             })

resources/views/layout.blade.php

@@ -3,7 +3,7 @@
         {!! $heading !!}
     </x-slot>
 
-    <x-slot name="button"></x-slot>
+    <x-slot name="button">{!! $button !!}</x-slot>
 
     {!! $fields !!}
 </x-moonshine::collapse>

resources/views/layouts.blade.php

@@ -14,6 +14,4 @@
     <div>
         {!! $dropdown !!}
     </div>
-
-    <br />
 </div>

src/Fields/Layout.php

@@ -129,8 +129,6 @@ public function headingFields(): Fields
                 FlexibleRender::make($this->title()),
 
                 ...$this->getHeadingAdditionalFields(),
-
-                $this->getRemoveButton(),
             ]))
                 ->customAttributes(['class' => 'w-full'])
                 ->itemsAlign('center')
@@ -188,6 +186,7 @@ public function render(): View
         return view('moonshine-layouts-field::layout', [
             'key' => $this->key(),
             'heading' => FieldsGroup::make($this->headingFields()),
+            'button' => $this->getRemoveButton(),
             'fields' => FieldsGroup::make($this->fields()),
         ]);
     }

src/Fields/Layouts.php

@@ -8,9 +8,11 @@
 use Illuminate\Contracts\View\View;
 use Illuminate\Support\Collection;
 use MoonShine\AssetManager\Js;
+use MoonShine\Contracts\Core\HasComponentsContract;
 use MoonShine\Contracts\Core\PageContract;
 use MoonShine\Contracts\Core\ResourceContract;
 use MoonShine\Contracts\UI\ActionButtonContract;
+use MoonShine\Contracts\UI\Collection\ComponentsContract;
 use MoonShine\Contracts\UI\HasFieldsContract;
 use MoonShine\Layouts\Casts\LayoutItem;
 use MoonShine\Layouts\Casts\LayoutsCast;
@@ -169,9 +171,15 @@ public function getFilledLayouts(): LayoutCollection
         return LayoutCollection::make($filled);
     }
 
-    private function fillClonedRecursively(Collection $collection, mixed $data): Collection
+    private function fillClonedRecursively(ComponentsContract|Collection $collection, mixed $data): Collection
     {
         return $collection->map(function (mixed $item) use ($data) {
+            if ($item instanceof HasComponentsContract) {
+                $item = (clone $item)->setComponents(
+                    $this->fillClonedRecursively($item->getComponents(), $data)->toArray()
+                );
+            }
+
             if ($item instanceof HasFieldsContract) {
                 $item = (clone $item)->fields(
                     $this->fillClonedRecursively($item->getFields(), $data)->toArray()