Hide focus race condition bug

Potentially described in #21
fregante · Feb 19, 2024 · b19e72c · b19e72c
1 parent c1b9715
commit b19e72c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/index.test.ts b/index.test.ts
@@ -76,7 +76,11 @@ function getState(field: HTMLElement) {
 }
 
 for (const type of ['textarea', 'input', 'contenteditable'] as const) {
-	test(`${type}: harness test`, t => {
+	test(`${type}: harness test`, async t => {
+		// Reset the document focus
+		(document.activeElement as HTMLElement)?.blur?.();
+		document.body.focus();
+
 		t.equal(getState(getField(type)), '|');
 		t.equal(getState(getField(type, '|')), '|');
 		t.equal(getState(getField(type, 'A|')), 'A|');

diff --git a/index.ts b/index.ts
@@ -15,8 +15,8 @@ function withFocus<T>(field: HTMLElement, callback: () => T): T {
 		field.focus();
 		return callback();
 	} finally {
+		field.blur(); // Supports `intialFocus === body`
 		if (initialFocus instanceof HTMLElement) {
-			field.blur(); // Supports `intialFocus === body`
 			initialFocus.focus();
 		}
 	}