diff --git a/explorer/src/views/explore/ReposView.svelte b/explorer/src/views/explore/ReposView.svelte index 53e686b39..c718509da 100644 --- a/explorer/src/views/explore/ReposView.svelte +++ b/explorer/src/views/explore/ReposView.svelte @@ -104,7 +104,9 @@ gap: 0.25rem; } .breadcrumb :global(a:hover) { - color: var(--color-text-brand); + text-decoration: underline; + text-decoration-thickness: 1px; + text-underline-offset: 2px; } .breadcrumb-current { color: var(--color-text-secondary); diff --git a/explorer/src/views/explore/SeedPicker.svelte b/explorer/src/views/explore/SeedPicker.svelte index 323795c75..e662d081a 100644 --- a/explorer/src/views/explore/SeedPicker.svelte +++ b/explorer/src/views/explore/SeedPicker.svelte @@ -33,6 +33,7 @@ import DropdownListItem from "@app/components/DropdownList/DropdownListItem.svelte"; import Icon from "@app/components/Icon.svelte"; import IconButton from "@app/components/IconButton.svelte"; + import Link from "@app/components/Link.svelte"; import Popover from "@app/components/Popover.svelte"; import TextInput from "@app/components/TextInput.svelte"; @@ -47,9 +48,14 @@ // Where the picker sits. A breadcrumb sits on the left of the header, so // its popover is anchored to the toggle's left edge instead of its right. export let variant: "header" | "breadcrumb" | "panel" = "header"; + // Splits the toggle: the hostname links to the node page, and a separate + // chevron opens the picker. + export let nodeLink = false; const VALIDATION_TIMEOUT_MS = 10000; + let chevron: HTMLButtonElement | undefined = undefined; + // The httpd version of the seed serving the current page, if explorer no // longer supports it. Only the node picker names that seed. $: outdatedVersion = @@ -226,6 +232,7 @@ function handleEscape(event: KeyboardEvent) { if (expanded && event.key === "Escape") { closeFocused(); + chevron?.focus(); } } @@ -252,6 +259,35 @@ background-color: var(--color-surface-mid); color: var(--color-text-primary); } + .split { + display: flex; + align-items: center; + gap: 0.25rem; + padding-left: 0.5rem; + } + .node-link { + display: flex; + align-items: center; + gap: 0.375rem; + max-width: 14rem; + padding: 0.375rem 0; + color: var(--color-text-primary); + } + .chevron { + display: flex; + align-items: center; + background: transparent; + border: none; + padding: 0.25rem; + border-radius: var(--border-radius-sm); + color: var(--color-text-tertiary); + cursor: pointer; + } + .chevron:hover, + .chevron[aria-expanded="true"] { + background-color: var(--color-surface-mid); + color: var(--color-text-primary); + } .hostname { font: var(--txt-body-m-regular); } @@ -283,6 +319,22 @@ align-items: center; gap: 0.125rem; } + .hover-action { + display: flex; + opacity: 0; + } + /* Hover the whole dropdown row, not just .item, which sits inside the + row's padding. */ + :global(:hover) > .item .hover-action, + :global(:focus-visible) > .item .hover-action, + .hover-action:focus-within { + opacity: 1; + } + @media (hover: none) { + .hover-action { + opacity: 1; + } + } .add-new-row { padding: 0.25rem 0.25rem 0 0.25rem; } @@ -325,35 +377,70 @@ popoverFullWidthOnMobile={variant === "breadcrumb"} popoverPadding="0.25rem" popoverBorderRadius="var(--border-radius-md)"> -
e.key === "Enter" && toggle()} - role="button" - tabindex="0" - aria-haspopup="dialog" - aria-expanded={expanded}> - -
{baseUrl.hostname}
- {#await outdatedVersion then version} - {#if version !== undefined} - - - - {/if} - {/await} - {#if variant !== "breadcrumb"} - + + {#if nodeLink} +
+ + + + {baseUrl.hostname} + + + {#await outdatedVersion then version} + {#if version !== undefined} + + + + {/if} + {/await} + +
+ {:else} +
e.key === "Enter" && toggle()} + role="button" + tabindex="0" + aria-haspopup="dialog" + aria-expanded={expanded}> + +
{baseUrl.hostname}
+ {#await outdatedVersion then version} + {#if version !== undefined} + + + + {/if} + {/await} + {#if variant !== "breadcrumb"} + + {/if} +
{/if} -
+
@@ -375,20 +462,27 @@ {/if}
- openNodeView(item)}> - - + {#if !nodeLink} + + openNodeView(item)}> + + + + {/if} {#if isBookmarked(item, $bookmarkedSeeds)} - removeBookmark(item)}> - - + + removeBookmark(item)}> + + + {:else} {/if} - openNodeView(item)}> - - + {#if !nodeLink} + + openNodeView(item)}> + + + + {/if}
diff --git a/explorer/src/views/nodes/View.svelte b/explorer/src/views/nodes/View.svelte index c47533850..60af12965 100644 --- a/explorer/src/views/nodes/View.svelte +++ b/explorer/src/views/nodes/View.svelte @@ -161,7 +161,7 @@ {baseUrl} mode="node" variant="breadcrumb" - ariaLabel="Current node selector" + nodeLink title="Switch the node serving this page"> diff --git a/explorer/src/views/repos/Layout.svelte b/explorer/src/views/repos/Layout.svelte index 16eb47433..dbbb8e6cd 100644 --- a/explorer/src/views/repos/Layout.svelte +++ b/explorer/src/views/repos/Layout.svelte @@ -99,13 +99,15 @@ gap: 0.375rem; } .node-crumb { - margin-right: -0.5rem; + margin-right: -0.25rem; } .repo-separator { display: flex; } .breadcrumb :global(a:hover) { - color: var(--color-text-brand); + text-decoration: underline; + text-decoration-thickness: 1px; + text-underline-offset: 2px; } @media (max-width: 719.98px) { .tab-bar { @@ -191,7 +193,7 @@ {baseUrl} mode="node" variant="breadcrumb" - ariaLabel="Current node selector" + nodeLink title="Switch the node serving this page"> - import Icon from "@app/components/Icon.svelte"; diff --git a/explorer/src/views/users/View.svelte b/explorer/src/views/users/View.svelte index f964e1a6d..6f6d08c46 100644 --- a/explorer/src/views/users/View.svelte +++ b/explorer/src/views/users/View.svelte @@ -78,7 +78,9 @@ gap: 0.25rem; } .breadcrumb :global(a:hover) { - color: var(--color-text-brand); + text-decoration: underline; + text-decoration-thickness: 1px; + text-underline-offset: 2px; } @@ -90,7 +92,7 @@ {baseUrl} mode="node" variant="breadcrumb" - ariaLabel="Current node selector" + nodeLink title="Switch the node serving this page"> diff --git a/explorer/tests/e2e/node.spec.ts b/explorer/tests/e2e/node.spec.ts index b021440d6..c587a489d 100644 --- a/explorer/tests/e2e/node.spec.ts +++ b/explorer/tests/e2e/node.spec.ts @@ -187,14 +187,35 @@ test("node can be switched from a repo the node doesn't have", async ({ ).toBeVisible(); }); -test("repo page shows the node selector in the header", async ({ page }) => { +test("repo page links the node name and shows the node selector", async ({ + page, +}) => { await page.goto(`/nodes/localhost/${sourceBrowsingRid}`, { waitUntil: "networkidle", }); - await expect( - page.getByRole("button", { name: "Current node selector" }), - ).toContainText("localhost"); + await expect(page.getByRole("link", { name: "localhost" })).toHaveAttribute( + "href", + "/nodes/localhost", + ); + await expect(page.getByRole("button", { name: "Switch node" })).toBeVisible(); +}); + +test("node selector works with the keyboard", async ({ page }) => { + await page.goto(`/nodes/localhost/${sourceBrowsingRid}`, { + waitUntil: "networkidle", + }); + + const chevron = page.getByRole("button", { name: "Switch node" }); + await chevron.focus(); + await page.keyboard.press("Enter"); + await expect(chevron).toHaveAttribute("aria-expanded", "true"); + await expect(page.getByText("Custom seeds")).toBeVisible(); + + await page.keyboard.press("Escape"); + await expect(chevron).toHaveAttribute("aria-expanded", "false"); + await expect(page.getByText("Custom seeds")).toBeHidden(); + await expect(chevron).toBeFocused(); }); test("breadcrumb picker lists a seed that isn't bookmarked", async ({ @@ -220,18 +241,19 @@ test("breadcrumb picker lists a seed that isn't bookmarked", async ({ waitUntil: "networkidle", }); - const picker = page.getByRole("button", { name: "Current node selector" }); - await expect(picker).toContainText("seed.example.tld"); - await picker.click(); + await page.getByRole("button", { name: "Switch node" }).click(); // The seed serving the page is listed under the custom seeds, even though - // it was never bookmarked, and its node view is reachable from there. + // it was never bookmarked. const item = page .locator(".item") .filter({ hasText: "seed.example.tld" }) .first(); await expect(item).toBeVisible(); - await item.getByRole("button", { name: "Open node view" }).click(); + await expect( + item.getByRole("button", { name: "Open node view" }), + ).toHaveCount(0); + await page.getByRole("link", { name: "seed.example.tld" }).click(); await expect(page).toHaveURL("/nodes/seed.example.tld"); }); diff --git a/explorer/tests/e2e/router.spec.ts b/explorer/tests/e2e/router.spec.ts index 9d4117760..84c5da21e 100644 --- a/explorer/tests/e2e/router.spec.ts +++ b/explorer/tests/e2e/router.spec.ts @@ -35,12 +35,7 @@ test("navigation between node and repo pages", async ({ page }) => { await expectBackAndForwardNavigationWorks("/nodes/localhost", page); await expectUrlPersistsReload(page); - // The node breadcrumb is a picker now, so the node page is reached through - // its "Open node view" action. - await page.getByRole("button", { name: "Current node selector" }).click(); - await page - .getByRole("button", { name: "Open node view", exact: true }) - .click(); + await page.getByRole("link", { name: "localhost" }).click(); await expect(page).toHaveURL("/nodes/localhost"); });