Merge pull request #43 from cybozu/revert-weak-reference

Revert #40
cybozu · Jan 22, 2025 · 65d9786 · 65d9786
2 parents 92018cb + 7e01af5
commit 65d9786
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 46 deletions.
diff --git a/Sources/WebUI/WebView+Extension.swift b/Sources/WebUI/WebView+Extension.swift
@@ -20,7 +20,7 @@ extension WebView: View {
         @MainActor
         private func makeView() -> Remakeable<EnhancedWKWebView> {
             let webView = Remakeable<EnhancedWKWebView> {
-                let wrappedView = EnhancedWKWebView(frame: .zero, configuration: parent.configuration ?? .init())
+                let wrappedView = EnhancedWKWebView(frame: .zero, configuration: parent.configuration)
                 parent.applyModifiers(to: wrappedView)
                 return wrappedView
             }

diff --git a/Sources/WebUI/WebView.swift b/Sources/WebUI/WebView.swift
@@ -13,12 +13,12 @@ import WebKit
 /// ```
 @available(iOS 16.4, macOS 13.3, *)
 public struct WebView {
-    weak var configuration: WKWebViewConfiguration?
+    let configuration: WKWebViewConfiguration
 
     private let initialRequest: URLRequest?
 
-    private weak var uiDelegate: (any WKUIDelegate)?
-    private weak var navigationDelegate: (any WKNavigationDelegate)?
+    private var uiDelegate: (any WKUIDelegate)?
+    private var navigationDelegate: (any WKNavigationDelegate)?
     private var isInspectable = false
     private var allowsBackForwardNavigationGestures = false
     private var allowsLinkPreview = true
@@ -30,7 +30,7 @@ public struct WebView {
     ///   - request: The initial request specifying the URL to load.
     ///   - configuration: The configuration for the new web view.
     @MainActor
-    public init(request: URLRequest? = nil, configuration: WKWebViewConfiguration? = nil) {
+    public init(request: URLRequest? = nil, configuration: WKWebViewConfiguration = .init()) {
         self.initialRequest = request
         self.configuration = configuration
     }

diff --git a/Tests/WebUITests/WebViewTests.swift b/Tests/WebUITests/WebViewTests.swift
@@ -2,14 +2,6 @@
 import XCTest
 
 final class WebViewTests: XCTestCase {
-    @MainActor
-    func test_configuration_is_weakly_referenced() {
-        var configuration: WebViewConfigurationMock? = .init()
-        let sut = WebView(configuration: configuration)
-        configuration = nil
-        XCTAssertNil(sut.configuration)
-    }
-
     @MainActor
     func test_applyModifiers_uiDelegate() {
         let uiDelegateMock = UIDelegateMock()
@@ -19,15 +11,6 @@ final class WebViewTests: XCTestCase {
         XCTAssertTrue(uiDelegateMock === webViewMock.uiDelegate)
     }
 
-    @MainActor
-    func test_uiDelegate_is_weakly_referenced() {
-        var sut = WebView()
-        let actual = weaklyScope(UIDelegateMock()) {
-            sut = sut.uiDelegate($0)
-        }
-        XCTAssertNil(actual)
-    }
-
     @MainActor
     func test_applyModifiers_navigationDelegate() {
         let navigationDelegateMock = NavigationDelegateMock()
@@ -37,15 +20,6 @@ final class WebViewTests: XCTestCase {
         XCTAssertTrue(navigationDelegateMock === webViewMock.navigationDelegateProxy.delegate)
     }
 
-    @MainActor
-    func test_navigationDelegate_is_weakly_referenced() {
-        var sut = WebView()
-        let actual = weaklyScope(NavigationDelegateMock()) {
-            sut = sut.navigationDelegate($0)
-        }
-        XCTAssertNil(actual)
-    }
-
     @MainActor
     func test_applyModifiers_isInspectable() {
         let sut = WebView().allowsInspectable(true)

diff --git a/Tests/WebUITests/XCTestCase+Extension.swift b/Tests/WebUITests/XCTestCase+Extension.swift