No longer keep WebView2 around across previews.

This should fix crash on subsequent previews in newer WebView2s.
I think due to changes in WebView2 where "WebView2 controller will be auto closed if the parent hwnd is destroyed".
Also fixes "Multiple windows are not supported" as each preview is now its own instance.
Previews will be slower due to this :(

Author: mooflu

Plugin.cs

@@ -10,21 +10,20 @@ namespace QuickLook.Plugin.WebViewPlus
 {
     public class Plugin : IViewer
     {
-        private static WebpagePanel _panel;
+        private WebpagePanel _panel;
 
         public int Priority => 1;
         private static double _width = 1000;
         private static double _height = 1200;
 
         public void Init()
         {
-            _panel = new WebpagePanel();
         }
 
         public bool CanHandle(string path)
         {
             var extension = Path.GetExtension(path).ToLower().Substring(1);
-            return !Directory.Exists(path) && _panel.Extensions.Any(extension.Equals);
+            return !Directory.Exists(path) && WebpagePanel.Extensions.Any(extension.Equals);
         }
 
         public void Prepare(string path, ContextObject context)
@@ -35,6 +34,7 @@ public void Prepare(string path, ContextObject context)
 
         public void View(string path, ContextObject context)
         {
+            _panel = new WebpagePanel();
             context.ViewerContent = _panel;
             context.Title = Path.IsPathRooted(path) ? Path.GetFileName(path) : path;
 
@@ -47,11 +47,8 @@ public void Cleanup()
             _width = _panel.ActualWidth;
             _height = _panel.ActualHeight;
 
-            // starting webview2 is expensive, so keep it running and just unload the webapp data
-            _panel.UnloadData();
-
-            //_panel?.Dispose();
-            //_panel = null;
+            _panel?.Dispose();
+            _panel = null;
         }
     }
 }

QuickLook.Plugin.WebViewPlus.csproj

@@ -58,14 +58,14 @@
     </AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.Web.WebView2.Core, Version=1.0.2651.64, Culture=neutral, PublicKeyToken=2a8ab48044d2601e, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Web.WebView2.1.0.2651.64\lib\net462\Microsoft.Web.WebView2.Core.dll</HintPath>
+    <Reference Include="Microsoft.Web.WebView2.Core, Version=1.0.3065.39, Culture=neutral, PublicKeyToken=2a8ab48044d2601e, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.Web.WebView2.1.0.3065.39\lib\net462\Microsoft.Web.WebView2.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Web.WebView2.WinForms, Version=1.0.2651.64, Culture=neutral, PublicKeyToken=2a8ab48044d2601e, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Web.WebView2.1.0.2651.64\lib\net462\Microsoft.Web.WebView2.WinForms.dll</HintPath>
+    <Reference Include="Microsoft.Web.WebView2.WinForms, Version=1.0.3065.39, Culture=neutral, PublicKeyToken=2a8ab48044d2601e, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.Web.WebView2.1.0.3065.39\lib\net462\Microsoft.Web.WebView2.WinForms.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Web.WebView2.Wpf, Version=1.0.2651.64, Culture=neutral, PublicKeyToken=2a8ab48044d2601e, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Web.WebView2.1.0.2651.64\lib\net462\Microsoft.Web.WebView2.Wpf.dll</HintPath>
+    <Reference Include="Microsoft.Web.WebView2.Wpf, Version=1.0.3065.39, Culture=neutral, PublicKeyToken=2a8ab48044d2601e, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.Web.WebView2.1.0.3065.39\lib\net462\Microsoft.Web.WebView2.Wpf.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -109,11 +109,11 @@
     </ItemGroup>
     <Copy SourceFiles="@(WebApp)" DestinationFiles="@(WebApp->'$(OutDir)\webviewplus\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" OverwriteReadOnlyFiles="true" Retries="3" RetryDelayMilliseconds="300" />
   </Target>
-  <Import Project="packages\Microsoft.Web.WebView2.1.0.2651.64\build\Microsoft.Web.WebView2.targets" Condition="Exists('packages\Microsoft.Web.WebView2.1.0.2651.64\build\Microsoft.Web.WebView2.targets')" />
+  <Import Project="packages\Microsoft.Web.WebView2.1.0.3065.39\build\Microsoft.Web.WebView2.targets" Condition="Exists('packages\Microsoft.Web.WebView2.1.0.3065.39\build\Microsoft.Web.WebView2.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('packages\Microsoft.Web.WebView2.1.0.2651.64\build\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Web.WebView2.1.0.2651.64\build\Microsoft.Web.WebView2.targets'))" />
+    <Error Condition="!Exists('packages\Microsoft.Web.WebView2.1.0.3065.39\build\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Web.WebView2.1.0.3065.39\build\Microsoft.Web.WebView2.targets'))" />
   </Target>
 </Project>

WebpagePanel.cs

@@ -47,7 +47,7 @@ public class WebpagePanel : UserControl
     {
         public static readonly string DefaultExtensions =
             "html,htm,mht,mhtml,pdf,epub,csv,xlsx,svg,md,markdown,gltf,glb,c++,h++,bat,c,cmake,cpp,cs,css,d,go,h,hpp,java,js,json,jsx,kt,lua,m,mm,makefile,pas,perl,php,pl,ps1,psm1,py,r,rb,rs,sass,scala,scss,sh,sql,swift,tex,ts,tsx,txt,webp,xml,yaml,yml";
-        public string[] Extensions = { };
+        public static string[] Extensions = SettingHelper.Get("ExtensionList", WebpagePanel.DefaultExtensions, "QuickLook.Plugin.WebViewPlus").Split(',');
 
         // These should match the ones in the web app openFile.ts:BINARY_EXTENSIONS
         private static readonly string[] _binExtensions = "pdf,epub,xlsx,xls,ods,gltf,glb,fbx,obj,webp,jpg,jpeg,png,apng,gif,bmp,avif,ttf,otf,woff,woff2".Split(',');
@@ -61,7 +61,6 @@ public class WebpagePanel : UserControl
 
         public WebpagePanel()
         {
-            Extensions = SettingHelper.Get("ExtensionList", WebpagePanel.DefaultExtensions, "QuickLook.Plugin.WebViewPlus").Split(',');
             DetectEncoding = SettingHelper.Get<bool>("DetectEncoding", false, "QuickLook.Plugin.WebViewPlus");
 
             var unavailReason = WebpagePanel.WebView2UnavailableReason();
@@ -327,9 +326,11 @@ private void FrameNavigationStarting(object sender, CoreWebView2NavigationStarti
                     _webView.CoreWebView2.PostWebMessageAsString("frameNavigationRejected");
                 }
             }
-        }
-
-        public void UnloadData()
+        }
+
+        // No longer used - Changes in webview2 caused crashes due to
+        // "WebView2 controller will be auto closed if the parent hwnd is destroyed"
+        public void UnloadData() 
         {
             _activeFileInfo = null;
             _sharedBuffer?.Dispose();
@@ -340,7 +341,7 @@ public void UnloadData()
             }
         }
 
-        public void Dispose() // Not used - unloading only; see above
+        public void Dispose()
         {
             _activeFileInfo = null;
             _sharedBuffer?.Dispose();

packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Web.WebView2" version="1.0.2651.64" targetFramework="net462" />
+  <package id="Microsoft.Web.WebView2" version="1.0.3065.39" targetFramework="net462" />
   <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net462" />
   <package id="UTF.Unknown" version="2.5.1" targetFramework="net462" />
 </packages>