@tanstack/router-core 0.0.1-beta.186 → 0.0.1-beta.187

package/build/esm/index.js

@@ -1716,7 +1716,7 @@ class Router {
       const from = this.state.location;
       const fromPathname = dest.from ?? from.pathname;
       let pathname = resolvePath(this.basepath ?? '/', fromPathname, `${dest.to ?? ''}`);
-      const fromMatches = this.matchRoutes(from.pathname, from.search);
+      const fromMatches = this.matchRoutes(fromPathname, from.search);
       const prevParams = {
         ...last(fromMatches)?.params
       };
@@ -1764,17 +1764,23 @@ class Router {
       let next = build(dest);
       let maskedNext = maskedDest ? build(maskedDest) : undefined;
       if (!maskedNext) {
-        const foundMask = this.options.routeMasks?.find(d => {
+        let params = {};
+        let foundMask = this.options.routeMasks?.find(d => {
           const match = matchPathname(this.basepath, next.pathname, {
             to: d.from,
             fuzzy: false
           });
           if (match) {
-            return match;
+            params = match;
+            return true;
           }
           return false;
         });
         if (foundMask) {
+          foundMask = {
+            ...foundMask,
+            from: interpolatePath(foundMask.from, params)
+          };
           maskedDest = foundMask;
           maskedNext = build(maskedDest);
         }