fix(global): Allow overwriting field type defaults per-field

Log1x · Dec 31, 2019 · 00304e7 · 00304e7
1 parent 7900fff
commit 00304e7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Block.php b/src/Block.php
@@ -252,7 +252,7 @@ protected function build()
                     return;
                 }
 
-                return [array_merge($field, $this->defaults->get($field['type']))];
+                return [array_merge($this->defaults->get($field['type']), $field)];
             }
 
             return $value;

diff --git a/src/Field.php b/src/Field.php
@@ -74,7 +74,7 @@ protected function build()
                     return;
                 }
 
-                return [array_merge($field, $this->defaults->get($field['type']))];
+                return [array_merge($this->defaults->get($field['type']), $field)];
             }
 
             return $value;
-Original file line number
+Diff line change
@@ Expand Up / @@ -252,7 +252,7 @@ protected function build() @@
                         return;
                     }
-                    return [array_merge($field, $this->defaults->get($field['type']))];
+                    return [array_merge($this->defaults->get($field['type']), $field)];
                 }
                 return $value;
@@ Expand Down @@