Merge pull request #1353 from dev-lnk/td-fix

Author: lee-to

src/Fields/Td.php

@@ -8,13 +8,14 @@
 use Illuminate\Contracts\View\View;
 use Illuminate\View\ComponentAttributeBag;
 use MoonShine\Components\FieldsGroup;
+use MoonShine\Contracts\Fields\FieldsWrapper;
 use MoonShine\Decorations\LineBreak;
 use Throwable;
 
 /**
  * @method static static make(Closure|string $label, ?Closure $fields = null)
  */
-class Td extends Template
+class Td extends Template implements FieldsWrapper
 {
     private ?Closure $conditionalFields = null;
 
@@ -60,6 +61,10 @@ public function hasConditionalFields(): bool
 
     public function getConditionalFields(): array
     {
+        if(\is_null($this->getData())) {
+            return [];
+        }
+
         return value($this->conditionalFields, $this->getData(), $this);
     }
 
@@ -105,12 +110,10 @@ protected function resolvePreview(): string|View
             return parent::resolvePreview();
         }
 
-        $fields = $this->hasConditionalFields()
-            ? $this->getConditionalFields()
-            : $this->getFields();
+        $fields = $this->getFields();
 
         return FieldsGroup::make(
-            Fields::make($fields)
+            $fields
         )
             ->mapFields(fn (Field $field, int $index): Field => $field
                 ->resolveFill($this->toRawValue(withoutModify: true), $this->getData())
@@ -119,4 +122,11 @@ protected function resolvePreview(): string|View
                 ->forcePreview())
             ->render();
     }
-}
+
+    public function getFields(): Fields
+    {
+        return $this->hasConditionalFields()
+            ? Fields::make($this->getConditionalFields())
+            : Fields::make($this->getRawFields());
+    }
+}

src/Http/Requests/Resources/UpdateColumnFormRequest.php

@@ -4,6 +4,7 @@
 
 namespace MoonShine\Http\Requests\Resources;
 
+use MoonShine\Contracts\Fields\FieldsWrapper;
 use MoonShine\Exceptions\ResourceException;
 use MoonShine\Fields\Field;
 use MoonShine\Http\Requests\MoonShineFormRequest;
@@ -41,9 +42,27 @@ public function authorize(): bool
      */
     public function getField(): ?Field
     {
-        return $this->getResource()
-            ?->getIndexFields()
-            ?->withoutWrappers()
+        $resource = $this->getResource();
+
+        if (\is_null($resource)) {
+            return null;
+        }
+
+        $data = $resource->getItem();
+
+        if (\is_null($data)) {
+            return null;
+        }
+
+        $fields = $resource->getIndexFields();
+        $fields->each(
+            fn (Field $field): Field => $field instanceof FieldsWrapper
+                ? $field->resolveFill($data->toArray(), $data)
+                : $field
+        );
+
+        return $fields
+            ->withoutWrappers()
             ?->findByColumn(
                 request()->input('field')
             );