fix: dispose webview after leaving mini app page

Fooxboy · Dec 18, 2024 · 0a8d987 · 0a8d987
1 parent 2232f96
commit 0a8d987
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/MusicX/Views/MiniAppView.xaml b/MusicX/Views/MiniAppView.xaml
@@ -10,7 +10,8 @@
       xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
       xmlns:converters="clr-namespace:MusicX.Converters"
       mc:Ignorable="d"
-      d:DataContext="{d:DesignInstance viewModels:MiniAppViewModel}">
+      d:DataContext="{d:DesignInstance viewModels:MiniAppViewModel}"
+      Unloaded="MiniAppView_OnUnloaded">
     <Page.Resources>
         <converters:NullToVisibilityConverter x:Key="NullToVisibilityConverter" />
     </Page.Resources>
@@ -20,8 +21,7 @@
                       DefaultBackgroundColor="Transparent"
                       AllowExternalDrop="False"
                       NavigationStarting="WebView_OnNavigationStarting"
-                      NavigationCompleted="WebView_OnNavigationCompleted"
-                      WebMessageReceived="WebView_OnWebMessageReceived">
+                      NavigationCompleted="WebView_OnNavigationCompleted">
             <wv2:WebView2.Style>
                 <Style TargetType="wv2:WebView2">
                     <Setter Property="Visibility" Value="Hidden" />

diff --git a/MusicX/Views/MiniAppView.xaml.cs b/MusicX/Views/MiniAppView.xaml.cs
@@ -2,6 +2,7 @@
 using System.Net;
 using System.Runtime.Serialization;
 using System.Threading.Tasks;
+using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
 using System.Windows.Navigation;
@@ -263,8 +264,8 @@ private void WebView_OnNavigationCompleted(object? sender, CoreWebView2Navigatio
             : $"Код ошибки сервера: {(HttpStatusCode)e.HttpStatusCode}";
     }
 
-    private void WebView_OnWebMessageReceived(object? sender, CoreWebView2WebMessageReceivedEventArgs e)
+    private void MiniAppView_OnUnloaded(object sender, RoutedEventArgs e)
     {
-
+        WebView.Dispose();
     }
 }