kylefang/react-navigation
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-navigation.git synced 2026-04-22 19:58:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: use nested params for initial state only

Browse Source 
This fixes an issue where the new actions could bring back the params even after it was reset
This commit is contained in:
Satyajit Sahoo
2021-07-16 11:48:53 +02:00
parent 858d256b0a
commit 577d79e98c
1 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
packages/core/src/useNavigationBuilder.tsx
View File

@@ -250,21 +250,7 @@ export default function useNavigationBuilder<
const routeParamList = routeNames.reduce<Record<string, object | undefined>>(
(acc, curr) => {
const { initialParams } = screens[curr][1];
const initialParamsFromParams =
route?.params?.state == null &&
route?.params?.initial !== false &&
route?.params?.screen === curr
? route.params.params
: undefined;
acc[curr] =
initialParams !== undefined || initialParamsFromParams !== undefined
? {
...initialParams,
...initialParamsFromParams,
}
: undefined;
acc[curr] = initialParams;
return acc;
},
{}
@@ -326,6 +312,28 @@ export default function useNavigationBuilder<
);
const [initializedState, isFirstStateInitialization] = React.useMemo(() => {
const initialRouteParamList = routeNames.reduce<
Record<string, object | undefined>
>((acc, curr) => {
const { initialParams } = screens[curr][1];
const initialParamsFromParams =
route?.params?.state == null &&
route?.params?.initial !== false &&
route?.params?.screen === curr
? route.params.params
: undefined;
acc[curr] =
initialParams !== undefined || initialParamsFromParams !== undefined
? {
...initialParams,
...initialParamsFromParams,
}
: undefined;
return acc;
}, {});
// If the current state isn't initialized on first render, we initialize it
// We also need to re-initialize it if the state passed from parent was changed (maybe due to reset)
// Otherwise assume that the state was provided as initial state
@@ -337,7 +345,7 @@ export default function useNavigationBuilder<
return [
router.getInitialState({
routeNames,
routeParamList,
routeParamList: initialRouteParamList,
routeGetIdList,
}),
true,
@@ -348,16 +356,15 @@ export default function useNavigationBuilder<
route?.params?.state ?? (currentState as PartialState<State>),
{
routeNames,
routeParamList,
routeParamList: initialRouteParamList,
routeGetIdList,
}
),
false,
];
}
// We explicitly don't include routeNames/routeParamList in the dep list
// below. We want to avoid forcing a new state to be calculated in cases
// where routeConfigs change without affecting routeNames/routeParamList.
// We explicitly don't include routeNames, route.params etc. in the dep list
// below. We want to avoid forcing a new state to be calculated in those cases
// Instead, we handle changes to these in the nextState code below. Note
// that some changes to routeConfigs are explicitly ignored, such as changes
// to initialParams