fix: include empty keys

fullscreeninteractive · Aug 29, 2022 · a6b7ac4 · a6b7ac4
1 parent 3dc1f35
commit a6b7ac4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/src/EditableKeyValueField.php b/src/EditableKeyValueField.php
@@ -48,17 +48,14 @@ public function getFormField()
 
     public function getValueFromData($data)
     {
-        $incoming = isset($data[$this->Name]) ? $data[$this->Name] : false;
-
-        if (!$incoming) {
-            return json_encode([]);
-        }
-
+        $incoming = isset($data[$this->Name]) ? $data[$this->Name] : [];
         $value = [];
 
         foreach ($this->getKeysAsArray() as $i => $k) {
-            if (isset($data[$i])) {
-                $value[$k] = $data[$i];
+            if (isset($incoming[$i])) {
+                $value[$k] = $incoming[$i];
+            } else {
+                $value[$k] = '';
             }
         }
 

diff --git a/src/SubmittedKeyValueField.php b/src/SubmittedKeyValueField.php
@@ -9,7 +9,6 @@ class SubmittedKeyValueFormField extends SubmittedFormField
 {
     private static $table_name = 'SubmittedKeyValueFormField';
 
-
     public function getFormattedValue()
     {
         $data = json_decode($this->Value, true);
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,6 @@ class SubmittedKeyValueFormField extends SubmittedFormField @@
     {
         private static $table_name = 'SubmittedKeyValueFormField';
         public function getFormattedValue()
         {
             $data = json_decode($this->Value, true);
@@ Expand Down @@