webview v2

Author: okorohelijah

packages/webview_flutter/webview_flutter_wkwebview/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 3.24.3
+
+* Prevents test `WKFrameInfo` from deallocating during tests to prevent crash on iOS 26+.
+
 ## 3.24.2
 
 * Fixes dartdoc comments that accidentally used HTML.

packages/webview_flutter/webview_flutter_wkwebview/darwin/Tests/FrameInfoProxyAPITests.swift

@@ -13,27 +13,27 @@ class FrameInfoProxyAPITests: XCTestCase {
     let registrar = TestProxyApiRegistrar()
     let api = registrar.apiDelegate.pigeonApiWKFrameInfo(registrar)
 
-    let instance: TestFrameInfo? = TestFrameInfo()
-    let value = try? api.pigeonDelegate.isMainFrame(pigeonApi: api, pigeonInstance: instance!)
+    let instance = TestFrameInfo.instance
+    let value = try? api.pigeonDelegate.isMainFrame(pigeonApi: api, pigeonInstance: instance)
 
-    XCTAssertEqual(value, instance!.isMainFrame)
+    XCTAssertEqual(value, instance.isMainFrame)
   }
 
   @MainActor func testRequest() {
     let registrar = TestProxyApiRegistrar()
     let api = registrar.apiDelegate.pigeonApiWKFrameInfo(registrar)
 
-    let instance: TestFrameInfo? = TestFrameInfo()
-    let value = try? api.pigeonDelegate.request(pigeonApi: api, pigeonInstance: instance!)
+    let instance = TestFrameInfo.instance
+    let value = try? api.pigeonDelegate.request(pigeonApi: api, pigeonInstance: instance)
 
-    XCTAssertEqual(value?.value, instance!.request)
+    XCTAssertEqual(value?.value, instance.request)
   }
 
   @MainActor func testNilRequest() {
     let registrar = TestProxyApiRegistrar()
     let api = registrar.apiDelegate.pigeonApiWKFrameInfo(registrar)
 
-    let instance = TestFrameInfoWithNilRequest()
+    let instance = TestFrameInfoWithNilRequest.instance
     let value = try? api.pigeonDelegate.request(pigeonApi: api, pigeonInstance: instance)
     // On macOS 15.5+, `WKFrameInfo.request` returns with an empty URLRequest.
     // Previously it would return nil so accept either.
@@ -46,6 +46,14 @@ class FrameInfoProxyAPITests: XCTestCase {
 }
 
 class TestFrameInfo: WKFrameInfo {
+  // Global test instance of `WKFrameInfo`. Using a static instance prevents a crash when
+  // a `WKFrameInfo` is deallocated during a test on iOS 26+.
+  static let instance = TestFrameInfo()
+
+  private override init() {
+
+  }
+
   override var isMainFrame: Bool {
     return true
   }
@@ -56,4 +64,11 @@ class TestFrameInfo: WKFrameInfo {
 }
 
 class TestFrameInfoWithNilRequest: WKFrameInfo {
+  // Global test instance of `WKFrameInfo` with a nil URLRequest. Using a static instance prevents a
+  // crash when a `WKFrameInfo` is deallocated during a test on iOS 26+.
+  static let instance = TestFrameInfoWithNilRequest()
+
+  private override init() {
+
+  }
 }

packages/webview_flutter/webview_flutter_wkwebview/darwin/Tests/NavigationActionProxyAPITests.swift

@@ -40,7 +40,7 @@ class NavigationActionProxyAPITests: XCTestCase {
 }
 
 class TestNavigationAction: WKNavigationAction {
-  let internalTargetFrame = TestFrameInfo()
+  let internalTargetFrame = TestFrameInfo.instance
 
   override var request: URLRequest {
     return URLRequest(url: URL(string: "http://google.com")!)

packages/webview_flutter/webview_flutter_wkwebview/darwin/Tests/UIDelegateProxyAPITests.swift

@@ -39,7 +39,7 @@ class UIDelegateProxyAPITests: XCTestCase {
     let instance = UIDelegateImpl(api: api, registrar: registrar)
     let webView = WKWebView(frame: .zero)
     let origin = SecurityOriginProxyAPITests.testSecurityOrigin
-    let frame = TestFrameInfo()
+    let frame = TestFrameInfo.instance
     let type: WKMediaCaptureType = .camera
 
     var resultDecision: WKPermissionDecision?
@@ -64,7 +64,7 @@ class UIDelegateProxyAPITests: XCTestCase {
     let instance = UIDelegateImpl(api: api, registrar: registrar)
     let webView = WKWebView(frame: .zero)
     let message = "myString"
-    let frame = TestFrameInfo()
+    let frame = TestFrameInfo.instance
 
     instance.webView(webView, runJavaScriptAlertPanelWithMessage: message, initiatedByFrame: frame)
     {
@@ -79,7 +79,7 @@ class UIDelegateProxyAPITests: XCTestCase {
     let instance = UIDelegateImpl(api: api, registrar: registrar)
     let webView = WKWebView(frame: .zero)
     let message = "myString"
-    let frame = TestFrameInfo()
+    let frame = TestFrameInfo.instance
 
     var confirmedResult: Bool?
     let callbackExpectation = expectation(description: "Wait for callback.")
@@ -103,7 +103,7 @@ class UIDelegateProxyAPITests: XCTestCase {
     let webView = WKWebView(frame: .zero)
     let prompt = "myString"
     let defaultText = "myString3"
-    let frame = TestFrameInfo()
+    let frame = TestFrameInfo.instance
 
     var inputResult: String?
     let callbackExpectation = expectation(description: "Wait for callback.")

packages/webview_flutter/webview_flutter_wkwebview/pubspec.yaml

@@ -2,7 +2,7 @@ name: webview_flutter_wkwebview
 description: A Flutter plugin that provides a WebView widget based on Apple's WKWebView control.
 repository: https://github.com/flutter/packages/tree/main/packages/webview_flutter/webview_flutter_wkwebview
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+webview%22
-version: 3.24.2
+version: 3.24.3
 
 environment:
   sdk: ^3.9.0