kylefang/react-navigation
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-navigation.git synced 2026-01-12 22:51:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: don't merge initial params when merge !== true

Browse Source
This commit is contained in:
Satyajit Sahoo
2021-07-26 13:35:54 +02:00
parent 9b2105692d
commit 54b215b9d3
4 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/routers/src/StackRouter.tsx
View File

@@ -434,13 +434,7 @@ export default function StackRouter(options: StackRouterOptions) {
}
: route.params;
} else {
params =
routeParamList[route.name] !== undefined
? {
...routeParamList[route.name],
...action.payload.params,
}
: action.payload.params;
params = action.payload.params;
}
return {

8
packages/routers/src/TabRouter.tsx
View File

@@ -326,13 +326,7 @@ export default function TabRouter({
}
: route.params;
} else {
params =
routeParamList[route.name] !== undefined
? {
...routeParamList[route.name],
...action.payload.params,
}
: action.payload.params;
params = action.payload.params;
}
const path =

4
packages/routers/src/__tests__/StackRouter.test.tsx
View File

@@ -1487,7 +1487,7 @@ it("doesn't merge params on navigate to an existing screen", () => {
routeNames: ['baz', 'bar', 'qux'],
routes: [
{ key: 'baz', name: 'baz' },
{ key: 'bar', name: 'bar', params: { color: 'test' } },
{ key: 'bar', name: 'bar' },
],
});
@@ -1515,7 +1515,7 @@ it("doesn't merge params on navigate to an existing screen", () => {
routeNames: ['baz', 'bar', 'qux'],
routes: [
{ key: 'baz', name: 'baz' },
{ key: 'bar', name: 'bar', params: { color: 'test', fruit: 'orange' } },
{ key: 'bar', name: 'bar', params: { fruit: 'orange' } },
],
});
});

2
packages/routers/src/__tests__/TabRouter.test.tsx
View File

@@ -1510,7 +1510,7 @@ it("doesn't merge params on navigate to an existing screen", () => {
routes: [
{ key: 'baz', name: 'baz' },
{ key: 'bar', name: 'bar' },
{ key: 'qux', name: 'qux', params: { color: 'indigo', test: 12 } },
{ key: 'qux', name: 'qux', params: { test: 12 } },
],
history: [
{ type: 'route', key: 'baz' },