[webview_flutter] Update webview packages for Android and iOS to implement `runJavascript` and `runJavascriptReturningResult`. #4402

BeMacized · 2021-10-01T13:26:43Z

This PR implements the newly added runJavaScript and runJavaScriptForResult methods added to the platform interface in #4401.

This is meant as a solution to the issue mentioned in flutter/flutter#66318, and was discussed offline with @mvanbeusekom and @stuartmorgan.

As this PR also depends on and includes the changes from #4401, this PR will remain in draft state until that PR is merged and published.

Relevant issue:

[webview_flutter] Exception- Error Domain=WKErrorDomain Code=5 "JavaScript execution returned a result of an unsupported type" on iOS 14. flutter#66318

Pre-launch Checklist

…e with new methods for running JavaScript

…sult` in iOS and Android packages.

packages/webview_flutter/webview_flutter_android/android/build.gradle

…native

… webview/js_eval_fix_native

BeMacized · 2021-10-08T12:27:30Z

I think I've fixed every case now where "JavaScript" could be used, while still using "Javascript" where it was needed to either stay consistent or prevent a breaking change.

If you still find any cases I missed, let me know!

BeMacized · 2021-10-18T13:17:16Z

@stuartmorgan Would you be able to take another look at this please?

stuartmorgan

Small things, otherwise LG

packages/webview_flutter/webview_flutter/example/ios/Podfile

packages/webview_flutter/webview_flutter_android/android/build.gradle

...webview_flutter/webview_flutter_wkwebview/example/integration_test/webview_flutter_test.dart

packages/webview_flutter/webview_flutter_wkwebview/example/ios/Podfile

packages/webview_flutter/webview_flutter/example/ios/Podfile

packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FlutterWebView.m

BeMacized · 2021-10-22T10:20:05Z

@stuartmorgan All PR feedback has been implemented.

I however came across one issue with either the formatter or the format check: they seem to disagree. When formatting the webview plugin with the included script (dart run ./script/tool/lib/src/main.dart format --plugins webview_flutter), it formats FlutterWebView.m in such a way that it does not pass the check. @mvanbeusekom has been able to reproduce the issue as well.

I've fixed it now based on the output from cirrus so that this PR passes the check, but it does not fix the problem with the formatter.

stuartmorgan · 2021-10-25T14:23:42Z

I however came across one issue with either the formatter or the format check: they seem to disagree. When formatting the webview plugin with the included script (dart run ./script/tool/lib/src/main.dart format --plugins webview_flutter), it formats FlutterWebView.m in such a way that it does not pass the check. @mvanbeusekom has been able to reproduce the issue as well.

flutter/flutter#39767

The script and the format check are exactly the same thing; what disagrees is the version of clang-format on the bots and the version you have locally.

stuartmorgan

LGTM with one nit. Thanks!

stuartmorgan · 2021-10-25T16:58:00Z

...webview_flutter/webview_flutter_wkwebview/example/integration_test/webview_flutter_test.dart

@@ -110,11 +110,11 @@ void main() {
    await pageLoads.stream.firstWhere((String url) => url == currentUrl);

    final String content = await controller
-        .evaluateJavascript('document.documentElement.innerText');


I just realized that in both implementation packages you've replaced all instances of evaluateJavascript with one of the new methods, which means we no longer have any test coverage that the legacy method still works.

Please add a new test to both the Android and iOS packages that does a simple test of evaluateJavascript (including its return result) just to make sure we have sanity coverage that it's not broken. (It doesn't need to cover edge cases, it's mostly to make sure that, e.g., we'd notice if the case statement for mapping "evaluateJavascript" to the right helper method were dropped.)

stuartmorgan

New tests LGTM, thanks

… to implement `runJavascript` and `runJavascriptReturningResult`. (flutter/plugins#4402)

* master: [webview_flutter] Deprecate evaluateJavascript in favour of runJavaScript and runJavaScriptForResult. (flutter#4403) [webview_flutter] Add interface methods to load local files and HTML strings. (flutter#4446) [ci] add pedantic dep to new in_app_purchase pkgs (flutter#4471) [ci] Remove unused dep from file_selector. (flutter#4468) [ci] update build_runner dep in android_intent and file_selector example (flutter#4467) [webview_flutter] Add platform interface method `loadRequest`. (flutter#4450) Remove -Werror from deprecated plugin Android builds (flutter#4466) [webview_flutter] Update webview packages for Android and iOS to implement `runJavascript` and `runJavascriptReturningResult`. (flutter#4402) [camera] Fix CamcorderProfile Usages (flutter#4423) [google_sign_in] Use a transparent image as a placeholder for the `GoogleUserCircleAvatar` (flutter#4391) [in_app_purchase]IAP/platform interface add cancel status (flutter#4093) [image_picker] doc:readme image picker misprints (flutter#4421) Support Hybrid Composition through the GoogleMaps Widget (flutter#4082) [path_provider] started supporting background platform channels (flutter#4443) [device_info] started using Background Platform Channels (flutter#4456) # Conflicts: # packages/webview_flutter/webview_flutter/CHANGELOG.md # packages/webview_flutter/webview_flutter/pubspec.yaml

…ement `runJavascript` and `runJavascriptReturningResult`. (flutter#4402) * [webview_flutter_platform_interface] Update webview platform interface with new methods for running JavaScript * Fix tests * [webview_flutter] Implemented `runJavaScript` and `runJavaScriptForResult` in iOS and Android packages. * Remove accidental development team inclusion from project.pbxproj * Implemented PR feedback * Updated runJavaScriptForResult behaviour * Implemented PR feedback partially * Implement PR feedback * Update changelog * Implement PR feedback from interface PR * Update changelog * Revert inclusion of development team * Implement PR feedback * Implemented platform interface PR feedback * Update pubspec dependency * Fixed capitalisation * Fixed capitalisation * Fix warning * Partially implement PR feedback * Partially implement PR feedback * Format * Update podfile * Update podfile * Update podfiles * Update iOS project files * Update podspec * Remove unnecessary podfile configuration * Implemented PR feedback * Format * Revert podfile changes * Implemented PR feedback * Fix formatting * Fix formatting * Fixed test. * Re-add integration tests for deprecated evaluateJavascript method. * Fix merge conflicts

BeMacized added 4 commits October 1, 2021 15:02

[webview_flutter_platform_interface] Update webview platform interfac…

e25faa3

…e with new methods for running JavaScript

Fix tests

f19b5c3

[webview_flutter] Implemented runJavaScript and `runJavaScriptForRe…

