From 2fea9fafd098e1fb3b0b706c2aeba2220a4c064b Mon Sep 17 00:00:00 2001
From: Tom Moor <tom.moor@gmail.com>
Date: Fri, 14 Jul 2017 21:58:43 -0700
Subject: [PATCH] Fixes: Any route after SidebarHidden not loading correctly

---
 .../RouteSidebarHidden/RouteSidebarHidden.js  | 28 +++++++++++++++++
 .../components/RouteSidebarHidden/index.js    |  3 ++
 .../components/SidebarHidden/SidebarHidden.js | 25 ----------------
 frontend/components/SidebarHidden/index.js    |  3 --
 frontend/index.js                             | 30 ++++++++-----------
 5 files changed, 44 insertions(+), 45 deletions(-)
 create mode 100644 frontend/components/RouteSidebarHidden/RouteSidebarHidden.js
 create mode 100644 frontend/components/RouteSidebarHidden/index.js
 delete mode 100644 frontend/components/SidebarHidden/SidebarHidden.js
 delete mode 100644 frontend/components/SidebarHidden/index.js

diff --git a/frontend/components/RouteSidebarHidden/RouteSidebarHidden.js b/frontend/components/RouteSidebarHidden/RouteSidebarHidden.js
new file mode 100644
index 000000000..c15cb6ad9
--- /dev/null
+++ b/frontend/components/RouteSidebarHidden/RouteSidebarHidden.js
@@ -0,0 +1,28 @@
+// @flow
+import React, { Component } from 'react';
+import { inject } from 'mobx-react';
+import { Route } from 'react-router-dom';
+import UiStore from 'stores/UiStore';
+
+class RouteSidebarHidden extends Component {
+  props: {
+    ui: UiStore,
+    component: any,
+  };
+
+  componentDidMount() {
+    this.props.ui.enableEditMode();
+  }
+
+  componentWillUnmount() {
+    this.props.ui.disableEditMode();
+  }
+
+  render() {
+    const { component, ...rest } = this.props;
+    const Component = component;
+    return <Route {...rest} render={props => <Component {...props} />} />;
+  }
+}
+
+export default inject('ui')(RouteSidebarHidden);
diff --git a/frontend/components/RouteSidebarHidden/index.js b/frontend/components/RouteSidebarHidden/index.js
new file mode 100644
index 000000000..0a92e652c
--- /dev/null
+++ b/frontend/components/RouteSidebarHidden/index.js
@@ -0,0 +1,3 @@
+// @flow
+import RouteSidebarHidden from './RouteSidebarHidden';
+export default RouteSidebarHidden;
diff --git a/frontend/components/SidebarHidden/SidebarHidden.js b/frontend/components/SidebarHidden/SidebarHidden.js
deleted file mode 100644
index adf26b443..000000000
--- a/frontend/components/SidebarHidden/SidebarHidden.js
+++ /dev/null
@@ -1,25 +0,0 @@
-// @flow
-import { Component } from 'react';
-import { inject } from 'mobx-react';
-import UiStore from 'stores/UiStore';
-
-class SidebarHidden extends Component {
-  props: {
-    ui: UiStore,
-    children: React$Element<any>,
-  };
-
-  componentDidMount() {
-    this.props.ui.enableEditMode();
-  }
-
-  componentWillUnmount() {
-    this.props.ui.disableEditMode();
-  }
-
-  render() {
-    return this.props.children;
-  }
-}
-
-export default inject('ui')(SidebarHidden);
diff --git a/frontend/components/SidebarHidden/index.js b/frontend/components/SidebarHidden/index.js
deleted file mode 100644
index b63c0b7a1..000000000
--- a/frontend/components/SidebarHidden/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-// @flow
-import SidebarHidden from './SidebarHidden';
-export default SidebarHidden;
diff --git a/frontend/index.js b/frontend/index.js
index 0fbe170e5..b1fe77f3b 100644
--- a/frontend/index.js
+++ b/frontend/index.js
@@ -35,7 +35,7 @@ import Error404 from 'scenes/Error404';
 
 import ScrollToTop from 'components/ScrollToTop';
 import Layout from 'components/Layout';
-import SidebarHidden from 'components/SidebarHidden';
+import RouteSidebarHidden from 'components/RouteSidebarHidden';
 
 import flatpages from 'static/flatpages';
 
@@ -122,25 +122,21 @@ render(
                   <Route exact path="/search" component={Search} />
                   <Route exact path="/search/:query" component={Search} />
                   <Route exact path="/settings" component={Settings} />
-                  <Route exact path="/developers" component={Api} />
 
                   <Route path="/404" component={Error404} />
 
-                  {/* This is a bit busted, break any view after it */}
-                  <SidebarHidden>
-                    <Switch>
-                      <Route
-                        exact
-                        path={`/doc/${matchDocumentSlug}/:edit`}
-                        component={Document}
-                      />
-                      <Route
-                        exact
-                        path="/collections/:id/new"
-                        component={DocumentNew}
-                      />
-                    </Switch>
-                  </SidebarHidden>
+                  <RouteSidebarHidden
+                    exact
+                    path={`/doc/${matchDocumentSlug}/:edit`}
+                    component={Document}
+                  />
+                  <RouteSidebarHidden
+                    exact
+                    path="/collections/:id/new"
+                    component={DocumentNew}
+                  />
+
+                  <Route exact path="/developers" component={Api} />
 
                   <Route component={notFoundSearch} />
                 </Switch>