fix: issue with excludePaths and update dependencies (#80)

* fix: issue with excludePaths and update dependencies

* bump version

Author: icd2k3

.eslintrc

@@ -7,7 +7,8 @@
     "react/destructuring-assignment": 0,
     "react/jsx-one-expression-per-line": 0,
     "react/jsx-filename-extension": 0,
-    "react/no-multi-comp": 0
+    "react/no-multi-comp": 0,
+    "react/jsx-props-no-spreading": 0
   },
   "globals": {
     "jest": "writeable"

.npmignore

@@ -1,3 +1,6 @@
 src/
 coverage/
 /yarn-error.log
+scripts/
+hooks/
+coverage/

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-router-breadcrumbs-hoc",
-  "version": "3.2.2",
+  "version": "3.2.3",
   "description": "small, flexible, higher order component for rendering breadcrumbs with react-router 4.x",
   "repository": "icd2k3/react-router-breadcrumbs-hoc",
   "main": "dist/cjs/index.js",
@@ -48,16 +48,16 @@
     "enzyme": "^3.10.0",
     "enzyme-adapter-react-16": "^1.14.0",
     "eslint": "^6.0.1",
-    "eslint-config-airbnb": "^17.1.1",
+    "eslint-config-airbnb": "^18.0.1",
     "eslint-plugin-import": "^2.18.1",
     "eslint-plugin-jsx-a11y": "^6.2.3",
     "eslint-plugin-react": "^7.14.2",
     "husky": "^3.0.1",
     "jest": "^24.8.0",
     "js-yaml": "^3.13.1",
     "prop-types": "^15.7.2",
-    "react": "16.8.6",
-    "react-dom": "16.8.6",
+    "react": "16.9.0",
+    "react-dom": "16.9.0",
     "react-router": "^5.0.1",
     "react-router-dom": "^5.0.1",
     "rollup": "^1.17.0",

rollup.config.js

@@ -27,7 +27,7 @@ const globals = {
   'react-router': 'ReactRouter',
 };
 
-export default exports.map(item => ({
+export default exports.map((item) => ({
   input: 'src/index.js',
   plugins: item.plugins,
   external,

src/index.js

@@ -29,10 +29,10 @@ const NO_BREADCRUMB = 'NO_BREADCRUMB';
  * we used to use the humanize-string package, but it added a lot of bundle
  * size and issues with compilation. This 4-liner seems to cover most cases.
  */
-const humanize = str => str
+const humanize = (str) => str
   .replace(/^[\s_]+|[\s_]+$/g, '')
   .replace(/[_\s]+/g, ' ')
-  .replace(/^[a-z]/, m => m.toUpperCase());
+  .replace(/^[a-z]/, (m) => m.toUpperCase());
 
 /**
  * Renders and returns the breadcrumb complete
@@ -84,7 +84,8 @@ const getBreadcrumbMatch = ({
 
   // Check the optional `exludePaths` option in `options` to see if the
   // current path should not include a breadcrumb.
-  if (excludePaths && excludePaths.includes(pathSection)) {
+  const getIsPathExcluded = (path) => matchPath(pathSection, { path, exact: true, strict: false });
+  if (excludePaths && excludePaths.some(getIsPathExcluded)) {
     return NO_BREADCRUMB;
   }
 
@@ -192,18 +193,20 @@ export const getBreadcrumbs = ({ routes, location, options = {} }) => {
  * Takes a route array and recursively flattens it IF there are
  * nested routes in the config.
 */
-const flattenRoutes = routes => (routes || []).reduce((arr, route) => {
+const flattenRoutes = (routes) => (routes || []).reduce((arr, route) => {
   if (route.routes) {
     return arr.concat([route, ...flattenRoutes(route.routes)]);
   }
   return arr.concat(route);
 }, []);
 
-export default (routes = [], options) => Component => withRouter(props => createElement(Component, {
-  ...props,
-  breadcrumbs: getBreadcrumbs({
-    routes: flattenRoutes(routes),
-    location: props.location,
-    options,
+export default (routes = [], options) => (Component) => withRouter(
+  (props) => createElement(Component, {
+    ...props,
+    breadcrumbs: getBreadcrumbs({
+      routes: flattenRoutes(routes),
+      location: props.location,
+      options,
+    }),
   }),
-}));
+);

src/index.test.js

@@ -309,6 +309,20 @@ describe('react-router-breadcrumbs-hoc', () => {
         const { breadcrumbs } = render({ pathname: '/one/two', options: { excludePaths: ['/', '/one'] } });
         expect(breadcrumbs).toBe('Two');
       });
+
+      it('Should work with url params', () => {
+        const routes = [
+          { path: '/a' },
+          { path: '/a/:b' },
+          { path: '/a/:b/:c' },
+        ];
+        const { breadcrumbs } = render({
+          pathname: '/a/b/c',
+          routes,
+          options: { excludePaths: ['/a/:b', '/a'] },
+        });
+        expect(breadcrumbs).toBe('Home / C');
+      });
     });
 
     describe('options without routes array', () => {