Lighter block DOM: put sibling inserter in popover #19456
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,74 +1,119 @@ | ||
| /** | ||
| * WordPress dependencies | ||
| */ | ||
| import { useSelect } from '@wordpress/data'; | ||
| import { useState } from '@wordpress/element'; | ||
| import { Popover } from '@wordpress/components'; | ||
|
|
||
| /** | ||
| * Internal dependencies | ||
| */ | ||
| import Inserter from '../inserter'; | ||
|
|
||
| function Indicator( { clientId } ) { | ||
| const showInsertionPoint = useSelect( ( select ) => { | ||
| const { | ||
| getBlockIndex, | ||
| getBlockInsertionPoint, | ||
| isBlockInsertionPointVisible, | ||
| getBlockRootClientId, | ||
| } = select( 'core/block-editor' ); | ||
| const rootClientId = getBlockRootClientId( clientId ); | ||
| const blockIndex = getBlockIndex( clientId, rootClientId ); | ||
| const insertionPoint = getBlockInsertionPoint(); | ||
| return ( | ||
| isBlockInsertionPointVisible() && | ||
| insertionPoint.index === blockIndex && | ||
| insertionPoint.rootClientId === rootClientId | ||
| ); | ||
| }, [ clientId ] ); | ||
|
|
||
| if ( ! showInsertionPoint ) { | ||
| return null; | ||
| } | ||
|
|
||
| return <div className="block-editor-block-list__insertion-point-indicator" />; | ||
| } | ||
|
|
||
| export default function InsertionPoint( { | ||
| className, | ||
| isMultiSelecting, | ||
| selectedBlockClientId, | ||
| children, | ||
| } ) { | ||
| const [ isInserterShown, setIsInserterShown ] = useState( false ); | ||
| const [ isInserterForced, setIsInserterForced ] = useState( false ); | ||
| const [ inserterElement, setInserterElement ] = useState( null ); | ||
| const [ inserterClientId, setInserterClientId ] = useState( null ); | ||
|
|
||
| function onMouseMove( event ) { | ||
| if ( event.target.className !== className ) { | ||
| if ( isInserterShown ) { | ||
| setIsInserterShown( false ); | ||
| } | ||
| return; | ||
| } | ||
|
|
||
| const rect = event.target.getBoundingClientRect(); | ||
| const offset = event.clientY - rect.top; | ||
| const element = Array.from( event.target.children ).find( ( blockEl ) => { | ||
| return blockEl.offsetTop > offset; | ||
| } ); | ||
|
|
||
| if ( ! element ) { | ||
| return; | ||
| } | ||
|
|
||
| const clientId = element.id.slice( 'block-'.length ); | ||
|
|
||
| if ( ! clientId || clientId === selectedBlockClientId ) { | ||
| return; | ||
| } | ||
|
|
||
| const elementRect = element.getBoundingClientRect(); | ||
|
|
||
| if ( event.clientX > elementRect.right || event.clientX < elementRect.left ) { | ||
| if ( isInserterShown ) { | ||
| setIsInserterShown( false ); | ||
| } | ||
| return; | ||
| } | ||
|
|
||
| setIsInserterShown( true ); | ||
| setInserterElement( element ); | ||
| setInserterClientId( clientId ); | ||
|
Comment on lines
+82
to
+84
There was a problem hiding this comment. While it might not be too much an issue since There was a problem hiding this comment. Would it make much difference, you think? I thought the only thing we'd avoid is an extra function call. There was a problem hiding this comment.
It's hard to say. I'm not too sure what all React does internally to decide how to handle |
||
| } | ||
|
|
||
| return <> | ||
| { ! isMultiSelecting && ( isInserterShown || isInserterForced ) && <Popover | ||
| noArrow | ||
| animate={ false } | ||
| anchorRef={ inserterElement } | ||
| position="top right left" | ||
| focusOnMount={ false } | ||
| className="block-editor-block-list__block-popover" | ||
| __unstableSlotName="block-toolbar" | ||
| > | ||
| <div className="block-editor-block-list__insertion-point" style={ { width: inserterElement.offsetWidth } }> | ||
| <Indicator clientId={ inserterClientId } /> | ||
| <div | ||
| onFocus={ () => setIsInserterForced( true ) } | ||
| onBlur={ () => setIsInserterForced( false ) } | ||
| // While ideally it would be enough to capture the | ||
| // bubbling focus event from the Inserter, due to the | ||
| // characteristics of click focusing of `button`s in | ||
| // Firefox and Safari, it is not reliable. | ||
| // | ||
| // See: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/button#Clicking_and_focus | ||
| tabIndex={ -1 } | ||
| className="block-editor-block-list__insertion-point-inserter" | ||
| > | ||
| <Inserter clientId={ inserterClientId } /> | ||
| </div> | ||
| </div> | ||
| </Popover> } | ||
| <div onMouseMove={ ! isInserterForced && ! isMultiSelecting ? onMouseMove : undefined }> | ||
| { children } | ||
| </div> | ||
| </>; | ||
| } | ||
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
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.
What is this logic meant to be doing? It's quite unclear to me in reading this. A few inline comments or named utility functions could help clarify here.
FWIW, it raises some curiosity how reliable
classNameis here, whether that might hurt maintainability or interoperability (I know of at least a few Chrome extensions which apply classes to the live DOM, etc). Could be something whereevent.target.classList.containscould prove more durable.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.
Yeah, if we need to take into account outside changes to the class name, then checking with
containsis better. Even better would be to keep a list of all the reference check if it's included.