Change: useNavigationEvent -> LoadOnAttached property

nuskey8 · nuskey8 · commit 703c6221c922 · 2025-01-05T14:59:26.000+09:00
diff --git a/src/NavStack/Assets/NavStack/Runtime/Scenes/SceneNavigationSheetExtensions.cs b/src/NavStack/Assets/NavStack/Runtime/Scenes/SceneNavigationSheetExtensions.cs
@@ -7,12 +7,12 @@ public static class SceneNavigationSheetExtensions
     {
         public static UniTask AddSceneAsync(this INavigationSheet navigationSheet, int sceneBuildIndex, CancellationToken cancellationToken = default)
         {
-            return navigationSheet.AddAsync(new ScenePage(sceneBuildIndex, true), cancellationToken);
+            return navigationSheet.AddAsync(new ScenePage(sceneBuildIndex), cancellationToken);
         }
 
         public static UniTask AddSceneAsync(this INavigationSheet navigationSheet, string sceneName, CancellationToken cancellationToken = default)
         {
-            return navigationSheet.AddAsync(new ScenePage(sceneName, true), cancellationToken);
+            return navigationSheet.AddAsync(new ScenePage(sceneName), cancellationToken);
         }
     }
 }
diff --git a/src/NavStack/Assets/NavStack/Runtime/Scenes/SceneNavigationStackExtensions.cs b/src/NavStack/Assets/NavStack/Runtime/Scenes/SceneNavigationStackExtensions.cs
@@ -7,22 +7,22 @@ public static class SceneNavigationStackExtensions
     {
         public static UniTask PushSceneAsync(this INavigationStack navigationStack, int sceneBuildIndex, CancellationToken cancellationToken = default)
         {
-            return navigationStack.PushAsync(new ScenePage(sceneBuildIndex, false), new NavigationContext(), cancellationToken);
+            return navigationStack.PushAsync(new ScenePage(sceneBuildIndex), new NavigationContext(), cancellationToken);
         }
 
         public static UniTask PushSceneAsync(this INavigationStack navigationStack, string sceneName, CancellationToken cancellationToken = default)
         {
-            return navigationStack.PushAsync(new ScenePage(sceneName, false), new NavigationContext(), cancellationToken);
+            return navigationStack.PushAsync(new ScenePage(sceneName), new NavigationContext(), cancellationToken);
         }
 
         public static UniTask PushSceneAsync(this INavigationStack navigationStack, int sceneBuildIndex, NavigationContext context, CancellationToken cancellationToken = default)
         {
-            return navigationStack.PushAsync(new ScenePage(sceneBuildIndex, false), context, cancellationToken);
+            return navigationStack.PushAsync(new ScenePage(sceneBuildIndex), context, cancellationToken);
         }
 
         public static UniTask PushSceneAsync(this INavigationStack navigationStack, string sceneName, NavigationContext context, CancellationToken cancellationToken = default)
         {
-            return navigationStack.PushAsync(new ScenePage(sceneName, false), context, cancellationToken);
+            return navigationStack.PushAsync(new ScenePage(sceneName), context, cancellationToken);
         }
     }
 }
diff --git a/src/NavStack/Assets/NavStack/Runtime/Scenes/ScenePage.cs b/src/NavStack/Assets/NavStack/Runtime/Scenes/ScenePage.cs
@@ -15,43 +15,42 @@ enum SceneLoadType
         readonly SceneLoadType loadType;
         readonly int buildIndex;
         readonly string sceneName;
-        readonly bool useNavigationEvent;
 
-        public ScenePage(int buildIndex, bool useNavigationEvent)
+        public bool LoadOnAttached { get; init; } = false;
+
+        public ScenePage(int buildIndex)
         {
             loadType = SceneLoadType.BuildIndex;
             this.buildIndex = buildIndex;
-            this.useNavigationEvent = useNavigationEvent;
         }
 
-        public ScenePage(string sceneName, bool useLifecycleEvent)
+        public ScenePage(string sceneName)
         {
             loadType = SceneLoadType.SceneName;
             this.sceneName = sceneName;
-            this.useNavigationEvent = useLifecycleEvent;
         }
