Merge branch 'release/1.5.9'

Author: rhukster

Blueprints/src/BlueprintSchema.php

@@ -506,7 +506,7 @@ protected function parseFormField($key, array $field, array $params, $prefix = '
         // Add all default properties for the field type (field needs to override them).
         $type = isset($properties['type']) ? $properties['type'] : '';
         if (isset($this->types[$type])) {
-            $properties = array_merge_recursive($this->types[$type], $properties);
+            $properties = $this->mergeTypeDefaults($properties, $this->types[$type]);
         }
 
         // Merge properties with existing ones.
@@ -557,6 +557,31 @@ protected function parseFormField($key, array $field, array $params, $prefix = '
         }
     }
 
+    /**
+     * @param array $properties
+     * @param array $defaults
+     * @return array
+     */
+    protected function mergeTypeDefaults(array $properties, array $defaults)
+    {
+        foreach ($properties as $key => $value) {
+            if (is_int($key)) {
+                // Handle items in a list, but avoid duplicates.
+                if (!in_array($value, $defaults, true)) {
+                    $defaults[] = $value;
+                }
+            } elseif (is_array($value) && isset($defaults[$key]) && is_array($defaults[$key])) {
+                // Recursively merge array value.
+                $defaults[$key] = $this->mergeTypeDefaults($value, $defaults[$key]);
+            } else {
+                // Replace value.
+                $defaults[$key] = $value;
+            }
+        }
+
+        return $defaults;
+    }
+
     /**
      * @param string $key
      * @param string $prefix

CHANGELOG.md

@@ -1,3 +1,9 @@
+# v1.5.9
+## 04/14/2021
+
+1. [](#bugfix)
+    * Fixed regression in default field type settings
+
 # v1.5.8
 ## 04/12/2021