peter
b4a6569d0d
- SelectTrigger lays its toolbar value out as a row; the saved-view chip passes its glyph and modified dot through the icon/trailing slots (an <svg> is display:block and broke the chip in two). - One Escape in a dialog's open list closed the list AND the dialog: the list's close flushes synchronously and pops its layer before the dialog's window listener runs. takeEscape() is the one close-on-Escape test (topmost AND not yet taken); Modal, the Welcome lightbox and useLayer use it, and keymap.dispatch ignores a taken Escape. - /watch: the Download sits on the toolbar rung, level with the Repeat chip.
73 lines
3.0 KiB
TypeScript
73 lines
3.0 KiB
TypeScript
// @vitest-environment jsdom
|
|
//
|
|
// "Manage views…" opens a dialog from a menu row, so it must close the menu FIRST and open the dialog
|
|
// on a fresh task (`closeThenAct`): the menu's focus return, queued as it unmounts, otherwise takes the
|
|
// dialog's focus back to the trigger behind its scrim — measured in Chrome on ActionMenu (E11 S2), and
|
|
// this row was the sibling that fix missed (deep-review E11 round 1). jsdom does not run that focus
|
|
// race, so the ORDER is what is pinned: the menu is gone before the dialog is asked to open.
|
|
import { beforeAll, describe, expect, it, vi } from "vitest";
|
|
import { fireEvent, render, screen } from "@testing-library/react";
|
|
import { FloatingTree } from "@floating-ui/react";
|
|
|
|
const openModal = vi.fn();
|
|
vi.mock("react-i18next", async (importOriginal) => {
|
|
const actual = await importOriginal<typeof import("react-i18next")>();
|
|
return { ...actual, useTranslation: () => ({ t: (key: string) => key }) };
|
|
});
|
|
vi.mock("./savedViewsContext", () => ({
|
|
useSavedViews: () => ({ views: [], activeViewId: null, apply: vi.fn(), openModal }),
|
|
}));
|
|
|
|
import SavedViewsPopover from "./SavedViewsPopover";
|
|
|
|
beforeAll(() => {
|
|
class Stub {
|
|
observe() {}
|
|
unobserve() {}
|
|
disconnect() {}
|
|
takeRecords() {
|
|
return [];
|
|
}
|
|
}
|
|
globalThis.ResizeObserver ??= Stub as unknown as typeof ResizeObserver;
|
|
globalThis.IntersectionObserver ??= Stub as unknown as typeof IntersectionObserver;
|
|
});
|
|
|
|
describe("SavedViewsPopover · Manage views…", () => {
|
|
it("closes the menu first, then opens the dialog once", async () => {
|
|
render(
|
|
<FloatingTree>
|
|
<SavedViewsPopover trigger="views" ariaLabel="Saved views" />
|
|
</FloatingTree>,
|
|
);
|
|
fireEvent.click(screen.getByRole("button", { name: "Saved views" }));
|
|
// floating-ui never positions in jsdom, so the surface stays visibility:hidden and the row has no
|
|
// accessible name to query by: find it by its text.
|
|
fireEvent.click(screen.getByText("views.manage"));
|
|
expect(screen.queryByRole("menuitem", { hidden: true })).toBeNull();
|
|
expect(openModal).not.toHaveBeenCalled();
|
|
await vi.waitFor(() => expect(openModal).toHaveBeenCalledTimes(1));
|
|
});
|
|
});
|
|
|
|
// E28: the toolbar chip's glyph sat INSIDE the value text, and an <svg> is display:block under the
|
|
// preflight, so the chip broke onto two lines (the bookmark above "gaming ▾"). The glyph and the
|
|
// modified dot ride in the trigger's own slots; the value is a row.
|
|
describe("SavedViewsPopover · toolbar chip", () => {
|
|
it("puts the glyph in the trigger's icon slot, not inside the value", () => {
|
|
render(
|
|
<FloatingTree>
|
|
<SavedViewsPopover
|
|
toolbar
|
|
icon={<svg data-testid="glyph" />}
|
|
trigger={<span>gaming</span>}
|
|
ariaLabel="View chip"
|
|
/>
|
|
</FloatingTree>,
|
|
);
|
|
const button = screen.getByRole("button", { name: "View chip" });
|
|
expect(screen.getByTestId("glyph").parentElement).toBe(button);
|
|
expect(screen.getByText("gaming").parentElement!.className).toContain("flex");
|
|
});
|
|
});
|