wip

resources/views/fields/fieldset.blade.php

@@ -1,6 +1,6 @@
 <fieldset>
     <legend>{{ $label }}</legend>
     @foreach($fields as $field)
-        {!! $field->render() !!}
+        @include($field['template'], $field)
     @endforeach
 </fieldset>

src/Fields/Fieldset.php

@@ -7,7 +7,6 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Router;
-use Illuminate\Support\Facades\App;
 
 class Fieldset extends Field
 {
@@ -78,16 +77,11 @@ public function invalid(Request $request): bool
     /**
      * {@inheritdoc}
      */
-    public function toArray(): array
+    public function toFormComponent(Request $request, Model $model): array
     {
-        return array_merge(
-            parent::toArray(),
-            App::call(function (Request $request): array {
-                return [
-                    'fields' => $this->resolveFields($request)->all(),
-                ];
-            })
-        );
+        return array_merge(parent::toFormComponent($request, $model), [
+            'fields' => $this->resolveFields($request)->mapToFormComponents($request, $model),
+        ]);
     }
 
     /**

src/Fields/Meta.php

@@ -3,7 +3,6 @@
 namespace Cone\Root\Fields;
 
 use Closure;
-use Illuminate\Contracts\View\View;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\MorphOne as EloquentRelation;
@@ -250,6 +249,14 @@ public function toArray(): array
         return $this->field->toArray();
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function toFormComponent(Request $request, Model $model): array
+    {
+        return $this->field->toFormComponent($request, $model);
+    }
+
     /**
      * {@inheritdoc}
      */