Skip to content

[pull] main from AnnulusGames:main #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 3 commits into from
May 14, 2024
Merged

[pull] main from AnnulusGames:main #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
42063d5
Fix: page event definition and implementation being reversed
nuskey8 May 13, 2024
a6b30da
Fix: README sample code
nuskey8 May 13, 2024
a23c6ba
Merge pull request #7 from AnnulusGames/change-navigation-event-handling
nuskey8 May 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ await navigationStack.PushAsync(page, context, cancellationToken);

class ExamplePage : IPage
{
public UniTask OnNavigatedFrom(NavigationContext context, CancellationToken cancellationToken = default)
public UniTask OnNavigatedTo(NavigationContext context, CancellationToken cancellationToken = default)
{
var id = (string)context.Parameters["id"];

Expand Down Expand Up @@ -188,7 +188,7 @@ public class SamplePage1 : MonoBehaviour, IPage
{
[SerializeField] CanvasGroup canvasGroup;

public async UniTask OnNavigatedFrom(NavigationContext context, CancellationToken cancellationToken = default)
public async UniTask OnNavigatedTo(NavigationContext context, CancellationToken cancellationToken = default)
{
if (!context.Options.Animated)
{
Expand All @@ -203,7 +203,7 @@ public class SamplePage1 : MonoBehaviour, IPage
.ToUniTask(CancellationTokenSource.CreateLinkedTokenSource(destroyCancellationToken, cancellationToken).Token);
}

public async UniTask OnNavigatedTo(NavigationContext context, CancellationToken cancellationToken = default)
public async UniTask OnNavigatedFrom(NavigationContext context, CancellationToken cancellationToken = default)
{
if (!context.Options.Animated)
{
Expand Down
10 changes: 5 additions & 5 deletions README_JA.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ public interface IPage

| イベント | 説明 |
| - | - |
| OnNavigatedFrom | 他のPageから遷移してきた際に呼ばれる。 |
| OnNavigatedTo | 他のPageへ遷移する際に呼ばれる。 |
| OnNavigatedFrom | 他のPageへ遷移する際に呼ばれる。 |
| OnNavigatedTo | 他のPageから遷移してきた際に呼ばれる。 |

これをMonoBehaviourを継承したコンポーネント等で実装することでPageとして使用可能なViewを作成できます。

Expand Down Expand Up @@ -154,7 +154,7 @@ await navigationStack.PushAsync(page, context, cancellationToken);

class ExamplePage : IPage
{
public UniTask OnNavigatedFrom(NavigationContext context, CancellationToken cancellationToken = default)
public UniTask OnNavigatedTo(NavigationContext context, CancellationToken cancellationToken = default)
{
var id = (string)context.Parameters["id"];

Expand Down Expand Up @@ -200,7 +200,7 @@ public class SamplePage1 : MonoBehaviour, IPage
{
[SerializeField] CanvasGroup canvasGroup;

public async UniTask OnNavigatedFrom(NavigationContext context, CancellationToken cancellationToken = default)
public async UniTask OnNavigatedTo(NavigationContext context, CancellationToken cancellationToken = default)
{
if (!context.Options.Animated)
{
Expand All @@ -215,7 +215,7 @@ public class SamplePage1 : MonoBehaviour, IPage
.ToUniTask(CancellationTokenSource.CreateLinkedTokenSource(destroyCancellationToken, cancellationToken).Token);
}

public async UniTask OnNavigatedTo(NavigationContext context, CancellationToken cancellationToken = default)
public async UniTask OnNavigatedFrom(NavigationContext context, CancellationToken cancellationToken = default)
{
if (!context.Options.Animated)
{
Expand Down
6 changes: 3 additions & 3 deletions src/NavStack/Assets/NavStack/Runtime/Internal/NavigationSheetCore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ public async UniTask ShowAsync(INavigation navigation, int index, NavigationCont
var page = pages[index];
if (activePage == page) return;

var task1 = activePage == null ? UniTask.CompletedTask : activePage.OnNavigatedTo(copiedContext, cancellationToken);
var task2 = page.OnNavigatedFrom(copiedContext, cancellationToken);
var task1 = activePage == null ? UniTask.CompletedTask : activePage.OnNavigatedFrom(copiedContext, cancellationToken);
var task2 = page.OnNavigatedTo(copiedContext, cancellationToken);

await UniTask.WhenAll(task1, task2);

Expand Down Expand Up @@ -128,7 +128,7 @@ public async UniTask HideAsync(INavigation navigation, NavigationContext context
{
if (activePage != null)
{
await activePage.OnNavigatedTo(copiedContext, cancellationToken);
await activePage.OnNavigatedFrom(copiedContext, cancellationToken);
}

activePage = null;
Expand Down
8 changes: 4 additions & 4 deletions src/NavStack/Assets/NavStack/Runtime/Internal/NavigationStackCore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ public async UniTask PopAsync(INavigation navigation, NavigationContext context,
}
pageStack.TryPeek(out activePage);

var task1 = page.OnNavigatedTo(copiedContext, cancellationToken);
var task2 = activePage == null ? UniTask.CompletedTask : activePage.OnNavigatedFrom(copiedContext, cancellationToken);
var task1 = page.OnNavigatedFrom(copiedContext, cancellationToken);
var task2 = activePage == null ? UniTask.CompletedTask : activePage.OnNavigatedTo(copiedContext, cancellationToken);

await UniTask.WhenAll(task1, task2);

Expand Down Expand Up @@ -105,8 +105,8 @@ public async UniTask PushAsync(INavigation navigation, Func<UniTask<IPage>> page
}
activePage = page;

var task1 = activePage == null ? UniTask.CompletedTask : activePage.OnNavigatedTo(copiedContext, cancellationToken);
var task2 = activePage.OnNavigatedFrom(copiedContext, cancellationToken);
var task1 = activePage == null ? UniTask.CompletedTask : activePage.OnNavigatedFrom(copiedContext, cancellationToken);
var task2 = activePage.OnNavigatedTo(copiedContext, cancellationToken);

await UniTask.WhenAll(task1, task2);

Expand Down