Skip to content

List block: prevent error upon pasting when list is empty #43761

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
oandregal merged 3 commits into from
Sep 1, 2022
Merged

List block: prevent error upon pasting when list is empty #43761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a0ed01e
Prevent error when list is empty
oandregal Sep 1, 2022
aae4651
Add e2e test
oandregal Sep 1, 2022
3bb19c5
e2e test: switch back to normal editor when done
oandregal Sep 1, 2022
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
2 changes: 1 addition & 1 deletion packages/block-library/src/list/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export function createListBlockFromDOMElement( listElement ) {
const [ nestedList, ...nodes ] = children;

const hasNestedList =
nestedList.tagName === 'UL' || nestedList.tagName === 'OL';
nestedList?.tagName === 'UL' || nestedList?.tagName === 'OL';
Copy link
Member

@ellatrix ellatrix Sep 1, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Strange how there's no e2e test catching this. Should we add one to test migration from an empty list? How come the integration deprecation tests are passing?

Copy link
Member Author

@oandregal oandregal Sep 1, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pushed one at aae4651 (it fails without this fix).

if ( ! hasNestedList ) {
return createBlock( 'core/list-item', {
content: listItem.innerHTML,
Expand Down
5 changes: 5 additions & 0 deletions ...s/editor/blocks/__snapshots__/List-can-be-created-by-pasting-an-empty-list-1-chromium.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<!-- wp:list -->
<ul><!-- wp:list-item -->
<li></li>
<!-- /wp:list-item --></ul>
<!-- /wp:list -->
21 changes: 21 additions & 0 deletions test/e2e/specs/editor/blocks/list.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1132,4 +1132,25 @@ test.describe( 'List', () => {
<!-- /wp:list -->`
);
} );

test( 'can be created by pasting an empty list', async ( {
editor,
pageUtils,
} ) => {
// Open code editor
await pageUtils.pressKeyWithModifier( 'secondary', 'M' ); // Emulates CTRL+Shift+Alt + M => toggle code editor

// Paste empty list block
await pageUtils.setClipboardData( {
plainText:
'<!-- wp:list -->\n<ul><li></li></ul>\n<!-- /wp:list -->',
} );
await pageUtils.pressKeyWithModifier( 'primary', 'v' );

// Go back to normal editor
await pageUtils.pressKeyWithModifier( 'secondary', 'M' ); // Emulates CTRL+Shift+Alt + M => toggle code editor

// Verify no WSOD and content is proper.
expect( await editor.getEditedPostContent() ).toMatchSnapshot();
} );
} );