Merge pull request #157 from BalassaMarton/multiwindow-close

Shell - Handle window close events correctly
morganstanley · Feb 21, 2023 · 26df8ef · 26df8ef
2 parents fee34a5 + cea0db8
commit 26df8ef
Show file tree

Hide file tree

Showing 5 changed files with 76 additions and 8 deletions.
diff --git a/Tryouts/Prototypes/Shell/.gitignore b/Tryouts/Prototypes/Shell/.gitignore
@@ -0,0 +1 @@
+Properties/launchsettings.json
diff --git a/Tryouts/Prototypes/Shell/Node-launcher/MultiWindowDemo/index.html b/Tryouts/Prototypes/Shell/Node-launcher/MultiWindowDemo/index.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="UTF-8" />
+    <title>Navigation demo</title>
+</head>
+
+<body>
+    <script>
+
+        let popup;
+
+        function getPopupUrl(content) {
+            return "popup.html?" + encodeURIComponent(content);
+        }
+
+        function showPopup() {
+            const content = document.getElementById("popupContent").value;
+            console.log(`Opening new window with content '${content}'`);
+
+            if (popup && !popup.closed) {
+                popup.location = getPopupUrl(content);
+            }
+            else {
+                popup = window.open(getPopupUrl(content));
+            }
+        }
+    </script>
+    <div>
+        <form onsubmit="showPopup(); return false;">
+            <input type="text" id="popupContent"></input>
+            <button>Open</button>
+        </form>
+    </div>
+</body>
+
+</html>
diff --git a/Tryouts/Prototypes/Shell/Node-launcher/MultiWindowDemo/popup.html b/Tryouts/Prototypes/Shell/Node-launcher/MultiWindowDemo/popup.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8" />
+    <title>title</title>
+</head>
+<body>
+    <script>
+
+        window.onload = ev => {
+            const content = window.location.search.substring(1);
+            console.log(`Setting content to ${content}`);
+            document.getElementById("content").textContent = content;
+        }
+
+    </script>
+    <div>
+        <span id="content"></span>
+    </div>
+    <div>
+        <button onclick="window.close()">Close window</button>
+    </div>
+</body>
+</html>
diff --git a/Tryouts/Prototypes/Shell/Properties/launchSettings.json b/Tryouts/Prototypes/Shell/Properties/launchSettings.json
diff --git a/Tryouts/Prototypes/Shell/WebWindow.xaml.cs b/Tryouts/Prototypes/Shell/WebWindow.xaml.cs
@@ -25,10 +25,18 @@ public WebWindow(WebWindowOptions webWindowOptions)
                 if (args.IsSuccess)
                 {
                     webView.CoreWebView2.NewWindowRequested += (sender, args) => OnNewWindowRequested(args);
+                    webView.CoreWebView2.WindowCloseRequested += (sender, args) => OnWindowCloseRequested(args);
                 }
             };
         }
 
+        protected override void OnClosed(EventArgs e)
+        {
+            base.OnClosed(e);
+            this.RemoveLogicalChild(webView);
+            webView.Dispose();
+        }
+
         private readonly ImageSourceProvider _iconProvider = new ImageSourceProvider(new EnvironmentImageSourcePolicy());
 
         private void TrySetIconUrl(WebWindowOptions webWindowOptions)
@@ -64,5 +72,10 @@ private async void OnNewWindowRequested(CoreWebView2NewWindowRequestedEventArgs
             e.NewWindow = window.webView.CoreWebView2;
             deferral.Complete();
         }
+
+        private void OnWindowCloseRequested(object args)
+        {
+            this.Close();
+        }
     }
 }