javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-17 02:31:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(react): support history@5 in preparation for react router 6 (#23297)

Browse Source 
resolves #23294
This commit is contained in:
Liam DeBeasi
2021-05-14 09:03:15 -04:00
committed by GitHub
parent eb10a2ab0c
commit 4da5216b4f
4 changed files with 54 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
packages/react-router/src/ReactRouter/IonRouter.tsx
View File

@ -203,8 +203,16 @@ class IonRouterInner extends React.PureComponent<IonRouteProps, IonRouteState> {
this.incomingRouteParams = undefined;
}
/**
* history@4.x uses goBack(), history@5.x uses back()
* TODO: If support for React Router <=5 is dropped
* this logic is no longer needed. We can just
* assume back() is available.
*/
handleNativeBack() {
this.props.history.goBack();
const history = this.props.history as any;
const goBack = history.goBack || history.back;
goBack();
}
handleNavigate(
@ -256,7 +264,15 @@ class IonRouterInner extends React.PureComponent<IonRouteProps, IonRouteState> {
routeInfo.tab === '' && prevInfo.tab === ''
)
) {
this.props.history.goBack();
/**
* history@4.x uses goBack(), history@5.x uses back()
* TODO: If support for React Router <=5 is dropped
* this logic is no longer needed. We can just
* assume back() is available.
*/
const history = this.props.history as any;
const goBack = history.goBack || history.back;
goBack();
} else {
this.handleNavigate(prevInfo.pathname + (prevInfo.search || ''), 'pop', 'back');
}