Migrate RCTWebView to WKWebView.

facebook · Dec 5, 2017 · da2cf97 · da2cf97
1 parent 7fb3a92
commit da2cf97
Show file tree

Hide file tree

Showing 5 changed files with 443 additions and 119 deletions.
diff --git a/React/Base/RCTConvert.h b/React/Base/RCTConvert.h
@@ -9,6 +9,9 @@
 
 #import <QuartzCore/QuartzCore.h>
 #import <UIKit/UIKit.h>
+#if !TARGET_OS_TV
+#import <WebKit/WebKit.h>
+#endif
 
 #import <React/RCTAnimationType.h>
 #import <React/RCTBorderStyle.h>
@@ -70,6 +73,7 @@ typedef NSURL RCTFileURL;
 + (UIReturnKeyType)UIReturnKeyType:(id)json;
 #if !TARGET_OS_TV
 + (UIDataDetectorTypes)UIDataDetectorTypes:(id)json;
++ (WKDataDetectorTypes)WKDataDetectorTypes:(id)json;
 #endif
 
 + (UIViewContentMode)UIViewContentMode:(id)json;

diff --git a/React/Base/RCTConvert.m b/React/Base/RCTConvert.m
@@ -363,6 +363,19 @@ + (NSLocale *)NSLocale:(id)json
   @"none": @(UIDataDetectorTypeNone),
   @"all": @(UIDataDetectorTypeAll),
 }), UIDataDetectorTypePhoneNumber, unsignedLongLongValue)
+
+RCT_MULTI_ENUM_CONVERTER(WKDataDetectorTypes, (@{
+  @"phoneNumber": @(WKDataDetectorTypePhoneNumber),
+  @"link": @(WKDataDetectorTypeLink),
+  @"address": @(WKDataDetectorTypeAddress),
+  @"calendarEvent": @(WKDataDetectorTypeCalendarEvent),
+  @"trackingNumber": @(WKDataDetectorTypeTrackingNumber),
+  @"flightNumber": @(WKDataDetectorTypeFlightNumber),
+  @"lookupSuggestion": @(WKDataDetectorTypeLookupSuggestion),
+  @"none": @(WKDataDetectorTypeNone),
+  @"all": @(WKDataDetectorTypeAll),
+}), WKDataDetectorTypePhoneNumber, unsignedLongLongValue)
+
 #endif
 
 RCT_ENUM_CONVERTER(UIKeyboardAppearance, (@{

diff --git a/React/Views/RCTWebView.h b/React/Views/RCTWebView.h
@@ -7,6 +7,8 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
+#import <WebKit/WebKit.h>
+
 #import <React/RCTView.h>
 
 @class RCTWebView;
@@ -37,6 +39,9 @@ shouldStartLoadForRequest:(NSMutableDictionary<NSString *, id> *)request
 @property (nonatomic, assign) BOOL messagingEnabled;
 @property (nonatomic, copy) NSString *injectedJavaScript;
 @property (nonatomic, assign) BOOL scalesPageToFit;
+@property (nonatomic, assign) BOOL allowsInlineMediaPlayback;
+@property (nonatomic, assign) BOOL mediaPlaybackRequiresUserAction;
+@property (nonatomic, assign) WKDataDetectorTypes dataDetectorTypes;
 
 - (void)goForward;
 - (void)goBack;