Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed drag and drop within Submenus #68297

Open
wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

Fixed drag and drop within Submenus #68297

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions packages/block-editor/src/components/use-block-drop-zone/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,17 +257,24 @@ export function isDropTargetValid(

// Work out if dragged blocks have an allowed parent and if so
// check target block matches the allowed parent.
const draggedBlockTypes = draggedBlockNames.map( ( name ) =>
getBlockType( name )
);
const draggedBlockTypes = draggedBlockNames.map( ( name ) => {
const blockType = getBlockType( name );
return {
name,
parent: blockType.parent || [],
};
} );
const targetMatchesDraggedBlockParents = draggedBlockTypes.every(
( block ) => {
const [ firstParent ] = draggedBlockTypes[ 0 ]?.parent || [];
const [ allowedParentName ] = block?.parent || [];
if ( ! allowedParentName ) {
if ( ! firstParent && ! allowedParentName ) {
return true;
}

return allowedParentName === targetBlockName;
return (
firstParent === allowedParentName ||
allowedParentName === targetBlockName
);
}
);

Expand Down
Loading