Skip to content

Commit

Permalink
Update: Simplify code and use capture events instead of pointer event…
Browse files Browse the repository at this point in the history
…s hack. (#59565)

Co-authored-by: jorgefilipecosta <jorgefilipecosta@git.wordpress.org>
  • Loading branch information
jorgefilipecosta and jorgefilipecosta committed Mar 4, 2024
1 parent 4ec760f commit aa523a3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 13 deletions.
3 changes: 0 additions & 3 deletions packages/dataviews/src/style.scss
Expand Up @@ -507,9 +507,6 @@
margin-left: $grid-unit-10;
}

.dataviews-view-grid__card.has-no-pointer-events * {
pointer-events: none;
}
.dataviews-filter-summary__popover {
.components-popover__content {
width: 230px;
Expand Down
13 changes: 3 additions & 10 deletions packages/dataviews/src/view-grid.js
Expand Up @@ -15,7 +15,6 @@ import {
} from '@wordpress/components';
import { __ } from '@wordpress/i18n';
import { useAsyncList } from '@wordpress/compose';
import { useState } from '@wordpress/element';

/**
* Internal dependencies
Expand All @@ -36,7 +35,6 @@ function GridItem( {
primaryField,
visibleFields,
} ) {
const [ hasNoPointerEvents, setHasNoPointerEvents ] = useState( false );
const hasBulkAction = useHasAPossibleBulkAction( actions, item );
const id = getItemId( item );
const isSelected = selection.includes( id );
Expand All @@ -46,11 +44,11 @@ function GridItem( {
key={ id }
className={ classnames( 'dataviews-view-grid__card', {
'is-selected': hasBulkAction && isSelected,
'has-no-pointer-events': hasNoPointerEvents,
} ) }
onMouseDown={ ( event ) => {
onClickCapture={ ( event ) => {
if ( hasBulkAction && ( event.ctrlKey || event.metaKey ) ) {
setHasNoPointerEvents( true );
event.stopPropagation();
event.preventDefault();
if ( ! isSelected ) {
onSelectionChange(
data.filter( ( _item ) => {
Expand All @@ -74,11 +72,6 @@ function GridItem( {
}
}
} }
onClick={ () => {
if ( hasNoPointerEvents ) {
setHasNoPointerEvents( false );
}
} }
>
<div className="dataviews-view-grid__media">
{ mediaField?.render( { item } ) }
Expand Down

0 comments on commit aa523a3

Please sign in to comment.