🎨 fixs CookiesProperty

Author: jinzaz

src/Avalonia.WebView2/Controls/WebView2.Properties/Cookies.cs

@@ -5,16 +5,12 @@ namespace Avalonia.Controls;
 
 partial class WebView2
 {
-    /// <summary>
-    /// The <see cref="AvaloniaProperty" /> which backs the <see cref="Cookies" /> property.
-    /// </summary>
-    public static readonly DirectProperty<WebView2, CookieContainer?> CookiesProperty = AvaloniaProperty.RegisterDirect<WebView2, CookieContainer?>(nameof(Cookies), x => x.Cookies);
+    ///// <summary>
+    ///// The <see cref="AvaloniaProperty" /> which backs the <see cref="Cookies" /> property.
+    ///// </summary>
+    //public static readonly DirectProperty<WebView2, CookieContainer?> CookiesProperty = AvaloniaProperty.RegisterDirect<WebView2, CookieContainer?>(nameof(Cookies), x => x.Cookies);
 
-    public CookieContainer Cookies
-    {
-        get { return (CookieContainer)GetValue(CookiesProperty); }
-        set { SetValue(CookiesProperty, value); }
-    }
+    public CookieContainer Cookies { get; set; } = null;
 
     readonly HashSet<string> _loadedCookies = new HashSet<string>();
 

src/Avalonia.WebView2/Platforms/Droid/Controls/WebView2.SetValue.cs

@@ -42,7 +42,10 @@ public void SetSource(IWebView2 webView2, Uri? source)
 
     public void SetZoomFactor(IWebView2 webView2, double zoomFactor)
     {
-        webView2.PlatformWebView?.ZoomBy((float)zoomFactor);
+        if (zoomFactor >= 0.01d)
+        {
+            webView2.PlatformWebView?.ZoomBy((float)zoomFactor);
+        }
     }
 }
 #endif

src/Avalonia.WebView2/Platforms/Droid/Controls/WebView2.cs

@@ -189,6 +189,8 @@ protected virtual void SetInitValue(AWebView webView)
     /// <param name="handler"></param>
     public partial class WebViewClientCompat2(Handler handler) : WebViewClientCompat
     {
+        readonly WeakReference<Handler> handler = new(handler);
+
         /// <summary>
         /// 获取允许的 URL 协议列表，当非标准协议时，WebView 会显示 net::ERR_UNKNOWN_URL_SCHEME 错误页，设置白名单以屏蔽错误
         /// </summary>
@@ -256,6 +258,7 @@ public override bool ShouldOverrideUrlLoading(AWebView? view, string? url)
 
         public override void OnPageStarted(AWebView? view, string? url, Bitmap? favicon)
         {
+            var handler = Handler;
             if (!string.IsNullOrWhiteSpace(url))
             {
                 handler.VirtualView.SyncPlatformCookiesToWebView2(url).FireAndForget();
@@ -278,13 +281,27 @@ public override void OnPageStarted(AWebView? view, string? url, Bitmap? favicon)
 
         public override void OnPageFinished(AWebView? view, string? url)
         {
+            var handler = Handler;
             if (!string.IsNullOrWhiteSpace(url))
             {
                 handler.VirtualView.SyncPlatformCookiesToWebView2(url).FireAndForget();
             }
 
             base.OnPageFinished(view, url);
         }
+
+        protected Handler? Handler
+        {
+            get
+            {
+                if (handler.TryGetTarget(out var h))
+                {
+                    return h;
+                }
+
+                return null;
+            }
+        }
     }