From bfc0309a137f48fe915fd10f7def364e02899a6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Su=C3=A1rez?= <javiersuarezruiz@hotmail.com>
Date: Mon, 15 Apr 2024 18:44:25 +0200
Subject: [PATCH 1/5] [iOS] Fix crash closing Popup with WebView (#21718)

* Added repro sample

* Fix the issue

* Added UI Test

* Updated csproj

* More changes

* Removed sample and test

* More changes

* Removed unnecesary changes
---
 .../iOS/MauiWebViewNavigationDelegate.cs      | 41 +++++++++++++++----
 1 file changed, 32 insertions(+), 9 deletions(-)

diff --git a/src/Core/src/Platform/iOS/MauiWebViewNavigationDelegate.cs b/src/Core/src/Platform/iOS/MauiWebViewNavigationDelegate.cs
index 6f1a916c218b..3000e3ec430d 100644
--- a/src/Core/src/Platform/iOS/MauiWebViewNavigationDelegate.cs
+++ b/src/Core/src/Platform/iOS/MauiWebViewNavigationDelegate.cs
@@ -26,12 +26,17 @@ public MauiWebViewNavigationDelegate(IWebViewHandler handler)
 		public void DidFinishNavigation(WKWebView webView, WKNavigation navigation)
 		{
 			var handler = Handler;
+
+			if (handler is null || !handler.IsConnected())
+				return;
+
+			var platformView = handler?.PlatformView;
 			var virtualView = handler?.VirtualView;
 
-			if (handler == null || virtualView == null)
+			if (platformView is null || virtualView is null)
 				return;
 
-			handler.PlatformView?.UpdateCanGoBackForward(handler.VirtualView);
+			platformView.UpdateCanGoBackForward(virtualView);
 
 			if (webView.IsLoading)
 				return;
@@ -47,39 +52,49 @@ public void DidFinishNavigation(WKWebView webView, WKNavigation navigation)
 			if (handler is WebViewHandler webViewHandler)
 				webViewHandler.ProcessNavigatedAsync(url).FireAndForget();
 			else
-				handler.PlatformView?.UpdateCanGoBackForward(virtualView);
+				platformView.UpdateCanGoBackForward(virtualView);
 		}
 
 		[Export("webView:didFailNavigation:withError:")]
 		public void DidFailNavigation(WKWebView webView, WKNavigation navigation, NSError error)
 		{
 			var handler = Handler;
+
+			if (handler is null || !handler.IsConnected())
+				return;
+
+			var platformView = handler?.PlatformView;
 			var virtualView = handler?.VirtualView;
 
-			if (handler == null || virtualView == null)
+			if (platformView is null || virtualView is null)
 				return;
 
 			var url = GetCurrentUrl();
 
 			virtualView.Navigated(_lastEvent, url, WebNavigationResult.Failure);
 
-			handler.PlatformView?.UpdateCanGoBackForward(virtualView);
+			platformView.UpdateCanGoBackForward(virtualView);
 		}
 
 		[Export("webView:didFailProvisionalNavigation:withError:")]
 		public void DidFailProvisionalNavigation(WKWebView webView, WKNavigation navigation, NSError error)
 		{
 			var handler = Handler;
+
+			if (handler is null || !handler.IsConnected())
+				return;
+
+			var platformView = handler?.PlatformView;
 			var virtualView = handler?.VirtualView;
 
-			if (handler == null || virtualView == null)
+			if (platformView is null || virtualView is null)
 				return;
 
 			var url = GetCurrentUrl();
 
 			virtualView.Navigated(_lastEvent, url, WebNavigationResult.Failure);
 
-			handler.PlatformView?.UpdateCanGoBackForward(virtualView);
+			platformView.UpdateCanGoBackForward(virtualView);
 		}
 
 		// https://stackoverflow.com/questions/37509990/migrating-from-uiwebview-to-wkwebview
@@ -87,9 +102,17 @@ public void DidFailProvisionalNavigation(WKWebView webView, WKNavigation navigat
 		public void DecidePolicy(WKWebView webView, WKNavigationAction navigationAction, Action<WKNavigationActionPolicy> decisionHandler)
 		{
 			var handler = Handler;
+
+			if (handler is null || !handler.IsConnected())
+			{
+				decisionHandler.Invoke(WKNavigationActionPolicy.Cancel);
+				return;
+			}
+
+			var platformView = handler?.PlatformView;
 			var virtualView = handler?.VirtualView;
 
-			if (handler == null || virtualView == null)
+			if (platformView is null || virtualView is null)
 			{
 				decisionHandler.Invoke(WKNavigationActionPolicy.Cancel);
 				return;
@@ -130,7 +153,7 @@ public void DecidePolicy(WKWebView webView, WKNavigationAction navigationAction,
 			var lastUrl = request.Url.ToString();
 
 			bool cancel = virtualView.Navigating(navEvent, lastUrl);
-			handler.PlatformView?.UpdateCanGoBackForward(virtualView);
+			platformView.UpdateCanGoBackForward(virtualView);
 			decisionHandler(cancel ? WKNavigationActionPolicy.Cancel : WKNavigationActionPolicy.Allow);
 		}
 

From cf32698e65cc6df3e969fe34db2a53dd242ebd5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Su=C3=A1rez?= <javiersuarezruiz@hotmail.com>
Date: Thu, 18 Apr 2024 09:38:06 +0200
Subject: [PATCH 2/5] Added UITest

---
 .../Issues/Issue21846.xaml                    | 17 ++++++++++
 .../Issues/Issue21846.xaml.cs                 | 22 ++++++++++++
 .../Issues/Issue21846Modal.xaml               | 20 +++++++++++
 .../Issues/Issue21846Modal.xaml.cs            | 34 +++++++++++++++++++
 .../tests/UITests/Tests/Issues/Issue21846.cs  | 28 +++++++++++++++
 5 files changed, 121 insertions(+)
 create mode 100644 src/Controls/samples/Controls.Sample.UITests/Issues/Issue21846.xaml
 create mode 100644 src/Controls/samples/Controls.Sample.UITests/Issues/Issue21846.xaml.cs
 create mode 100644 src/Controls/samples/Controls.Sample.UITests/Issues/Issue21846Modal.xaml
 create mode 100644 src/Controls/samples/Controls.Sample.UITests/Issues/Issue21846Modal.xaml.cs
 create mode 100644 src/Controls/tests/UITests/Tests/Issues/Issue21846.cs

diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21846.xaml b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21846.xaml
new file mode 100644
index 000000000000..97b83ee4f6fa
--- /dev/null
+++ b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21846.xaml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="Maui.Controls.Sample.Issues.Issue21846"
+             xmlns:ns="clr-namespace:Maui.Controls.Sample.Issues">
+  <ScrollView>
+    <VerticalStackLayout
+      Padding="30,0"
+      Spacing="25">
+      <Button
+        x:Name="TestButton"
+        AutomationId="OpenModalButton"
+        Text="Open"
+        Clicked="OnButtonClicked" />
+    </VerticalStackLayout>
+  </ScrollView>
+</ContentPage>
\ No newline at end of file
diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21846.xaml.cs b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21846.xaml.cs
new file mode 100644
index 000000000000..ea0d03e6872b
--- /dev/null
+++ b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21846.xaml.cs
@@ -0,0 +1,22 @@
+using System;
+using Microsoft.Maui;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui.Controls.Xaml;
+
+namespace Maui.Controls.Sample.Issues
+{
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	[Issue(IssueTracker.Github, 21846, "Fix crash closing Popup with WebView", PlatformAffected.iOS)]
+	public partial class Issue21846 : ContentPage
+	{
+		public Issue21846()
+		{
+			InitializeComponent();
+		}
+
+		void OnButtonClicked(object sender, System.EventArgs e)
+		{
+			Navigation.PushModalAsync(new Issue21846Modal());
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21846Modal.xaml b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21846Modal.xaml
new file mode 100644
index 000000000000..7c6a0d4993bb
--- /dev/null
+++ b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21846Modal.xaml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="Maui.Controls.Sample.Issues.Issue21846Modal"
+             xmlns:ns="clr-namespace:Maui.Controls.Sample.Issues">
+  <ScrollView>
+    <Grid
+      RowDefinitions="*, Auto"
+      Padding="30,0">
+      <WebView 
+        x:Name="TestWebView"
+        Source="https://www.microsoft.com"/>
+      <Button
+        Grid.Row="1"
+        AutomationId="CloseModalButton"
+        Text="Close"
+        Clicked="OnButtonClicked" />
+    </Grid>
+  </ScrollView>
+</ContentPage>
\ No newline at end of file
diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21846Modal.xaml.cs b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21846Modal.xaml.cs
new file mode 100644
index 000000000000..ece722d299f2
--- /dev/null
+++ b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21846Modal.xaml.cs
@@ -0,0 +1,34 @@
+using System;
+using Microsoft.Maui;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui.Controls.Xaml;
+
+namespace Maui.Controls.Sample.Issues
+{
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class Issue21846Modal : ContentPage
+	{
+		public Issue21846Modal()
+		{
+			InitializeComponent();
+
+			BindingContext = this;
+		}
+		
+		void OnButtonClicked(object sender, System.EventArgs e)
+		{
+			if (TestWebView is IElement visualElement)
+			{
+				if (visualElement.Handler != null)
+				{
+					if (visualElement.Handler is IDisposable disposableHandler)
+						disposableHandler.Dispose();
+
+					visualElement.Handler.DisconnectHandler();
+				}
+			}
+
+			Navigation.PopModalAsync();
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue21846.cs b/src/Controls/tests/UITests/Tests/Issues/Issue21846.cs
new file mode 100644
index 000000000000..973f6db3c275
--- /dev/null
+++ b/src/Controls/tests/UITests/Tests/Issues/Issue21846.cs
@@ -0,0 +1,28 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace Microsoft.Maui.AppiumTests.Issues
+{
+	public class Issue21846 : _IssuesUITest
+	{
+		public Issue21846(TestDevice device) : base(device)
+		{
+		}
+
+		public override string Issue => "Fix crash closing Popup with WebView";
+
+		[Test]
+		[Category(UITestCategories.WebView)]
+		public void WebViewNoCrashPopup()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Android, TestDevice.Mac, TestDevice.Windows]);
+
+			App.WaitForElement("OpenModalButton");
+			App.Click("OpenModalButton");
+
+			App.WaitForElement("CloseModalButton");
+			App.Click("CloseModalButton");
+		}
+	}
+}

From ac02ee146a31ee495e2da550526135cb56e423b1 Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Thu, 18 Apr 2024 10:54:49 -0500
Subject: [PATCH 3/5] Update Issue21846.xaml.cs

---
 .../Controls.Sample.UITests/Issues/Issue21846.xaml.cs       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21846.xaml.cs b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21846.xaml.cs
index ea0d03e6872b..7e3cc3e505d7 100644
--- a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21846.xaml.cs
+++ b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21846.xaml.cs
@@ -14,9 +14,9 @@ public Issue21846()
 			InitializeComponent();
 		}
 
-		void OnButtonClicked(object sender, System.EventArgs e)
+		async void OnButtonClicked(object sender, System.EventArgs e)
 		{
-			Navigation.PushModalAsync(new Issue21846Modal());
+			await Navigation.PushModalAsync(new Issue21846Modal());
 		}
 	}
-}
\ No newline at end of file
+}

From cf5b6a2a2e37139b78fb6afc6196e2af0d17cfb1 Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Thu, 18 Apr 2024 10:55:43 -0500
Subject: [PATCH 4/5] Update Issue21846Modal.xaml.cs

---
 .../Controls.Sample.UITests/Issues/Issue21846Modal.xaml.cs  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21846Modal.xaml.cs b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21846Modal.xaml.cs
index ece722d299f2..617d30c9037a 100644
--- a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21846Modal.xaml.cs
+++ b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21846Modal.xaml.cs
@@ -15,7 +15,7 @@ public Issue21846Modal()
 			BindingContext = this;
 		}
 		
-		void OnButtonClicked(object sender, System.EventArgs e)
+		async void OnButtonClicked(object sender, System.EventArgs e)
 		{
 			if (TestWebView is IElement visualElement)
 			{
@@ -28,7 +28,7 @@ void OnButtonClicked(object sender, System.EventArgs e)
 				}
 			}
 
-			Navigation.PopModalAsync();
+			await Navigation.PopModalAsync();
 		}
 	}
-}
\ No newline at end of file
+}

From 970ab4133b0519d398289138e07e6520ddb02966 Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Thu, 18 Apr 2024 10:56:00 -0500
Subject: [PATCH 5/5] Update Issue21846.cs

---
 src/Controls/tests/UITests/Tests/Issues/Issue21846.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue21846.cs b/src/Controls/tests/UITests/Tests/Issues/Issue21846.cs
index 973f6db3c275..5332e44725fe 100644
--- a/src/Controls/tests/UITests/Tests/Issues/Issue21846.cs
+++ b/src/Controls/tests/UITests/Tests/Issues/Issue21846.cs
@@ -16,7 +16,7 @@ public Issue21846(TestDevice device) : base(device)
 		[Category(UITestCategories.WebView)]
 		public void WebViewNoCrashPopup()
 		{
-			this.IgnoreIfPlatforms([TestDevice.Android, TestDevice.Mac, TestDevice.Windows]);
+			this.IgnoreIfPlatforms([TestDevice.Android, TestDevice.Windows]);
 
 			App.WaitForElement("OpenModalButton");
 			App.Click("OpenModalButton");