fix: tests

Author: huntabyte

tests/src/tests/dropdown-menu/dropdown-menu.browser.test.ts

@@ -58,8 +58,7 @@ async function openWithKbd(props: DropdownMenuSetupProps = {}, key: string = kbd
 
 async function openSubmenu(props: Awaited<ReturnType<typeof openWithKbd>>) {
 	const t = props;
-	await userEvent.keyboard(kbd.ARROW_DOWN);
-	await expect.element(page.getByTestId("sub-trigger")).toHaveFocus();
+	await focusSubTrigger();
 
 	await expectNotExists(t.getSubContent());
 	await userEvent.keyboard(kbd.ARROW_RIGHT);
@@ -71,6 +70,15 @@ async function openSubmenu(props: Awaited<ReturnType<typeof openWithKbd>>) {
 	};
 }
 
+async function focusSubTrigger(): Promise<void> {
+	const subtrigger = page.getByTestId("sub-trigger");
+	if (subtrigger.element() === document.activeElement) return;
+	await userEvent.keyboard(kbd.ARROW_DOWN);
+	if (subtrigger.element() === document.activeElement) return;
+	await userEvent.keyboard(kbd.ARROW_DOWN);
+	await expect.element(subtrigger).toHaveFocus();
+}
+
 afterEach(() => {
 	vi.resetAllMocks();
 });
@@ -145,9 +153,7 @@ it("should manage focus correctly when opened with keyboard", async () => {
 it("should open submenu with keyboard on subtrigger", async () => {
 	await openWithKbd();
 
-	await userEvent.keyboard(kbd.ARROW_DOWN);
-	const subtrigger = page.getByTestId("sub-trigger");
-	await expect.element(subtrigger).toHaveFocus();
+	await focusSubTrigger();
 	await expectNotExists(page.getByTestId("sub-content"));
 	await userEvent.keyboard(kbd.ARROW_RIGHT);
 	await expectExists(page.getByTestId("sub-content"));
@@ -201,8 +207,7 @@ it("should check the radio item when clicked & respects binding", async () => {
 it("should skip over disabled items when navigating with the keyboard", async () => {
 	await openWithKbd();
 	await expect.element(page.getByTestId("item")).toHaveFocus();
-	await userEvent.keyboard(kbd.ARROW_DOWN);
-	await expect.element(page.getByTestId("sub-trigger")).toHaveFocus();
+	await focusSubTrigger();
 	await userEvent.keyboard(kbd.ARROW_DOWN);
 	await expect.element(page.getByTestId("checkbox-item")).toHaveFocus();
 	await expect.element(page.getByTestId("disabled-item")).not.toHaveFocus();
@@ -215,8 +220,7 @@ it("should not loop through the menu items when the `loop` prop is set to false/
 			loop: false,
 		},
 	});
-	await userEvent.keyboard(kbd.ARROW_DOWN);
-	await expect.element(page.getByTestId("sub-trigger")).toHaveFocus();
+	await focusSubTrigger();
 	await userEvent.keyboard(kbd.ARROW_DOWN);
 	await expect.element(page.getByTestId("checkbox-item")).toHaveFocus();
 	await userEvent.keyboard(kbd.ARROW_DOWN);
@@ -235,8 +239,7 @@ it("should loop through the menu items when the `loop` prop is set to true", asy
 			loop: true,
 		},
 	});
-	await userEvent.keyboard(kbd.ARROW_DOWN);
-	await expect.element(page.getByTestId("sub-trigger")).toHaveFocus();
+	await focusSubTrigger();
 	await userEvent.keyboard(kbd.ARROW_DOWN);
 	await expect.element(page.getByTestId("checkbox-item")).toHaveFocus();
 	await userEvent.keyboard(kbd.ARROW_DOWN);