Skip to content

Commit 83ffcda

Browse files
authored
Revert "deep merge properties (#1877)" (#1895)
* Revert "deep merge properties (#1877)" This reverts commit 7179279. * Update changelog
1 parent 519272b commit 83ffcda

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ For changes prior to v1.0.0, see the [legacy releases](https://legacy.inertiajs.
1010
## [Unreleased](https://github.com/inertiajs/inertia/compare/v1.1.0...HEAD)
1111

1212
- Fix `preserveScroll` and `preserveState` types ([#1882](https://github.com/inertiajs/inertia/pull/1882))
13-
- Add Svelte TypeScript support ([#1866](https://github.com/inertiajs/inertia/pull/1866))
13+
- Revert "merge props from partial reloads" ([#1895](https://github.com/inertiajs/inertia/pull/1895))
1414

1515
## [v1.1.0](https://github.com/inertiajs/inertia/compare/v1.0.16...v1.1.0)
1616

packages/core/src/router.ts

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { default as Axios, AxiosResponse } from 'axios'
2-
import deepmerge from 'deepmerge'
32
import debounce from './debounce'
43
import {
54
fireBeforeEvent,
@@ -388,9 +387,7 @@ export class Router {
388387

389388
const pageResponse: Page = response.data
390389
if (isPartial && pageResponse.component === this.page.component) {
391-
pageResponse.props = deepmerge(this.page.props, pageResponse.props, {
392-
arrayMerge: (_target: any[], source: any[]) => source,
393-
})
390+
pageResponse.props = { ...this.page.props, ...pageResponse.props }
394391
}
395392
preserveScroll = this.resolvePreserveOption(preserveScroll, pageResponse) as boolean
396393
preserveState = this.resolvePreserveOption(preserveState, pageResponse)

0 commit comments

Comments
 (0)