From 6a9738bc0472f8e49bec460e6afe9d719eb8e811 Mon Sep 17 00:00:00 2001 From: Jonathan Reinink Date: Tue, 28 May 2024 07:30:43 -0400 Subject: [PATCH 1/2] Fix `preserveScroll` and `preserveState` types --- packages/core/src/router.ts | 2 +- packages/core/src/types.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/core/src/router.ts b/packages/core/src/router.ts index 48a4e1893..1fc19d1dc 100644 --- a/packages/core/src/router.ts +++ b/packages/core/src/router.ts @@ -236,7 +236,7 @@ export class Router { } } - protected resolvePreserveOption(value: PreserveStateOption, page: Page): boolean | string { + protected resolvePreserveOption(value: PreserveStateOption, page: Page): boolean { if (typeof value === 'function') { return value(page) } else if (value === 'errors') { diff --git a/packages/core/src/types.ts b/packages/core/src/types.ts index cba9d687b..1f77ddbdd 100644 --- a/packages/core/src/types.ts +++ b/packages/core/src/types.ts @@ -55,7 +55,7 @@ export type PageHandler = ({ preserveState: PreserveStateOption }) => Promise -export type PreserveStateOption = boolean | string | ((page: Page) => boolean) +export type PreserveStateOption = boolean | 'errors' | ((page: Page) => boolean) export type Progress = AxiosProgressEvent From 24850a890bcd0903893e266b6b5d400553491ef2 Mon Sep 17 00:00:00 2001 From: Jonathan Reinink Date: Tue, 28 May 2024 09:46:50 -0400 Subject: [PATCH 2/2] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0272f2f38..0e9963cbc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ For changes prior to v1.0.0, see the [legacy releases](https://legacy.inertiajs. ## [Unreleased](https://github.com/inertiajs/inertia/compare/v1.1.0...HEAD) +- Fix `preserveScroll` and `preserveState` types ([#1882](https://github.com/inertiajs/inertia/pull/1882)) - Add Svelte TypeScript support ([#1866](https://github.com/inertiajs/inertia/pull/1866)) ## [v1.1.0](https://github.com/inertiajs/inertia/compare/v1.0.16...v1.1.0)