javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-20 04:14:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(react): support for 'root' router direction, fixes #19982 (#20052)

Browse Source
This commit is contained in:
Ely Lucas
2019-12-09 17:23:39 -07:00
committed by GitHub
parent 1c7d1e5cf1
commit e116712275
4 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/react-router/src/ReactRouter/NavManager.tsx
View File

@ -9,7 +9,7 @@ import { StackManager } from './StackManager';
interface NavManagerProps extends RouteComponentProps { interface NavManagerProps extends RouteComponentProps {
onNavigateBack: (defaultHref?: string) => void; onNavigateBack: (defaultHref?: string) => void;
onNavigate: (type: 'push' | 'replace' | 'pop', path: string, state?: any) => void; onNavigate: (ionRouteAction: IonRouteAction, path: string, state?: any) => void;
} }
export class NavManager extends React.Component<NavManagerProps, NavContextState> { export class NavManager extends React.Component<NavManagerProps, NavContextState> {

18
packages/react-router/src/ReactRouter/Router.tsx
View File

@ -88,7 +88,7 @@ class RouteManager extends React.Component<RouteComponentProps, RouteManagerStat
} }
historyChange(location: HistoryLocation, action: HistoryAction) { historyChange(location: HistoryLocation, action: HistoryAction) {
const ionRouteAction = this.currentIonRouteAction === 'pop' ? 'pop' : action.toLowerCase(); const ionRouteAction = this.currentIonRouteAction === 'pop' ? 'pop' : action.toLowerCase() as IonRouteAction;
let direction = this.currentRouteDirection; let direction = this.currentRouteDirection;
if (ionRouteAction === 'push') { if (ionRouteAction === 'push') {
@ -101,6 +101,11 @@ class RouteManager extends React.Component<RouteComponentProps, RouteManagerStat
direction = 'none'; direction = 'none';
} }
if (direction === 'root') {
this.locationHistory.clear();
this.locationHistory.add(location);
}
location.state = location.state || { direction }; location.state = location.state || { direction };
this.setState({ this.setState({
location, location,
@ -175,8 +180,15 @@ class RouteManager extends React.Component<RouteComponentProps, RouteManagerStat
const enteringEl = this.ionPageElements[enteringView.id]; const enteringEl = this.ionPageElements[enteringView.id];
const leavingEl = leavingView && this.ionPageElements[leavingView.id]; const leavingEl = leavingView && this.ionPageElements[leavingView.id];
if (enteringEl) { if (enteringEl) {
// Don't animate from an empty view let navDirection: NavDirection | undefined;
const navDirection = leavingEl && leavingEl.innerHTML === '' ? undefined : direction === 'none' ? undefined : direction; if (leavingEl && leavingEl.innerHTML === '') {
// Don't animate from an empty view
navDirection = undefined;
} else if (direction === 'none' || direction === 'root') {
navDirection = undefined;
} else {
navDirection = direction;
}
const shouldGoBack = !!enteringView.prevId; const shouldGoBack = !!enteringView.prevId;
const routerOutlet = this.routerOutlets[viewStack.id]; const routerOutlet = this.routerOutlets[viewStack.id];
this.commitView( this.commitView(

6
packages/react-router/src/utils/LocationHistory.ts
View File

@ -3,7 +3,7 @@ import { Location as HistoryLocation } from 'history';
const RESTRICT_SIZE = 25; const RESTRICT_SIZE = 25;
export class LocationHistory { export class LocationHistory {
locationHistory: HistoryLocation[] = []; private locationHistory: HistoryLocation[] = [];
add(location: HistoryLocation) { add(location: HistoryLocation) {
this.locationHistory.push(location); this.locationHistory.push(location);
@ -21,6 +21,10 @@ export class LocationHistory {
this.locationHistory.push(location); this.locationHistory.push(location);
} }
clear() {
this.locationHistory = [];
}
findLastLocationByUrl(url: string) { findLastLocationByUrl(url: string) {
for (let i = this.locationHistory.length - 1; i >= 0; i--) { for (let i = this.locationHistory.length - 1; i >= 0; i--) {
const location = this.locationHistory[i]; const location = this.locationHistory[i];

2
packages/react/src/components/hrefprops.ts
View File

@ -1,4 +1,4 @@
export declare type RouterDirection = 'forward' | 'back' | 'none'; export declare type RouterDirection = 'forward' | 'back' | 'root' | 'none';
export type HrefProps<T> = Omit<T, 'routerDirection'> & { export type HrefProps<T> = Omit<T, 'routerDirection'> & {
routerLink?: string; routerLink?: string;