3a22d00

…sult` in iOS and Android packages.

Remove accidental development team inclusion from project.pbxproj

2bcec1c

google-cla bot added the cla: yes label Oct 1, 2021

github-actions bot added p: webview_flutter Edits files for a webview_flutter plugin platform-android platform-ios labels Oct 1, 2021

BeMacized commented Oct 1, 2021

View reviewed changes

packages/webview_flutter/webview_flutter_android/android/build.gradle Show resolved Hide resolved

BeMacized mentioned this pull request Oct 1, 2021

[webview_flutter] Deprecate evaluateJavascript in favour of runJavaScript and runJavaScriptForResult. #4403

Merged

11 tasks

BeMacized added 11 commits October 1, 2021 15:38

Implemented PR feedback

ff493a2

Merge branch 'webview/js_eval_fix_platform' into webview/js_eval_fix_…

6bf082f

…native

Updated runJavaScriptForResult behaviour

ff125c9

Implemented PR feedback partially

9f661e8

Implement PR feedback

cbc88e8

Merge branch 'webview/js_eval_fix_platform' into webview/js_eval_fix_…

9f537c7

…native

Update changelog

26004c3

Merge branch 'webview/js_eval_fix_platform' into webview/js_eval_fix_…

283f8a7

…native

Implement PR feedback from interface PR

b95d986

Update changelog

3d8b9ce

Revert inclusion of development team

0ecf641

BeMacized changed the title ~~[webview_flutter] Update webview packages for Android and iOS to implement runJavaScript and runJavaScriptForResult.~~ [webview_flutter] Update webview packages for Android and iOS to implement runJavascript and runJavascriptReturningResult. Oct 4, 2021

BeMacized added 8 commits October 5, 2021 14:18

Implement PR feedback

02e1106

Merge branch 'webview/js_eval_fix_platform' into webview/js_eval_fix_…

d7780dd

…native

Implemented platform interface PR feedback

d8f51ed

Merge branch 'master' into webview/js_eval_fix_platform

285c2cc

Merge branch 'webview/js_eval_fix_platform' into webview/js_eval_fix_…

90cb648

…native

Update pubspec dependency

bfcacdc

Merge branch 'master' into webview/js_eval_fix_native

bcb368c

Fixed capitalisation

485ead3

BeMacized added 3 commits October 8, 2021 14:12

Merge remote-tracking branch 'origin/webview/js_eval_fix_native' into…

28ac939

… webview/js_eval_fix_native

Remove unnecessary podfile configuration

962ad02

Implemented PR feedback

9184d48

BeMacized marked this pull request as ready for review October 8, 2021 12:31

BeMacized added 2 commits October 18, 2021 13:00

Merge branch 'master' into webview/js_eval_fix_native

a111502

Format

80cbe9b

stuartmorgan suggested changes Oct 21, 2021

View reviewed changes

BeMacized added 5 commits October 22, 2021 11:01

Revert podfile changes

9fdab9d

Implemented PR feedback

6e609d7

Fix formatting

f6d8cb4

Fix formatting

b019d3c

Fixed test.

2b0f490

stuartmorgan approved these changes Oct 25, 2021

View reviewed changes

BeMacized added 4 commits October 26, 2021 13:24

Re-add integration tests for deprecated evaluateJavascript method.

fa9526c

Merge branch 'master' into webview/js_eval_fix_native

45e799b

Merge branch 'master' into webview/js_eval_fix_native

40a6b38

Fix merge conflicts

e2f4710

stuartmorgan approved these changes Oct 29, 2021

View reviewed changes

BeMacized merged commit 0c23f8f into flutter:master Nov 1, 2021

engine-flutter-autoroll mentioned this pull request Nov 3, 2021

Roll Plugins from e51cc1df7b75 to db098ed8408d (6 revisions) flutter/flutter#92949

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Nov 3, 2021

0c23f8f [webview_flutter] Update webview packages for Android and iOS…

7d89afa

… to implement `runJavascript` and `runJavascriptReturningResult`. (flutter/plugins#4402)

engine-flutter-autoroll mentioned this pull request Nov 3, 2021

Roll Plugins from e51cc1df7b75 to 53fff22979d2 (7 revisions) flutter/flutter#92954

Merged

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Nov 3, 2021

0c23f8f [webview_flutter] Update webview packages for Android and iOS…

1911448

… to implement `runJavascript` and `runJavascriptReturningResult`. (flutter/plugins#4402)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[webview_flutter] Update webview packages for Android and iOS to implement `runJavascript` and `runJavascriptReturningResult`. #4402

[webview_flutter] Update webview packages for Android and iOS to implement `runJavascript` and `runJavascriptReturningResult`. #4402

BeMacized commented Oct 1, 2021

BeMacized commented Oct 8, 2021

BeMacized commented Oct 18, 2021

stuartmorgan left a comment

BeMacized commented Oct 22, 2021

stuartmorgan commented Oct 25, 2021

stuartmorgan left a comment

stuartmorgan Oct 25, 2021

stuartmorgan left a comment

[webview_flutter] Update webview packages for Android and iOS to implement runJavascript and runJavascriptReturningResult. #4402

[webview_flutter] Update webview packages for Android and iOS to implement runJavascript and runJavascriptReturningResult. #4402

Conversation

BeMacized commented Oct 1, 2021

Pre-launch Checklist

BeMacized commented Oct 8, 2021

BeMacized commented Oct 18, 2021

stuartmorgan left a comment

Choose a reason for hiding this comment

BeMacized commented Oct 22, 2021

stuartmorgan commented Oct 25, 2021

stuartmorgan left a comment

Choose a reason for hiding this comment

stuartmorgan Oct 25, 2021

Choose a reason for hiding this comment

stuartmorgan left a comment

Choose a reason for hiding this comment

[webview_flutter] Update webview packages for Android and iOS to implement `runJavascript` and `runJavascriptReturningResult`. #4402

[webview_flutter] Update webview packages for Android and iOS to implement `runJavascript` and `runJavascriptReturningResult`. #4402