Skip to content

List View: Allow dragging to all levels of the block hierarchy #49742

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

Merged
andrewserong merged 11 commits into from
May 2, 2023
Merged

List View: Allow dragging to all levels of the block hierarchy #49742

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
726fadb
List View: Allow drag to all levels of the block hierarchy
andrewserong Apr 12, 2023
332f754
Allow drag to root
andrewserong Apr 13, 2023
39d18c9
Partially fix block index for root blocks
andrewserong Apr 24, 2023
752bd70
Attempt to fix blockIndex value and accounting for the dragged blocks
andrewserong Apr 27, 2023
ea625d6
Rearrange things slightly, tidy up comments
andrewserong Apr 28, 2023
b444cc0
Remove no longer needed comment
andrewserong Apr 28, 2023
d7cab3c
Update tests
andrewserong Apr 28, 2023
41a1f9c
Add data-level to fix issue in Firefox
andrewserong May 1, 2023
ca8ec6d
Add missing comment
andrewserong May 1, 2023
5e9068c
Add comments to link hard-coded indentation level and CSS
andrewserong May 1, 2023
0e90f5d
Switch to getting aria-level by attribute instead of adding an extra …
andrewserong May 2, 2023
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
Prev Previous commit
Switch to getting aria-level by attribute instead of adding an extra … 
…data attribute
  • Loading branch information
@andrewserong
andrewserong committed May 2, 2023
commit 0e90f5d31eb8fafc8a6074e86199c30e3d223bf2
1 change: 0 additions & 1 deletion packages/block-editor/src/components/list-view/block.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,6 @@ function ListViewBlock( {
id={ `list-view-${ listViewInstanceId }-block-${ clientId }` }
data-block={ clientId }
data-expanded={ canExpand ? isExpanded : undefined }
data-level={ level }
ref={ rowRef }
>
<TreeGridCell
Expand Down
11 changes: 7 additions & 4 deletions packages/block-editor/src/components/list-view/use-list-view-drop-zone.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,9 +389,12 @@ export default function useListViewDropZone() {
const blocksData = blockElements.map( ( blockElement ) => {
const clientId = blockElement.dataset.block;
const isExpanded = blockElement.dataset.expanded === 'true';
const nestingLevel = blockElement.dataset.level
? parseInt( blockElement.dataset.level, 10 )
: undefined;

// Get nesting level from `aria-level` attribute because Firefox does not support `element.ariaLevel`.
const nestingLevel = parseInt(
blockElement.getAttribute( 'aria-level' ),
10
);
const rootClientId = getBlockRootClientId( clientId );

return {
Expand All @@ -400,7 +403,7 @@ export default function useListViewDropZone() {
rootClientId,
blockIndex: getBlockIndex( clientId ),
element: blockElement,
nestingLevel,
nestingLevel: nestingLevel || undefined,
isDraggedBlock: isBlockDrag
? draggedBlockClientIds.includes( clientId )
: false,
Expand Down