Skip to content

Fix drag and drop indices when block list contains a style element #32776

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

Merged
talldan merged 3 commits into from
Jun 25, 2021
Merged

Fix drag and drop indices when block list contains a style element #32776

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
be391a9
Check for style elements
talldan Jun 17, 2021
e45fbcb
Use wp-block classname
talldan Jun 17, 2021
c31a9ba
Remove test that is no longer valid
talldan Jun 22, 2021
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
Prev Previous commit
Next Next commit
Use wp-block classname
  • Loading branch information
@talldan
talldan committed Jun 25, 2021
commit e45fbcbb6633fc9c75feb2a72ee7048fea28019a
10 changes: 2 additions & 8 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 @@ -43,11 +43,6 @@ export function getNearestBlockIndex( elements, position, orientation ) {
let candidateDistance;

elements.forEach( ( element, index ) => {
// Ensure the element is a block. It should have the `wp-block` class.
if ( ! element.classList.contains( 'wp-block' ) ) {
return;
}

const rect = element.getBoundingClientRect();
const [ distance, edge ] = getDistanceToNearestEdge(
position,
Expand Down Expand Up @@ -106,9 +101,8 @@ export default function useBlockDropZone( {
const throttled = useThrottle(
useCallback( ( event, currentTarget ) => {
const blockElements = Array.from( currentTarget.children ).filter(
( element ) => {
return element.nodeName !== 'STYLE';
}
// Ensure the element is a block. It should have the `wp-block` class.
( element ) => element.classList.contains( 'wp-block' )
);
const targetIndex = getNearestBlockIndex(
blockElements,
Expand Down