Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions docs/navigation-design.md
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,11 @@ the Storage shell during solo resource navigation.
- It reads the owner from the pod context, so it does not depend on the navbar existing.

### File explorer header
- Never shown for the profile and friends panes.
- Never shown for profile, friends, preferences or dashboard panes (`home` and `dashboard`).
- Never shown over the folder pane, which supplies its own storage header or navbar.
- Never shown for root resources or WebIDs.
- For account-menu views and for panes with their own subject: shown only when the URL is inside the
viewer's own pod.
- For other account-menu views and panes with their own subject: shown only when the URL is inside
the viewer's own pod.

## Modules

Expand Down
14 changes: 7 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/navigation/chrome.ts
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ export function deriveExplorerHeader (input: ExplorerHeaderInput): boolean {
}

/**
* The header is never shown over a person's profile or friends, whatever the resource,
* The header is never shown over profile, friends, preferences or dashboard panes,
* nor over a storage view, which has its own header or the navbar.
*/
export function explorerHeaderForPane (
Expand All @@ -174,6 +174,6 @@ export function explorerHeaderForPane (
folderView?: FolderView,
solo = false
): boolean {
if (paneName === 'folder') return false
if (paneName === 'folder' || paneName === 'basicPreferences' || paneName === 'home' || paneName === 'dashboard') return false
return resourceHeader && !isPersonPane(paneName)
}
5 changes: 5 additions & 0 deletions test/unit/navigation/chrome.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,11 @@ describe('file explorer header', () => {
expect(explorerHeaderForPane(false, 'folder')).toBe(false)
})

it.each(['basicPreferences', 'home', 'dashboard'])('is never shown over %s', paneName => {
expect(explorerHeaderForPane(true, paneName)).toBe(false)
expect(explorerHeaderForPane(true, paneName, undefined, true)).toBe(false)
})

it('is never shown over a storage view, which has its own header or the navbar', () => {
expect(explorerHeaderForPane(true, 'folder', 'explorer')).toBe(false)
expect(explorerHeaderForPane(true, 'folder', 'storage')).toBe(false)
Expand Down
10 changes: 8 additions & 2 deletions test/unit/outline/manager.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -586,15 +586,15 @@ describe('manager', () => {
expect(provider.querySelector('solid-ui-file-explorer-header')).not.toBeNull()
})

it('reuses resource visibility and menu items when switching panes', async () => {
it.each(['profile', 'basicPreferences', 'home', 'dashboard'])('reuses resource visibility and menu items when switching to %s and back', async paneName => {
isInViewerPodMock.mockResolvedValue(true)
const provider = createExplorer(MockPane, { headerOnlyInViewerPod: true })
await vi.waitFor(() => {
expect(provider.querySelector<FileExplorerHeader>('solid-ui-file-explorer-header')?.menuItems).toHaveLength(1)
})
const header = provider.querySelector<FileExplorerHeader>('solid-ui-file-explorer-header')!
const menuItems = header.menuItems
findPane.mockReturnValue({ ...MockPane, name: 'profile' })
findPane.mockReturnValue({ ...MockPane, name: paneName })
menuItems[0].action(new Event('click'))
expect(provider.querySelector('solid-ui-file-explorer-header')).toBeNull()

Expand Down Expand Up @@ -718,6 +718,12 @@ describe('manager', () => {
expect(await headerShown(false)).toBe(true)
})

it.each(['basicPreferences', 'home', 'dashboard'])('is hidden for account-menu %s even inside the viewer\'s pod', async name => {
isInViewerPodMock.mockResolvedValue(true)

expect(await headerShown(false, { ...MockPane, name })).toBe(false)
})

it('is not affected for navbar navigation to a pane without its own subject', async () => {
isInViewerPodMock.mockResolvedValue(false)

Expand Down
Loading