(iOS & Android) Add postMessage API support (#362)
<!-- Please make sure the checklist boxes are all checked before submitting the PR. The checklist is intended as a quick reference, for complete details please see our Contributor Guidelines: http://cordova.apache.org/contribute/contribute_guidelines.html Thanks! --> ### Platforms affected Android iOS (both UIWebView & WKWebView implementations) ### What does this PR do? Adds support for [postMessage API](https://developer.mozilla.org/en-US/docs/Web/API/Window/postMessage) enabling pages loaded into the InappBrowser to post messages back to the parent Webview of the Cordova app. For example, sending event messages associated with UI interactions such as button clicks from the wrapped page back to the parent app Webview. ### What testing has been done on this change? Automated tests have been extended to cover the `message` event. ### Checklist - [x ] Commit message follows the format: "GH-3232: (android) Fix bug with resolving file paths", where CB-xxxx is the JIRA ID & "android" is the platform affected. - [ x] Added automated test coverage as appropriate for this change.
This commit is contained in:
committed by
Jan Piotrowski
parent
0fd43ae644
commit
c54d10052a
@@ -337,6 +337,16 @@ static CDVUIInAppBrowser* instance = nil;
|
||||
[self.inAppBrowserViewController navigateTo:url];
|
||||
}
|
||||
|
||||
-(void)createIframeBridge
|
||||
{
|
||||
// Create an iframe bridge in the new document to communicate with the CDVThemeableBrowserViewController
|
||||
NSString* jsIframeBridge = @"var e = _cdvIframeBridge=d.getElementById('_cdvIframeBridge'); if(!_cdvIframeBridge) {e = _cdvIframeBridge = d.createElement('iframe'); e.id='_cdvIframeBridge'; e.style.display='none'; d.body.appendChild(e);}";
|
||||
// Add the postMessage API
|
||||
NSString* jspostMessageApi = @"window.webkit={messageHandlers:{cordova_iab:{postMessage:function(message){_cdvIframeBridge.src='gap-iab://message/'+encodeURIComponent(message);}}}}";
|
||||
// Inject the JS to the webview
|
||||
[self.inAppBrowserViewController.webView stringByEvaluatingJavaScriptFromString:[NSString stringWithFormat:@"(function(d){%@%@})(document)", jsIframeBridge, jspostMessageApi]];
|
||||
}
|
||||
|
||||
// This is a helper method for the inject{Script|Style}{Code|File} API calls, which
|
||||
// provides a consistent method for injecting JavaScript code into the document.
|
||||
//
|
||||
@@ -348,9 +358,6 @@ static CDVUIInAppBrowser* instance = nil;
|
||||
|
||||
- (void)injectDeferredObject:(NSString*)source withWrapper:(NSString*)jsWrapper
|
||||
{
|
||||
// Ensure an iframe bridge is created to communicate with the CDVUIInAppBrowserViewController
|
||||
[self.inAppBrowserViewController.webView stringByEvaluatingJavaScriptFromString:@"(function(d){_cdvIframeBridge=d.getElementById('_cdvIframeBridge');if(!_cdvIframeBridge) {var e = _cdvIframeBridge = d.createElement('iframe');e.id='_cdvIframeBridge'; e.style.display='none';d.body.appendChild(e);}})(document)"];
|
||||
|
||||
if (jsWrapper != nil) {
|
||||
NSData* jsonData = [NSJSONSerialization dataWithJSONObject:@[source] options:0 error:nil];
|
||||
NSString* sourceArrayString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
|
||||
@@ -472,6 +479,22 @@ static CDVUIInAppBrowser* instance = nil;
|
||||
}
|
||||
[self.commandDelegate sendPluginResult:pluginResult callbackId:scriptCallbackId];
|
||||
return NO;
|
||||
}else if ([scriptCallbackId isEqualToString:@"message"] && (self.callbackId != nil)) {
|
||||
// Send a message event
|
||||
NSString* scriptResult = [url path];
|
||||
if ((scriptResult != nil) && ([scriptResult length] > 1)) {
|
||||
scriptResult = [scriptResult substringFromIndex:1];
|
||||
NSError* __autoreleasing error = nil;
|
||||
NSData* decodedResult = [NSJSONSerialization JSONObjectWithData:[scriptResult dataUsingEncoding:NSUTF8StringEncoding] options:kNilOptions error:&error];
|
||||
if (error == nil) {
|
||||
NSMutableDictionary* dResult = [NSMutableDictionary new];
|
||||
[dResult setValue:@"message" forKey:@"type"];
|
||||
[dResult setObject:decodedResult forKey:@"data"];
|
||||
CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:dResult];
|
||||
[pluginResult setKeepCallback:[NSNumber numberWithBool:YES]];
|
||||
[self.commandDelegate sendPluginResult:pluginResult callbackId:self.callbackId];
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -513,6 +536,7 @@ static CDVUIInAppBrowser* instance = nil;
|
||||
|
||||
- (void)webViewDidFinishLoad:(UIWebView*)theWebView
|
||||
{
|
||||
[self createIframeBridge];
|
||||
if (self.callbackId != nil) {
|
||||
// TODO: It would be more useful to return the URL the page is actually on (e.g. if it's been redirected).
|
||||
NSString* url = [self.inAppBrowserViewController.currentURL absoluteString];
|
||||
|
||||
Reference in New Issue
Block a user