From 4e9ba271593f4b8b90b6ba25c566b7b36d2d4ce8 Mon Sep 17 00:00:00 2001 From: Davy Wentworth Date: Tue, 15 Oct 2024 07:59:25 -0700 Subject: [PATCH 1/2] Use ctrl as meta key for 'find next' behavior. --- client/app/readerprototype/components/ReaderSearchBar.jsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/client/app/readerprototype/components/ReaderSearchBar.jsx b/client/app/readerprototype/components/ReaderSearchBar.jsx index 725d5f4b565..41d45a84539 100644 --- a/client/app/readerprototype/components/ReaderSearchBar.jsx +++ b/client/app/readerprototype/components/ReaderSearchBar.jsx @@ -58,7 +58,9 @@ const ReaderSearchBar = () => { // handle keyboard control of search results useEffect(() => { const keyHandler = (event) => { - if (event.metaKey && event.code === 'KeyG') { + const metaKey = navigator.appVersion.includes('Win') ? 'ctrlKey' : 'metaKey'; + + if (metaKey && event.code === 'KeyG') { event.preventDefault(); if (event.shiftKey) { previous(); From bc175887332b48dfd227ac5048c5b8e0d1287c11 Mon Sep 17 00:00:00 2001 From: Davy Wentworth Date: Tue, 15 Oct 2024 09:03:04 -0700 Subject: [PATCH 2/2] Bugfix --- client/app/readerprototype/components/ReaderSearchBar.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/app/readerprototype/components/ReaderSearchBar.jsx b/client/app/readerprototype/components/ReaderSearchBar.jsx index 41d45a84539..c6685fd312d 100644 --- a/client/app/readerprototype/components/ReaderSearchBar.jsx +++ b/client/app/readerprototype/components/ReaderSearchBar.jsx @@ -60,7 +60,7 @@ const ReaderSearchBar = () => { const keyHandler = (event) => { const metaKey = navigator.appVersion.includes('Win') ? 'ctrlKey' : 'metaKey'; - if (metaKey && event.code === 'KeyG') { + if (event[metaKey] && event.code === 'KeyG') { event.preventDefault(); if (event.shiftKey) { previous();