deps: react-router-dom 4 -> 6 (history 5, react-router-bootstrap 0.26)
Removes the Router/Switch/Route/Link/LinkContainer legacy-context
warnings. Keeps the shared history singleton (used outside React by
NotificationsObserver + Utils/location) via unstable_HistoryRouter, and
bridges v6 hooks back to v4-shaped history/match/location props with a
new withRouterCompat HOC so the ~20 class pages stay untouched.
- <Switch> -> <Routes>, component= -> element=
- Authenticated/Public -> guard components (children or <Navigate replace>)
- LocationListener -> useLocation + useEffect function
- regex route /fire/:type(active|archive|alert)/:id -> /fire/:type/:id
- history.listen callback is ({ location }) in history v5
Browser-verified: SPA nav, /subscriptions->/login auth redirect,
deep-link /fire/archive/:id (params), browser back/forward. REST smoke
byte-identical.
This commit is contained in:
parent
a1a1b9a801
commit
e2d13ca64c
10 changed files with 177 additions and 212 deletions
|
|
@ -1,8 +1,8 @@
|
|||
/* eslint-disable import/no-absolute-path */
|
||||
import React from 'react';
|
||||
import PropTypes from 'prop-types';
|
||||
import { withRouter } from 'react-router-dom';
|
||||
import { LinkContainer } from 'react-router-bootstrap';
|
||||
import withRouterCompat from '../withRouterCompat/withRouterCompat';
|
||||
/* import { Nav, NavDropdown } from 'react-bootstrap'; */
|
||||
import { withTranslation, Trans } from 'react-i18next';
|
||||
import { testId } from '/imports/ui/components/Utils/TestUtils';
|
||||
|
|
@ -39,4 +39,4 @@ AuthenticatedNavigation.propTypes = {
|
|||
name: PropTypes.string.isRequired
|
||||
};
|
||||
|
||||
export default withTranslation()(withRouter(AuthenticatedNavigation));
|
||||
export default withTranslation()(withRouterCompat(AuthenticatedNavigation));
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue