set currentRoute during loading transitions

emberjs · Mar 7, 2021 · e246785 · e246785
1 parent efb37aa
commit e246785
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/packages/@ember/-internals/routing/lib/system/router.ts b/packages/@ember/-internals/routing/lib/system/router.ts
@@ -548,7 +548,7 @@ class EmberRouter extends EmberObject {
 
   intermediateTransitionTo(name: string, ...args: any[]) {
     this._routerMicrolib.intermediateTransitionTo(name, ...args);
-
+    
     updatePaths(this);
 
     if (DEBUG) {
@@ -1306,6 +1306,8 @@ let defaultActionHandlers = {
         let loadingRouteName = findRouteStateName(route, 'loading');
         if (loadingRouteName) {
           router.intermediateTransitionTo(loadingRouteName);
+          const infos = router._routerMicrolib.currentRouteInfos!;
+          router.set('currentRoute', infos[infos.length - 1]);
           return false;
         }
       }
@@ -1314,6 +1316,8 @@ let defaultActionHandlers = {
       let loadingSubstateName = findRouteSubstateName(route, 'loading');
       if (loadingSubstateName) {
         router.intermediateTransitionTo(loadingSubstateName);
+        const infos = router._routerMicrolib.currentRouteInfos!;
+        router.set('currentRoute', infos[infos.length - 1]);
         return false;
       }