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

Master react (#19150)

Browse Source 
* chore(): bump to beta 8

* fix(): IonFabButton href fix

* fix(react): support components with href attributes

* fix(): Prep work to break router out

* fix(): breaking react-router and react-core into own packages

* chore(): moving view stuff out of react-core

* chore(): dev build 8-1

* chore(): update to react beta 8

* chore(): fixes to deps

* fix(): removing IonAnchor in favor of IonRouterLink

* chore(): beta 9 release

* refactor(react): treeshake, minify, api

* wip

* fix(): react dev builds

* fix(): fixes to get app builds working again

* fix(): removing tgz file

* feat(): adding platform helper methods

* fix(): don't map attributes to props

* chore(): add test app

* feat(): copy css folder from core

* chore(): move rollup node resolve to devDependencies

* fix(): expose setupConfig()

* perf(): improve treeshaking

* fix(): removing crypto from generateUniqueId

* fix(): adding missing rollup dp

* fix(): test cleanup and fixes to make tests pass

* chore(): moving react to packages folder

* fix(): fixing react build due to move to packages

* feat(): adding missing IonInfiniteScrollContent component

* chore(): add automated testing using cypress

* fix(): adding option onDidDismiss to controller components

* 0.0.10 react

* wip

* fix(): removing deprecated React calls

* fix(): exporting setupConfig from core

* chore(): bump to 4.8.0-rc.0

* chore(): updating test-app deps and fixing test

* chore(): updates to react readme

* fix(): exposing isPlatform

* fix(react): support using class attribute for core components

* fix(react): fixing react tests by removing the webcrypto

* fix(react): supporting going back to pages with query strings

* chore(): adding react changelog

* chore(): react rc1 release
This commit is contained in:
Ely Lucas
2019-08-21 18:11:32 -06:00
committed by GitHub
parent c6051e89a5
commit 2923aac44e
10 changed files with 78 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,16 +4,21 @@ import { Location as HistoryLocation, UnregisterCallback } from 'history';
import React from 'react';
import { RouteComponentProps } from 'react-router-dom';
import { ViewManager } from './ViewManager';
import { generateUniqueId } from '../utils';
import { LocationHistory } from '../utils/LocationHistory'
import { ViewItem } from './ViewItem';
import { ViewStack } from './RouteManagerContext';
interface NavManagerProps extends RouteComponentProps {
findViewInfoByLocation: (location: HistoryLocation) => any;
findViewInfoById: (id: string) => any;
findViewInfoByLocation: (location: HistoryLocation) => {view?: ViewItem, viewStack?: ViewStack };
findViewInfoById: (id: string) => {view?: ViewItem, viewStack?: ViewStack };
};
interface NavManagerState extends NavContextState {};
export class NavManager extends React.Component<NavManagerProps, NavManagerState> {
listenUnregisterCallback: UnregisterCallback;
locationHistory: LocationHistory = new LocationHistory();
constructor(props: NavManagerProps) {
super(props);
@ -31,6 +36,15 @@ export class NavManager extends React.Component<NavManagerProps, NavManagerState
this.setState({
currentPath: location.pathname
})
this.locationHistory.add(location);
});
this.locationHistory.add({
hash: window.location.hash,
key: generateUniqueId(6),
pathname: window.location.pathname,
search: window.location.search,
state: {}
});
}
@ -43,9 +57,14 @@ export class NavManager extends React.Component<NavManagerProps, NavManagerState
goBack(defaultHref?: string) {
const { view: leavingView } = this.props.findViewInfoByLocation(this.props.location);
if (leavingView) {
const { view: enteringView } = this.props.findViewInfoById(leavingView.prevId);
const { view: enteringView } = this.props.findViewInfoById(leavingView.prevId!);
if (enteringView) {
this.props.history.replace(enteringView.routeData.match.url, { direction: 'back' });
const lastLocation = this.locationHistory.findLastLocation(enteringView.routeData.match.url);
if (lastLocation) {
this.props.history.replace(lastLocation.pathname + lastLocation.search, { direction: 'back' });
} else {
this.props.history.replace(enteringView.routeData.match.url, { direction: 'back' });
}
} else {
defaultHref && this.props.history.replace(defaultHref, { direction: 'back' });
}