Merge pull request #4 from cybozu/fix-infinite-loop-3

Fix infinite loop due to `objectWillChange` firing

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,14 +13,14 @@ 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)
-            proxy.setUp(webView)
+            setUpWebViewProxy(webView)
             parent.applyModifiers(to: webView)
             parent.loadInitialURL(in: webView)
             return webView

Sources/WebUI/WebViewProxy.swift

@@ -140,14 +140,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))
     }
 }