From ebf9b18b766a057de74af9d129be950f7d3f042a Mon Sep 17 00:00:00 2001 From: cat0363 Date: Fri, 9 Jun 2023 09:40:28 +0900 Subject: [PATCH] Update PopupExtensions.shared.cs Fixed code for Issue #1120 --- .../Views/Popup/PopupExtensions.shared.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/CommunityToolkit.Maui/Views/Popup/PopupExtensions.shared.cs b/src/CommunityToolkit.Maui/Views/Popup/PopupExtensions.shared.cs index 78c20fc0b..8e9ad95fa 100644 --- a/src/CommunityToolkit.Maui/Views/Popup/PopupExtensions.shared.cs +++ b/src/CommunityToolkit.Maui/Views/Popup/PopupExtensions.shared.cs @@ -27,14 +27,14 @@ public static partial class PopupExtensions } else { - void handler(object? sender, NavigatedToEventArgs args) + void handler(object? sender, EventArgs args) { - page.NavigatedTo -= handler; + page.Loaded -= handler; CreateAndShowPopup(page, popup); } - page.NavigatedTo += handler; + page.Loaded += handler; } } @@ -60,9 +60,9 @@ void handler(object? sender, NavigatedToEventArgs args) { var taskCompletionSource = new TaskCompletionSource(); - async void handler(object? sender, NavigatedToEventArgs args) + async void handler(object? sender, EventArgs args) { - page.NavigatedTo -= handler; + page.Loaded -= handler; try { @@ -76,7 +76,7 @@ async void handler(object? sender, NavigatedToEventArgs args) } } - page.NavigatedTo += handler; + page.Loaded += handler; return taskCompletionSource.Task; }