From cb93242224fa1cf225aad058c8a2a882ef20639b Mon Sep 17 00:00:00 2001 From: HichemTab-tech Date: Wed, 5 Nov 2025 13:22:20 +0100 Subject: [PATCH 1/3] fix: update history state to keep the page updated after a popstate event --- packages/core/src/eventHandler.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/core/src/eventHandler.ts b/packages/core/src/eventHandler.ts index 00a46197c..889f664af 100644 --- a/packages/core/src/eventHandler.ts +++ b/packages/core/src/eventHandler.ts @@ -99,6 +99,9 @@ class EventHandler { Scroll.restore(history.getScrollRegions()) fireNavigateEvent(currentPage.get()) }) + + const {url, ...pageWithoutUrl} = currentPage.get() + history.replaceState({...pageWithoutUrl}) }) .catch(() => { this.onMissingHistoryItem() From bbb082af871dd9b46dd63ee454e41667ac050041 Mon Sep 17 00:00:00 2001 From: HichemTab-tech Date: Wed, 5 Nov 2025 13:40:38 +0100 Subject: [PATCH 2/3] fix: ensure correct type for history state replacement --- packages/core/src/eventHandler.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/core/src/eventHandler.ts b/packages/core/src/eventHandler.ts index 889f664af..2c9bc703e 100644 --- a/packages/core/src/eventHandler.ts +++ b/packages/core/src/eventHandler.ts @@ -1,7 +1,7 @@ import debounce from './debounce' import { fireNavigateEvent } from './events' import { history } from './history' -import { router } from './index' +import { Page, router } from './index' import { page as currentPage } from './page' import { Scroll } from './scroll' import { GlobalEvent, GlobalEventNames, GlobalEventResult, InternalEvent } from './types' @@ -101,7 +101,7 @@ class EventHandler { }) const {url, ...pageWithoutUrl} = currentPage.get() - history.replaceState({...pageWithoutUrl}) + history.replaceState({...pageWithoutUrl} as Page) }) .catch(() => { this.onMissingHistoryItem() From f451647235164d901ab26c510c180e0a037734df Mon Sep 17 00:00:00 2001 From: HichemTab-tech Date: Wed, 5 Nov 2025 13:42:13 +0100 Subject: [PATCH 3/3] format --- packages/core/src/eventHandler.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/core/src/eventHandler.ts b/packages/core/src/eventHandler.ts index 2c9bc703e..90a6ba86a 100644 --- a/packages/core/src/eventHandler.ts +++ b/packages/core/src/eventHandler.ts @@ -100,8 +100,8 @@ class EventHandler { fireNavigateEvent(currentPage.get()) }) - const {url, ...pageWithoutUrl} = currentPage.get() - history.replaceState({...pageWithoutUrl} as Page) + const { url, ...pageWithoutUrl } = currentPage.get() + history.replaceState({ ...pageWithoutUrl } as Page) }) .catch(() => { this.onMissingHistoryItem()