Apply patch for onUrlChanged and injectedCookiesSource

Author: robinheinze

WKWebView.ios.js

@@ -187,6 +187,7 @@ class WKWebView extends React.Component {
      * Receive scroll events from view
      */
     onScroll: PropTypes.func,
+    onUrlChanged: PropTypes.func,
     /**
      * A callback to get response headers, http status code and http localized status code.
      */
@@ -221,6 +222,10 @@ class WKWebView extends React.Component {
      * Sets the JS to be injected when the webpage loads.
      */
     injectedJavaScript: PropTypes.string,
+        /**
+     * A domain whose cookies will be injected into `document.cookies`.
+     */
+    injectedCookiesSource: PropTypes.string,
     /**
      * Allows custom handling of any webview requests by a JS handler. Return true
      * or false from this method to continue loading the request.
@@ -339,6 +344,7 @@ class WKWebView extends React.Component {
         injectedJavaScriptForMainFrameOnly={this.props.injectedJavaScriptForMainFrameOnly}
         injectJavaScript={this.props.injectJavaScript}
         injectedJavaScript={this.props.injectedJavaScript}
+        injectedCookiesSource={this.props.injectedCookiesSource}
         bounces={this.props.bounces}
         scrollEnabled={this.props.scrollEnabled}
         contentInset={this.props.contentInset}
@@ -355,6 +361,7 @@ class WKWebView extends React.Component {
         onProgress={this._onProgress}
         onMessage={this._onMessage}
         onScroll={this._onScroll}
+        onUrlChanged={this._onUrlChanged}
         onShouldStartLoadWithRequest={onShouldStartLoadWithRequest}
         pagingEnabled={this.props.pagingEnabled}
         directionalLockEnabled={this.props.directionalLockEnabled}
@@ -511,6 +518,11 @@ class WKWebView extends React.Component {
     onScroll && onScroll(event.nativeEvent);
   };
 
+  _onUrlChanged = (event: Event) => {
+    const onUrlChanged = this.props.onUrlChanged;
+    onUrlChanged && onUrlChanged(event.nativeEvent);
+  }
+
   _onNavigationResponse = (event: Event) => {
     const { onNavigationResponse } = this.props;
     onNavigationResponse && onNavigationResponse(event)

ios/RCTWKWebView.xcodeproj/project.pbxproj

@@ -12,6 +12,7 @@
 		097457AF1D2AF4E0000D9368 /* RCTWKWebView.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 097457AC1D2A4595000D9368 /* RCTWKWebView.h */; };
 		097457B01D2AF4E0000D9368 /* RCTWKWebViewManager.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 097457A81D2A457C000D9368 /* RCTWKWebViewManager.h */; };
 		3E609CF61EAA815D00187C8C /* WeakScriptMessageDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 3E609CF51EAA815D00187C8C /* WeakScriptMessageDelegate.m */; };
+		AAE1993720AC4A9100C9735F /* NSHTTPCookie+SetCookie.m in Sources */ = {isa = PBXBuildFile; fileRef = AAE1993620AC4A9100C9735F /* NSHTTPCookie+SetCookie.m */; };
 		E683F3D72080F3400005F1F5 /* WKProcessPool+SharedProcessPool.m in Sources */ = {isa = PBXBuildFile; fileRef = E683F3D62080F3400005F1F5 /* WKProcessPool+SharedProcessPool.m */; };
 /* End PBXBuildFile section */
 
