From 00304e7119339a21b69b730365b3d9a522ec3eec Mon Sep 17 00:00:00 2001
From: Brandon <brandon@tendency.me>
Date: Tue, 31 Dec 2019 01:19:52 -0600
Subject: [PATCH] fix(global): Allow overwriting field type defaults per-field

---
 src/Block.php | 2 +-
 src/Field.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Block.php b/src/Block.php
index bc494274..bc6f246b 100644
--- 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
index 14e567fb..45ef7782 100644
--- 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;