diff --git a/package-lock.json b/package-lock.json index 8fba6263..989ee690 100644 --- a/package-lock.json +++ b/package-lock.json @@ -27,7 +27,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" }, "devDependencies": { @@ -4848,9 +4848,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001822", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001822.tgz", - "integrity": "sha512-Y3fvWQWzc69dlCyr07tuNrEhotv+db5FpMSPD3slZnkPKwRNOKwFBz2dP966XUmWMXLTOt+YShkFoQoom3U7hg==", + "version": "1.0.30001823", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001823.tgz", + "integrity": "sha512-TQ5s/djDjNk1axreUW+4rULH+BmdCMLiJkhaXnO5wqivG7tITkSUj4ItIdzqdZHKaXcHAV8dhH3JxOM7/7bwqw==", "dev": true, "funding": [ { @@ -5461,9 +5461,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.5.477", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.477.tgz", - "integrity": "sha512-PN++F4zWZoVDGWinxMnSCpVqKhqFOJfLXxdU8bYJKudAEsHL/XKVITOKWVbfMt1r276Mi9RDLU9VHx9uKJ4RMQ==", + "version": "1.5.478", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.478.tgz", + "integrity": "sha512-pftG+ma5Lm8O6/p45bhYT6StBN5ziQymaRzmCZwFl8DwWHKPPD93FdOmP1aqftcepolQYvrcyTLa17kE8Yf+jg==", "dev": true, "license": "ISC" }, @@ -8257,9 +8257,9 @@ } }, "node_modules/lucide": { - "version": "1.69.0", - "resolved": "https://registry.npmjs.org/lucide/-/lucide-1.69.0.tgz", - "integrity": "sha512-0i7rhzoeiE7rAB6w0Jb/2Gb2qlC6xezen4wStLEY8thp+nhGef1iM7Ulh0YfGkPjp02gY/D88UWYDg3uMsat4A==", + "version": "1.70.0", + "resolved": "https://registry.npmjs.org/lucide/-/lucide-1.70.0.tgz", + "integrity": "sha512-LxPqUjt8e5PT7JuvmnKc8ECAqgkbnLG3hIi/FV2JpqWdPWLbLCoI5P3jje/Lq84uNU2kCpe2webgyFFJJ9zPAA==", "license": "ISC" }, "node_modules/lz-string": { @@ -10100,9 +10100,9 @@ "license": "MIT" }, "node_modules/solid-ui": { - "version": "5.0.2-6", - "resolved": "https://registry.npmjs.org/solid-ui/-/solid-ui-5.0.2-6.tgz", - "integrity": "sha512-Gy9zCLYzH2uWkBehSUwXntYrnpqUrqx9nYjIluYW+N+GzeAQMM8zD6NM72ocCaRnPiaXPCX1hxA9vDiARUR0vw==", + "version": "5.0.2-7", + "resolved": "https://registry.npmjs.org/solid-ui/-/solid-ui-5.0.2-7.tgz", + "integrity": "sha512-Qt5zWWq0cy1KaZkLJEWrVnVEdOuVErfvfuUEHKFTFi41FzmMtTD/5k2uMgnT3Gb5zzT2z5przxJWyqpWfmU+TA==", "license": "MIT", "dependencies": { "@awesome.me/webawesome": "^3.9.0", diff --git a/package.json b/package.json index 7535df1f..5aad5f94 100644 --- a/package.json +++ b/package.json @@ -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": { diff --git a/src/navigation/chrome.ts b/src/navigation/chrome.ts index 566e302b..f573af34 100644 --- a/src/navigation/chrome.ts +++ b/src/navigation/chrome.ts @@ -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) } diff --git a/src/outline/manager.js b/src/outline/manager.js index 44a09f24..e19753e0 100644 --- a/src/outline/manager.js +++ b/src/outline/manager.js @@ -344,7 +344,11 @@ export default function (context) { 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 + } : undefined, paneElement }) diff --git a/test/unit/navigation/chrome.test.ts b/test/unit/navigation/chrome.test.ts index c06052b5..313720f4 100644 --- a/test/unit/navigation/chrome.test.ts +++ b/test/unit/navigation/chrome.test.ts @@ -211,7 +211,7 @@ 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) }) @@ -219,7 +219,7 @@ describe('file explorer header', () => { 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) })