Skip to content

RichText: fix arrow navigation around emoji #30206

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
ellatrix merged 3 commits into from
Mar 25, 2021
Merged

RichText: fix arrow navigation around emoji #30206

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
ef3c89e
RichText: fix arrow navaround emoji
ellatrix Mar 24, 2021
e291bcb
Add e2e test
ellatrix Mar 24, 2021
463b5fb
Fix e2e issue
ellatrix Mar 25, 2021
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
6 changes: 6 additions & 0 deletions packages/e2e-tests/specs/editor/various/__snapshots__/rich-text.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,12 @@ exports[`RichText should make bold after split and merge 1`] = `
<!-- /wp:paragraph -->"
`;

exports[`RichText should navigate arround emoji 1`] = `
"<!-- wp:paragraph -->
<p>1🍓</p>
<!-- /wp:paragraph -->"
`;

exports[`RichText should not format text after code backtick 1`] = `
"<!-- wp:paragraph -->
<p>A <code>backtick</code> and more.</p>
Expand Down
12 changes: 12 additions & 0 deletions packages/e2e-tests/specs/editor/various/rich-text.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,4 +415,16 @@ describe( 'RichText', () => {

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

it( 'should navigate arround emoji', async () => {
await clickBlockAppender();
await page.keyboard.type( '🍓' );
// Only one press on arrow left should be required to move in front of
// the emoji.
await page.keyboard.press( 'ArrowLeft' );
await page.keyboard.type( '1' );

// Expect '1🍓'.
expect( await getEditedPostContent() ).toMatchSnapshot();
} );
} );
32 changes: 12 additions & 20 deletions packages/rich-text/src/component/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,9 +605,6 @@ function RichText(
return;
}

// In all other cases, prevent default behaviour.
event.preventDefault();

const formatsBefore = formats[ start - 1 ] || EMPTY_ACTIVE_FORMATS;
const formatsAfter = formats[ start ] || EMPTY_ACTIVE_FORMATS;

Expand Down Expand Up @@ -650,30 +647,22 @@ function RichText(
}
}

if ( newActiveFormatsLength !== currentActiveFormats.length ) {
const newActiveFormats = source.slice( 0, newActiveFormatsLength );
const newValue = {
...record.current,
activeFormats: newActiveFormats,
};
record.current = newValue;
applyRecord( newValue );
setActiveFormats( newActiveFormats );
if ( newActiveFormatsLength === currentActiveFormats.length ) {
record.current._newActiveFormats = isReverse
? formatsBefore
: formatsAfter;
return;
}

const newPos = start + ( isReverse ? -1 : 1 );
const newActiveFormats = isReverse ? formatsBefore : formatsAfter;
event.preventDefault();

const newActiveFormats = source.slice( 0, newActiveFormatsLength );
const newValue = {
...record.current,
start: newPos,
end: newPos,
activeFormats: newActiveFormats,
};

record.current = newValue;
applyRecord( newValue );
onSelectionChange( newPos, newPos );
setActiveFormats( newActiveFormats );
}

Expand Down Expand Up @@ -860,8 +849,11 @@ function RichText(
...oldRecord,
start,
end,
// Allow `getActiveFormats` to get new `activeFormats`.
activeFormats: undefined,
// _newActiveFormats may be set on arrow key navigation to control
// the right boundary position. If undefined, getActiveFormats will
// give the active formats according to the browser.
activeFormats: oldRecord._newActiveFormats,
_newActiveFormats: undefined,
};

const newActiveFormats = getActiveFormats(
Expand Down