Fix #908

spicywebau · Jul 25, 2024 · b712e95 · b712e95
1 parent b3cab72
commit b712e95
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## Unreleased
+
+### Fixed
+- Fixed a bug where edited descendants of unedited blocks weren't being returned in GraphQL draft queries
+
 ## 4.2.8 - 2024-07-10
 
 ### Fixed

diff --git a/src/gql/types/elements/Block.php b/src/gql/types/elements/Block.php
@@ -45,7 +45,7 @@ protected function resolve(mixed $source, array $arguments, mixed $context, Reso
 
             // The blocks at `$source->$fieldName` cannot be trusted, it will most likely be out of order and cached.
             // We should retrieve the children blocks by query instead, so it'll always be in the correct order.
-            $descendants = $source->getDescendants()->all();
+            $descendants = $source->getDescendants()->ownerId($source->ownerId)->all();
             $children = array_filter($descendants, function($block) use ($childrenLevel) {
                 return (int)$block->level === $childrenLevel;
             });