Fix: Highlighting currently selected page on sidebar broken with sections (#1405)

Fixes #1375

Author: Juha Karttunen

src/client/rsg-components/ComponentsList/ComponentsList.spec.js

@@ -2,6 +2,12 @@ import React from 'react';
 import ComponentsList from './ComponentsList';
 import { ComponentsListRenderer } from './ComponentsListRenderer';
 
+const context = {
+	config: {
+		pagePerSection: true,
+	},
+};
+
 it('should set the correct href for items', () => {
 	const components = [
 		{
@@ -16,7 +22,7 @@ it('should set the correct href for items', () => {
 		},
 	];
 
-	const actual = shallow(<ComponentsList items={components} classes={{}} />);
+	const actual = shallow(<ComponentsList items={components} classes={{}} />, { context });
 	expect(actual).toMatchSnapshot();
 });
 
@@ -34,7 +40,7 @@ it('if a custom href is provided, should use it instead of generating internal l
 		},
 	];
 
-	const actual = shallow(<ComponentsList items={components} classes={{}} />);
+	const actual = shallow(<ComponentsList items={components} classes={{}} />, { context });
 	expect(actual).toMatchSnapshot();
 });
 
@@ -51,15 +57,15 @@ it('should set a parameter on link when useHashId is activated', () => {
 			slug: 'input',
 		},
 	];
-
 	const actual = shallow(
 		<ComponentsList
 			items={components}
 			classes={{}}
 			useRouterLinks
 			hashPath={['Components']}
 			useHashId
-		/>
+		/>,
+		{ context }
 	);
 	expect(actual).toMatchSnapshot();
 });
@@ -83,7 +89,8 @@ it('should set a sub route on link when useHashId is deactivated', () => {
 			useRouterLinks
 			hashPath={['Components']}
 			useHashId={false}
-		/>
+		/>,
+		{ context }
 	);
 	expect(actual).toMatchSnapshot();
 });
@@ -101,13 +108,13 @@ it('should render sections with nested components', () => {
 			href: '#input',
 		},
 	];
-	const actual = shallow(<ComponentsListRenderer items={components} classes={{}} />);
+	const actual = shallow(<ComponentsListRenderer items={components} classes={{}} />, { context });
 
 	expect(actual).toMatchSnapshot();
 });
 
 it('should return null when the list is empty', () => {
-	const actual = shallow(<ComponentsListRenderer items={[]} classes={{}} />);
+	const actual = shallow(<ComponentsListRenderer items={[]} classes={{}} />, { context });
 
 	expect(actual.getElement()).toBe(null);
 });
@@ -124,7 +131,7 @@ it('should ignore items without visibleName', () => {
 			href: '#input',
 		},
 	];
-	const actual = shallow(<ComponentsListRenderer items={components} classes={{}} />);
+	const actual = shallow(<ComponentsListRenderer items={components} classes={{}} />, { context });
 
 	expect(actual).toMatchSnapshot();
 });

src/client/rsg-components/ComponentsList/ComponentsListRenderer.js

@@ -37,14 +37,17 @@ const styles = ({ color, fontFamily, fontSize, space, mq }) => ({
 	},
 });
 
-export function ComponentsListRenderer({ classes, items }) {
+export function ComponentsListRenderer({ classes, items }, { config }) {
+	const { pagePerSection } = config;
 	items = items.filter(item => item.visibleName);
 
 	if (!items.length) {
 		return null;
 	}
 
-	const windowHash = window.location.pathname + getHash(window.location.hash);
+	// Match selected component in both basic routing and pagePerSection routing.
+	const { hash, pathname } = window.location;
+	const windowHash = pathname + (pagePerSection ? hash : getHash(hash));
 	return (
 		<ul className={classes.list}>
 			{items.map(({ heading, visibleName, href, content, shouldOpenInNewTab }) => {
@@ -77,4 +80,8 @@ ComponentsListRenderer.propTypes = {
 	classes: PropTypes.object.isRequired,
 };
 
+ComponentsListRenderer.contextTypes = {
+	config: PropTypes.object.isRequired,
+};
+
 export default Styled(styles)(ComponentsListRenderer);