From 2e1426e945ec5b3162f883dc193d665e2f936e39 Mon Sep 17 00:00:00 2001
From: James Lyne <jim+github@not-null.co.uk>
Date: Fri, 28 May 2021 22:31:08 +0100
Subject: [PATCH] More generic keyboard event handling

---
 src/components/Sidebar.vue        | 38 ++----------------
 src/components/util/RadioList.vue | 32 +---------------
 src/util/events.ts                | 64 +++++++++++++++++++++++++++++++
 3 files changed, 69 insertions(+), 65 deletions(-)
 create mode 100644 src/util/events.ts

diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index 83ec278..e6d8779 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -50,6 +50,7 @@ import {MutationTypes} from "@/store/mutation-types";
 import "@/assets/icons/players.svg";
 import "@/assets/icons/maps.svg";
 import {nextTick} from "vue";
+import {handleKeyboardEvent} from "@/util/events";
 
 export default defineComponent({
 	components: {
@@ -113,41 +114,8 @@ export default defineComponent({
 				return;
 			}
 
-			const sectionHeadings: HTMLElement[] = Array.from(this.$el.querySelectorAll('.section__heading button')),
-				position = sectionHeadings.indexOf(e.target as HTMLElement);
-
-			if(position === -1) {
-				return;
-			}
-
-			let newPosition;
-
-			switch(e.key) {
-				case 'ArrowDown':
-					newPosition = position + 1;
-					break;
-				case 'ArrowUp':
-					newPosition = position - 1;
-					break;
-				case 'Home':
-					newPosition = 0;
-					break;
-				case 'End':
-					newPosition = sectionHeadings.length - 1;
-					break;
-				default:
-					return;
-			}
-
-			if(newPosition >= sectionHeadings.length) {
-				newPosition = 0
-			} else if(newPosition < 0) {
-				newPosition = sectionHeadings.length - 1;
-			}
-
-			e.preventDefault();
-			e.stopImmediatePropagation();
-			sectionHeadings[newPosition].focus();
+			const sectionHeadings: HTMLElement[] = Array.from(this.$el.querySelectorAll('.section__heading button'));
+			handleKeyboardEvent(e, sectionHeadings);
 		},
 		togglePlayers() {
 			useStore().commit(MutationTypes.TOGGLE_UI_ELEMENT_VISIBILITY, 'players');
diff --git a/src/components/util/RadioList.vue b/src/components/util/RadioList.vue
index 2382bed..4ca2208 100644
--- a/src/components/util/RadioList.vue
+++ b/src/components/util/RadioList.vue
@@ -21,6 +21,7 @@
 
 <script lang="ts">
 import {defineComponent} from 'vue';
+import {handleKeyboardEvent} from "@/util/events";
 
 export default defineComponent({
 	name: 'RadioList',
@@ -30,36 +31,7 @@ export default defineComponent({
 
 	methods: {
 		onKeydown(e: KeyboardEvent) {
-			if(e.key === 'ArrowUp' || e.key === 'ArrowDown' || e.key === 'ArrowLeft' || e.key === 'ArrowRight') {
-				const fieldset = e.currentTarget as HTMLFieldSetElement,
-					position = Array.from(fieldset.elements).indexOf(e.target as HTMLElement);
-
-				if(position < 0) {
-					return;
-				}
-
-				let newPosition = (e.key === 'ArrowUp' || e.key === 'ArrowLeft') ? position - 1 : position + 1;
-
-				if(newPosition < 0) {
-					newPosition = fieldset.elements.length - 1;
-				} else if (newPosition >= fieldset.elements.length) {
-					newPosition = 0;
-				}
-
-				(fieldset.elements[newPosition] as HTMLElement).focus();
-				e.preventDefault();
-			} else if(e.key === 'Enter') {
-				if(e.target instanceof HTMLInputElement && e.target.type === 'radio') {
-					const mouseEvent = new MouseEvent('click', {
-						ctrlKey: e.ctrlKey,
-						shiftKey: e.shiftKey,
-						metaKey: e.metaKey,
-						altKey: e.altKey,
-					});
-
-					e.target.dispatchEvent(mouseEvent);
-				}
-			}
+			handleKeyboardEvent(e, Array.from((e.currentTarget as HTMLFieldSetElement).elements) as HTMLElement[])
 		}
 	}
 });
diff --git a/src/util/events.ts b/src/util/events.ts
new file mode 100644
index 0000000..bcb0b78
--- /dev/null
+++ b/src/util/events.ts
@@ -0,0 +1,64 @@
+const navigationKeys = new Set<string>([
+	'ArrowUp',
+	'ArrowDown',
+	'ArrowLeft',
+	'ArrowRight',
+	'Home',
+	'End'
+]);
+
+export const handleKeyboardEvent = (e: KeyboardEvent, elements: HTMLElement[]) => {
+	if(!e.target) {
+		return;
+	}
+
+	if(navigationKeys.has(e.key)) {
+		const position = elements.indexOf(e.target as HTMLElement);
+
+		if(position < 0) {
+			return;
+		}
+
+		let newPosition = position;
+
+		switch(e.key) {
+			case 'ArrowUp':
+			case 'ArrowLeft':
+				newPosition = position - 1;
+				break;
+
+			case 'ArrowDown':
+			case 'ArrowRight':
+				newPosition = position + 1;
+				break;
+
+			case 'Home':
+				newPosition = 0;
+				break;
+
+			case 'End':
+				newPosition = elements.length - 1;
+				break;
+		}
+
+		if(newPosition < 0) {
+			newPosition = elements.length - 1;
+		} else if(newPosition >= elements.length) {
+			newPosition = 0;
+		}
+
+		(elements[newPosition] as HTMLElement).focus();
+		e.preventDefault();
+	} else if(e.key === 'Enter' && e.target) {
+		const mouseEvent = new MouseEvent('click', {
+			ctrlKey: e.ctrlKey,
+			shiftKey: e.shiftKey,
+			metaKey: e.metaKey,
+			altKey: e.altKey,
+			bubbles: true,
+		});
+
+		e.target.dispatchEvent(mouseEvent);
+		e.preventDefault();
+	}
+}
\ No newline at end of file