From 5b6b2bbf916ec467c7dc330a57df74fc406a09d7 Mon Sep 17 00:00:00 2001 From: AdrianGonz97 <31664583+AdrianGonz97@users.noreply.github.com> Date: Mon, 1 Jul 2024 13:20:15 -0400 Subject: [PATCH] lets keep this synchronous --- packages/runed/src/lib/test/util.svelte.ts | 7 +++---- .../utilities/IsFocusWithin/IsFocusWithin.test.svelte.ts | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/packages/runed/src/lib/test/util.svelte.ts b/packages/runed/src/lib/test/util.svelte.ts index d9051758..9e20bef7 100644 --- 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) { @@ -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 index 3bc6255b..defea5f3 100644 --- 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"); });