Merge branch 'main' into add-load-with-URLRequest

Sources/WebUI/SetUpWebViewProxyAction.swift

@@ -0,0 +1,22 @@
+import SwiftUI
+import WebKit
+
+struct SetUpWebViewProxyAction {
+    let action: (WKWebView) -> Void
+
+    func callAsFunction(_ webView: WKWebView) {
+        action(webView)
+    }
+}
+
+private struct SetUpWebViewProxyActionKey: EnvironmentKey {
+    static var defaultValue = SetUpWebViewProxyAction(action: { _ in })
+}
+
+extension EnvironmentValues {
+    var setUpWebViewProxy: SetUpWebViewProxyAction {
+        get { self[SetUpWebViewProxyActionKey.self] }
+        set { self[SetUpWebViewProxyActionKey.self] = newValue }
+    }
+}
+

Sources/WebUI/WebView+Extension.swift

@@ -13,15 +13,16 @@ extension WebView: View {
     }
 
     struct _WebView: ViewRepresentable {
-        @Environment(\.webViewProxy) private var proxy: WebViewProxy
+        @Environment(\.setUpWebViewProxy) private var setUpWebViewProxy
 
         let parent: WebView
 
         @MainActor
         private func makeEnhancedWKWebView() -> EnhancedWKWebView {
             let webView = EnhancedWKWebView(frame: .zero, configuration: parent.configuration)
+            setUpWebViewProxy(webView)
             parent.applyModifiers(to: webView)
-            proxy.setUp(webView)
+            parent.loadInitialURL(in: webView)
             return webView
         }
 

Sources/WebUI/WebView.swift

@@ -15,7 +15,7 @@ import WebKit
 public struct WebView {
     let configuration: WKWebViewConfiguration
 
-    private let url: URL?
+    private let initialURL: URL?
 
     private var uiDelegate: (any WKUIDelegate)?
     private var navigationDelegate: (any WKNavigationDelegate)?
@@ -29,7 +29,7 @@ public struct WebView {
     ///   - url: The initial URL to load.
     ///   - configuration: The configuration for the new web view.
     public init(url: URL? = nil, configuration: WKWebViewConfiguration = .init()) {
-        self.url = url
+        self.initialURL = url
         self.configuration = configuration
     }
 
@@ -106,8 +106,12 @@ public struct WebView {
         webView.allowsBackForwardNavigationGestures = allowsBackForwardNavigationGestures
         webView.allowsLinkPreview = allowsLinkPreview
         webView.isRefreshable = isRefreshable
-        if let url {
-            webView.load(URLRequest(url: url))
+    }
+
+    @MainActor
+    func loadInitialURL(in webView: EnhancedWKWebView) {
+        if let initialURL {
+            webView.load(URLRequest(url: initialURL))
         }
     }
 }

Sources/WebUI/WebViewProxy.swift

@@ -147,14 +147,3 @@ public final class WebViewProxy: ObservableObject {
         }
     }
 }
-
-private struct WebViewProxyKey: EnvironmentKey {
-    static let defaultValue = WebViewProxy()
-}
-
-extension EnvironmentValues {
-    var webViewProxy: WebViewProxy {
-        get { self[WebViewProxyKey.self] }
-        set { self[WebViewProxyKey.self] = newValue }
-    }
-}

Sources/WebUI/WebViewReader.swift

@@ -34,6 +34,6 @@ public struct WebViewReader<Content: View>: View {
     /// The content and behavior of the view.
     public var body: some View {
         content(proxy)
-            .environment(\.webViewProxy, proxy)
+            .environment(\.setUpWebViewProxy, SetUpWebViewProxyAction(action: proxy.setUp))
     }
 }

Tests/WebUITests/WebViewTests.swift

@@ -53,11 +53,19 @@ final class WebViewTests: XCTestCase {
     }
 
     @MainActor
-    func test_applyModifiers_init_with_specified_URL() {
+    func test_loadInitialURL_do_not_load_URL_if_URL_is_not_specified_in_init() {
+        let sut = WebView()
+        let webViewMock = WKWebViewMock()
+        sut.loadInitialURL(in: webViewMock)
+        XCTAssertNil(webViewMock.loadedURL)
+    }
+
+    @MainActor
+    func test_loadInitialURL_load_URL_if_URL_is_specified_in_init() {
         let url = URL(string: "https://www.example.com")!
         let sut = WebView(url: url)
         let webViewMock = WKWebViewMock()
-        sut.applyModifiers(to: webViewMock)
+        sut.loadInitialURL(in: webViewMock)
         XCTAssertEqual(webViewMock.loadedURL, url)
     }
 }