Skip to content
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

List Block: fix merging with indented list items #17845

Merged
merged 2 commits into from
Oct 9, 2019
Merged

List Block: fix merging with indented list items #17845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1174cc9
List Block: fix merging with indented list items
ellatrix Oct 8, 2019
78dab76
Fix forward merge
ellatrix Oct 8, 2019
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
17 changes: 14 additions & 3 deletions packages/block-editor/src/store/effects.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,14 @@ export default {
const selectedBlock = clientId === clientIdA ? cloneA : cloneB;
const html = selectedBlock.attributes[ attributeKey ];
const selectedBlockType = clientId === clientIdA ? blockAType : blockBType;
const multilineTag = selectedBlockType.attributes[ attributeKey ].multiline;
const {
multiline: multilineTag,
__unstableMultilineWrapperTags: multilineWrapperTags,
} = selectedBlockType.attributes[ attributeKey ];
const value = insert( create( {
html,
multilineTag,
multilineWrapperTags,
} ), START_OF_SELECTED_AREA, offset, offset );

selectedBlock.attributes[ attributeKey ] = toHTMLString( {
Expand Down Expand Up @@ -136,8 +140,15 @@ export default {
typeof v === 'string' && v.indexOf( START_OF_SELECTED_AREA ) !== -1
);
const convertedHtml = updatedAttributes[ newAttributeKey ];
const multilineTag = blockAType.attributes[ newAttributeKey ].multiline;
const convertedValue = create( { html: convertedHtml, multilineTag } );
const {
multiline: multilineTag,
__unstableMultilineWrapperTags: multilineWrapperTags,
} = blockAType.attributes[ newAttributeKey ];
const convertedValue = create( {
html: convertedHtml,
multilineTag,
multilineWrapperTags,
} );
const newOffset = convertedValue.text.indexOf( START_OF_SELECTED_AREA );
const newValue = remove( convertedValue, newOffset, newOffset + 1 );
const newHtml = toHTMLString( { value: newValue, multilineTag } );
Expand Down
1 change: 1 addition & 0 deletions packages/block-library/src/list/block.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"source": "html",
"selector": "ol,ul",
"multiline": "li",
"__unstableMultilineWrapperTags": [ "ol", "ul" ],
"default": ""
},
"start": {
Expand Down
12 changes: 12 additions & 0 deletions packages/e2e-tests/specs/blocks/__snapshots__/list.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,18 @@ exports[`List should place the caret in the right place with nested list 1`] = `
<!-- /wp:list -->"
`;

exports[`List should preserve indentation after merging backward and forward 1`] = `
"<!-- wp:list -->
<ul><li>1<ul><li>2</li><li>3</li></ul></li><li></li></ul>
<!-- /wp:list -->"
`;

exports[`List should preserve indentation after merging backward and forward 2`] = `
"<!-- wp:list -->
<ul><li>1<ul><li>2</li><li>3</li></ul></li></ul>
<!-- /wp:list -->"
`;

exports[`List should split indented list item 1`] = `
"<!-- wp:list -->
<ul><li>one<ul><li>two</li><li>three</li></ul></li></ul>
Expand Down
32 changes: 32 additions & 0 deletions packages/e2e-tests/specs/blocks/list.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,4 +446,36 @@ describe( 'List', () => {

expect( await getEditedPostContent() ).toMatchSnapshot();
} );

it( 'should preserve indentation after merging backward and forward', async () => {
await clickBlockAppender();

// Tests the shortcut with a non breaking space.
await page.keyboard.type( '* 1' );
await page.keyboard.press( 'Enter' );
await page.keyboard.press( 'Space' );
await page.keyboard.type( '2' );
await page.keyboard.press( 'Enter' );
await page.keyboard.type( '3' );

// Create a new paragraph.
await page.keyboard.press( 'Enter' );
await page.keyboard.press( 'Enter' );

// Merge the pragraph back. No list items should be joined.
await page.keyboard.press( 'Backspace' );

expect( await getEditedPostContent() ).toMatchSnapshot();

// Again create a new paragraph.
await page.keyboard.press( 'Enter' );

// Move to the end of the list.
await page.keyboard.press( 'ArrowLeft' );

// Merge forward. No list items should be joined.
await page.keyboard.press( 'Delete' );

expect( await getEditedPostContent() ).toMatchSnapshot();
} );
} );