Merge remote-tracking branch 'origin/master'

moonshine-software · Aug 23, 2024 · c392fc2 · c392fc2
2 parents e6b68b9 + 3753e4c
commit c392fc2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Fields/Layouts.php b/src/Fields/Layouts.php
@@ -125,7 +125,7 @@ public function getFilledLayouts(): LayoutCollection
             );
         }
 
-        $filled = $values->map(function (LayoutItem $data) use ($layouts) {
+        $filled = $values ? $values->map(function (LayoutItem $data) use ($layouts) {
             /** @var ?Layout $layout */
             $layout = $layouts->findByName($data->getName());
 
@@ -168,7 +168,7 @@ public function getFilledLayouts(): LayoutCollection
                 ->headingAdditionalFields($fields);
 
             return $layout->removeButton($this->getRemoveButton());
-        })->filter();
+        })->filter() : [];
 
         return LayoutCollection::make($filled);
     }

diff --git a/tests/Feature/LayoutsTest.php b/tests/Feature/LayoutsTest.php
@@ -44,8 +44,8 @@ public function it_simple_create(): void
 
         $model = TestModel::query()->first();
 
-        $first = static fn(TestModel $model): array => $model->data->findByName('first')->get('json');
-        $second = static fn(TestModel $model): array => $model->data->findByName('second')->get('json');
+        $first = static fn (TestModel $model): array => $model->data->findByName('first')->get('json');
+        $second = static fn (TestModel $model): array => $model->data->findByName('second')->get('json');
 
         $this->assertEquals(['key 1' => 'value 1', 'key 2' => 'value 2'], $first($model));
         $this->assertEquals([['title' => 'Title 1', 'image' => $image->hashName()]], $second($model));