Skip to content

[webview_flutter_wkwebview] Change callback methods with a non-null return type to non-null #8564

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
auto-submit merged 13 commits into from
Feb 13, 2025
Merged

[webview_flutter_wkwebview] Change callback methods with a non-null return type to non-null #8564

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
beb7539
fix maybe
bparrishMines Feb 4, 2025
cf27f9d
bump pigeon
bparrishMines Feb 4, 2025
0910d57
Merge branch 'main' of github.com:flutter/packages into wkwebview_imp…
bparrishMines Feb 10, 2025
9442ba7
update pigeon
bparrishMines Feb 10, 2025
5353741
add other method
bparrishMines Feb 11, 2025
f9e6b6d
Merge branch 'main' of github.com:flutter/packages into wkwebview_imp…
bparrishMines Feb 11, 2025
a072e89
add dart tests
bparrishMines Feb 11, 2025
fe2784a
changelog
bparrishMines Feb 11, 2025
cd912dc
fix unit tests
bparrishMines Feb 11, 2025
1654755
Merge branch 'main' of github.com:flutter/packages into wkwebview_imp…
bparrishMines Feb 13, 2025
dbe3fee
formatting
bparrishMines Feb 13, 2025
2ea1d4c
unavailable is not
bparrishMines Feb 13, 2025
d989135
comment and changelog
bparrishMines Feb 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
comment and changelog
  • Loading branch information
@bparrishMines
bparrishMines committed Feb 13, 2025
commit d989135b31f1f947c8353a2fc6d3c510c6a2764b
4 changes: 2 additions & 2 deletions packages/webview_flutter/webview_flutter_wkwebview/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
## 3.18.1

* Updates internal API wrapper to make all Flutter methods with a non-null return value be required
to implement.
* Fixes bug that would allow the API wrapper to return `null` when a non-null value was required in
a callback method.
* Changes default method to enable JavaScript for web content to
`WKWebpagePreferences.allowsContentJavaScript`.

Expand Down
2 changes: 2 additions & 0 deletions ...iew_flutter_wkwebview/Sources/webview_flutter_wkwebview/PreferencesProxyAPIDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ class PreferencesProxyAPIDelegate: PigeonApiDelegateWKPreferences {
pigeonApi: PigeonApiWKPreferences, pigeonInstance: WKPreferences, enabled: Bool
) throws {
if #available(iOS 14.0, macOS 11.0, *) {
// On iOS 14 and macOS 11, WKWebpagePreferences.allowsContentJavaScript should be
// used instead.
throw (pigeonApi.pigeonRegistrar as! ProxyAPIRegistrar)
.createUnsupportedVersionError(
method: "WKPreferences.javaScriptEnabled",
Expand Down