Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

[webview_flutter] Add unimplemented features to the web version. #5808

Closed
FlafyDev wants to merge 17 commits into from
Closed

[webview_flutter] Add unimplemented features to the web version. #5808

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
f8e51ad
fix: unreliable encoding
FlafyDev May 14, 2022
e9dfa1f
chore: update version and changelog
FlafyDev May 14, 2022
e0b13de
revert changelog formatting
FlafyDev May 14, 2022
c71ebc9
Merge pull request #1 from FlafyDev/webview_flutter_web_encoding
FlafyDev May 14, 2022
f2dbc37
Add run Javascript
FlafyDev May 15, 2022
1a7c427
Add limited Javascript channels support
FlafyDev May 15, 2022
ee406e1
Specify types
FlafyDev May 15, 2022
974dd97
added loadHtml and JavascriptChannel tests
FlafyDev May 15, 2022
214c4bc
loadHtmlString wait for load
FlafyDev May 15, 2022
d325c0e
Make runJavascript safer
FlafyDev May 15, 2022
7e25b40
Implement evaluateJavascript
FlafyDev May 16, 2022
98ce7a8
chore: changelog and version
FlafyDev May 19, 2022
6af1972
revert fix for flutter/flutter#104273
FlafyDev May 26, 2022
450b0f4
Revert "revert fix for flutter/flutter#104273"
FlafyDev May 26, 2022
cf4de8d
revert fix for flutter/flutter#104273
FlafyDev May 26, 2022
99dad9a
modify test to use srcdoc instead of src
FlafyDev May 26, 2022
a69e837
remove unused import
FlafyDev May 26, 2022
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
Next Next commit
Add run Javascript
  • Loading branch information
@FlafyDev
FlafyDev committed May 15, 2022
commit f2dbc37b0d2413dbf56e4de4b29d72a3f36f9431
49 changes: 38 additions & 11 deletions packages/webview_flutter/webview_flutter_web/lib/webview_flutter_web.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,13 @@
import 'dart:async';
import 'dart:convert';
import 'dart:html';
import 'dart:js' as js;
import 'package:flutter/foundation.dart';
import 'package:flutter/gestures.dart';
import 'package:flutter/widgets.dart';
import 'package:flutter_web_plugins/flutter_web_plugins.dart';
import 'package:html/dom.dart' as dom;
import 'package:html/parser.dart';
import 'package:webview_flutter_platform_interface/webview_flutter_platform_interface.dart';
import 'shims/dart_ui.dart' as ui;

Expand Down Expand Up @@ -44,13 +47,19 @@ class WebWebViewPlatform implements WebViewPlatform {
}
final IFrameElement element =
document.getElementById('webview-$viewId')! as IFrameElement;

final WebWebViewPlatformController controller =
WebWebViewPlatformController(element, viewId);

js.context['webview${viewId}_getWindow'] = (js.JsObject window) {
controller.window = window;
};

if (creationParams.initialUrl != null) {
// ignore: unsafe_html
element.src = creationParams.initialUrl;
}
onWebViewPlatformCreated(WebWebViewPlatformController(
element,
));
onWebViewPlatformCreated(controller);
},
);
}
Expand All @@ -65,8 +74,11 @@ class WebWebViewPlatform implements WebViewPlatform {
/// Implementation of [WebViewPlatformController] for web.
class WebWebViewPlatformController implements WebViewPlatformController {
/// Constructs a [WebWebViewPlatformController].
WebWebViewPlatformController(this._element);
WebWebViewPlatformController(this._element, [this._viewId = 1]);

/// The IFrame's Window object.
late js.JsObject window;
final int _viewId;
final IFrameElement _element;
HttpRequestFactory _httpRequestFactory = HttpRequestFactory();

Expand Down Expand Up @@ -150,12 +162,15 @@ class WebWebViewPlatformController implements WebViewPlatformController {

@override
Future<void> runJavascript(String javascript) {
throw UnimplementedError();
return Future<dynamic>.value(
window.callMethod('eval', <String>[javascript]));
}

@override
Future<String> runJavascriptReturningResult(String javascript) {
throw UnimplementedError();
return Future<dynamic>.value(
window.callMethod('eval', <String>[javascript]))
.then((dynamic value) => value.toString());
}

@override
Expand Down Expand Up @@ -184,11 +199,7 @@ class WebWebViewPlatformController implements WebViewPlatformController {
String? baseUrl,
}) async {
// ignore: unsafe_html
_element.src = Uri.dataFromString(
html,
mimeType: 'text/html',
encoding: Encoding.getByName('utf-8'),
).toString();
_element.srcdoc = preprocessHtml(html);
}

@override
Expand All @@ -215,6 +226,22 @@ class WebWebViewPlatformController implements WebViewPlatformController {
Future<void> loadFlutterAsset(String key) {
throw UnimplementedError();
}

String preprocessHtml(String html) {
final dom.Document document = parse(html);

final dom.Element scriptElement = document.createElement('script');
scriptElement.text = 'parent.webview${_viewId}_getWindow(window)';

document.head?.insertBefore(scriptElement, document.head!.firstChild);

String outputHtml = document.outerHtml;
if (!outputHtml.trim().startsWith('<!DOCTYPE html>')) {
outputHtml = '<!DOCTYPE html>$outputHtml';
}

return outputHtml;
}
}

/// Factory class for creating [HttpRequest] instances.
Expand Down
1 change: 1 addition & 0 deletions packages/webview_flutter/webview_flutter_web/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ dependencies:
sdk: flutter
flutter_web_plugins:
sdk: flutter
html: ^0.15.0
webview_flutter_platform_interface: ^1.8.0

dev_dependencies:
Expand Down