This repository was archived by the owner on Feb 22, 2023. It is now read-only.
[webview_flutter] Add loadAssetFile to load html file from local assets #1247
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,13 +7,15 @@ | |
| #import "JavaScriptChannelHandler.h" | ||
|
|
||
| @implementation FLTWebViewFactory { | ||
| NSObject<FlutterPluginRegistrar>* _registrar; | ||
| NSObject<FlutterBinaryMessenger>* _messenger; | ||
| } | ||
|
|
||
| - (instancetype)initWithRegistrar:(NSObject<FlutterPluginRegistrar>*)registrar { | ||
| self = [super init]; | ||
| if (self) { | ||
| _registrar = registrar; | ||
| _messenger = registrar.messenger; | ||
| } | ||
| return self; | ||
| } | ||
|
|
@@ -28,7 +30,7 @@ - (instancetype)initWithMessenger:(NSObject<FlutterBinaryMessenger>*)messenger { | |
| FLTWebViewController* webviewController = [[FLTWebViewController alloc] initWithFrame:frame | ||
| viewIdentifier:viewId | ||
| arguments:args | ||
| registrar:_registrar]; | ||
| return webviewController; | ||
| } | ||
|
|
||
|
|
@@ -42,17 +44,20 @@ @implementation FLTWebViewController { | |
| // The set of registered JavaScript channel names. | ||
| NSMutableSet* _javaScriptChannelNames; | ||
| FLTWKNavigationDelegate* _navigationDelegate; | ||
| NSObject<FlutterPluginRegistrar>* _registrar; | ||
| } | ||
|
|
||
| - (instancetype)initWithFrame:(CGRect)frame | ||
| viewIdentifier:(int64_t)viewId | ||
| arguments:(id _Nullable)args | ||
| registrar:(NSObject<FlutterPluginRegistrar>*)registrar { | ||
| if ([super init]) { | ||
| _viewId = viewId; | ||
| _registrar = registrar; | ||
|
|
||
| NSString* channelName = [NSString stringWithFormat:@"plugins.flutter.io/webview_%lld", viewId]; | ||
| _channel = [FlutterMethodChannel methodChannelWithName:channelName | ||
| binaryMessenger:registrar.messenger]; | ||
| _javaScriptChannelNames = [[NSMutableSet alloc] init]; | ||
|
|
||
| WKUserContentController* userContentController = [[WKUserContentController alloc] init]; | ||
|
|
@@ -77,7 +82,11 @@ - (instancetype)initWithFrame:(CGRect)frame | |
|
|
||
| NSString* initialUrl = args[@"initialUrl"]; | ||
| if ([initialUrl isKindOfClass:[NSString class]]) { | ||
| if ([initialUrl rangeOfString:@"://"].location == NSNotFound) { | ||
|
|
||
| [self loadAssetFile:initialUrl]; | ||
| } else { | ||
| [self loadUrl:initialUrl]; | ||
| } | ||
| } | ||
| } | ||
| return self; | ||
|
|
@@ -92,6 +101,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:@"loadAssetFile"]) { | ||
| [self onLoadAssetFile:call result:result]; | ||
| } else if ([[call method] isEqualToString:@"canGoBack"]) { | ||
| [self onCanGoBack:call result:result]; | ||
| } else if ([[call method] isEqualToString:@"canGoForward"]) { | ||
|
|
@@ -133,6 +144,17 @@ - (void)onLoadUrl:(FlutterMethodCall*)call result:(FlutterResult)result { | |
| } | ||
| } | ||
|
|
||
| - (void)onLoadAssetFile:(FlutterMethodCall*)call result:(FlutterResult)result { | ||
| NSString* url = [call arguments]; | ||
| if (![self loadAssetFile:url]) { | ||
| result([FlutterError errorWithCode:@"loadAssetFile_failed" | ||
| message:@"Failed parsing the URL" | ||
| details:[NSString stringWithFormat:@"URL was: '%@'", url]]); | ||
| } else { | ||
| result(nil); | ||
| } | ||
| } | ||
|
|
||
| - (void)onCanGoBack:(FlutterMethodCall*)call result:(FlutterResult)result { | ||
| BOOL canGoBack = [_webView canGoBack]; | ||
| result([NSNumber numberWithBool:canGoBack]); | ||
|
|
@@ -289,6 +311,20 @@ - (bool)loadUrl:(NSString*)url withHeaders:(NSDictionary<NSString*, NSString*>*) | |
| return true; | ||
| } | ||
|
|
||
| - (bool)loadAssetFile:(NSString*)url { | ||
| NSString* key = [_registrar lookupKeyForAsset:url]; | ||
|
There was a problem hiding this comment. It won't work if the url has search or hash parameters. There was a problem hiding this comment.
Yes.. I try to load reactjs app from local file system. it is not loading url with bookmark (#). is there any work-around to load bookmark urls? There was a problem hiding this comment. yes.. try to load bookmark url.. it is not working. . is there any work-around? There was a problem hiding this comment.
The returned key of method There was a problem hiding this comment. thanks for your response.. i'm new to objective c.. tried the proposed changes you described above.. still getting same error.. My changes are in from console log: There was a problem hiding this comment. - (bool)loadAssetFile:(NSString*)url {
NSArray* array = [url componentsSeparatedByString:@"?"];
NSString* pathString = [array objectAtIndex:0];
NSLog(@"%@%@", @"pathString: ", pathString);
NSString* key = [_registrar lookupKeyForAsset:pathString];
NSURL* baseURL = [[NSBundle mainBundle] URLForResource:key withExtension:nil];
if (!baseURL) {
return false;
}
NSURL* newUrl = baseURL;
if ([array count] > 1) {
NSString* queryString = [array objectAtIndex:1];
NSLog(@"%@%@", @"queryString: ", queryString);
NSString* queryPart = [NSString stringWithFormat:@"%@%@", @"?", queryString];
NSLog(@"%@%@", @"queryPart: ", queryPart);
newUrl = [NSURL URLWithString:queryPart relativeToURL:baseURL];
}
if (@available(iOS 9.0, *)) {
[_webView loadFileURL:newUrl allowingReadAccessToURL:[NSURL URLWithString:@"file:///"]];
} else {
return false;
}
return true;
} |
||
| NSURL* nsUrl = [[NSBundle mainBundle] URLForResource:key withExtension:nil]; | ||
| if (!nsUrl) { | ||
| return false; | ||
| } | ||
| if (@available(iOS 9.0, *)) { | ||
| [_webView loadFileURL:nsUrl allowingReadAccessToURL:[NSURL URLWithString:@"file:///"]]; | ||
| } else { | ||
| return false; | ||
| } | ||
| return true; | ||
| } | ||
|
|
||
| - (void)registerJavaScriptChannels:(NSSet*)channelNames | ||
| controller:(WKUserContentController*)userContentController { | ||
| for (NSString* channelName in channelNames) { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -429,6 +429,17 @@ class WebViewController { | |
| }); | ||
| } | ||
|
|
||
| /// Loads the specified file. | ||
|
There was a problem hiding this comment. The docs should say that this is a Flutter asset. |
||
| /// | ||
| /// `url` must not be null. | ||
| Future<void> loadAssetFile(String url) async { | ||
|
|
||
| assert(url != null); | ||
| // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter. | ||
| // https://github.com/flutter/flutter/issues/26431 | ||
| // ignore: strong_mode_implicit_dynamic_method | ||
| return _channel.invokeMethod('loadAssetFile', url); | ||
|
There was a problem hiding this comment. @shaqian could you update the PR to clear this comment? (add type parameter) |
||
| } | ||
|
|
||
| /// Accessor to the current URL that the WebView is displaying. | ||
| /// | ||
| /// If [WebView.initialUrl] was never specified, returns `null`. | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This makes it so we accept something that isn't a URL as the
initialUrl.We could consider adding an
initialAssetparameter, but I'd leave it for a different PR as it warrants some more discussion (generally it seems like users tend to get confused by theinitialFooparameters)