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

Jump to bottom

Fix inserting link open editor in edit mode #5458

Merged
merged 6 commits into from
Jan 17, 2024
Merged

Fix inserting link open editor in edit mode #5458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5ca4d38
fix: make inserting link open editor in edit mode
2wheeh Jan 7, 2024
5755345
accordingly fix tests
2wheeh Jan 7, 2024
32ec9d3
revert floating one
2wheeh Jan 7, 2024
6ed8186
cover other tests
2wheeh Jan 7, 2024
c04fb58
cover copyandpaste
2wheeh Jan 7, 2024
5613e84
fix selection assertion
2wheeh Jan 7, 2024
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
1 change: 1 addition & 0 deletions packages/lexical-playground/__tests__/e2e/AutoLinks.spec.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ test.describe('Auto Links', () => {

await selectAll(page);
await click(page, '.link');
await click(page, '.link-confirm');

await assertHTML(
page,
Expand Down
11 changes: 6 additions & 5 deletions packages/lexical-playground/__tests__/e2e/CopyAndPaste/html/LinksHTMLCopyAndPaste.spec.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import {
assertSelection,
click,
copyToClipboard,
focus,
focusEditor,
html,
initialize,
Expand All @@ -42,7 +41,6 @@ test.describe('HTML Links CopyAndPaste', () => {
};

await pasteFromClipboard(page, clipboard);

await assertHTML(
page,
html`
Expand All @@ -66,6 +64,7 @@ test.describe('HTML Links CopyAndPaste', () => {

await selectAll(page);

// unlink
await click(page, '.link');

await assertHTML(
Expand All @@ -78,10 +77,8 @@ test.describe('HTML Links CopyAndPaste', () => {
);

await click(page, '.link');
await click(page, '.link-edit');
await focus(page, '.link-input');
await page.keyboard.type('facebook.com');
await page.keyboard.press('Enter');
await click(page, '.link-confirm');

await assertHTML(
page,
Expand Down Expand Up @@ -268,6 +265,7 @@ test.describe('HTML Links CopyAndPaste', () => {
await page.keyboard.type('Link text');
await selectAll(page);
await click(page, '.link');
await click(page, '.link-confirm');
await moveRight(page, 1);
await moveLeft(page, 4);

Expand Down Expand Up @@ -308,6 +306,7 @@ test.describe('HTML Links CopyAndPaste', () => {
await page.keyboard.type('Link text');
await selectAll(page);
await click(page, '.link');
await click(page, '.link-confirm');
await moveRight(page, 1);
await moveLeft(page, 4);

Expand Down Expand Up @@ -353,6 +352,7 @@ test.describe('HTML Links CopyAndPaste', () => {
await page.keyboard.type('Link text');
await selectAll(page);
await click(page, '.link');
await click(page, '.link-confirm');
await moveRight(page, 1);
await moveLeft(page, 4);

Expand Down Expand Up @@ -399,6 +399,7 @@ test.describe('HTML Links CopyAndPaste', () => {
await page.keyboard.type('Link text');
await selectAll(page);
await click(page, '.link');
await click(page, '.link-confirm');
await moveRight(page, 1);
await moveLeft(page, 4);

Expand Down
1 change: 1 addition & 0 deletions packages/lexical-playground/__tests__/e2e/CopyAndPaste/lexical/CopyAndPaste.spec.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -792,6 +792,7 @@ test.describe('CopyAndPaste', () => {
await page.keyboard.type('Hello');
await selectAll(page);
await click(page, '.link');
await click(page, '.link-confirm');
await page.keyboard.press('ArrowRight');
await page.keyboard.press('Space');
await page.keyboard.type('World');
Expand Down
55 changes: 50 additions & 5 deletions packages/lexical-playground/__tests__/e2e/Links.spec.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ test.describe('Links', () => {

// link
await click(page, '.link');
await click(page, '.link-confirm');

await assertHTML(
page,
Expand Down Expand Up @@ -191,6 +192,7 @@ test.describe('Links', () => {

// link
await click(page, '.link');
await click(page, '.link-confirm');

await assertHTML(
page,
Expand Down Expand Up @@ -311,6 +313,7 @@ test.describe('Links', () => {

// link
await click(page, '.link');
await click(page, '.link-confirm');

await assertHTML(
page,
Expand Down Expand Up @@ -378,6 +381,7 @@ test.describe('Links', () => {

// link
await click(page, '.link');
await click(page, '.link-confirm');

await moveLeft(page, 1);

Expand Down Expand Up @@ -432,6 +436,7 @@ test.describe('Links', () => {

// link
await click(page, '.link');
await click(page, '.link-confirm');

await assertHTML(
page,
Expand Down Expand Up @@ -522,6 +527,7 @@ test.describe('Links', () => {

// link
await click(page, '.link');
await click(page, '.link-confirm');

await assertHTML(
page,
Expand Down Expand Up @@ -565,6 +571,7 @@ test.describe('Links', () => {

// link
await click(page, '.link');
await click(page, '.link-confirm');

await selectCharacters(page, 'left', 1);
await page.keyboard.type('a');
Expand Down Expand Up @@ -592,6 +599,7 @@ test.describe('Links', () => {

// link
await click(page, '.link');
await click(page, '.link-confirm');

await selectCharacters(page, 'right', 1);
await page.keyboard.type('a');
Expand Down Expand Up @@ -654,6 +662,7 @@ test.describe('Links', () => {
await moveLeft(page, 'b'.length);
await selectCharacters(page, 'left', 1);
await click(page, '.link');
await click(page, '.link-confirm');

// Insert a character directly before the link
await moveLeft(page, 1);
Expand Down Expand Up @@ -730,6 +739,7 @@ test.describe('Links', () => {
await moveLeft(page, 1);
await selectCharacters(page, 'left', 1);
await click(page, '.link');
await click(page, '.link-confirm');

// Insert a character directly before the link
await moveLeft(page, 1);
Expand Down Expand Up @@ -803,6 +813,7 @@ test.describe('Links', () => {
// Turn 'b' into a link
await selectCharacters(page, 'left', 1);
await click(page, '.link');
await click(page, '.link-confirm');

// Insert a character directly before the link
await moveLeft(page, 1);
Expand Down Expand Up @@ -880,6 +891,7 @@ test.describe('Links', () => {
await moveLeft(page, 'b'.length);
await selectCharacters(page, 'left', 1);
await click(page, '.link');
await click(page, '.link-confirm');

// Insert a character directly after the link
await moveRight(page, 1);
Expand Down Expand Up @@ -955,6 +967,7 @@ test.describe('Links', () => {
await moveLeft(page, 1);
await selectCharacters(page, 'left', 1);
await click(page, '.link');
await click(page, '.link-confirm');

// Insert a character directly after the link
await moveRight(page, 1);
Expand Down Expand Up @@ -1030,6 +1043,7 @@ test.describe('Links', () => {
// Turn 'b' into a link
await selectCharacters(page, 'left', 1);
await click(page, '.link');
await click(page, '.link-confirm');

// Insert a character directly after the link
await moveRight(page, 1);
Expand Down Expand Up @@ -1157,6 +1171,7 @@ test.describe('Links', () => {

// link
await click(page, '.link');
await click(page, '.link-confirm');

await assertHTML(
page,
Expand Down Expand Up @@ -1237,6 +1252,7 @@ test.describe('Links', () => {

// Make it a link
await click(page, '.link');
await click(page, '.link-confirm');

await assertHTML(
page,
Expand Down Expand Up @@ -1330,6 +1346,7 @@ test.describe('Links', () => {

// Make it a link
await click(page, '.link');
await click(page, '.link-confirm');

await assertHTML(
page,
Expand Down Expand Up @@ -1420,6 +1437,8 @@ test.describe('Links', () => {
await selectAll(page);

await click(page, '.link');
await click(page, '.link-confirm');

await assertHTML(
page,
`<p
Expand Down Expand Up @@ -1470,6 +1489,8 @@ test.describe('Links', () => {
);

await click(page, '.link');
await click(page, '.link-confirm');

await assertHTML(
page,
html`
Expand Down Expand Up @@ -1534,6 +1555,8 @@ test.describe('Links', () => {

await selectCharacters(page, 'left', 'Awesome Website'.length);
await click(page, '.link');
await click(page, '.link-confirm');

await assertHTML(
page,
`
Expand Down Expand Up @@ -1602,6 +1625,7 @@ test.describe('Links', () => {

// link
await click(page, '.link');
await click(page, '.link-confirm');

await assertHTML(
page,
Expand Down Expand Up @@ -1629,8 +1653,8 @@ test.describe('Links', () => {
});
} else {
await assertSelection(page, {
anchorOffset: 6,
anchorPath: [0, 0, 0],
anchorOffset: 0,
anchorPath: [0, 1],
focusOffset: 5,
focusPath: [0, 1, 0, 0],
});
Expand Down Expand Up @@ -1666,7 +1690,7 @@ test.describe('Links', () => {
} else {
await assertSelection(page, {
anchorOffset: 0,
anchorPath: [0, 1],
anchorPath: [0, 1, 0, 0],
focusOffset: 5,
focusPath: [0, 1, 0, 0],
});
Expand Down Expand Up @@ -1716,6 +1740,7 @@ test.describe('Links', () => {

// link
await click(page, '.link');
await click(page, '.link-confirm');

await assertHTML(
page,
Expand All @@ -1742,13 +1767,20 @@ test.describe('Links', () => {
focusOffset: 0,
focusPath: [0, 1, 0, 0],
});
} else {
} else if (browserName === 'chromium') {
await assertSelection(page, {
anchorOffset: 5,
anchorPath: [0, 1, 0, 0],
focusOffset: 6,
focusPath: [0, 0, 0],
});
} else {
await assertSelection(page, {
anchorOffset: 5,
anchorPath: [0, 1, 0, 0],
focusOffset: 0,
focusPath: [0, 1],
});
}

await setURL(page, 'facebook.com');
Expand Down Expand Up @@ -1778,13 +1810,20 @@ test.describe('Links', () => {
focusOffset: 0,
focusPath: [0, 1, 0, 0],
});
} else {
} else if (browserName === 'chromium') {
await assertSelection(page, {
anchorOffset: 5,
anchorPath: [0, 1, 0, 0],
focusOffset: 0,
focusPath: [0, 1],
});
} else {
await assertSelection(page, {
anchorOffset: 5,
anchorPath: [0, 1, 0, 0],
focusOffset: 0,
focusPath: [0, 1, 0, 0],
});
}

// unlink
Expand Down Expand Up @@ -1819,6 +1858,7 @@ test.describe('Links', () => {
await selectCharacters(page, 'left', 5);

await click(page, '.link');
await click(page, '.link-confirm');

await assertHTML(
page,
Expand Down Expand Up @@ -1873,6 +1913,7 @@ test.describe('Links', () => {
await selectAll(page);

await click(page, '.link');
await click(page, '.link-confirm');

await assertHTML(
page,
Expand Down Expand Up @@ -1903,6 +1944,7 @@ test.describe('Links', () => {
await page.keyboard.type('Hello awesome');
await selectAll(page);
await click(page, '.link');
await click(page, '.link-confirm');
await page.keyboard.press('ArrowRight');
await page.keyboard.type('world');

Expand Down Expand Up @@ -1944,6 +1986,7 @@ test.describe('Links', () => {
await page.keyboard.type('some');
await selectAll(page);
await click(page, '.link');
await click(page, '.link-confirm');
await page.keyboard.press('ArrowRight');
await page.keyboard.type(' world');

Expand Down Expand Up @@ -1980,6 +2023,7 @@ test.describe('Links', () => {
await page.keyboard.type('Hello awesome');
await selectAll(page);
await click(page, '.link');
await click(page, '.link-confirm');
await page.keyboard.press('ArrowRight');
await page.keyboard.type(' world');

Expand Down Expand Up @@ -2011,6 +2055,7 @@ test.describe('Links', () => {
await page.keyboard.type('Hello awesome');
await selectAll(page);
await click(page, '.link');
await click(page, '.link-confirm');
await page.keyboard.press('ArrowRight');
await page.keyboard.type(' world');

Expand Down
2 changes: 2 additions & 0 deletions ...ges/lexical-playground/__tests__/regression/1083-backspace-with-element-at-front.spec.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ test.describe('Regression test #1083', () => {
await page.keyboard.type('Hello');
await selectAll(page);
await click(page, '.link');
await click(page, '.link-confirm');

await moveToLineEnd(page);
await page.keyboard.type('World');
Expand Down Expand Up @@ -77,6 +78,7 @@ test.describe('Regression test #1083', () => {
await page.keyboard.type('Hello');
await selectCharacters(page, 'left', 'Hello'.length);
await click(page, '.link');
await click(page, '.link-confirm');

await moveToLineEnd(page);
await page.keyboard.type('World');
Expand Down
Loading
Loading