[4.x] Supply field's config and form's handle to extraRenderableFieldData method

src/Fields/Fieldtype.php

@@ -355,7 +355,7 @@ public function toQueryableValue($value)
         return $value;
     }
 
-    public function extraRenderableFieldData(): array
+    public function extraRenderableFieldData($config = [], $form = null): array
     {
         return [];
     }

src/Forms/Tags.php

@@ -64,7 +64,16 @@ public function create()
         $jsDriver = $this->parseJsParamDriverAndOptions($this->params->get('js'), $form);
 
         $data['sections'] = $this->getSections($this->sessionHandle(), $jsDriver);
-        $data['fields'] = $this->getFields($this->sessionHandle(), $jsDriver);
+        if (! empty($data['sections'])) {
+            // fields have already been rendered in the sections: get from the sections to avoid a re-render
+            $data['fields'] = collect($data['sections'])->map(fn ($section) => $section['fields'])
+                ->flatten(1)
+                ->values()
+                ->all();
+        } else {
+            // render fields directly
+            $data['fields'] = $this->getFields($this->sessionHandle(), $jsDriver);
+        }
         $data['honeypot'] = $form->honeypot();
 
         if ($jsDriver) {

src/Tags/Concerns/RendersForms.php

@@ -138,7 +138,7 @@ protected function getRenderableField($field, $errorBag = 'default', $manipulate
             'default' => $field->value() ?? $field->defaultValue(),
             'old' => old($field->handle()),
             'value' => $value,
-        ], $field->fieldtype()->extraRenderableFieldData());
+        ], $field->fieldtype()->extraRenderableFieldData($field->config(), method_exists($this, 'form') ? $this->form()->handle() : null));
 
         if ($manipulateDataCallback instanceof Closure) {
             $data = $manipulateDataCallback($data, $field);