docs: check for pathprefix when selecting sidebar content

react-dnd · Nov 6, 2018 · 48a1bf2 · 48a1bf2
1 parent 13a2499
commit 48a1bf2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/packages/documentation/src/components/layout.tsx b/packages/documentation/src/components/layout.tsx
@@ -21,7 +21,9 @@ export interface LayoutProps {
 const Layout: React.SFC<LayoutProps> = props => {
 	const { children, location } = props
 	const sitepath = location && location.pathname
-	const isExampleUrl = (sitepath || '').startsWith('/examples')
+	const isExampleUrl = (sitepath || '')
+		.replace('/react-dnd', '')
+		.startsWith('/examples')
 	const sidebarItems: PageGroup[] = isExampleUrl ? ExamplePages : APIPages
 	const hideSidebar = props.hideSidebar || sitepath === '/about'
 	return (

diff --git a/packages/documentation/src/components/sidebar.tsx b/packages/documentation/src/components/sidebar.tsx
@@ -20,9 +20,7 @@ const SideBar: React.SFC<SideBarProps> = ({ groups, location }) => {
 	}
 
 	function renderLink({ title, location: pageLocation }: Page, key: string) {
-		const isSelected =
-			pageLocation === location ||
-			pageLocation === location.replace('/react-dnd', '')
+		const isSelected = pageLocation === location.replace('/react-dnd', '')
 		const arrow = <span className="arrowBullet" />
 		const Link = isSelected ? SelectedSidebarItem : SidebarItem