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

Writing Flow: fix list selection (2) #19724

Closed
wants to merge 2 commits into from
Closed

Writing Flow: fix list selection (2) #19724

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
4d30890
Writing Flow: fix list selection
ellatrix Jan 17, 2020
a94402e
Add e2e test
ellatrix Jan 17, 2020
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
23 changes: 22 additions & 1 deletion packages/dom/src/dom.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,27 @@ function isSelectionForward( selection ) {
return true;
}

function normaliseRange( range ) {
range = range.cloneRange();

const { startContainer, startOffset } = range;

if (
startContainer.nodeType === startContainer.TEXT_NODE &&
startContainer.nodeValue.length === startOffset
) {
let element = startContainer;

while ( ! element.nextSibling ) {
element = element.parentNode;
}

range.setStart( element.nextSibling, 0 );
}

return range;
}

/**
* Check whether the selection is at the edge of the container. Checks for
* horizontal position by default. Set `onlyVertical` to true to check only
Expand Down Expand Up @@ -93,7 +114,7 @@ function isEdge( container, isReverse, onlyVertical ) {
return false;
}

const range = selection.getRangeAt( 0 ).cloneRange();
const range = normaliseRange( selection.getRangeAt( 0 ) );
const isForward = isSelectionForward( selection );
const isCollapsed = selection.isCollapsed;

Expand Down
10 changes: 10 additions & 0 deletions packages/e2e-tests/specs/editor/various/__snapshots__/writing-flow.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,16 @@ exports[`Writing Flow Should navigate inner blocks with arrow keys 1`] = `
<!-- /wp:paragraph -->"
`;

exports[`Writing Flow should allow selecting entire list with longer last item 1`] = `
"<!-- wp:paragraph -->
<p>a</p>
<!-- /wp:paragraph -->

<!-- wp:list -->
<ul><li></li></ul>
<!-- /wp:list -->"
`;

exports[`Writing Flow should create valid paragraph blocks when rapidly pressing Enter 1`] = `
"<!-- wp:paragraph -->
<p></p>
Expand Down
17 changes: 17 additions & 0 deletions packages/e2e-tests/specs/editor/various/writing-flow.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,4 +440,21 @@ describe( 'Writing Flow', () => {

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

it( 'should allow selecting entire list with longer last item', async () => {
await page.keyboard.press( 'Enter' );
await page.keyboard.type( 'a' );
await page.keyboard.press( 'Enter' );
await page.keyboard.type( '* b' );
await page.keyboard.press( 'Enter' );
await page.keyboard.type( 'cd' );
await pressKeyWithModifier( 'shift', 'ArrowUp' );
await pressKeyWithModifier( 'shift', 'ArrowUp' );

// Ensure multi selection is not triggered and selection stays within
// the list.
await page.keyboard.press( 'Backspace' );

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