Merge pull request #16245 from Olegas/fix-router-match

Fix router matching utility in case matching with "startsWith" and searched part is inside of current url

lib/router/src/utils.test.ts

@@ -34,6 +34,12 @@ describe('getMatch', () => {
 
     expect(output).toBe(null);
   });
+
+  it('returns null match if "startsWith" part is in the middle', () => {
+    const output = getMatch('/foo/bar', '/bar', true);
+
+    expect(output).toBe(null);
+  });
 });
 
 describe('parsePath', () => {

lib/router/src/utils.ts

@@ -148,11 +148,19 @@ type Match = { path: string };
 
 export const getMatch = memoize(1000)(
   (current: string, target: string, startsWith = true): Match | null => {
-    const startsWithTarget = current && startsWith && current.startsWith(target);
+    if (startsWith) {
+      const startsWithTarget = current && current.startsWith(target);
+      if (startsWithTarget) {
+        return { path: current };
+      }
+
+      return null;
+    }
+
     const currentIsTarget = typeof target === 'string' && current === target;
     const matchTarget = current && target && current.match(target);
 
-    if (startsWithTarget || currentIsTarget || matchTarget) {
+    if (currentIsTarget || matchTarget) {
       return { path: current };
     }