Update WebView

Author: vmanot

Sources/SwiftUIX/Intramodular/Web/WebView.swift

@@ -170,30 +170,41 @@ struct _WKWebViewRepresentable: AppKitOrUIKitViewRepresentable {
 
         context.coordinator.webView = view
 
-        switch configuration.source {
-            case .url:
-                break
-            case .htmlString(let string):
-                view.loadHTMLString(string, baseURL: nil)
-        }
-        
-        DispatchQueue.main.async {
-            self.appKitOrUIKitViewBinding?.wrappedValue = view
+        if let appKitOrUIKitViewBinding = self.appKitOrUIKitViewBinding {
+            DispatchQueue.main.async {
+                if appKitOrUIKitViewBinding.wrappedValue !== view {
+                    appKitOrUIKitViewBinding.wrappedValue = view
+                } else {
+                    view._SwiftUIX_setNeedsLayout()
+                }
+            }
         }
 
         return view
     }
 
     func updateAppKitOrUIKitView(_ view: AppKitOrUIKitViewType, context: Context) {
+        if view.navigationDelegate !== context.coordinator {
+            view.navigationDelegate = context.coordinator
+            
+            view.reload()
+        }
+        
         view._SwiftUIX_configuration = configuration
 
-        switch configuration.source {
-            case .url(let url):
-                if url != coordinator.activeLoadRequest?.url {
-                    coordinator.load(url)
-                }
-            case .htmlString:
-                break
+        if view._latestSource != configuration.source {
+            defer {
+                view._latestSource = configuration.source
+            }
+            
+            switch configuration.source {
+                case .url(let url):
+                    if url != coordinator.activeLoadRequest?.url {
+                        coordinator.load(url)
+                    }
+                case .htmlString(let string):
+                    view.loadHTMLString(string, baseURL: nil)
+            }
         }
     }
 
@@ -220,7 +231,6 @@ extension _WKWebViewRepresentable {
             didSet {
                 activeLoadRequest = nil
                 oldValue?.navigationDelegate = nil
-                webView?.navigationDelegate = self
             }
         }
 
@@ -229,14 +239,18 @@ extension _WKWebViewRepresentable {
         var activeLoadRequest: LoadRequest?
 
         func load(_ url: URL) {
+            guard let webView else {
+                return
+            }
+            
             self.activeLoadRequest = nil
             self.activeLoadRequest = .init(url: url, redirectedURL: nil)
 
             DispatchQueue.main.async {
                 self.isLoading = true
             }
 
-            webView?.load(URLRequest(url: url))
+            webView.load(URLRequest(url: url))
         }
 
         func webView(

Sources/SwiftUIX/Intramodular/Web/_SwiftUIX_WKWebView.swift

@@ -20,6 +20,8 @@ public final class _SwiftUIX_WKWebView: WKWebView, WKNavigationDelegate {
         }
     }
 
+    var _latestSource: _WKWebViewRepresentable.Configuration.Source?
+    
     public override init(frame: CGRect, configuration: WKWebViewConfiguration) {
         super.init(frame: frame, configuration: configuration)