Fix connected links

Author: rvsia

packages/react-renderer-demo/src/components/navigation/find-connected-links.js

@@ -1,5 +1,6 @@
 export const query = /\?.*/;
 
-const findConnectedLinks = (pathname, navSchema) => navSchema.find(({ link }) => pathname.replace(/^\//, '').replace(query, '') === link);
+const findConnectedLinks = (pathname, navSchema) =>
+  navSchema.find(({ link }) => pathname.replace(/^\//, '').replace(query, '') === link.replace(query, ''));
 
 export default findConnectedLinks;

packages/react-renderer-demo/src/hooks/use-mapper-link.js

@@ -1,12 +1,13 @@
 import useQueryParam from './use-query-param';
+import { query } from '../components/navigation/find-connected-links';
 
 /**
  * Appends current query mapper value to URL
  * @param {string} link url string to be appended with current mapper query param
  */
 const useMapperLink = (link = '') => {
   const mapperQuery = useQueryParam('mapper');
-  return link.includes('component-example/') ? `${link}${mapperQuery}` : link;
+  return link.match(query) && mapperQuery ? `${link.replace(query, '')}${mapperQuery}` : link;
 };
 
 export default useMapperLink;