From c12d47b749422f7432ef5d7887409d207778aef6 Mon Sep 17 00:00:00 2001 From: laraproto Date: Wed, 6 Nov 2024 00:09:44 +0200 Subject: [PATCH] the size of AuthenticatedLayout is real --- resources/js/Components/Layouts/AuthenticatedLayout.svelte | 3 ++- resources/js/Library/PassState.svelte.ts | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/js/Components/Layouts/AuthenticatedLayout.svelte b/resources/js/Components/Layouts/AuthenticatedLayout.svelte index d605e4b..0daa80e 100644 --- a/resources/js/Components/Layouts/AuthenticatedLayout.svelte +++ b/resources/js/Components/Layouts/AuthenticatedLayout.svelte @@ -8,12 +8,13 @@ const searchChanged = () => { if ($page.url !== '/search') { + globalState.lastPage = $page.url router.visit('/search', { preserveState: true, }) } if ($page.url === '/search' && globalState.searchQuery === '') { - router.visit('/', { + router.visit(globalState.lastPage ?? '/', { preserveState: true, }) } diff --git a/resources/js/Library/PassState.svelte.ts b/resources/js/Library/PassState.svelte.ts index 769a2fd..220301d 100644 --- a/resources/js/Library/PassState.svelte.ts +++ b/resources/js/Library/PassState.svelte.ts @@ -3,6 +3,7 @@ import type { Snippet } from 'svelte'; export const globalState: { title?: Snippet; searchQuery?: string; + lastPage?: string; } = $state({ })