Fixed default value to come from the Form in overridable field (tha…

…nks @NicoHood)

CHANGELOG.md

@@ -4,6 +4,7 @@
 1. [](#bugfix)
    * Fixed state of the checkbox if no value is provided
    * Fixed evaluating default value in `hidden` field (thanks @NicoHood)
+   * Fixed default value to come from the `Form` in overridable field (thanks @NicoHood)
 
 # v4.3.0
 ## 12/14/2020

templates/forms/default/field.html.twig

@@ -7,18 +7,19 @@
 {% set vertical = field.style == 'vertical' %}
 
 {% if not blueprints or (blueprints.schema.type(field.type)['input@'] ?? true) is same as(true) %}
+    {% set default = field.default %}
     {% set toggleable = field.toggleable ?? false %}
     {% if toggleable %}
         {% set originalValue = originalValue is defined ? originalValue : value %}
         {% set toggleableChecked = originalValue is not null %}
     {% elseif field.overridable %}
         {% set toggleable = true %}
-        {% set default = form.getDefaultValue(field.name) ?? field.default %}
+        {% set default = form.getDefaultValue(field.name) ?? default %}
         {% set toggleableChecked = value is not null and value != default %}
     {% endif %}
 
     {% set cookie_name = 'forms-' ~ form.name ~ '-' ~ field.name %}
-    {% set value = value ?? (get_cookie(cookie_name) is not null ? get_cookie(cookie_name) : field.default) %}
+    {% set value = value ?? (get_cookie(cookie_name) is not null ? get_cookie(cookie_name) : default) %}
 
     {% if (field.yaml or field.validate.type == 'yaml') and value is iterable %}
         {% set value = value|toYaml %}