From cd1e87fdfb0b3e1aff0d661dc77b680b133c11fe Mon Sep 17 00:00:00 2001 From: Jerryxin <578676562@qq.com> Date: Sat, 14 Sep 2024 13:59:24 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20support=20AZERTY=20Keyboards=20(Alt?= =?UTF-8?q?Gr=20+=20=C3=A0)=20@=20startMeasure=20(#277)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Mentions.tsx | 1 + tests/FullProcess.spec.tsx | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/src/Mentions.tsx b/src/Mentions.tsx index 24f5b8e..fc36916 100644 --- a/src/Mentions.tsx +++ b/src/Mentions.tsx @@ -394,6 +394,7 @@ const InternalMentions = forwardRef( if ( key === nextMeasurePrefix || key === 'Shift' || + key === 'Alt' || mergedMeasuring || (nextMeasureText !== mergedMeasureText && matchOption) ) { diff --git a/tests/FullProcess.spec.tsx b/tests/FullProcess.spec.tsx index 348d082..6b20d37 100644 --- a/tests/FullProcess.spec.tsx +++ b/tests/FullProcess.spec.tsx @@ -187,4 +187,24 @@ describe('Full Process', () => { expectMeasuring(container, false); }); + + it('AltGr + à startMeasure', () => { + const onChange = jest.fn(); + const { container } = createMentions({ onChange }); + simulateInput(container, '@'); + + // AZERTY Keyboards (AltGr + à) + fireEvent.keyUp(container.querySelector('textarea'), { + keyCode: KeyCode.ALT, + which: KeyCode.ALT, + }); + expectMeasuring(container); + + fireEvent.keyDown(container.querySelector('textarea'), { + keyCode: KeyCode.ENTER, + which: KeyCode.ENTER, + }); + + expect(onChange).toBeCalledWith('@bamboo '); + }); }); From 76cf919a2c374cd8f821ff7fe1b5ddd49b91954b Mon Sep 17 00:00:00 2001 From: Jerryxin <578676562@qq.com> Date: Sat, 14 Sep 2024 15:40:05 +0800 Subject: [PATCH 2/2] fix: compatible with alt and altGr (#281) --- src/Mentions.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Mentions.tsx b/src/Mentions.tsx index fc36916..b774bad 100644 --- a/src/Mentions.tsx +++ b/src/Mentions.tsx @@ -394,7 +394,7 @@ const InternalMentions = forwardRef( if ( key === nextMeasurePrefix || key === 'Shift' || - key === 'Alt' || + which === KeyCode.ALT || mergedMeasuring || (nextMeasureText !== mergedMeasureText && matchOption) ) {