From 9cecc08b297b5b20cec1b3c4e0f91cf01aaad684 Mon Sep 17 00:00:00 2001
From: Pedro Nauck <pedronauck@gmail.com>
Date: Tue, 29 May 2018 00:38:14 -0300
Subject: [PATCH] fix(docz): add isActive to Link components

---
 .../src/components/shared/Sidebar/Menu.tsx                | 7 +------
 .../src/components/shared/Sidebar/index.tsx               | 4 ++--
 packages/docz/src/components/Link.tsx                     | 8 +++++++-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/packages/docz-theme-default/src/components/shared/Sidebar/Menu.tsx b/packages/docz-theme-default/src/components/shared/Sidebar/Menu.tsx
index 152b3bf86..497f5bab9 100644
--- a/packages/docz-theme-default/src/components/shared/Sidebar/Menu.tsx
+++ b/packages/docz-theme-default/src/components/shared/Sidebar/Menu.tsx
@@ -27,9 +27,6 @@ const Icon = styled<IconProps, 'div'>('div')`
   }
 `
 
-export const isActive = (match: any, location: any) =>
-  match && match.url === location.pathname
-
 export interface MenuProps {
   menu: string
   docs: Entry[]
@@ -55,9 +52,7 @@ export const Menu: SFC<MenuProps> = ({ menu, docs }) => (
             <dl>
               {docs.map(doc => (
                 <dt key={doc.id}>
-                  <Link isActive={isActive} to={doc.slug}>
-                    {doc.name}
-                  </Link>
+                  <Link to={doc.slug}>{doc.name}</Link>
                 </dt>
               ))}
             </dl>
diff --git a/packages/docz-theme-default/src/components/shared/Sidebar/index.tsx b/packages/docz-theme-default/src/components/shared/Sidebar/index.tsx
index 0eab946cb..801547a69 100644
--- a/packages/docz-theme-default/src/components/shared/Sidebar/index.tsx
+++ b/packages/docz-theme-default/src/components/shared/Sidebar/index.tsx
@@ -2,7 +2,7 @@ import React from 'react'
 import { Docs, Link, Entry, ThemeConfig } from 'docz'
 import styled from 'react-emotion'
 
-import { Menu, isActive } from './Menu'
+import { Menu } from './Menu'
 import logo from '../../../images/docz.svg'
 
 const Wrapper = styled('div')`
@@ -101,7 +101,7 @@ export const Sidebar = () => (
           </ThemeConfig>
           <Menus>
             {docsWithoutMenu.map(doc => (
-              <Link key={doc.id} to={doc.slug} isActive={isActive}>
+              <Link key={doc.id} to={doc.slug}>
                 {doc.name}
               </Link>
             ))}
diff --git a/packages/docz/src/components/Link.tsx b/packages/docz/src/components/Link.tsx
index cafe8ffaf..c48407ebf 100644
--- a/packages/docz/src/components/Link.tsx
+++ b/packages/docz/src/components/Link.tsx
@@ -6,13 +6,19 @@ import { dataContext, Entry } from '../theme'
 
 const findEntryBySlug = (to: any) => (entry: Entry) => entry.slug === to
 
+export const isActive = (match: any, location: any) =>
+  match && match.url === location.pathname
+
 export const Link: SFC<NavLinkProps> = ({ to, ...props }) => (
   <dataContext.Consumer>
     {({ entries }) => {
       const entriesArr = Object.values(entries || {})
       const entry = entriesArr.find(findEntryBySlug(to))
 
-      return entry && entries && <NavLink {...props} to={entry.route} />
+      return (
+        entry &&
+        entries && <NavLink isActive={isActive} {...props} to={entry.route} />
+      )
     }}
   </dataContext.Consumer>
 )