Benature/omnivore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4107 from omnivore-app/feat/web-return

Browse Source 
feat/web return
This commit is contained in:
Jackson Harper
2024-06-25 18:17:54 +08:00
committed by GitHub
parent 33b193b81f dd44322db7
commit 1d8d1df9e9
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/web/components/elements/images/OmnivoreLogoBase.tsx
View File

@ -21,10 +21,16 @@ export function OmnivoreLogoBase(props: OmnivoreLogoBaseProps): JSX.Element {
alignItems: 'center', alignItems: 'center',
}} }}
onClick={(event) => { onClick={(event) => {
const navReturn = window.localStorage.getItem('nav-return')
if (navReturn) {
window.location.assign(navReturn)
return
}
const query = window.sessionStorage.getItem('q') const query = window.sessionStorage.getItem('q')
if (query) { if (query) {
router.push(`/home?${query}`) window.location.assign(`/l/home?${query}`)
event.preventDefault() } else {
window.location.replace(`/l/home`)
} }
}} }}
tabIndex={-1} tabIndex={-1}

4
packages/web/components/templates/library/LibraryContainer.tsx
View File

@ -162,6 +162,10 @@ export function LibraryContainer(props: LibraryContainerProps): JSX.Element {
// eslint-disable-next-line react-hooks/exhaustive-deps // eslint-disable-next-line react-hooks/exhaustive-deps
}, [setQueryInputs, router.isReady, router.query]) }, [setQueryInputs, router.isReady, router.query])
useEffect(() => {
window.localStorage.setItem('nav-return', router.asPath)
}, [router.asPath])
const hasMore = useMemo(() => { const hasMore = useMemo(() => {
if (!itemsPages) { if (!itemsPages) {
return false return false