Fixes: Redirects do not push into history stack

This commit is contained in:
Tom Moor
2019-01-26 13:01:33 +00:00
parent 1768a1921d
commit 0ce50781d7
11 changed files with 11 additions and 11 deletions

View File

@ -77,7 +77,7 @@ class DropToImport extends React.Component<Props> {
...rest ...rest
} = this.props; } = this.props;
if (this.redirectTo) return <Redirect to={this.redirectTo} />; if (this.redirectTo) return <Redirect to={this.redirectTo} push />;
if (this.props.disabled) return this.props.children; if (this.props.disabled) return this.props.children;
return ( return (

View File

@ -74,7 +74,7 @@ class Editor extends React.Component<Props> {
}; };
render() { render() {
if (this.redirectTo) return <Redirect to={this.redirectTo} />; if (this.redirectTo) return <Redirect to={this.redirectTo} push />;
return ( return (
<RichMarkdownEditor <RichMarkdownEditor

View File

@ -81,7 +81,7 @@ class Layout extends React.Component<Props> {
const showSidebar = auth.authenticated && user && team; const showSidebar = auth.authenticated && user && team;
if (auth.isSuspended) return <ErrorSuspended />; if (auth.isSuspended) return <ErrorSuspended />;
if (this.redirectTo) return <Redirect to={this.redirectTo} />; if (this.redirectTo) return <Redirect to={this.redirectTo} push />;
return ( return (
<Container column auto> <Container column auto>

View File

@ -41,7 +41,7 @@ class AccountMenu extends React.Component<Props> {
}; };
render() { render() {
if (this.redirectTo) return <Redirect to={this.redirectTo} />; if (this.redirectTo) return <Redirect to={this.redirectTo} push />;
return ( return (
<DropdownMenu <DropdownMenu

View File

@ -90,7 +90,7 @@ class CollectionMenu extends React.Component<Props> {
}; };
render() { render() {
if (this.redirectTo) return <Redirect to={this.redirectTo} />; if (this.redirectTo) return <Redirect to={this.redirectTo} push />;
const { collection, label, onOpen, onClose } = this.props; const { collection, label, onOpen, onClose } = this.props;

View File

@ -82,7 +82,7 @@ class DocumentMenu extends React.Component<Props> {
}; };
render() { render() {
if (this.redirectTo) return <Redirect to={this.redirectTo} />; if (this.redirectTo) return <Redirect to={this.redirectTo} push />;
const { document, label, className, showPrint, auth } = this.props; const { document, label, className, showPrint, auth } = this.props;
const canShareDocuments = auth.team && auth.team.sharing; const canShareDocuments = auth.team && auth.team.sharing;

View File

@ -34,7 +34,7 @@ class NewChildDocumentMenu extends React.Component<Props> {
}; };
render() { render() {
if (this.redirectTo) return <Redirect to={this.redirectTo} />; if (this.redirectTo) return <Redirect to={this.redirectTo} push />;
const { label, document, ...rest } = this.props; const { label, document, ...rest } = this.props;
const { collection } = document; const { collection } = document;

View File

@ -35,7 +35,7 @@ class NewDocumentMenu extends React.Component<Props> {
}; };
render() { render() {
if (this.redirectTo) return <Redirect to={this.redirectTo} />; if (this.redirectTo) return <Redirect to={this.redirectTo} push />;
const { collections, label, ...rest } = this.props; const { collections, label, ...rest } = this.props;

View File

@ -44,7 +44,7 @@ class ShareMenu extends React.Component<Props> {
}; };
render() { render() {
if (this.redirectTo) return <Redirect to={this.redirectTo} />; if (this.redirectTo) return <Redirect to={this.redirectTo} push />;
const { share, label, onOpen, onClose } = this.props; const { share, label, onOpen, onClose } = this.props;

View File

@ -117,7 +117,7 @@ class CollectionScene extends React.Component<Props> {
render() { render() {
const { documents } = this.props; const { documents } = this.props;
if (this.redirectTo) return <Redirect to={this.redirectTo} />; if (this.redirectTo) return <Redirect to={this.redirectTo} push />;
if (!this.isFetching && !this.collection) return <Search notFound />; if (!this.isFetching && !this.collection) return <Search notFound />;
const pinnedDocuments = this.collection const pinnedDocuments = this.collection

View File

@ -87,7 +87,7 @@ class Header extends React.Component<Props> {
}; };
render() { render() {
if (this.redirectTo) return <Redirect to={this.redirectTo} />; if (this.redirectTo) return <Redirect to={this.redirectTo} push />;
const { const {
document, document,