lets keep this synchronous

svecosystem · Jul 1, 2024 · 5b6b2bb · 5b6b2bb
1 parent 5c45e57
commit 5b6b2bb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/packages/runed/src/lib/test/util.svelte.ts b/packages/runed/src/lib/test/util.svelte.ts
@@ -1,4 +1,4 @@
-import { tick } from "svelte";
+import { flushSync } from "svelte";
 import { test, vi } from "vitest";
 
 export function testWithEffect(name: string, fn: () => void | Promise<void>) {
@@ -24,9 +24,8 @@ export function vitestSetTimeoutWrapper(fn: () => void, timeout: number) {
 	vi.advanceTimersByTime(timeout);
 }
 
-export async function focus(node: HTMLElement | null | undefined) {
+export function focus(node: HTMLElement | null | undefined) {
 	if (node) {
-		node.focus();
-		await tick();
+		flushSync(() => node.focus());
 	}
 }
diff --git a/packages/runed/src/lib/utilities/IsFocusWithin/IsFocusWithin.test.svelte.ts b/packages/runed/src/lib/utilities/IsFocusWithin/IsFocusWithin.test.svelte.ts
@@ -33,7 +33,7 @@ describe("IsFocusWithin", () => {
 		expect(current).toHaveTextContent("false");
 		await user.click(input);
 		expect(current).toHaveTextContent("true");
-		await focus(submit);
+		focus(submit);
 		expect(submit).toHaveFocus();
 		expect(current).toHaveTextContent("true");
 	});
@@ -42,7 +42,7 @@ describe("IsFocusWithin", () => {
 		const { user, input, current, outside } = setup();
 		await user.click(input);
 		expect(current).toHaveTextContent("true");
-		await focus(outside);
+		focus(outside);
 		expect(outside).toHaveFocus();
 		expect(current).toHaveTextContent("false");
 	});