Pass slot instance down, instead of re-instantiating using template i…

…n container.
statamic · Feb 6, 2025 · 82f98a5 · 82f98a5
1 parent 10d444c
commit 82f98a5
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 7 deletions.
diff --git a/src/Forms/RenderableField.php b/src/Forms/RenderableField.php
@@ -6,25 +6,38 @@
 
 class RenderableField implements Htmlable
 {
+    protected $slot;
     protected $isBlade = false;
 
     public function __construct(protected $field, protected $data)
     {
         //
     }
 
-    public function isBlade(bool $isBlade): void
+    public function slot(RenderableFieldSlot $slot): self
+    {
+        $this->slot = $slot;
+
+        collect($this->data['fields'] ?? [])
+            ->each(fn ($field) => $field['field']->slot($slot));
+
+        return $this;
+    }
+
+    public function isBlade(bool $isBlade): self
     {
         $this->isBlade = $isBlade;
 
         collect($this->data['fields'] ?? [])
             ->each(fn ($field) => $field['field']->isBlade($isBlade));
+
+        return $this;
     }
 
     public function toHtml(): string
     {
         $data = array_merge($this->data, [
-            'slot' => new RenderableFieldSlot(app('form-slot'), $this->isBlade),
+            'slot' => $this->slot,
         ]);
 
         return $this->minifyFieldHtml(

diff --git a/src/Forms/Tags.php b/src/Forms/Tags.php
@@ -146,18 +146,18 @@ public function create()
      */
     public function fields()
     {
-        app()->instance('form-slot', $slot = $this->content);
-
         $isBlade = $this->isAntlersBladeComponent();
 
+        $slot = new RenderableFieldSlot($this->content, $isBlade);
+
         collect($this->context['fields'])
-            ->each(fn ($field) => $field['field']->isBlade($isBlade));
+            ->each(fn ($field) => $field['field']->slot($slot)->isBlade($isBlade));
 
         if ($isBlade) {
-            return $this->tagRenderer->render('@foreach($fields as $field)'.$slot.'@endforeach', $this->context->all());
+            return $this->tagRenderer->render('@foreach($fields as $field)'.$this->content.'@endforeach', $this->context->all());
         }
 
-        return Antlers::parse('{{ fields }}'.$slot.'{{ /fields }}', $this->context->all());
+        return Antlers::parse('{{ fields }}'.$this->content.'{{ /fields }}', $this->context->all());
     }
 
     /**