Nested draft handling improvements

CHANGELOG.md

@@ -5,6 +5,8 @@
 - Added `Craft.ElementEditor::markDeltaNameAsModified()`.
 - Removed `craft\elements\NestedElementManager::$allowDeletion`.
 - Fixed a bug where element editor forms could submit duplicate input values. ([#14276](https://github.com/craftcms/cms/issues/14276))
+- Fixed a bug where unedited, unpublished drafts created within Matrix fields would appear on page reload.
+- Fixed a bug where nested drafts weren’t getting deleted if no longer needed by a Matrix or Addresses field.
 
 ## 5.0.0-alpha.12 - 2024-02-05
 

src/elements/NestedElementManager.php

@@ -184,6 +184,7 @@ private function getValue(ElementInterface $owner, bool $fetchAll = false): Elem
         if ($fetchAll && !$query->getCachedResult()) {
             $query
                 ->drafts(null)
+                ->savedDraftsOnly()
                 ->status(null)
                 ->limit(null);
         }
@@ -790,6 +791,8 @@ private function deleteOtherNestedElements(ElementInterface $owner, array $excep
     {
         /** @var NestedElementInterface[] $elements */
         $elements = $this->nestedElementQuery($owner)
+            ->drafts(null)
+            ->savedDraftsOnly(false)
             ->status(null)
             ->siteId($owner->siteId)
             ->andWhere(['not', ['elements.id' => $except]])