@@ -37,6 +38,8 @@
 		097457AD1D2A4595000D9368 /* RCTWKWebView.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; path = RCTWKWebView.m; sourceTree = "<group>"; tabWidth = 2; };
 		3E609CF41EAA815D00187C8C /* WeakScriptMessageDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WeakScriptMessageDelegate.h; sourceTree = "<group>"; };
 		3E609CF51EAA815D00187C8C /* WeakScriptMessageDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WeakScriptMessageDelegate.m; sourceTree = "<group>"; };
+		AAE1993520AC4A8100C9735F /* NSHTTPCookie+SetCookie.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSHTTPCookie+SetCookie.h"; sourceTree = "<group>"; };
+ 		AAE1993620AC4A9100C9735F /* NSHTTPCookie+SetCookie.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSHTTPCookie+SetCookie.m"; sourceTree = "<group>"; };
 		E683F3D32080F2E10005F1F5 /* WKProcessPool+SharedProcessPool.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "WKProcessPool+SharedProcessPool.h"; sourceTree = "<group>"; };
 		E683F3D62080F3400005F1F5 /* WKProcessPool+SharedProcessPool.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "WKProcessPool+SharedProcessPool.m"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -77,6 +80,8 @@
 				097457A91D2A457C000D9368 /* RCTWKWebViewManager.m */,
 				3E609CF41EAA815D00187C8C /* WeakScriptMessageDelegate.h */,
 				3E609CF51EAA815D00187C8C /* WeakScriptMessageDelegate.m */,
+				AAE1993520AC4A8100C9735F /* NSHTTPCookie+SetCookie.h */,
+ 				AAE1993620AC4A9100C9735F /* NSHTTPCookie+SetCookie.m */,
 				E683F3D32080F2E10005F1F5 /* WKProcessPool+SharedProcessPool.h */,
 				E683F3D62080F3400005F1F5 /* WKProcessPool+SharedProcessPool.m */,
 			);
@@ -141,6 +146,7 @@
 				097457AB1D2A457C000D9368 /* RCTWKWebViewManager.m in Sources */,
 				3E609CF61EAA815D00187C8C /* WeakScriptMessageDelegate.m in Sources */,
 				E683F3D72080F3400005F1F5 /* WKProcessPool+SharedProcessPool.m in Sources */,
+				AAE1993720AC4A9100C9735F /* NSHTTPCookie+SetCookie.m in Sources */,
 				097457AE1D2A4595000D9368 /* RCTWKWebView.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

ios/RCTWKWebView/NSHTTPCookie+SetCookie.h

@@ -0,0 +1,5 @@
+#import <Foundation/Foundation.h>
+
+@interface NSHTTPCookie(SetCookie)
+- (NSString*)formatForSetCookie;
+@end

ios/RCTWKWebView/NSHTTPCookie+SetCookie.m

@@ -0,0 +1,21 @@
+#import "NSHTTPCookie+SetCookie.h"
+
+@implementation NSHTTPCookie(SetCookie)
+- (NSString*)formatForSetCookie {
+    NSString* name = [self name];
+    NSString* value = [self value];
+    NSString* domain = [self domain];
+    NSString* path = [self path];
+    NSString* isSecure = [self isSecure] ? @"Secure;" : @"";
+
+    NSDateFormatter* rfc7231DateFormatter = [[NSDateFormatter alloc] init];
+    NSLocale* posixLocale = [NSLocale localeWithLocaleIdentifier:@"en_US_POSIX"];
+    [rfc7231DateFormatter setLocale:posixLocale];
+    [rfc7231DateFormatter setTimeZone:[NSTimeZone timeZoneForSecondsFromGMT:0]];
+    rfc7231DateFormatter.dateFormat = @"EEE, dd MMM yyyy HH mm ss 'GMT'";
+    NSDate* expiresDate = [self expiresDate];
+    NSString* formattedExpiresDate = [self expiresDate] ? [NSString stringWithFormat:@"Expires=%@;", [rfc7231DateFormatter stringFromDate:expiresDate]] : @"";
+
+    return [NSString stringWithFormat:@"%@=%@; Domain=%@; Path=%@; %@%@ ", name, value, domain, path, formattedExpiresDate, isSecure];
+}
+@end

ios/RCTWKWebView/RCTWKWebView.h

@@ -36,6 +36,7 @@ shouldStartLoadForRequest:(NSMutableDictionary<NSString *, id> *)request
 @property (nonatomic, assign) BOOL injectedJavaScriptForMainFrameOnly;
 @property (nonatomic, copy) NSString *injectJavaScript;
 @property (nonatomic, copy) NSString *injectedJavaScript;
+@property (nonatomic, copy) NSString *injectedCookiesSource;
 @property (nonatomic, assign) BOOL hideKeyboardAccessoryView;
 @property (nonatomic, assign) BOOL keyboardDisplayRequiresUserAction;