Load provisional drafts for entries nested in cke field when previewing

craftcms · Feb 18, 2025 · 99414cc · 99414cc
1 parent 7a366ba
commit 99414cc
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/data/FieldData.php b/src/data/FieldData.php
@@ -146,15 +146,20 @@ public function loadEntries(): void
         $entryIds = $entryChunks->map(fn(Entry $chunk) => $chunk->entryId)->all();
 
         if (!empty($entryIds)) {
-            $entries = EntryElement::find()
+            $query = EntryElement::find()
                 ->id($entryIds)
                 ->siteId($this->siteId)
                 ->status(null)
                 ->drafts(null)
                 ->revisions(null)
                 ->trashed(null)
-                ->indexBy('id')
-                ->all();
+                ->indexBy('id');
+
+            if (Craft::$app->getRequest()->getIsPreview()) {
+                $query->withProvisionalDrafts();
+            }
+
+            $entries = $query->all();
         } else {
             $entries = [];
         }

diff --git a/src/web/assets/ckeditor/src/entries/entriesui.js b/src/web/assets/ckeditor/src/entries/entriesui.js
@@ -246,6 +246,11 @@ export default class CraftEntriesUI extends Plugin {
       params: {
         siteId: siteId,
       },
+      onLoad: () => {
+        slideout.elementEditor.on('update', () => {
+          Craft.Preview.refresh();
+        });
+      },
       onBeforeSubmit: async () => {
         // If the nested element is primarily owned by the canonical entry being edited,
         // then ensure we're working with a draft and save the nested entry changes to the draft