Only show unsaved drafts within Matrix fields, not derivative drafts

craftcms · Jan 30, 2025 · dc5c782 · dc5c782
1 parent f23854f
commit dc5c782
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Unreleased
 
 - Fixed an error that occurred when accessing the `edit/<elementId>` route for a draft that no longer existed.
+- Fixed a bug where Matrix fields set to inline-editable blocks view were showing drafts of nested entries.
 
 ## 5.6.3 - 2024-01-29
 

diff --git a/src/elements/NestedElementManager.php b/src/elements/NestedElementManager.php
@@ -193,7 +193,12 @@ private function getValue(ElementInterface $owner, bool $fetchAll = false): Elem
                 ->drafts(null)
                 ->savedDraftsOnly()
                 ->status(null)
-                ->limit(null);
+                ->limit(null)
+                ->andWhere([
+                    'or',
+                    ['elements.draftId' => null],
+                    ['elements.canonicalId' => null],
+                ]);
         }
 
         return $query;
@@ -893,6 +898,11 @@ private function deleteOtherNestedElements(ElementInterface $owner, array $excep
             ->status(null)
             ->siteId($owner->siteId)
             ->andWhere(['not', ['elements.id' => $except]])
+            ->andWhere([
+                'or',
+                ['elements.draftId' => null],
+                ['elements.canonicalId' => null],
+            ])
             ->all();
 
         $elementsService = Craft::$app->getElements();

diff --git a/src/fields/Matrix.php b/src/fields/Matrix.php
@@ -819,7 +819,16 @@ private function blockInputHtml(EntryQuery|ElementCollection|null $value, ?Eleme
         }
 
         if ($value instanceof EntryQuery) {
-            $value = $value->getCachedResult() ?? $value->drafts(null)->status(null)->limit(null)->all();
+            $value = $value->getCachedResult() ?? (clone $value)
+                ->drafts(null)
+                ->status(null)
+                ->limit(null)
+                ->andWhere([
+                    'or',
+                    ['elements.draftId' => null],
+                    ['elements.canonicalId' => null],
+                ])
+                ->all();
         }
 
         $view = Craft::$app->getView();