From 71d1fcc67596660f1122dadcfb9f025bb7c2700a Mon Sep 17 00:00:00 2001 From: Penar Musaraj Date: Thu, 13 Jun 2019 02:59:52 -0400 Subject: [PATCH] feat(iOS WKWebView): Add mainDocumentURL to onShouldStartLoadWithRequest(#493) * Pass mainDocumentURL to onShouldStartLoadWithRequest * Update reference * Update typescript types * Update WebViewTypes.ts --- docs/Reference.md | 1 + ios/RNCUIWebView.m | 1 + ios/RNCWKWebView.m | 1 + src/WebViewTypes.ts | 1 + 4 files changed, 4 insertions(+) diff --git a/docs/Reference.md b/docs/Reference.md index 941d006..9f490c7 100644 --- a/docs/Reference.md +++ b/docs/Reference.md @@ -496,6 +496,7 @@ target canGoBack canGoForward lockIdentifier +mainDocumentURL (iOS only) navigationType ``` diff --git a/ios/RNCUIWebView.m b/ios/RNCUIWebView.m index e646a62..95954b8 100644 --- a/ios/RNCUIWebView.m +++ b/ios/RNCUIWebView.m @@ -214,6 +214,7 @@ RCT_NOT_IMPLEMENTED(- (instancetype)initWithCoder:(NSCoder *)aDecoder) NSMutableDictionary *event = [self baseEvent]; [event addEntriesFromDictionary: @{ @"url": (request.URL).absoluteString, + @"mainDocumentURL": (request.mainDocumentURL).absoluteString, @"navigationType": navigationTypes[@(navigationType)] }]; if (![self.delegate webView:self diff --git a/ios/RNCWKWebView.m b/ios/RNCWKWebView.m index c6cded1..0682cda 100644 --- a/ios/RNCWKWebView.m +++ b/ios/RNCWKWebView.m @@ -721,6 +721,7 @@ static NSURLCredential* clientAuthenticationCredential; NSMutableDictionary *event = [self baseEvent]; [event addEntriesFromDictionary: @{ @"url": (request.URL).absoluteString, + @"mainDocumentURL": (request.mainDocumentURL).absoluteString, @"navigationType": navigationTypes[@(navigationType)] }]; if (![self.delegate webView:self diff --git a/src/WebViewTypes.ts b/src/WebViewTypes.ts index 3f97aff..57e839d 100644 --- a/src/WebViewTypes.ts +++ b/src/WebViewTypes.ts @@ -104,6 +104,7 @@ export interface WebViewNavigation extends WebViewNativeEvent { | 'reload' | 'formresubmit' | 'other'; + mainDocumentURL?: string; } export type DecelerationRateConstant = 'normal' | 'fast';