From 4092fe2b8a6d7cd162b7e5545f23e133f023f73a Mon Sep 17 00:00:00 2001 From: Dimitri POSTOLOV Date: Sat, 15 Apr 2023 01:35:51 +0200 Subject: [PATCH 1/3] replace rest of `event.keyCode` usages by `event.code` --- packages/graphiql-react/src/editor/header-editor.ts | 6 +++--- packages/graphiql-react/src/editor/variable-editor.ts | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/graphiql-react/src/editor/header-editor.ts b/packages/graphiql-react/src/editor/header-editor.ts index 19e8727c316..8fea2252564 100644 --- a/packages/graphiql-react/src/editor/header-editor.ts +++ b/packages/graphiql-react/src/editor/header-editor.ts @@ -96,9 +96,9 @@ export function useHeaderEditor( }); newEditor.on('keyup', (editorInstance, event) => { - const { keyCode, key, shiftKey } = event; - const isLetter = keyCode >= 65 && keyCode <= 90; - const isNumber = keyCode >= 48 && keyCode <= 57; + const { code, key, shiftKey } = event; + const isLetter = code.startsWith('Key'); + const isNumber = code.startsWith('Digit'); if (isLetter || (!shiftKey && isNumber) || key === '_' || key === '"') { editorInstance.execCommand('autocomplete'); } diff --git a/packages/graphiql-react/src/editor/variable-editor.ts b/packages/graphiql-react/src/editor/variable-editor.ts index d3c54ac995b..8c82d43995d 100644 --- a/packages/graphiql-react/src/editor/variable-editor.ts +++ b/packages/graphiql-react/src/editor/variable-editor.ts @@ -116,9 +116,9 @@ export function useVariableEditor( }); newEditor.on('keyup', (editorInstance, event) => { - const { keyCode, key, shiftKey } = event; - const isLetter = keyCode >= 65 && keyCode <= 90; - const isNumber = keyCode >= 48 && keyCode <= 57; + const { code, key, shiftKey } = event; + const isLetter = code.startsWith('Key'); + const isNumber = code.startsWith('Digit'); if (isLetter || (!shiftKey && isNumber) || key === '_' || key === '"') { editorInstance.execCommand('autocomplete'); } From 3fdbfddddeac5351b99bb980920a49070c2bbb4d Mon Sep 17 00:00:00 2001 From: Dimitri POSTOLOV Date: Mon, 17 Apr 2023 17:01:14 +0200 Subject: [PATCH 2/3] Apply suggestions from code review --- packages/graphiql-react/src/editor/header-editor.ts | 4 ++-- packages/graphiql-react/src/editor/variable-editor.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/graphiql-react/src/editor/header-editor.ts b/packages/graphiql-react/src/editor/header-editor.ts index 8fea2252564..db700f56fea 100644 --- a/packages/graphiql-react/src/editor/header-editor.ts +++ b/packages/graphiql-react/src/editor/header-editor.ts @@ -98,8 +98,8 @@ export function useHeaderEditor( newEditor.on('keyup', (editorInstance, event) => { const { code, key, shiftKey } = event; const isLetter = code.startsWith('Key'); - const isNumber = code.startsWith('Digit'); - if (isLetter || (!shiftKey && isNumber) || key === '_' || key === '"') { + const isNumber = !shiftKey && code.startsWith('Digit'); + if (isLetter || isNumber || key === '_' || key === '"') { editorInstance.execCommand('autocomplete'); } }); diff --git a/packages/graphiql-react/src/editor/variable-editor.ts b/packages/graphiql-react/src/editor/variable-editor.ts index 8c82d43995d..2213c383e27 100644 --- a/packages/graphiql-react/src/editor/variable-editor.ts +++ b/packages/graphiql-react/src/editor/variable-editor.ts @@ -118,8 +118,8 @@ export function useVariableEditor( newEditor.on('keyup', (editorInstance, event) => { const { code, key, shiftKey } = event; const isLetter = code.startsWith('Key'); - const isNumber = code.startsWith('Digit'); - if (isLetter || (!shiftKey && isNumber) || key === '_' || key === '"') { + const isNumber = !shiftKey && code.startsWith('Digit'); + if (isLetter || isNumber || key === '_' || key === '"') { editorInstance.execCommand('autocomplete'); } }); From 1daa04e3d2e2bc1268c589e41b95549ab84e2c89 Mon Sep 17 00:00:00 2001 From: Dimitri POSTOLOV Date: Sat, 27 May 2023 22:54:37 +0200 Subject: [PATCH 3/3] Create shaggy-chairs-explode.md --- .changeset/shaggy-chairs-explode.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/shaggy-chairs-explode.md diff --git a/.changeset/shaggy-chairs-explode.md b/.changeset/shaggy-chairs-explode.md new file mode 100644 index 00000000000..f93b7c5ebf9 --- /dev/null +++ b/.changeset/shaggy-chairs-explode.md @@ -0,0 +1,5 @@ +--- +'@graphiql/react': patch +--- + +replace rest of `event.keyCode` usages by `event.code`