Ensure default config values are available in form tag

statamic · May 15, 2024 · 2ba30f2 · 2ba30f2
1 parent 4bbd23e
commit 2ba30f2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/Fields/Fieldtype.php b/src/Fields/Fieldtype.php
@@ -253,6 +253,15 @@ public function configFields(): Fields
         return new ConfigFields($fields);
     }
 
+    public function defaultConfigValues(): array
+    {
+        return Field::commonFieldOptions()->all()
+            ->merge($this->configFields()->all())
+            ->filter(fn (ConfigField $configField) => $configField->get('default'))
+            ->map(fn (ConfigField $configField) => $configField->get('default'))
+            ->all();
+    }
+
     protected function configFieldItems(): array
     {
         return $this->configFields;

diff --git a/src/Tags/Concerns/RendersForms.php b/src/Tags/Concerns/RendersForms.php
@@ -135,7 +135,7 @@ protected function getRenderableField($field, $errorBag = 'default', $manipulate
         $default = $field->value() ?? $field->defaultValue();
         $value = $old === $missing ? $default : $old;
 
-        $data = array_merge($field->toArray(), [
+        $data = array_merge($field->fieldtype()->defaultConfigValues(), $field->toArray(), [
             'instructions' => $field->instructions(),
             'error' => $errors->first($field->handle()) ?: null,
             'default' => $field->value() ?? $field->defaultValue(),