Fix: context copy

nuskey8 · nuskey8 · commit 9802ce2aedb0 · 2024-04-06T16:15:52.000+09:00
diff --git a/src/NavStack/Assets/NavStack/Runtime/NavigationStackCore.cs b/src/NavStack/Assets/NavStack/Runtime/NavigationStackCore.cs
@@ -19,11 +19,14 @@ internal sealed class NavigationStackCore
 
         bool isRunning;
 
-        public async UniTask PopAsync(NavigationContext context, CancellationToken cancellationToken = default)
+        public async UniTask PopAsync(INavigation navigation, NavigationContext context, CancellationToken cancellationToken = default)
         {
+            var copiedContext = context.CreateCopy();
+            copiedContext.Options = context.Options ?? navigation.DefaultOptions;
+
             if (isRunning)
             {
-                switch (context.Options.AwaitOperation)
+                switch (copiedContext.Options.AwaitOperation)
                 {
                     case NavigationAwaitOperation.Error:
                         throw new InvalidOperationException("Navigation is currently in transition.");
@@ -43,10 +46,10 @@ public async UniTask PopAsync(NavigationContext context, CancellationToken cance
                 pageStack.TryPop(out var page);
                 pageStack.TryPeek(out activePage);
 
-                var task1 = NavigationHelper.InvokeOnDisappear(page, callbackReceivers, context, cancellationToken);
+                var task1 = NavigationHelper.InvokeOnDisappear(page, callbackReceivers, copiedContext, cancellationToken);
                 var task2 = activePage == null
                     ? UniTask.CompletedTask
-                    : NavigationHelper.InvokeOnAppear(activePage, callbackReceivers, context, cancellationToken);
+                    : NavigationHelper.InvokeOnAppear(activePage, callbackReceivers, copiedContext, cancellationToken);
 
                 await UniTask.WhenAll(task1, task2);
 
@@ -58,11 +61,14 @@ public async UniTask PopAsync(NavigationContext context, CancellationToken cance
             }
         }
 
-        public async UniTask PushAsync(Func<UniTask<IPage>> pageFactory, NavigationContext context, CancellationToken cancellationToken = default)
+        public async UniTask PushAsync(INavigation navigation, Func<UniTask<IPage>> pageFactory, NavigationContext context, CancellationToken cancellationToken = default)
         {
+            var copiedContext = context.CreateCopy();
+            copiedContext.Options = context.Options ?? navigation.DefaultOptions;
+            
             if (isRunning)
             {
-                switch (context.Options.AwaitOperation)
+                switch (copiedContext.Options.AwaitOperation)
                 {
                     case NavigationAwaitOperation.Error:
                         throw new InvalidOperationException("Navigation is currently in transition.");
@@ -83,8 +89,8 @@ public async UniTask PushAsync(Func<UniTask<IPage>> pageFactory, NavigationConte
 
                 var task1 = activePage == null
                     ? UniTask.CompletedTask
-                    : NavigationHelper.InvokeOnDisappear(activePage, callbackReceivers, context, cancellationToken);
-                var task2 = NavigationHelper.InvokeOnAppear(page, callbackReceivers, context, cancellationToken);
+                    : NavigationHelper.InvokeOnDisappear(activePage, callbackReceivers, copiedContext, cancellationToken);
+                var task2 = NavigationHelper.InvokeOnAppear(page, callbackReceivers, copiedContext, cancellationToken);
 
                 await UniTask.WhenAll(task1, task2);
 
diff --git a/src/NavStack/Assets/NavStack/Runtime/UI/NavigationStack.cs b/src/NavStack/Assets/NavStack/Runtime/UI/NavigationStack.cs
@@ -67,17 +67,17 @@ protected virtual void Awake()
 
         public UniTask PopAsync(NavigationContext context, CancellationToken cancellationToken = default)
         {
-            return core.PopAsync(context, cancellationToken);
+            return core.PopAsync(this, context, cancellationToken);
         }
 
         public UniTask PushAsync(IPage page, NavigationContext context, CancellationToken cancellationToken = default)
         {
-            return core.PushAsync(() => new(page), context, cancellationToken);
+            return core.PushAsync(this, () => new(page), context, cancellationToken);
         }
 
         public UniTask PushAsync(Func<UniTask<IPage>> factory, NavigationContext context, CancellationToken cancellationToken = default)
         {
-            return core.PushAsync(factory, context, cancellationToken);
+            return core.PushAsync(this, factory, context, cancellationToken);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -67,17 +67,17 @@ protected virtual void Awake()`
`67`	`67`
`68`	`68`	`public UniTask PopAsync(NavigationContext context, CancellationToken cancellationToken = default)`
`69`	`69`	`{`
`70`		`- return core.PopAsync(context, cancellationToken);`
	`70`	`+ return core.PopAsync(this, context, cancellationToken);`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`public UniTask PushAsync(IPage page, NavigationContext context, CancellationToken cancellationToken = default)`
`74`	`74`	`{`
`75`		`- return core.PushAsync(() => new(page), context, cancellationToken);`
	`75`	`+ return core.PushAsync(this, () => new(page), context, cancellationToken);`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`public UniTask PushAsync(Func<UniTask<IPage>> factory, NavigationContext context, CancellationToken cancellationToken = default)`
`79`	`79`	`{`
`80`		`- return core.PushAsync(factory, context, cancellationToken);`
	`80`	`+ return core.PushAsync(this, factory, context, cancellationToken);`
`81`	`81`	`}`
`82`	`82`	`}`
`83`	`83`	`}`