Add key bindings to bookmark ambiguous modal (one tap modal) #2622

AndBible · Oct 12, 2023 · 194fe5a · 194fe5a
1 parent 0a57c36
commit 194fe5a
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/app/bibleview-js/src/components/AmbiguousActionButtons.vue b/app/bibleview-js/src/components/AmbiguousActionButtons.vue
@@ -57,6 +57,7 @@ import {useCommon} from "@/composables";
 import {androidKey, modalKey} from "@/types/constants";
 import {SelectionInfo} from "@/types/common";
 import {BibleModalButtonId, GenericModalButtonId} from "@/composables/config";
+import {setupDocumentEventListener} from "@/utils";
 
 const props = withDefaults(defineProps<{
     selectionInfo: SelectionInfo
@@ -136,6 +137,20 @@ function speak() {
     }
     closeModals()
 }
+
+setupDocumentEventListener("keydown", (e: KeyboardEvent) => {
+    if (e.key.toLowerCase() === "b") {
+        addBookmark();
+    } else if (e.key.toLowerCase() === "n") {
+        addNote();
+    } else if (e.code === "Space") {
+        speak();
+    } else {
+        return;
+    }
+    e.preventDefault()
+    e.stopPropagation()
+})
 </script>
 
 <style scoped lang="scss">

diff --git a/app/bibleview-js/src/components/modals/AmbiguousSelection.vue b/app/bibleview-js/src/components/modals/AmbiguousSelection.vue
@@ -355,10 +355,12 @@ function help() {
 
 setupDocumentEventListener("keydown", (e: KeyboardEvent) => {
     if (!showModal.value) return
-    if (e.key === "+") {
+    else if (e.key === "+") {
         multiSelectionButtonClicked()
+        e.preventDefault()
+        e.stopPropagation()
     }
-    if (e.ctrlKey && e.code === "KeyC") {
+    else if (e.ctrlKey && e.code === "KeyC") {
         if (selectionInfo.value?.verseInfo) {
             console.log("Ctrl + c pressed. Copying (book initial, start ordinal, end ordinal)", selectionInfo.value?.verseInfo.bookInitials, startOrdinal.value, endOrdinal.value)
             android.copyVerse(selectionInfo.value.verseInfo.bookInitials, startOrdinal.value!, endOrdinal.value!)