From 79f6d3b3ec3f407c7685d4642c2295afd9bd1a65 Mon Sep 17 00:00:00 2001
From: Tom Moor <tom.moor@gmail.com>
Date: Tue, 31 Oct 2017 18:24:00 -0700
Subject: [PATCH] Pass location to trigger rerender. This is advised by
 react-router docs

---
 app/components/Layout/Layout.js                        | 3 +++
 app/components/Layout/components/SidebarCollections.js | 2 ++
 app/scenes/Collection/Collection.js                    | 3 +--
 app/scenes/Document/Document.js                        | 3 ++-
 app/scenes/SlackAuth/SlackAuth.js                      | 3 ++-
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/components/Layout/Layout.js b/app/components/Layout/Layout.js
index 2a5d34b31..25f11ec86 100644
--- a/app/components/Layout/Layout.js
+++ b/app/components/Layout/Layout.js
@@ -1,6 +1,7 @@
 // @flow
 import React from 'react';
 import { withRouter } from 'react-router-dom';
+import type { Location } from 'react-router-dom';
 import { Helmet } from 'react-helmet';
 import styled from 'styled-components';
 import { observer, inject } from 'mobx-react';
@@ -30,6 +31,7 @@ import DocumentsStore from 'stores/DocumentsStore';
 
 type Props = {
   history: Object,
+  location: Location,
   collections: CollectionsStore,
   documents: DocumentsStore,
   children?: ?React.Element<any>,
@@ -139,6 +141,7 @@ type Props = {
                   <LinkSection>
                     <SidebarCollections
                       history={this.props.history}
+                      location={this.props.location}
                       activeDocument={documents.active}
                       onCreateCollection={this.handleCreateCollection}
                       activeDocumentRef={this.scrollToActiveDocument}
diff --git a/app/components/Layout/components/SidebarCollections.js b/app/components/Layout/components/SidebarCollections.js
index 1ec90e187..81ab2b91e 100644
--- a/app/components/Layout/components/SidebarCollections.js
+++ b/app/components/Layout/components/SidebarCollections.js
@@ -2,6 +2,7 @@
 import React, { Component } from 'react';
 import { observable } from 'mobx';
 import { observer, inject } from 'mobx-react';
+import type { Location } from 'react-router-dom';
 import Flex from 'shared/components/Flex';
 import styled from 'styled-components';
 import { color, fontWeight } from 'shared/styles/constants';
@@ -20,6 +21,7 @@ import { type NavigationNode } from 'types';
 
 type Props = {
   history: Object,
+  location: Location,
   collections: CollectionsStore,
   documents: DocumentsStore,
   activeDocument: ?Document,
diff --git a/app/scenes/Collection/Collection.js b/app/scenes/Collection/Collection.js
index 7d1674bbc..14229c533 100644
--- a/app/scenes/Collection/Collection.js
+++ b/app/scenes/Collection/Collection.js
@@ -2,8 +2,7 @@
 import React, { Component } from 'react';
 import { observable } from 'mobx';
 import { observer, inject } from 'mobx-react';
-import { Redirect } from 'react-router-dom';
-import { Link } from 'react-router-dom';
+import { Link, Redirect } from 'react-router-dom';
 import styled from 'styled-components';
 import { newDocumentUrl } from 'utils/routeHelpers';
 
diff --git a/app/scenes/Document/Document.js b/app/scenes/Document/Document.js
index b6db3bd66..5da0f77cb 100644
--- a/app/scenes/Document/Document.js
+++ b/app/scenes/Document/Document.js
@@ -5,6 +5,7 @@ import styled from 'styled-components';
 import { observable } from 'mobx';
 import { observer, inject } from 'mobx-react';
 import { withRouter, Prompt } from 'react-router-dom';
+import type { Location } from 'react-router-dom';
 import keydown from 'react-keydown';
 import Flex from 'shared/components/Flex';
 import { color, layout } from 'shared/styles/constants';
@@ -42,7 +43,7 @@ Are you sure you want to discard them?
 type Props = {
   match: Object,
   history: Object,
-  location: Object,
+  location: Location,
   keydown: Object,
   documents: DocumentsStore,
   collections: CollectionsStore,
diff --git a/app/scenes/SlackAuth/SlackAuth.js b/app/scenes/SlackAuth/SlackAuth.js
index dc028c49d..3f00f7d9a 100644
--- a/app/scenes/SlackAuth/SlackAuth.js
+++ b/app/scenes/SlackAuth/SlackAuth.js
@@ -1,6 +1,7 @@
 // @flow
 import React from 'react';
 import { Redirect } from 'react-router-dom';
+import type { Location } from 'react-router-dom';
 import queryString from 'query-string';
 import { observable } from 'mobx';
 import { observer, inject } from 'mobx-react';
@@ -11,7 +12,7 @@ import AuthStore from 'stores/AuthStore';
 
 type Props = {
   auth: AuthStore,
-  location: Object,
+  location: Location,
 };
 
 @observer class SlackAuth extends React.Component {