-        
+
         public UniTask OnNavigatedFrom(NavigationContext context, CancellationToken cancellationToken = default)
         {
-            if (useNavigationEvent) return UniTask.CompletedTask;
+            if (LoadOnAttached) return UniTask.CompletedTask;
             return UnloadAsync(cancellationToken);
         }
 
         public UniTask OnNavigatedTo(NavigationContext context, CancellationToken cancellationToken = default)
         {
-            if (useNavigationEvent) return UniTask.CompletedTask;
+            if (LoadOnAttached) return UniTask.CompletedTask;
             return LoadAsync(cancellationToken);
         }
 
         public UniTask OnAttached(CancellationToken cancellationToken = default)
         {
-            if (!useNavigationEvent) return UniTask.CompletedTask;
+            if (!LoadOnAttached) return UniTask.CompletedTask;
             return LoadAsync(cancellationToken);
         }
 
         public UniTask OnDetached(CancellationToken cancellationToken = default)
         {
-            if (!useNavigationEvent) return UniTask.CompletedTask;
+            if (!LoadOnAttached) return UniTask.CompletedTask;
             return UnloadAsync(cancellationToken);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -7,12 +7,12 @@ public static class SceneNavigationSheetExtensions`
`7`	`7`	`{`
`8`	`8`	`public static UniTask AddSceneAsync(this INavigationSheet navigationSheet, int sceneBuildIndex, CancellationToken cancellationToken = default)`
`9`	`9`	`{`
`10`		`- return navigationSheet.AddAsync(new ScenePage(sceneBuildIndex, true), cancellationToken);`
	`10`	`+ return navigationSheet.AddAsync(new ScenePage(sceneBuildIndex), cancellationToken);`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`public static UniTask AddSceneAsync(this INavigationSheet navigationSheet, string sceneName, CancellationToken cancellationToken = default)`
`14`	`14`	`{`
`15`		`- return navigationSheet.AddAsync(new ScenePage(sceneName, true), cancellationToken);`
	`15`	`+ return navigationSheet.AddAsync(new ScenePage(sceneName), cancellationToken);`
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,22 +7,22 @@ public static class SceneNavigationStackExtensions`
`7`	`7`	`{`
`8`	`8`	`public static UniTask PushSceneAsync(this INavigationStack navigationStack, int sceneBuildIndex, CancellationToken cancellationToken = default)`
`9`	`9`	`{`
`10`		`- return navigationStack.PushAsync(new ScenePage(sceneBuildIndex, false), new NavigationContext(), cancellationToken);`
	`10`	`+ return navigationStack.PushAsync(new ScenePage(sceneBuildIndex), new NavigationContext(), cancellationToken);`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`public static UniTask PushSceneAsync(this INavigationStack navigationStack, string sceneName, CancellationToken cancellationToken = default)`
`14`	`14`	`{`
`15`		`- return navigationStack.PushAsync(new ScenePage(sceneName, false), new NavigationContext(), cancellationToken);`
	`15`	`+ return navigationStack.PushAsync(new ScenePage(sceneName), new NavigationContext(), cancellationToken);`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`public static UniTask PushSceneAsync(this INavigationStack navigationStack, int sceneBuildIndex, NavigationContext context, CancellationToken cancellationToken = default)`
`19`	`19`	`{`
`20`		`- return navigationStack.PushAsync(new ScenePage(sceneBuildIndex, false), context, cancellationToken);`
	`20`	`+ return navigationStack.PushAsync(new ScenePage(sceneBuildIndex), context, cancellationToken);`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`public static UniTask PushSceneAsync(this INavigationStack navigationStack, string sceneName, NavigationContext context, CancellationToken cancellationToken = default)`
`24`	`24`	`{`
`25`		`- return navigationStack.PushAsync(new ScenePage(sceneName, false), context, cancellationToken);`
	`25`	`+ return navigationStack.PushAsync(new ScenePage(sceneName), context, cancellationToken);`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,43 +15,42 @@ enum SceneLoadType`
`15`	`15`	`readonly SceneLoadType loadType;`
`16`	`16`	`readonly int buildIndex;`
`17`	`17`	`readonly string sceneName;`
`18`		`- readonly bool useNavigationEvent;`
`19`	`18`
`20`		`- public ScenePage(int buildIndex, bool useNavigationEvent)`
	`19`	`+ public bool LoadOnAttached { get; init; } = false;`
	`20`	`+`
	`21`	`+ public ScenePage(int buildIndex)`
`21`	`22`	`{`
`22`	`23`	`loadType = SceneLoadType.BuildIndex;`
`23`	`24`	`this.buildIndex = buildIndex;`
`24`		`- this.useNavigationEvent = useNavigationEvent;`
`25`	`25`	`}`
`26`	`26`
`27`		`- public ScenePage(string sceneName, bool useLifecycleEvent)`
	`27`	`+ public ScenePage(string sceneName)`
`28`	`28`	`{`
`29`	`29`	`loadType = SceneLoadType.SceneName;`
`30`	`30`	`this.sceneName = sceneName;`
`31`		`- this.useNavigationEvent = useLifecycleEvent;`
`32`	`31`	`}`
`33`		`-`
	`32`	`+`
`34`	`33`	`public UniTask OnNavigatedFrom(NavigationContext context, CancellationToken cancellationToken = default)`
`35`	`34`	`{`
`36`		`- if (useNavigationEvent) return UniTask.CompletedTask;`
	`35`	`+ if (LoadOnAttached) return UniTask.CompletedTask;`
`37`	`36`	`return UnloadAsync(cancellationToken);`
`38`	`37`	`}`
`39`	`38`
`40`	`39`	`public UniTask OnNavigatedTo(NavigationContext context, CancellationToken cancellationToken = default)`
`41`	`40`	`{`
`42`		`- if (useNavigationEvent) return UniTask.CompletedTask;`
	`41`	`+ if (LoadOnAttached) return UniTask.CompletedTask;`
`43`	`42`	`return LoadAsync(cancellationToken);`
`44`	`43`	`}`
`45`	`44`
`46`	`45`	`public UniTask OnAttached(CancellationToken cancellationToken = default)`
`47`	`46`	`{`
`48`		`- if (!useNavigationEvent) return UniTask.CompletedTask;`
	`47`	`+ if (!LoadOnAttached) return UniTask.CompletedTask;`
`49`	`48`	`return LoadAsync(cancellationToken);`
`50`	`49`	`}`
`51`	`50`
`52`	`51`	`public UniTask OnDetached(CancellationToken cancellationToken = default)`
`53`	`52`	`{`
`54`		`- if (!useNavigationEvent) return UniTask.CompletedTask;`
	`53`	`+ if (!LoadOnAttached) return UniTask.CompletedTask;`
`55`	`54`	`return UnloadAsync(cancellationToken);`
`56`	`55`	`}`
`57`	`56`