From 8f41d1d0b21504171dbd96d4f1e6794f239d88b2 Mon Sep 17 00:00:00 2001 From: v0ltis Date: Wed, 27 Dec 2023 13:04:26 +0100 Subject: [PATCH 1/3] Chevron now support every keyboard disposition, instead of QWERTY --- src/components/MacrosMenu/MacrosMenu.jsx | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/components/MacrosMenu/MacrosMenu.jsx b/src/components/MacrosMenu/MacrosMenu.jsx index 3509827b..655978b4 100644 --- a/src/components/MacrosMenu/MacrosMenu.jsx +++ b/src/components/MacrosMenu/MacrosMenu.jsx @@ -64,9 +64,14 @@ function MacrosMenu({ visibility, fullVisibility }) { const handleKeypress = e => { if (!allowedModes.get('Chevron').has(mode)) return + // If the shift key is pressed if (e.shiftKey) { - for (const macro of pinnedMacros) { - if (e.code === macro.key) { + + // For every macro if not null + for (const macro of pinnedMacros.filter(m => m.key)) { + // Support of all keyboards by using the key instead of the code + // Supporting "keyX" or "X" in the config + case insensitive + if (e.key.toUpperCase() === macro.key || ("key" + e.key).toUpperCase() === macro.key.toUpperCase()) { activateCard(macro) break } From d188b71766fe5bbefd0ffc6741273932b11e7f7c Mon Sep 17 00:00:00 2001 From: v0ltis Date: Wed, 27 Dec 2023 13:04:26 +0100 Subject: [PATCH 2/3] Chevron now support every keyboard disposition, instead of QWERTY --- src/components/MacrosMenu/MacrosMenu.jsx | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/components/MacrosMenu/MacrosMenu.jsx b/src/components/MacrosMenu/MacrosMenu.jsx index 3509827b..ef34aa39 100644 --- a/src/components/MacrosMenu/MacrosMenu.jsx +++ b/src/components/MacrosMenu/MacrosMenu.jsx @@ -64,9 +64,14 @@ function MacrosMenu({ visibility, fullVisibility }) { const handleKeypress = e => { if (!allowedModes.get('Chevron').has(mode)) return + // If the shift key is pressed if (e.shiftKey) { - for (const macro of pinnedMacros) { - if (e.code === macro.key) { + + // For every macro if not null + for (const macro of pinnedMacros.filter(m => m.key)) { + // Support of all keyboards by using the key instead of the code + // Supporting "keyX" or "X" in the config + case insensitive + if (e.key.toUpperCase() === macro.key.toUpperCase() || ("key" + e.key).toUpperCase() === macro.key.toUpperCase()) { activateCard(macro) break } From eb232c12a7439423ba5ab9e3bc5a0e1313400f68 Mon Sep 17 00:00:00 2001 From: v0ltis Date: Wed, 27 Dec 2023 13:46:55 +0100 Subject: [PATCH 3/3] Merge remote-tracking branch 'origin/master' # Conflicts: # src/components/MacrosMenu/MacrosMenu.jsx --- src/components/MacrosMenu/MacrosMenu.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/MacrosMenu/MacrosMenu.jsx b/src/components/MacrosMenu/MacrosMenu.jsx index 655978b4..ef34aa39 100644 --- a/src/components/MacrosMenu/MacrosMenu.jsx +++ b/src/components/MacrosMenu/MacrosMenu.jsx @@ -71,7 +71,7 @@ function MacrosMenu({ visibility, fullVisibility }) { for (const macro of pinnedMacros.filter(m => m.key)) { // Support of all keyboards by using the key instead of the code // Supporting "keyX" or "X" in the config + case insensitive - if (e.key.toUpperCase() === macro.key || ("key" + e.key).toUpperCase() === macro.key.toUpperCase()) { + if (e.key.toUpperCase() === macro.key.toUpperCase() || ("key" + e.key).toUpperCase() === macro.key.toUpperCase()) { activateCard(macro) break }