Enable drag and drop in List View, fix performance issues #33320
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,125 @@ | ||
| /** | ||
| * WordPress dependencies | ||
| */ | ||
| import { Popover } from '@wordpress/components'; | ||
| import { useCallback, useMemo } from '@wordpress/element'; | ||
|
|
||
| export default function ListViewDropIndicator( { | ||
| listViewRef, | ||
| blockDropTarget, | ||
| } ) { | ||
| const { rootClientId, clientId, dropPosition } = blockDropTarget || {}; | ||
|
|
||
| const [ rootBlockElement, blockElement ] = useMemo( () => { | ||
| if ( ! listViewRef.current ) { | ||
| return []; | ||
| } | ||
|
|
||
| // The rootClientId will be defined whenever dropping into inner | ||
| // block lists, but is undefined when dropping at the root level. | ||
| const _rootBlockElement = rootClientId | ||
| ? listViewRef.current.querySelector( | ||
| `[data-block="${ rootClientId }"]` | ||
| ) | ||
| : undefined; | ||
|
|
||
| // The clientId represents the sibling block, the dragged block will | ||
| // usually be inserted adjacent to it. It will be undefined when | ||
| // dropping a block into an empty block list. | ||
| const _blockElement = clientId | ||
| ? listViewRef.current.querySelector( | ||
| `[data-block="${ clientId }"]` | ||
| ) | ||
| : undefined; | ||
|
|
||
| return [ _rootBlockElement, _blockElement ]; | ||
| }, [ rootClientId, clientId ] ); | ||
|
|
||
| // The targetElement is the element that the drop indicator will appear | ||
| // before or after. When dropping into an empty block list, blockElement | ||
| // is undefined, so the indicator will appear after the rootBlockElement. | ||
| const targetElement = blockElement || rootBlockElement; | ||
|
|
||
| const getDropIndicatorIndent = useCallback( () => { | ||
| if ( ! rootBlockElement ) { | ||
| return 0; | ||
| } | ||
|
|
||
| // Calculate the indent using the block icon of the root block. | ||
| // Using a classname selector here might be flaky and could be | ||
| // improved. | ||
| const targetElementRect = targetElement.getBoundingClientRect(); | ||
| const rootBlockIconElement = rootBlockElement.querySelector( | ||
| '.block-editor-block-icon' | ||
| ); | ||
| const rootBlockIconRect = rootBlockIconElement.getBoundingClientRect(); | ||
| return rootBlockIconRect.right - targetElementRect.left; | ||
| }, [ rootBlockElement, targetElement ] ); | ||
|
|
||
| const style = useMemo( () => { | ||
| if ( ! targetElement ) { | ||
| return {}; | ||
| } | ||
|
|
||
| const indent = getDropIndicatorIndent(); | ||
|
|
||
| return { | ||
| width: targetElement.offsetWidth - indent, | ||
| }; | ||
| }, [ getDropIndicatorIndent, targetElement ] ); | ||
|
|
||
| const getAnchorRect = useCallback( () => { | ||
| if ( ! targetElement ) { | ||
| return {}; | ||
| } | ||
|
|
||
| const ownerDocument = targetElement.ownerDocument; | ||
| const rect = targetElement.getBoundingClientRect(); | ||
| const indent = getDropIndicatorIndent(); | ||
|
|
||
| const anchorRect = { | ||
| left: rect.left + indent, | ||
| right: rect.right, | ||
| width: 0, | ||
| height: rect.height, | ||
| ownerDocument, | ||
| }; | ||
|
|
||
| if ( dropPosition === 'top' ) { | ||
| return { | ||
| ...anchorRect, | ||
| top: rect.top, | ||
| bottom: rect.top, | ||
| }; | ||
| } | ||
|
|
||
| if ( dropPosition === 'bottom' || dropPosition === 'inside' ) { | ||
| return { | ||
| ...anchorRect, | ||
| top: rect.bottom, | ||
| bottom: rect.bottom, | ||
| }; | ||
| } | ||
|
|
||
| return {}; | ||
| }, [ targetElement, dropPosition, getDropIndicatorIndent ] ); | ||
|
|
||
| if ( ! targetElement ) { | ||
| return null; | ||
| } | ||
|
|
||
| return ( | ||
| <Popover | ||
| noArrow | ||
| animate={ false } | ||
| getAnchorRect={ getAnchorRect } | ||
| focusOnMount={ false } | ||
| className="block-editor-list-view-drop-indicator" | ||
| > | ||
| <div | ||
| style={ style } | ||
| className="block-editor-list-view-drop-indicator__line" | ||
| /> | ||
| </Popover> | ||
| ); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The
elementIdprop seems to be dead code,Draggableignores it when__experimentalDragComponentis defined, andBlockDraggablehas that prop hard-coded just below this line.