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

Fix selection clearer ref passed to motion.div #31469

Merged
merged 1 commit into from
May 4, 2021
Merged

Fix selection clearer ref passed to motion.div #31469

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
20 changes: 8 additions & 12 deletions packages/block-editor/src/components/block-selection-clearer/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,18 @@ import { useRefEffect } from '@wordpress/compose';
import { store as blockEditorStore } from '../../store';

export function useBlockSelectionClearer( onlySelfClicks = false ) {
const hasSelection = useSelect( ( select ) => {
const { hasSelectedBlock, hasMultiSelection } = select(
blockEditorStore
);

return hasSelectedBlock() || hasMultiSelection();
} );
const { hasSelectedBlock, hasMultiSelection } = useSelect(
blockEditorStore
);
const { clearSelectedBlock } = useDispatch( blockEditorStore );

return useRefEffect(
( node ) => {
if ( ! hasSelection ) {
return;
}

function onMouseDown( event ) {
if ( ! hasSelectedBlock() && ! hasMultiSelection() ) {
return;
}

// Only handle clicks on the canvas, not the content.
if (
event.target.closest( '.wp-block' ) ||
Expand All @@ -43,7 +39,7 @@ export function useBlockSelectionClearer( onlySelfClicks = false ) {
node.removeEventListener( 'mousedown', onMouseDown );
};
},
[ hasSelection, clearSelectedBlock ]
[ hasSelectedBlock, hasMultiSelection, clearSelectedBlock ]
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Of course a change in these dependencies won't do anything, but they should remain content anyway. Not sure if we should pass it through useMergeRefs after all.

);
}

Expand Down