Skip to content

Commit

Permalink
revert(core): fix deepmerge properties (based on [inertia/pull/1895](i…
Browse files Browse the repository at this point in the history
  • Loading branch information
jrson83 committed Jun 19, 2024
1 parent 3ad44dc commit c25e0f6
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions packages/core/src/router.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { default as Axios, type AxiosResponse, isAxiosError } from 'axios'
import { merge } from 'ts-deepmerge'
import { debounce } from './debounce'
import {
fireBeforeEvent,
Expand Down Expand Up @@ -467,9 +466,10 @@ export class Router {

const pageResponse = response.data
if (isPartial && pageResponse.component === this.page.component) {
pageResponse.props = merge(this.page.props, pageResponse.props, {
/* pageResponse.props = merge(this.page.props, pageResponse.props, {
arrayMerge: (_target: any[], source: any[]) => source,
})
}) */
pageResponse.props = { ...this.page.props, ...pageResponse.props }
}
preserveScroll = this.resolvePreserveOption(
preserveScroll,
Expand Down

0 comments on commit c25e0f6

Please sign in to comment.