Merge pull request #322 from open-source-labs/dev

fix: keydown listener was not returning properly when input elements were focused
open-source-labs · May 3, 2023 · 6f53df1 · 6f53df1
2 parents 3be9a3d + d4cbe75
commit 6f53df1
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 11 deletions.
diff --git a/src/lib/containers/Graph/Graph.svelte b/src/lib/containers/Graph/Graph.svelte
@@ -333,17 +333,15 @@
 
 	function handleKeyDown(e: KeyboardEvent) {
 		const { key, code } = e;
-
+		const target = e.target as HTMLElement;
 		// We dont want to prevent users from refreshing the page
+		// Or interacting with inputs
 		if (code === 'KeyR' && e.metaKey) return;
-
-		const target = e.target as HTMLElement;
+		if (target.tagName == 'INPUT' || target.tagName == 'TEXTAREA') return;
 
 		//Otherwise we prevent default keydown behavior
-		if (target.tagName !== 'INPUT' && target.tagName !== 'TEXTAREA') {
-			e.preventDefault();
-		}
 
+		e.preventDefault();
 		if (code === 'KeyA' && e[`${modifier}Key`]) {
 			const unlockedNodes = graph.nodes.getAll().filter((node) => !get(node.locked));
 			$selected = new Set(unlockedNodes);

diff --git a/tests/inputs/test.ts b/tests/inputs/test.ts
@@ -5,6 +5,7 @@ const testRoute = '/inputs';
 test('inputs can be interacted with', async ({ page }) => {
 	await page.goto(testRoute);
 
+	// Grab the input elements for testing
 	const textField = page.locator('#text-test');
 	const checkBox = page.locator('#checkbox-test');
 
@@ -20,8 +21,10 @@ test('inputs can be interacted with', async ({ page }) => {
 	await textField.press('B');
 	await textField.press('C');
 
+	// Chcek that the value has changed
 	await expect(textField).toHaveValue('TestABC');
 
+	// Clear the input
 	await textField.press('Backspace');
 	await textField.press('Backspace');
 	await textField.press('Backspace');
@@ -31,22 +34,47 @@ test('inputs can be interacted with', async ({ page }) => {
 	await textField.press('Backspace');
 	await textField.press('Backspace');
 
+	// Check that it was cleared
+	await expect(textField).toHaveValue('');
+
 	await textField.press('1');
 	await textField.press('Space');
 	await textField.press('2');
 
 	await expect(textField).toHaveValue('1 2');
 
-	// Select the checkbox element
-	const checkbox = await page.$('#checkbox-test');
-	if (!checkbox) throw new Error('Checkbox not found');
+	if (!checkBox) throw new Error('Checkbox not found');
 	// Check if the checkbox is checked
-	const isChecked = await checkbox.isChecked();
+	const isChecked = await checkBox.isChecked();
 	await expect(isChecked).toBe(true);
 	// Click the checkbox
 	await checkBox.click();
 
-	const isNowChecked = await checkbox.isChecked();
+	const isNowChecked = await checkBox.isChecked();
+
 	// Check the current value of the chebox
 	await expect(isNowChecked).toBe(false);
+
+	// Grab the graph element
+	const graphWrapper = page.locator('.svelvet-graph-wrapper');
+
+	// Check the transforms
+	await expect(graphWrapper).toHaveAttribute('style', 'transform: translate(0px, 0px) scale(1);');
+
+	// These commands should not affect the graph
+	await textField.press('=');
+	await textField.press('=');
+	await textField.press('=');
+
+	await expect(graphWrapper).toHaveAttribute('style', 'transform: translate(0px, 0px) scale(1);');
+
+	await textField.press('-');
+	await textField.press('-');
+
+	await expect(graphWrapper).toHaveAttribute('style', 'transform: translate(0px, 0px) scale(1);');
+
+	await textField.press('0');
+	await textField.press('0');
+
+	await expect(graphWrapper).toHaveAttribute('style', 'transform: translate(0px, 0px) scale(1);');
 });