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
26 changes: 13 additions & 13 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
"rdflib": "2.4.1",
"solid-logic": "6.0.1-5",
"solid-namespace": "^0.5.4",
"solid-ui": "5.0.2-6",
"solid-ui": "5.0.2-7",
"source-pane": "4.0.1-0"
},
"overrides": {
Expand Down
2 changes: 1 addition & 1 deletion src/navigation/chrome.ts
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,6 @@ export function explorerHeaderForPane (
folderView?: FolderView,
solo = false
): boolean {
if (paneName === 'folder' && (folderView === 'explorer' || folderView === 'storage')) return false
if (paneName === 'folder') return false
return resourceHeader && !isPersonPane(paneName)
}
6 changes: 5 additions & 1 deletion src/outline/manager.js
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@

// Represent an object in summary form as a content block

function appendRemoveIcon (node, subject, removeNode) {

Check warning on line 134 in src/outline/manager.js

View workflow job for this annotation

GitHub Actions / build (24)

'appendRemoveIcon' is defined but never used

Check warning on line 134 in src/outline/manager.js

View workflow job for this annotation

GitHub Actions / build (22)

'appendRemoveIcon' is defined but never used
const image = UI.utils.AJARImage(
outlineIcons.src.icon_remove_node,
'remove',
Expand Down Expand Up @@ -344,7 +344,11 @@
pane,
relevantPanes: provider.relevantPanes || [],
header: state && explorerHeaderForPane(state.showHeader, pane?.name, state.options.folderView, state.options.solo)
? { paneIcon: getPaneIcon(pane, subject, context), menuItems: state.menuItems }
? {
paneIcon: getPaneIcon(pane, subject, context),
menuItems: state.menuItems,
showBack: !state.options.solo
Comment thread
SharonStrats marked this conversation as resolved.
Resolved
}
: undefined,
paneElement
})
Expand Down
4 changes: 2 additions & 2 deletions test/unit/navigation/chrome.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -211,15 +211,15 @@ describe('file explorer header', () => {
it('is never shown over profile or friends panes', () => {
expect(explorerHeaderForPane(true, 'profile')).toBe(false)
expect(explorerHeaderForPane(true, 'social')).toBe(false)
expect(explorerHeaderForPane(true, 'folder')).toBe(true)
expect(explorerHeaderForPane(true, 'folder')).toBe(false)
expect(explorerHeaderForPane(true, undefined)).toBe(true)
expect(explorerHeaderForPane(false, 'folder')).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)
expect(explorerHeaderForPane(true, 'folder', 'container')).toBe(true)
expect(explorerHeaderForPane(true, 'folder', 'container')).toBe(false)
// A pane opened in place of the folder keeps its resource header
expect(explorerHeaderForPane(true, 'source', 'explorer')).toBe(true)
})
Expand Down
Loading