feat!: overwrite resolved field values by default

johannschopplich · Aug 8, 2024 · c1c3f08 · c1c3f08
1 parent 7b45676
commit c1c3f08
Showing 1 changed file with 21 additions and 22 deletions.
diff --git a/src/extensions/fieldMethods.php b/src/extensions/fieldMethods.php
@@ -46,18 +46,17 @@
             continue;
         }
 
-        // Get already resolved images
-        $resolved = $block->content()->get('resolved')->or([])->value();
-
-        if ($kirby->option('blocksResolver.replaceValues', false)) {
+        $resolvedKey = $kirby->option('blocksResolver.resolvedKey');
+        if (!empty($resolvedKey)) {
+            $resolvedData = $block->content()->get($resolvedKey)->or([])->value();
             $block->content()->update([
-                $key => $images->map($defaultResolver)->values()
+                $resolvedKey => array_merge($resolvedData, [
+                    strtolower($key) => $images->map($defaultResolver)->values()
+                ])
             ]);
         } else {
             $block->content()->update([
-                'resolved' => array_merge($resolved, [
-                    strtolower($key) => $images->map($defaultResolver)->values()
-                ])
+                $key => $images->map($defaultResolver)->values()
             ]);
         }
     }
@@ -97,18 +96,17 @@
             continue;
         }
 
-        // Get already resolved images
-        $resolved = $block->content()->get('resolved')->or([])->value();
-
-        if ($kirby->option('blocksResolver.replaceValues', false)) {
+        $resolvedKey = $kirby->option('blocksResolver.resolvedKey');
+        if (!empty($resolvedKey)) {
+            $resolvedData = $block->content()->get($resolvedKey)->or([])->value();
             $block->content()->update([
-                $key => $pages->map($defaultResolver)->values()
+                $resolvedKey => array_merge($resolvedData, [
+                    strtolower($key) => $pages->map($defaultResolver)->values()
+                ])
             ]);
         } else {
             $block->content()->update([
-                'resolved' => array_merge($resolved, [
-                    strtolower($key) => $pages->map($defaultResolver)->values()
-                ])
+                $key => $pages->map($defaultResolver)->values()
             ]);
         }
     }
@@ -129,17 +127,18 @@
         }
 
         $field = $block->content()->get($key);
-        $resolved = $block->content()->get('resolved')->or([])->value();
 
-        if ($kirby->option('blocksResolver.replaceValues', false)) {
+        $resolvedKey = $kirby->option('blocksResolver.resolvedKey');
+        if (!empty($resolvedKey)) {
+            $resolvedData = $block->content()->get($resolvedKey)->or([])->value();
             $block->content()->update([
-                $key => $resolver($field, $block)
+                $resolvedKey => array_merge($resolvedData, [
+                    strtolower($key) => $resolver($field, $block)
+                ])
             ]);
         } else {
             $block->content()->update([
-                'resolved' => array_merge($resolved, [
-                    strtolower($key) => $resolver($field, $block)
-                ])
+                $key => $resolver($field, $block)
             ]);
         }
     }