From c3d7f0785cba97444281a858d9c4d33d04b690d4 Mon Sep 17 00:00:00 2001
From: Tom Moor <tom.moor@gmail.com>
Date: Sun, 6 May 2018 00:06:36 -0700
Subject: [PATCH] =?UTF-8?q?Restore=20stickyness=20of=20=E2=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/components/Sidebar/components/CollectionLink.js | 2 +-
 app/components/Sidebar/components/SidebarLink.js    | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/components/Sidebar/components/CollectionLink.js b/app/components/Sidebar/components/CollectionLink.js
index 9cf95290a..8f71c5aef 100644
--- a/app/components/Sidebar/components/CollectionLink.js
+++ b/app/components/Sidebar/components/CollectionLink.js
@@ -41,7 +41,6 @@ class CollectionLink extends React.Component<Props> {
         history={history}
         collectionId={collection.id}
         activeClassName="activeDropZone"
-        menuOpen={this.menuOpen}
       >
         <SidebarLink
           key={collection.id}
@@ -50,6 +49,7 @@ class CollectionLink extends React.Component<Props> {
           iconColor={collection.color}
           expand={expanded}
           hideExpandToggle
+          menuOpen={this.menuOpen}
           expandedContent={
             <CollectionChildren column>
               {collection.documents.map(document => (
diff --git a/app/components/Sidebar/components/SidebarLink.js b/app/components/Sidebar/components/SidebarLink.js
index 4533b7765..42958eb53 100644
--- a/app/components/Sidebar/components/SidebarLink.js
+++ b/app/components/Sidebar/components/SidebarLink.js
@@ -53,6 +53,7 @@ type Props = {
   expand?: boolean,
   expandedContent?: React.Node,
   menu?: React.Node,
+  menuOpen?: boolean,
   hideExpandToggle?: boolean,
   iconColor?: string,
   active?: boolean,
@@ -92,13 +93,14 @@ class SidebarLink extends React.Component<Props> {
       expand,
       active,
       menu,
+      menuOpen,
       hideExpandToggle,
     } = this.props;
     const Component = to ? StyledNavLink : StyledDiv;
     const showExpandIcon = expandedContent && !hideExpandToggle;
 
     return (
-      <Wrapper column>
+      <Wrapper menuOpen={menuOpen} column>
         <Component
           iconVisible={showExpandIcon}
           activeStyle={activeStyle}
@@ -124,7 +126,7 @@ class SidebarLink extends React.Component<Props> {
 const Action = styled.span`
   position: absolute;
   right: 0;
-  top: 0;
+  top: 2px;
   color: ${color.slate};
   svg {
     opacity: 0.75;