Changed to call Popup's MapOnClosed method (#2202)

Changed so that MapOnClosed method is called
CommunityToolkit · Sep 12, 2024 · 4d1d049 · 4d1d049
1 parent 52b84a9
commit 4d1d049
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/CommunityToolkit.Maui.Core/Handlers/Popup/PopupHandler.shared.cs b/src/CommunityToolkit.Maui.Core/Handlers/Popup/PopupHandler.shared.cs
@@ -23,9 +23,9 @@ public partial class PopupHandler
 	/// </summary>
 	public static CommandMapper<IPopup, PopupHandler> PopUpCommandMapper = new(ElementCommandMapper)
 	{
-		[nameof(IPopup.OnClosed)] = MapOnClosed,
 #if !(IOS || MACCATALYST)
 		[nameof(IPopup.OnOpened)] = MapOnOpened,
+		[nameof(IPopup.OnClosed)] = MapOnClosed,
 #endif
 		[nameof(IPopup.OnDismissedByTappingOutsideOfPopup)] = MapOnDismissedByTappingOutsideOfPopup
 	};

diff --git a/src/CommunityToolkit.Maui/HandlerImplementation/Popup/Popup.macios.cs b/src/CommunityToolkit.Maui/HandlerImplementation/Popup/Popup.macios.cs
@@ -44,6 +44,8 @@ static PageHandler CreatePageHandler(IPopup virtualView)
 	/// <param name="result">We don't need to provide the result parameter here.</param>
 	public static void MapOnClosed(PopupHandler handler, IPopup view, object? result)
 	{
+		PopupHandler.MapOnClosed(handler, view, result);
+
 		var parent = view.Parent as Element;
 		if (parent is not null)
 		{