Fix: wrong page event call

nuskey8 · nuskey8 · commit be17858544b2 · 2024-06-05T10:24:22.000+09:00
diff --git a/src/NavStack/Assets/NavStack/Runtime/Internal/NavigationSheetCore.cs b/src/NavStack/Assets/NavStack/Runtime/Internal/NavigationSheetCore.cs
@@ -85,12 +85,13 @@ public async UniTask ShowAsync(INavigation navigation, int index, NavigationCont
                 var page = pages[index];
                 if (activePage == page) return;
 
-                var task1 = activePage == null ? UniTask.CompletedTask : activePage.OnNavigatedFrom(copiedContext, cancellationToken);
-                var task2 = page.OnNavigatedTo(copiedContext, cancellationToken);
+                var prevPage = activePage;
+                activePage = page;
 
-                await UniTask.WhenAll(task1, task2);
+                var task1 = prevPage == null ? UniTask.CompletedTask : prevPage.OnNavigatedFrom(copiedContext, cancellationToken);
+                var task2 = activePage.OnNavigatedTo(copiedContext, cancellationToken);
 
-                activePage = page;
+                await UniTask.WhenAll(task1, task2);
             }
             finally
             {
diff --git a/src/NavStack/Assets/NavStack/Runtime/Internal/NavigationStackCore.cs b/src/NavStack/Assets/NavStack/Runtime/Internal/NavigationStackCore.cs
@@ -103,9 +103,11 @@ public async UniTask PushAsync(INavigation navigation, Func<UniTask<IPage>> page
                 {
                     await navigationStackEvent.OnPush(copiedContext, cancellationToken);
                 }
+
+                var prevPage = activePage;
                 activePage = page;
 
-                var task1 = activePage == null ? UniTask.CompletedTask : activePage.OnNavigatedFrom(copiedContext, cancellationToken);
+                var task1 = prevPage == null ? UniTask.CompletedTask : prevPage.OnNavigatedFrom(copiedContext, cancellationToken);
                 var task2 = activePage.OnNavigatedTo(copiedContext, cancellationToken);
                 
                 await UniTask.WhenAll(task1, task2);

Original file line number	Diff line number	Diff line change
`@@ -103,9 +103,11 @@ public async UniTask PushAsync(INavigation navigation, Func<UniTask<IPage>> page`
`103`	`103`	`{`
`104`	`104`	`await navigationStackEvent.OnPush(copiedContext, cancellationToken);`
`105`	`105`	`}`
	`106`	`+`
	`107`	`+ var prevPage = activePage;`
`106`	`108`	`activePage = page;`
`107`	`109`
`108`		`- var task1 = activePage == null ? UniTask.CompletedTask : activePage.OnNavigatedFrom(copiedContext, cancellationToken);`
	`110`	`+ var task1 = prevPage == null ? UniTask.CompletedTask : prevPage.OnNavigatedFrom(copiedContext, cancellationToken);`
`109`	`111`	`var task2 = activePage.OnNavigatedTo(copiedContext, cancellationToken);`
`110`	`112`
`111`	`113`	`await UniTask.WhenAll(task1, task2);`