Merge branch '4.x' into feature/237-pasting-nested-entries-between-ed…

…itors
craftcms · Jun 12, 2024 · 28437ac · 28437ac
2 parents d401885 + 01f7603
commit 28437ac
Showing 1 changed file with 16 additions and 9 deletions.
diff --git a/src/Field.php b/src/Field.php
@@ -1034,7 +1034,10 @@ protected function prepValueForInput($value, ?ElementInterface $element, bool $s
                 ->keyBy(fn(EntryChunk $chunk) => $chunk->entryId)
                 ->map(fn(EntryChunk $chunk) => $chunk->getEntry())
                 ->all();
-            ElementHelper::swapInProvisionalDrafts($entries);
+
+            if (!$static) {
+                ElementHelper::swapInProvisionalDrafts($entries);
+            }
 
             $value = $chunks
                 ->map(function(BaseChunk $chunk) use ($static, $entries) {
@@ -1046,18 +1049,22 @@ protected function prepValueForInput($value, ?ElementInterface $element, bool $s
                     $entry = $entries[$chunk->entryId];
 
                     try {
-                        if (!$static) {
-                            return Html::tag('craft-entry', options: [
-                                'data' => [
-                                    'entry-id' => $entry->isProvisionalDraft ? $entry->getCanonicalId() : $entry->id,
-                                    'card-html' => $this->getCardHtml($entry),
-                                ],
-                            ]);
-                        }
+                        $cardHtml = $this->getCardHtml($entry);
                     } catch (InvalidConfigException) {
                         // this can happen e.g. when the entry type has been deleted
                         return '';
                     }
+
+                    if ($static) {
+                        return $cardHtml;
+                    }
+
+                    return Html::tag('craft-entry', options: [
+                        'data' => [
+                            'entry-id' => $entry->isProvisionalDraft ? $entry->getCanonicalId() : $entry->id,
+                            'card-html' => $cardHtml,
+                        ],
+                    ]);
                 })
                 ->join('');
         }