Merge pull request #201 from alleyinteractive/feature/issue-200/add-n…

…ested-query-block-capability

Issue-200: Add a new block that can be nested or ability for Query Block to be nested

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 All notable changes to `WP Curate` will be documented in this file.
 
+## 2.4.0 - 2024-08-28
+
+- Enhancement: Subquery block added to allow a separate set of posts within a query block.
+see https://github.com/alleyinteractive/wp-curate/issues/200
+
 ## 2.3.3 - 2024-09-16
 
 - Bug Fix: Hold space on the front end for curated posts that were deleted.

blocks/post/edit.tsx

@@ -42,20 +42,24 @@ export default function Edit({
   isSelected,
 }: PostEditProps) {
   // @ts-ignore
-  const queryParentId = select('core/block-editor').getBlockParentsByBlockName(clientId, 'wp-curate/query')[0];
+  const queryParents = select('core/block-editor').getBlockParentsByBlockName(clientId, ['wp-curate/query', 'wp-curate/subquery']);
+  const queryParentId = queryParents.pop();
+
   // @ts-ignore
   const queryParent = select('core/block-editor').getBlock(queryParentId) ?? {
     attributes: {
       posts: [],
       postTypes: [],
     },
   };
+
   const queryBlocks = select('core/block-editor').getBlocksByName('wp-curate/query');
   const {
     attributes: {
       posts = [],
       postTypes = [],
     } = {},
+    name: parentName,
   } = queryParent;
 
   const queryInclude = include.split(',').map((id: string) => parseInt(id, 10));
@@ -175,7 +179,7 @@ export default function Edit({
             'wp-curate-post-block',
             { 'wp-curate-post-block--selected': isParentOfSelectedBlock },
             { 'wp-curate-post-block--backfill': !selected || postDeleted },
-            { 'curate-droppable': moveData.postId && moveData.postId !== postId },
+            { 'curate-droppable': parentName === 'wp-curate/query' && moveData.postId && moveData.postId !== postId },
             { 'wp-curate-error': postDeleted },
           ),
         },