Try inserting blocks directly in empty grid cells #63108
+296
−82
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 |
|---|---|---|
|
|
@@ -15,9 +15,10 @@ import { __experimentalUseDropZone as useDropZone } from '@wordpress/compose'; | |
| */ | ||
| import { __unstableUseBlockElement as useBlockElement } from '../block-list/use-block-props/use-block-refs'; | ||
| import BlockPopoverCover from '../block-popover/cover'; | ||
| import { range, GridRect, getGridInfo, getComputedCSS } from './utils'; | ||
| import { store as blockEditorStore } from '../../store'; | ||
| import { useGetNumberOfBlocksBeforeCell } from './use-get-number-of-blocks-before-cell'; | ||
| import ButtonBlockAppender from '../button-block-appender'; | ||
|
|
||
| export function GridVisualizer( { clientId, contentRef, parentLayout } ) { | ||
| const isDistractionFree = useSelect( | ||
|
|
@@ -44,6 +45,28 @@ export function GridVisualizer( { clientId, contentRef, parentLayout } ) { | |
| ); | ||
| } | ||
|
|
||
| const checkIfCellOccupied = ( gridElement, column, row ) => { | ||
| const cell = Array.from( gridElement.children ).find( ( child ) => { | ||
|
There was a problem hiding this comment. Bit worried about performance here. We're iterating through the grid's children once per cell. So for a 16x16 grid with blocks in every cell that's An alternative approach might be to calculate I might try that if you don't mind me pushing to this branch. There was a problem hiding this comment. Sure, go ahead! There was a problem hiding this comment. I think the bug you're seeing with appender still appearing when a paragraph is added must happening in this function, because the There was a problem hiding this comment. How's this look? 9a626e3 Not very scientific but it feels a bit snappier to me clicking around. There was a problem hiding this comment. Hmmm, I'm seeing There was a problem hiding this comment. But the issue with the appender still rendering is fixed! And the code looks much neater |
||
| const [ columnStart, columnSpan ] = | ||
| getComputedCSS( child, 'grid-column' ).match( /\d+/g ) || []; | ||
| const [ rowStart, rowSpan ] = | ||
| getComputedCSS( child, 'grid-row' ).match( /\d+/g ) || []; | ||
| const columnEnd = columnSpan | ||
| ? parseInt( columnStart, 10 ) + parseInt( columnSpan, 10 ) - 1 | ||
| : columnStart; | ||
| const rowEnd = rowSpan | ||
| ? parseInt( rowStart, 10 ) + parseInt( rowSpan, 10 ) - 1 | ||
| : rowStart; | ||
| return ( | ||
| column >= columnStart && | ||
| column <= columnEnd && | ||
| row >= rowStart && | ||
| row <= rowEnd | ||
| ); | ||
| } ); | ||
| return cell !== undefined; | ||
| }; | ||
|
|
||
| const GridVisualizerGrid = forwardRef( | ||
| ( { clientId, gridElement, isManualGrid }, ref ) => { | ||
| const [ gridInfo, setGridInfo ] = useState( () => | ||
|
|
@@ -52,6 +75,17 @@ const GridVisualizerGrid = forwardRef( | |
| const [ isDroppingAllowed, setIsDroppingAllowed ] = useState( false ); | ||
| const [ highlightedRect, setHighlightedRect ] = useState( null ); | ||
|
|
||
| const { | ||
| updateBlockAttributes, | ||
| moveBlocksToPosition, | ||
| __unstableMarkNextChangeAsNotPersistent, | ||
| } = useDispatch( blockEditorStore ); | ||
|
|
||
| const getNumberOfBlocksBeforeCell = useGetNumberOfBlocksBeforeCell( | ||
| clientId, | ||
| gridInfo.numColumns | ||
| ); | ||
|
|
||
| useEffect( () => { | ||
| const observers = []; | ||
| for ( const element of [ gridElement, ...gridElement.children ] ) { | ||
|
|
@@ -99,25 +133,84 @@ const GridVisualizerGrid = forwardRef( | |
| { isManualGrid | ||
| ? range( 1, gridInfo.numRows ).map( ( row ) => | ||
| range( 1, gridInfo.numColumns ).map( | ||
| ( column ) => { | ||
| const isCellOccupied = | ||
| checkIfCellOccupied( | ||
| gridElement, | ||
| column, | ||
| row | ||
| ); | ||
| const isHighlighted = | ||
| highlightedRect?.contains( | ||
| column, | ||
| row | ||
| ) ?? false; | ||
| return ( | ||
| <GridVisualizerCell | ||
| key={ `${ row }-${ column }` } | ||
| color={ gridInfo.currentColor } | ||
| className={ | ||
| isHighlighted && | ||
| 'is-highlighted' | ||
| } | ||
| > | ||
| { isCellOccupied ? ( | ||
| <GridVisualizerDropZone | ||
| column={ column } | ||
| row={ row } | ||
| gridClientId={ | ||
| clientId | ||
| } | ||
| gridInfo={ gridInfo } | ||
| setHighlightedRect={ | ||
| setHighlightedRect | ||
| } | ||
| /> | ||
| ) : ( | ||
| <GridVisualizerAppender | ||
| column={ column } | ||
| row={ row } | ||
| gridClientId={ | ||
| clientId | ||
| } | ||
| gridInfo={ gridInfo } | ||
| setHighlightedRect={ | ||
| setHighlightedRect | ||
| } | ||
| onSelectCallback={ ( | ||
| block | ||
| ) => { | ||
| updateBlockAttributes( | ||
| block.clientId, | ||
| { | ||
| style: { | ||
| layout: { | ||
| columnStart: | ||
| column, | ||
| rowStart: | ||
| row, | ||
| }, | ||
| }, | ||
| } | ||
| ); | ||
| __unstableMarkNextChangeAsNotPersistent(); | ||
| moveBlocksToPosition( | ||
| [ | ||
| block.clientId, | ||
| ], | ||
| clientId, | ||
| clientId, | ||
| getNumberOfBlocksBeforeCell( | ||
| column, | ||
| row | ||
| ) | ||
| ); | ||
| } } | ||
|
There was a problem hiding this comment. I'd move this callback logic into |
||
| /> | ||
| ) } | ||
| </GridVisualizerCell> | ||
| ); | ||
| } | ||
| ) | ||
| ) | ||
| : Array.from( | ||
|
|
@@ -135,28 +228,32 @@ const GridVisualizerGrid = forwardRef( | |
| } | ||
| ); | ||
|
|
||
| function GridVisualizerCell( { color, children, className } ) { | ||
| return ( | ||
| <div | ||
| className={ clsx( | ||
| 'block-editor-grid-visualizer__cell', | ||
| className | ||
| ) } | ||
| style={ { | ||
| boxShadow: `inset 0 0 0 1px color-mix(in srgb, ${ color } 20%, #0000)`, | ||
| color, | ||
| } } | ||
| > | ||
| { children } | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| function useGridVisualizerDropZone( | ||
| column, | ||
| row, | ||
| gridClientId, | ||
| gridInfo, | ||
| setHighlightedRect | ||
| ) { | ||
| const { getBlockAttributes, getBlockRootClientId } = | ||
| useSelect( blockEditorStore ); | ||
| const { | ||
| updateBlockAttributes, | ||
| moveBlocksToPosition, | ||
|
|
@@ -168,7 +265,7 @@ function GridVisualizerDropZone( { | |
| gridInfo.numColumns | ||
| ); | ||
|
|
||
| return useDropZoneWithValidation( { | ||
| validateDrag( srcClientId ) { | ||
| const attributes = getBlockAttributes( srcClientId ); | ||
| const rect = new GridRect( { | ||
|
|
@@ -221,21 +318,58 @@ function GridVisualizerDropZone( { | |
| __unstableMarkNextChangeAsNotPersistent(); | ||
| moveBlocksToPosition( | ||
| [ srcClientId ], | ||
| getBlockRootClientId( srcClientId ), | ||
|
There was a problem hiding this comment. We need to allow blocks from outside the grid (so with a different rootClientId) to be dropped inside the grid too. |
||
| gridClientId, | ||
| getNumberOfBlocksBeforeCell( column, row ) | ||
| ); | ||
| }, | ||
| } ); | ||
| } | ||
|
|
||
| function GridVisualizerDropZone( { | ||
| column, | ||
| row, | ||
| gridClientId, | ||
| gridInfo, | ||
| setHighlightedRect, | ||
| } ) { | ||
| return ( | ||
| <div | ||
| className="block-editor-grid-visualizer__drop-zone" | ||
| ref={ useGridVisualizerDropZone( | ||
| column, | ||
| row, | ||
| gridClientId, | ||
| gridInfo, | ||
| setHighlightedRect | ||
| ) } | ||
| /> | ||
| ); | ||
| } | ||
|
|
||
| function GridVisualizerAppender( { | ||
| column, | ||
| row, | ||
| gridClientId, | ||
| gridInfo, | ||
| setHighlightedRect, | ||
| onSelectCallback, | ||
| } ) { | ||
| return ( | ||
| <ButtonBlockAppender | ||
| rootClientId={ gridClientId } | ||
| className="block-editor-grid-visualizer__appender" | ||
| ref={ useGridVisualizerDropZone( | ||
| column, | ||
| row, | ||
| gridClientId, | ||
| gridInfo, | ||
| setHighlightedRect | ||
| ) } | ||
| style={ { | ||
| color: gridInfo.currentColor, | ||
| } } | ||
| onSelectCallback={ onSelectCallback } | ||
| /> | ||
| ); | ||
| } | ||
|
|
||
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.
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.
Is the
Callbacksuffix necessary? Theonprefix already hints that it's a function so I'd simply call thisonSelect.