From 21af0bd8beb76f71afe87198f9ea5522b31e49c6 Mon Sep 17 00:00:00 2001
From: Tom Moor <tom.moor@gmail.com>
Date: Sun, 13 Oct 2019 16:15:42 -0700
Subject: [PATCH] fix: Sidebar links unexpand closes #1044

---
 app/components/Sidebar/components/DocumentLink.js | 2 +-
 app/components/Sidebar/components/SidebarLink.js  | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/components/Sidebar/components/DocumentLink.js b/app/components/Sidebar/components/DocumentLink.js
index 952ec0dfc..d3840f2ec 100644
--- a/app/components/Sidebar/components/DocumentLink.js
+++ b/app/components/Sidebar/components/DocumentLink.js
@@ -72,7 +72,7 @@ class DocumentLink extends React.Component<Props> {
               pathname: node.url,
               state: { title: node.title },
             }}
-            expanded={showChildren}
+            expanded={showChildren ? true : undefined}
             label={node.title}
             depth={depth}
             exact={false}
diff --git a/app/components/Sidebar/components/SidebarLink.js b/app/components/Sidebar/components/SidebarLink.js
index 655f0a7cc..cdaf4b7ac 100644
--- a/app/components/Sidebar/components/SidebarLink.js
+++ b/app/components/Sidebar/components/SidebarLink.js
@@ -26,16 +26,12 @@ type Props = {
 
 @observer
 class SidebarLink extends React.Component<Props> {
-  @observable expanded: boolean;
+  @observable expanded: ?boolean = this.props.expanded;
 
   style = {
     paddingLeft: `${(this.props.depth || 0) * 16 + 16}px`,
   };
 
-  componentDidMount() {
-    if (this.props.expanded) this.handleExpand();
-  }
-
   componentWillReceiveProps(nextProps: Props) {
     if (nextProps.expanded !== undefined) {
       this.expanded = nextProps.expanded;
@@ -45,6 +41,8 @@ class SidebarLink extends React.Component<Props> {
   @action
   handleClick = (ev: SyntheticEvent<>) => {
     ev.preventDefault();
+    ev.stopPropagation();
+
     this.expanded = !this.expanded;
   };