Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,9 @@ public void onMethodCall(MethodCall methodCall, Result result) {
case "loadUrl":
loadUrl(methodCall, result);
break;
case "loadData":
loadData(methodCall, result);
break;
case "updateSettings":
updateSettings(methodCall, result);
break;
Expand Down Expand Up @@ -239,6 +242,18 @@ private void loadUrl(MethodCall methodCall, Result result) {
result.success(null);
}

@SuppressWarnings("unchecked")
private void loadData(MethodCall methodCall, Result result) {
Map<String, Object> request = (Map<String, Object>) methodCall.arguments;
String baseUrl = (String) request.get("baseUrl");
String data = (String) request.get("data");
String mimeType = (String) request.get("mimeType");
String encoding = (String) request.get("encoding");
webView.loadDataWithBaseURL(baseUrl, data, mimeType, encoding, "");
result.success(null);
}


private void canGoBack(Result result) {
result.success(webView.canGoBack());
}
Expand Down
27 changes: 27 additions & 0 deletions packages/webview_flutter/ios/Classes/FlutterWebView.m
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,8 @@ - (void)onMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
[self onUpdateSettings:call result:result];
} else if ([[call method] isEqualToString:@"loadUrl"]) {
[self onLoadUrl:call result:result];
} else if ([[call method] isEqualToString:@"loadData"]) {
[self onLoadData:call result:result];
} else if ([[call method] isEqualToString:@"canGoBack"]) {
[self onCanGoBack:call result:result];
} else if ([[call method] isEqualToString:@"canGoForward"]) {
Expand Down Expand Up @@ -183,6 +185,17 @@ - (void)onLoadUrl:(FlutterMethodCall*)call result:(FlutterResult)result {
}
}

- (void)onLoadData:(FlutterMethodCall*)call result:(FlutterResult)result {
if (![self loadData:[call arguments]]) {
result([FlutterError
errorWithCode:@"loadData_failed"
message:@"Failed parsing the data"
details:[NSString stringWithFormat:@"Request was: '%@'", [call arguments]]]);
} else {
result(nil);
}
}

- (void)onCanGoBack:(FlutterMethodCall*)call result:(FlutterResult)result {
BOOL canGoBack = [_webView canGoBack];
result([NSNumber numberWithBool:canGoBack]);
Expand Down Expand Up @@ -412,6 +425,20 @@ - (bool)loadUrl:(NSString*)url withHeaders:(NSDictionary<NSString*, NSString*>*)
return true;
}

- (bool)loadData:(NSDictionary<NSString*, id>*)request {
if (!request) {
return false;
}

NSString* data = request[@"data"];
NSString* baseUrl = request[@"baseUrl"];
NSString* mimeType = request[@"mimeType"];
NSString* encoding = request[@"encoding"];
NSData* nsData = [data dataUsingEncoding:NSUTF8StringEncoding];
NSURL* nsUrl = [NSURL URLWithString:baseUrl];
return [_webView loadData:nsData MIMEType:mimeType characterEncodingName:encoding baseURL:nsUrl];
}

- (void)registerJavaScriptChannels:(NSSet*)channelNames
controller:(WKUserContentController*)userContentController {
for (NSString* channelName in channelNames) {
Expand Down
6 changes: 6 additions & 0 deletions packages/webview_flutter/lib/platform_interface.dart
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,12 @@ abstract class WebViewPlatformController {
"WebView loadUrl is not implemented on the current platform");
}

Future<void> loadData(
String baseUrl, String data, String mimeType, String encoding) {
throw UnimplementedError(
"WebView loadData is not implemented on the current platform");
}

/// Updates the webview settings.
///
/// Any non null field in `settings` will be set as the new setting value.
Expand Down
16 changes: 16 additions & 0 deletions packages/webview_flutter/lib/src/webview_method_channel.dart
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,22 @@ class MethodChannelWebViewPlatform implements WebViewPlatformController {
});
}

@override
Future<void> loadData(
String baseUrl,
String data,
String mimeType,
String encoding
) async {
print("loadData call");
return _channel.invokeMethod<void>('loadData', <String, dynamic>{
'baseUrl': baseUrl,
'data': data,
'mimeType': mimeType,
'encoding': encoding,
});
}

@override
Future<String> currentUrl() => _channel.invokeMethod<String>('currentUrl');

Expand Down
8 changes: 8 additions & 0 deletions packages/webview_flutter/lib/webview_flutter.dart
Original file line number Diff line number Diff line change
Expand Up @@ -613,6 +613,14 @@ class WebViewController {
return _webViewPlatformController.loadUrl(url, headers);
}

Future<void> loadData(
String baseUrl,
String data,
String mimeType,
String encoding) async {
return _webViewPlatformController.loadData(baseUrl, data, mimeType, encoding);
}

/// Accessor to the current URL that the WebView is displaying.
///
/// If [WebView.initialUrl] was never specified, returns `null`.
Expand Down