Offline, privacy-first grammar checker. Fast, open-source, Rust-powered
fix(chrome-ext): Applying suggestions duplicates text in WhatsApp Web Lexical editor (#2563)
David Raphid7d08cad4642
diff --git a/packages/chrome-plugin/tests/lexical.spec.ts b/packages/chrome-plugin/tests/lexical.spec.tsindex 8baf7947e..f087c5a6a 100644--- a/packages/chrome-plugin/tests/lexical.spec.ts+++ b/packages/chrome-plugin/tests/lexical.spec.ts@@ -23,10 +23,17 @@ test('Can apply basic suggestion.', async ({ page }) => {await page.waitForTimeout(3000);await expect(lexical).toContainText('This is a test');- await lexical.press('Control+ArrowDown');- await lexical.pressSequentially(" of Harper's grammar checking.");- await expect(lexical).toContainText("This is a test of Harper's grammar checking.");+ // Verify editor state is preserved: arrow keys and backspace must work.+ await lexical.press('End');+ await lexical.press('ArrowLeft');+ await lexical.press('ArrowLeft');+ await lexical.press('Backspace');+ await expect(lexical).toContainText('This is a tst');++ // Verify typing still works.+ await lexical.pressSequentially('e');+ await expect(lexical).toContainText('This is a test');});test('Can ignore suggestion.', async ({ page }) => {diff --git a/packages/chrome-plugin/tests/lexical_webcomponent.spec.ts b/packages/chrome-plugin/tests/lexical_webcomponent.spec.tsindex 81a5fa5d0..ade11c1df 100644--- a/packages/chrome-plugin/tests/lexical_webcomponent.spec.ts+++ b/packages/chrome-plugin/tests/lexical_webcomponent.spec.ts@@ -45,5 +45,14 @@ test.describe('Lexical webcomponent regression', () => {const lexicalText = (await lexical.textContent()) ?? '';const mirrorText = (await mirror.textContent()) ?? '';expect(lexicalText.trim()).toBe(mirrorText.trim());++ // Verify editor state is preserved: arrow keys and backspace must work.+ await lexical.press('End');+ await lexical.press('Backspace');+ await expect(lexical).toContainText('This is a test. This is a test again');++ // Verify typing still works.+ await lexical.pressSequentially('.');+ await expect(lexical).toContainText('This is a test. This is a test again.');});});diff --git a/packages/chrome-plugin/tests/pages/lexical_webcomponent.html b/packages/chrome-plugin/tests/pages/lexical_webcomponent.htmlindex bfe8aee0c..fe9ca9f7f 100644--- a/packages/chrome-plugin/tests/pages/lexical_webcomponent.html+++ b/packages/chrome-plugin/tests/pages/lexical_webcomponent.html@@ -43,6 +43,20 @@if (mirror) mirror.textContent = editor.textContent ?? '';};+ // Simulates WhatsApp's Lexical: tracks cursor internally, ignores programmatic selection+ let internalCursorPosition = 0;++ editor.addEventListener('click', () => {+ const sel = window.getSelection();+ if (sel && sel.rangeCount > 0) {+ const range = sel.getRangeAt(0);+ const preRange = document.createRange();+ preRange.selectNodeContents(editor);+ preRange.setEnd(range.startContainer, range.startOffset);+ internalCursorPosition = preRange.toString().length;+ }+ });+editor.addEventListener('beforeinput', (event) => {if (event.isTrusted === false &&@@ -54,7 +68,12 @@// in response to synthetic beforeinput events emitted by our// extension when a suggestion is accepted.setTimeout(() => {- editor.textContent = `${event.data}\n`;+ const currentText = editor.textContent ?? '';+ const newText =+ currentText.slice(0, internalCursorPosition) ++ event.data ++ currentText.slice(internalCursorPosition);+ editor.textContent = newText;syncMirror();}, 0);}diff --git a/packages/lint-framework/src/lint/computeLintBoxes.ts b/packages/lint-framework/src/lint/computeLintBoxes.tsindex 1c7d78747..c159b164e 100644--- a/packages/lint-framework/src/lint/computeLintBoxes.ts+++ b/packages/lint-framework/src/lint/computeLintBoxes.ts@@ -91,14 +91,14 @@ function replaceValue() {if (isFormEl(el)) {replaceFormElementValue(el as HTMLTextAreaElement | HTMLInputElement, value);- } else if (getLexicalRoot(el) != null) {- replaceLexicalValue(el, value);- } else if (getSlateRoot(el) != null && span && replacementText !== undefined) {- replaceSlateValue(el, span, replacementText);- } else if (getCkEditorRoot(el) != null && span && replacementText !== undefined) {- replaceSlateValue(el, span, replacementText);- } else if (getDraftRoot(el) != null && span && replacementText !== undefined) {- replaceDraftJsValue(el, span, replacementText);+ } else if (getLexicalRoot(el) != null && span && replacementText !== undefined) {+ replaceLexicalValue(el, span, replacementText);+ } else if (+ (getSlateRoot(el) != null || getCkEditorRoot(el) != null || getDraftRoot(el) != null) &&+ span &&+ replacementText !== undefined+ ) {+ replaceRichTextEditorValue(el, span, replacementText);} else {replaceGenericContentEditable(el, value);}@@ -112,47 +112,21 @@ function replaceFormElementValue(el: HTMLTextAreaElement | HTMLInputElement, valel.dispatchEvent(new InputEvent('input', { bubbles: true }));}-function replaceLexicalValue(el: HTMLElement, value: string) {- // Select all text- const range = el.ownerDocument!.createRange();- if (el.nodeType === Node.TEXT_NODE) {- const len = (el as unknown as Text).data.length;- range.setStart(el, 0);- range.setEnd(el, len);- } else {- range.selectNodeContents(el);- }- const sel = el.ownerDocument!.defaultView!.getSelection();- sel?.removeAllRanges();- sel?.addRange(range);-- // Insert new text- const evInit: InputEventInit = {- bubbles: true,- cancelable: true,- inputType: 'insertText',- data: value,- };-- if ('StaticRange' in self && 'getTargetRanges' in InputEvent.prototype) {- if (sel?.rangeCount) evInit.targetRanges = [new StaticRange(sel.getRangeAt(0))];- }+function replaceLexicalValue(+ el: HTMLElement,+ span: { start: number; end: number },+ replacementText: string,+) {+ const setup = selectSpanInEditor(el, span);+ if (!setup) return;- el.dispatchEvent(new InputEvent('beforeinput', evInit));- if (getEditorText(el) === value) {- return;- }+ const { doc, sel, range } = setup;- el.dispatchEvent(new InputEvent('textInput', evInit));- if (getEditorText(el) === value) {- return;- }+ // Direct DOM replacement+ replaceTextInRange(doc, sel, range, replacementText);- setTimeout(() => {- if (getEditorText(el) !== value) {- el.textContent = value;- }- }, 0);+ // Notify+ el.dispatchEvent(new InputEvent('input', { bubbles: true, cancelable: false }));}function selectSpanInEditor(el: HTMLElement, span: { start: number; end: number }) {@@ -173,10 +147,10 @@ function selectSpanInEditor(el: HTMLElement, span: { start: number; end: numbersel.removeAllRanges();sel.addRange(range);- return { doc, range };+ return { doc, sel, range };}-function replaceDraftJsValue(+function replaceRichTextEditorValue(el: HTMLElement,span: { start: number; end: number },replacementText: string,@@ -184,23 +158,12 @@ function replaceDraftJsValue(const setup = selectSpanInEditor(el, span);if (!setup) return;- setup.doc.execCommand('insertText', false, replacementText);-}--function replaceSlateValue(- el: HTMLElement,- span: { start: number; end: number },- replacementText: string,-) {- const setup = selectSpanInEditor(el, span);- if (!setup) return;-- const { doc, range } = setup;+ const { doc, sel, range } = setup;const evInit: InputEventInit = {bubbles: true,cancelable: true,- inputType: 'insertText',+ inputType: 'insertReplacementText',data: replacementText,};@@ -212,7 +175,44 @@ function replaceSlateValue(el.dispatchEvent(beforeEvt);if (!beforeEvt.defaultPrevented) {- doc.execCommand('insertText', false, replacementText);+ replaceTextInRange(doc, sel, range, replacementText);+ el.dispatchEvent(new InputEvent('input', { bubbles: true, cancelable: false }));+ }+}++function replaceTextInRange(doc: Document, sel: Selection, range: Range, replacementText: string) {+ const startContainer = range.startContainer;+ const endContainer = range.endContainer;++ if (startContainer === endContainer && startContainer.nodeType === Node.TEXT_NODE) {+ const textNode = startContainer as Text;+ const startOffset = range.startOffset;+ const endOffset = range.endOffset;++ const oldText = textNode.textContent || '';+ const newText =+ oldText.substring(0, startOffset) + replacementText + oldText.substring(endOffset);++ textNode.textContent = newText;++ // Set cursor after replacement+ const newRange = doc.createRange();+ const cursorPosition = startOffset + replacementText.length;+ newRange.setStart(textNode, cursorPosition);+ newRange.setEnd(textNode, cursorPosition);+ sel.removeAllRanges();+ sel.addRange(newRange);+ } else {+ // Multi node range fallback+ range.deleteContents();+ const textNode = doc.createTextNode(replacementText);+ range.insertNode(textNode);++ const newRange = doc.createRange();+ newRange.setStartAfter(textNode);+ newRange.setEndAfter(textNode);+ sel.removeAllRanges();+ sel.addRange(newRange);}}@@ -221,12 +221,3 @@ function replaceGenericContentEditable(el: HTMLElement, value: string) {el.dispatchEvent(new InputEvent('beforeinput', { bubbles: true, data: value }));el.dispatchEvent(new InputEvent('input', { bubbles: true }));}--function getEditorText(el: HTMLElement): string {- const text = el.textContent ?? '';- return normalizeEditorText(text);-}--function normalizeEditorText(text: string): string {- return text.replace(/\u200b/g, '').replace(/[\n\r]+$/g, '');-}