react-native 0.0.0-17be3a003 → 0.0.0-18697adec

package/React/Base/RCTBridgeModule.h

@@ -9,11 +9,14 @@
 #import <UIKit/UIKit.h>
 
 #import <React/RCTDefines.h>
+#import <React/RCTJSThread.h>
 
 @class RCTBridge;
 @protocol RCTBridgeMethod;
 @class RCTModuleRegistry;
 @class RCTViewRegistry;
+@class RCTBundleManager;
+@class RCTCallableJSModules;
 
 /**
  * The type of a block that is capable of sending a response to a bridged
@@ -40,16 +43,6 @@ typedef void (^RCTPromiseResolveBlock)(id result);
  */
 typedef void (^RCTPromiseRejectBlock)(NSString *code, NSString *message, NSError *error);
 
-/**
- * This constant can be returned from +methodQueue to force module
- * methods to be called on the JavaScript thread. This can have serious
- * implications for performance, so only use this if you're sure it's what
- * you need.
- *
- * NOTE: RCTJSThread is not a real libdispatch queue
- */
-RCT_EXTERN dispatch_queue_t RCTJSThread;
-
 RCT_EXTERN_C_BEGIN
 
 typedef struct RCTMethodInfo {
@@ -122,7 +115,7 @@ RCT_EXTERN_C_END
  * moduleRegistry = _moduleRegistry;`. If using Swift, add
  * `@objc var moduleRegistry: RCTModuleRegistry!` to your module.
  */
-@property (nonatomic, weak, readonly) RCTModuleRegistry *moduleRegistry;
+@property (nonatomic, weak, readwrite) RCTModuleRegistry *moduleRegistry;
 
 /**
  * A reference to the RCTViewRegistry. Useful for modules that query UIViews,
@@ -133,7 +126,28 @@ RCT_EXTERN_C_END
  * viewRegistry_DEPRECATED = _viewRegistry_DEPRECATED;`. If using Swift, add
  * `@objc var viewRegistry_DEPRECATED: RCTViewRegistry!` to your module.
  */
-@property (nonatomic, weak, readonly) RCTViewRegistry *viewRegistry_DEPRECATED;
+@property (nonatomic, weak, readwrite) RCTViewRegistry *viewRegistry_DEPRECATED;
+
+/**
+ * A reference to the RCTBundleManager. Useful for modules that need to read
+ * or write to the app's bundle URL.
+ *
+ * To implement this in your module, just add `@synthesize bundleManager =
+ * _bundleManager;`. If using Swift, add `@objc var bundleManager:
+ * RCTBundleManager!` to your module.
+ */
+@property (nonatomic, weak, readwrite) RCTBundleManager *bundleManager;
+
+/**
+ * A reference to an RCTCallableJSModules. Useful for modules that need to
+ * call into methods on JavaScript modules registered as callable with
+ * React Native.
+ *
+ * To implement this in your module, just add `@synthesize callableJSModules =
+ * _callableJSModules;`. If using Swift, add `@objc var callableJSModules:
+ * RCTCallableJSModules!` to your module.
+ */
+@property (nonatomic, weak, readwrite) RCTCallableJSModules *callableJSModules;
 
 /**
  * A reference to the RCTBridge. Useful for modules that require access
@@ -406,6 +420,21 @@ RCT_EXTERN_C_END
 - (id)moduleForName:(const char *)moduleName lazilyLoadIfNecessary:(BOOL)lazilyLoad;
 @end
 
+typedef void (^RCTBridgelessBundleURLSetter)(NSURL *bundleURL);
+typedef NSURL * (^RCTBridgelessBundleURLGetter)(void);
+
+/**
+ * A class that allows NativeModules/TurboModules to read/write the bundleURL, with or without the bridge.
+ */
+@interface RCTBundleManager : NSObject
+- (void)setBridge:(RCTBridge *)bridge;
+- (void)setBridgelessBundleURLGetter:(RCTBridgelessBundleURLGetter)getter
+                           andSetter:(RCTBridgelessBundleURLSetter)setter
+                    andDefaultGetter:(RCTBridgelessBundleURLGetter)defaultGetter;
+- (void)resetBundleURL;
+@property NSURL *bundleURL;
+@end
+
 typedef UIView * (^RCTBridgelessComponentViewProvider)(NSNumber *);
 
 /**
@@ -417,3 +446,24 @@ typedef UIView * (^RCTBridgelessComponentViewProvider)(NSNumber *);
 
 - (UIView *)viewForReactTag:(NSNumber *)reactTag;
 @end
+
+typedef void (^RCTBridgelessJSModuleMethodInvoker)(
+    NSString *moduleName,
+    NSString *methodName,
+    NSArray *args,
+    dispatch_block_t onComplete);
+
+/**
+ * A class that allows NativeModules to call methods on JavaScript modules registered
+ * as callable with React Native.
+ */
+@interface RCTCallableJSModules : NSObject
+- (void)setBridge:(RCTBridge *)bridge;
+- (void)setBridgelessJSModuleMethodInvoker:(RCTBridgelessJSModuleMethodInvoker)bridgelessJSModuleMethodInvoker;
+
+- (void)invokeModule:(NSString *)moduleName method:(NSString *)methodName withArgs:(NSArray *)args;
+- (void)invokeModule:(NSString *)moduleName
+              method:(NSString *)methodName
+            withArgs:(NSArray *)args
+          onComplete:(dispatch_block_t)onComplete;
+@end

package/React/Base/RCTBundleManager.m

@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import "RCTAssert.h"
+#import "RCTBridge+Private.h"
+#import "RCTBridge.h"
+#import "RCTBridgeModule.h"
+
+@implementation RCTBundleManager {
+  __weak RCTBridge *_bridge;
+  RCTBridgelessBundleURLGetter _bridgelessBundleURLGetter;
+  RCTBridgelessBundleURLSetter _bridgelessBundleURLSetter;
+  RCTBridgelessBundleURLGetter _bridgelessBundleURLDefaultGetter;
+}
+
+- (void)setBridge:(RCTBridge *)bridge
+{
+  _bridge = bridge;
+}
+
+- (void)setBridgelessBundleURLGetter:(RCTBridgelessBundleURLGetter)getter
+                           andSetter:(RCTBridgelessBundleURLSetter)setter
+                    andDefaultGetter:(RCTBridgelessBundleURLGetter)defaultGetter
+{
+  _bridgelessBundleURLGetter = getter;
+  _bridgelessBundleURLSetter = setter;
+  _bridgelessBundleURLDefaultGetter = defaultGetter;
+}
+
+- (void)setBundleURL:(NSURL *)bundleURL
+{
+  if (_bridge) {
+    _bridge.bundleURL = bundleURL;
+    return;
+  }
+
+  RCTAssert(
+      _bridgelessBundleURLSetter != nil,
+      @"RCTBundleManager: In bridgeless mode, RCTBridgelessBundleURLSetter must not be nil.");
+  _bridgelessBundleURLSetter(bundleURL);
+}
+
+- (NSURL *)bundleURL
+{
+  if (_bridge) {
+    return _bridge.bundleURL;
+  }
+
+  RCTAssert(
+      _bridgelessBundleURLGetter != nil,
+      @"RCTBundleManager: In bridgeless mode, RCTBridgelessBundleURLGetter must not be nil.");
+
+  return _bridgelessBundleURLGetter();
+}
+
+- (void)resetBundleURL
+{
+  RCTBridge *strongBridge = _bridge;
+  if (strongBridge) {
+    strongBridge.bundleURL = [strongBridge.delegate sourceURLForBridge:strongBridge];
+    return;
+  }
+
+  RCTAssert(
+      _bridgelessBundleURLDefaultGetter != nil,
+      @"RCTBundleManager: In bridgeless mode, default RCTBridgelessBundleURLGetter must not be nil.");
+  RCTAssert(
+      _bridgelessBundleURLSetter != nil,
+      @"RCTBundleManager: In bridgeless mode, RCTBridgelessBundleURLSetter must not be nil.");
+
+  _bridgelessBundleURLSetter(_bridgelessBundleURLDefaultGetter());
+}
+
+@end

package/React/Base/RCTBundleURLProvider.h

@@ -7,16 +7,19 @@
 
 #import <Foundation/Foundation.h>
 
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-extern NSString *const RCTBundleURLProviderUpdatedNotification;
+#import "RCTDefines.h"
 
-extern const NSUInteger kRCTBundleURLProviderDefaultPort;
+RCT_EXTERN NSString *const RCTBundleURLProviderUpdatedNotification;
+RCT_EXTERN const NSUInteger kRCTBundleURLProviderDefaultPort;
 
-#if defined(__cplusplus)
-}
+#if RCT_DEV_MENU | RCT_PACKAGER_LOADING_FUNCTIONALITY
+/**
+ * Allow/disallow accessing the packager server for various runtime scenario.
+ * For instance, if a test run should never access the packager, disable it
+ * by calling this function before initializing React Native (RCTBridge etc).
+ * By default the access is enabled.
+ */
+RCT_EXTERN void RCTBundleURLProviderAllowPackagerServerAccess(BOOL allowed);
 #endif
 
 @interface RCTBundleURLProvider : NSObject
@@ -49,6 +52,13 @@ extern const NSUInteger kRCTBundleURLProviderDefaultPort;
  */
 + (BOOL)isPackagerRunning:(NSString *)hostPort;
 
+/**
+ * Returns if there's a packager running at the given scheme://host:port.
+ * The port is optional, if not specified, kRCTBundleURLProviderDefaultPort will be used
+ * The scheme is also optional, if not specified, a default http protocol will be used
+ */
++ (BOOL)isPackagerRunning:(NSString *)hostPort scheme:(NSString *)scheme;
+
 /**
  * Returns the jsBundleURL for a given bundle entrypoint and
  * the fallback offline JS bundle if the packager is not running.
@@ -96,9 +106,15 @@ extern const NSUInteger kRCTBundleURLProviderDefaultPort;
  * The IP address or hostname of the packager.
  */
 @property (nonatomic, copy) NSString *jsLocation;
+
 @property (nonatomic, assign) BOOL enableMinification;
 @property (nonatomic, assign) BOOL enableDev;
 
+/**
+ * The scheme/protocol used of the packager, the default is the http protocol
+ */
+@property (nonatomic, copy) NSString *packagerScheme;
+
 + (instancetype)sharedSettings;
 
 /**
@@ -126,6 +142,13 @@ extern const NSUInteger kRCTBundleURLProviderDefaultPort;
                         modulesOnly:(BOOL)modulesOnly
                           runModule:(BOOL)runModule;
 
++ (NSURL *)jsBundleURLForBundleRoot:(NSString *)bundleRoot
+                       packagerHost:(NSString *)packagerHost
+                     packagerScheme:(NSString *)scheme
+                          enableDev:(BOOL)enableDev
+                 enableMinification:(BOOL)enableMinification
+                        modulesOnly:(BOOL)modulesOnly
+                          runModule:(BOOL)runModule;
 /**
  * Given a hostname for the packager and a resource path (including "/"), return the URL to the resource.
  * In general, please use the instance method to decide if the packager is running and fallback to the pre-packaged
@@ -133,4 +156,9 @@ extern const NSUInteger kRCTBundleURLProviderDefaultPort;
  */
 + (NSURL *)resourceURLForResourcePath:(NSString *)path packagerHost:(NSString *)packagerHost query:(NSString *)query;
 
++ (NSURL *)resourceURLForResourcePath:(NSString *)path
+                         packagerHost:(NSString *)packagerHost
+                               scheme:(NSString *)scheme
+                                query:(NSString *)query;
+
 @end

package/React/Base/RCTBundleURLProvider.mm

@@ -9,11 +9,20 @@
 
 #import "RCTConvert.h"
 #import "RCTDefines.h"
+#import "RCTLog.h"
 
 NSString *const RCTBundleURLProviderUpdatedNotification = @"RCTBundleURLProviderUpdatedNotification";
 
 const NSUInteger kRCTBundleURLProviderDefaultPort = RCT_METRO_PORT;
 
+#if RCT_DEV_MENU | RCT_PACKAGER_LOADING_FUNCTIONALITY
+static BOOL kRCTAllowPackagerAccess = YES;
+void RCTBundleURLProviderAllowPackagerServerAccess(BOOL allowed)
+{
+  kRCTAllowPackagerAccess = allowed;
+}
+#endif
+static NSString *const kRCTPackagerSchemeKey = @"RCT_packager_scheme";
 static NSString *const kRCTJsLocationKey = @"RCT_jsLocation";
 static NSString *const kRCTEnableDevKey = @"RCT_enableDev";
 static NSString *const kRCTEnableMinificationKey = @"RCT_enableMinification";
@@ -56,23 +65,34 @@ static NSString *const kRCTEnableMinificationKey = @"RCT_enableMinification";
   [self settingsUpdated];
 }
 
-static NSURL *serverRootWithHostPort(NSString *hostPort)
+static NSURL *serverRootWithHostPort(NSString *hostPort, NSString *scheme)
 {
+  if (![scheme length]) {
+    scheme = @"http";
+  }
   if ([hostPort rangeOfString:@":"].location != NSNotFound) {
-    return [NSURL URLWithString:[NSString stringWithFormat:@"http://%@/", hostPort]];
+    return [NSURL URLWithString:[NSString stringWithFormat:@"%@://%@/", scheme, hostPort]];
   }
-  return [NSURL
-      URLWithString:[NSString
-                        stringWithFormat:@"http://%@:%lu/", hostPort, (unsigned long)kRCTBundleURLProviderDefaultPort]];
+  return [NSURL URLWithString:[NSString stringWithFormat:@"%@://%@:%lu/",
+                                                         scheme,
+                                                         hostPort,
+                                                         (unsigned long)kRCTBundleURLProviderDefaultPort]];
 }
 
 #if RCT_DEV_MENU
 + (BOOL)isPackagerRunning:(NSString *)hostPort
 {
-  NSURL *url = [serverRootWithHostPort(hostPort) URLByAppendingPathComponent:@"status"];
+  return [RCTBundleURLProvider isPackagerRunning:hostPort scheme:nil];
+}
+
++ (BOOL)isPackagerRunning:(NSString *)hostPort scheme:(NSString *)scheme
+{
+  NSURL *url = [serverRootWithHostPort(hostPort, scheme) URLByAppendingPathComponent:@"status"];
 
   NSURLSession *session = [NSURLSession sharedSession];
-  NSURLRequest *request = [NSURLRequest requestWithURL:url];
+  NSURLRequest *request = [NSURLRequest requestWithURL:url
+                                           cachePolicy:NSURLRequestUseProtocolCachePolicy
+                                       timeoutInterval:10];
   __block NSURLResponse *response;
   __block NSData *data;
 
@@ -111,6 +131,11 @@ static NSURL *serverRootWithHostPort(NSString *hostPort)
 {
   return false;
 }
+
++ (BOOL)isPackagerRunning:(NSString *)hostPort scheme:(NSString *)scheme
+{
+  return false;
+}
 #endif
 
 - (NSString *)packagerServerHost
@@ -127,9 +152,16 @@ static NSURL *serverRootWithHostPort(NSString *hostPort)
 
 - (NSString *)packagerServerHostPort
 {
+#if RCT_DEV_MENU | RCT_PACKAGER_LOADING_FUNCTIONALITY
+  if (!kRCTAllowPackagerAccess) {
+    RCTLogInfo(@"Packager server access is disabled in this environment");
+    return nil;
+  }
+#endif
   NSString *location = [self jsLocation];
 #if RCT_DEV_MENU
-  if ([location length] && ![RCTBundleURLProvider isPackagerRunning:location]) {
+  NSString *scheme = [self packagerScheme];
+  if ([location length] && ![RCTBundleURLProvider isPackagerRunning:location scheme:scheme]) {
     location = nil;
   }
 #endif
@@ -153,8 +185,11 @@ static NSURL *serverRootWithHostPort(NSString *hostPort)
   } else {
     return [RCTBundleURLProvider jsBundleURLForBundleRoot:bundleRoot
                                              packagerHost:packagerServerHostPort
+                                           packagerScheme:[self packagerScheme]
                                                 enableDev:[self enableDev]
-                                       enableMinification:[self enableMinification]];
+                                       enableMinification:[self enableMinification]
+                                              modulesOnly:NO
+                                                runModule:YES];
   }
 }
 
@@ -162,6 +197,7 @@ static NSURL *serverRootWithHostPort(NSString *hostPort)
 {
   return [RCTBundleURLProvider jsBundleURLForBundleRoot:bundleRoot
                                            packagerHost:[self packagerServerHostPort]
+                                         packagerScheme:[self packagerScheme]
                                               enableDev:[self enableDev]
                                      enableMinification:[self enableMinification]
                                             modulesOnly:YES
@@ -196,13 +232,17 @@ static NSURL *serverRootWithHostPort(NSString *hostPort)
                         offlineBundle:(NSBundle *)offlineBundle
 {
   NSString *packagerServerHostPort = [self packagerServerHostPort];
+  NSString *packagerServerScheme = [self packagerScheme];
   if (!packagerServerHostPort) {
     // Serve offline bundle (local file)
     NSBundle *bundle = offlineBundle ?: [NSBundle mainBundle];
     return [bundle URLForResource:name withExtension:extension];
   }
   NSString *path = [NSString stringWithFormat:@"/%@/%@.%@", root, name, extension];
-  return [[self class] resourceURLForResourcePath:path packagerHost:packagerServerHostPort query:nil];
+  return [[self class] resourceURLForResourcePath:path
+                                     packagerHost:packagerServerHostPort
+                                           scheme:packagerServerScheme
+                                            query:nil];
 }
 
 + (NSURL *)jsBundleURLForBundleRoot:(NSString *)bundleRoot
@@ -225,6 +265,23 @@ static NSURL *serverRootWithHostPort(NSString *hostPort)
                  enableMinification:(BOOL)enableMinification
                         modulesOnly:(BOOL)modulesOnly
                           runModule:(BOOL)runModule
+{
+  return [[self class] jsBundleURLForBundleRoot:bundleRoot
+                                   packagerHost:packagerHost
+                                 packagerScheme:nil
+                                      enableDev:enableDev
+                             enableMinification:enableMinification
+                                    modulesOnly:modulesOnly
+                                      runModule:runModule];
+}
+
++ (NSURL *)jsBundleURLForBundleRoot:(NSString *)bundleRoot
+                       packagerHost:(NSString *)packagerHost
+                     packagerScheme:(NSString *)scheme
+                          enableDev:(BOOL)enableDev
+                 enableMinification:(BOOL)enableMinification
+                        modulesOnly:(BOOL)modulesOnly
+                          runModule:(BOOL)runModule
 {
   NSString *path = [NSString stringWithFormat:@"/%@.bundle", bundleRoot];
 #ifdef HERMES_BYTECODE_VERSION
@@ -245,12 +302,20 @@ static NSURL *serverRootWithHostPort(NSString *hostPort)
   if (bundleID) {
     query = [NSString stringWithFormat:@"%@&app=%@", query, bundleID];
   }
-  return [[self class] resourceURLForResourcePath:path packagerHost:packagerHost query:query];
+  return [[self class] resourceURLForResourcePath:path packagerHost:packagerHost scheme:scheme query:query];
 }
 
 + (NSURL *)resourceURLForResourcePath:(NSString *)path packagerHost:(NSString *)packagerHost query:(NSString *)query
 {
-  NSURLComponents *components = [NSURLComponents componentsWithURL:serverRootWithHostPort(packagerHost)
+  return [[self class] resourceURLForResourcePath:path packagerHost:packagerHost scheme:nil query:query];
+}
+
++ (NSURL *)resourceURLForResourcePath:(NSString *)path
+                         packagerHost:(NSString *)packagerHost
+                               scheme:(NSString *)scheme
+                                query:(NSString *)query
+{
+  NSURLComponents *components = [NSURLComponents componentsWithURL:serverRootWithHostPort(packagerHost, scheme)
                                            resolvingAgainstBaseURL:NO];
   components.path = path;
   if (query != nil) {
@@ -281,6 +346,15 @@ static NSURL *serverRootWithHostPort(NSString *hostPort)
   return [[NSUserDefaults standardUserDefaults] stringForKey:kRCTJsLocationKey];
 }
 
+- (NSString *)packagerScheme
+{
+  NSString *packagerScheme = [[NSUserDefaults standardUserDefaults] stringForKey:kRCTPackagerSchemeKey];
+  if (![packagerScheme length]) {
+    return @"http";
+  }
+  return packagerScheme;
+}
+
 - (void)setEnableDev:(BOOL)enableDev
 {
   [self updateValue:@(enableDev) forKey:kRCTEnableDevKey];
@@ -296,6 +370,11 @@ static NSURL *serverRootWithHostPort(NSString *hostPort)
   [self updateValue:@(enableMinification) forKey:kRCTEnableMinificationKey];
 }
 
+- (void)setPackagerScheme:(NSString *)packagerScheme
+{
+  [self updateValue:packagerScheme forKey:kRCTPackagerSchemeKey];
+}
+
 + (instancetype)sharedSettings
 {
   static RCTBundleURLProvider *sharedInstance;

package/React/Base/RCTCallableJSModules.m

@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import "RCTBridge.h"
+#import "RCTBridgeModule.h"
+
+@implementation RCTCallableJSModules {
+  RCTBridgelessJSModuleMethodInvoker _bridgelessJSModuleMethodInvoker;
+  __weak RCTBridge *_bridge;
+}
+
+- (void)setBridge:(RCTBridge *)bridge
+{
+  _bridge = bridge;
+}
+
+- (void)setBridgelessJSModuleMethodInvoker:(RCTBridgelessJSModuleMethodInvoker)bridgelessJSModuleMethodInvoker
+{
+  _bridgelessJSModuleMethodInvoker = bridgelessJSModuleMethodInvoker;
+}
+
+- (void)invokeModule:(NSString *)moduleName method:(NSString *)methodName withArgs:(NSArray *)args
+{
+  [self invokeModule:moduleName method:methodName withArgs:args onComplete:NULL];
+}
+
+- (void)invokeModule:(NSString *)moduleName
+              method:(NSString *)methodName
+            withArgs:(NSArray *)args
+          onComplete:(dispatch_block_t)onComplete
+{
+  RCTBridge *bridge = _bridge;
+  if (bridge) {
+    [bridge enqueueJSCall:moduleName method:methodName args:args completion:onComplete];
+    return;
+  }
+
+  if (_bridgelessJSModuleMethodInvoker) {
+    _bridgelessJSModuleMethodInvoker(moduleName, methodName, args, onComplete);
+  }
+}
+
+@end

package/React/Base/RCTConstants.h

@@ -10,21 +10,14 @@
 RCT_EXTERN NSString *const RCTUserInterfaceStyleDidChangeNotification;
 RCT_EXTERN NSString *const RCTUserInterfaceStyleDidChangeNotificationTraitCollectionKey;
 
-/*
- * Allows to enable or disable on-demand view mounting feature of ScrollView.
- * It's an experimental feature that improves performance and memory footprint of huge lists inside ScrollView.
- */
-RCT_EXTERN BOOL RCTExperimentGetOnDemandViewMounting(void);
-RCT_EXTERN void RCTExperimentSetOnDemandViewMounting(BOOL value);
-
-/*
- * It's an experimental feature that improves performance of hit-testing.
- */
-RCT_EXTERN BOOL RCTExperimentGetOptimizedHitTesting(void);
-RCT_EXTERN void RCTExperimentSetOptimizedHitTesting(BOOL value);
-
 /*
  * Preemptive View Allocation
  */
 RCT_EXTERN BOOL RCTExperimentGetPreemptiveViewAllocationDisabled(void);
 RCT_EXTERN void RCTExperimentSetPreemptiveViewAllocationDisabled(BOOL value);
+
+/*
+ * Remove clipped subviews
+ */
+RCT_EXTERN BOOL RCTGetRemoveClippedSubviewsEnabled(void);
+RCT_EXTERN void RCTSetRemoveClippedSubviewsEnabled(BOOL value);

package/React/Base/RCTConstants.m

@@ -11,46 +11,31 @@ NSString *const RCTUserInterfaceStyleDidChangeNotification = @"RCTUserInterfaceS
 NSString *const RCTUserInterfaceStyleDidChangeNotificationTraitCollectionKey = @"traitCollection";
 
 /*
- * On-demand view mounting
- */
-static BOOL RCTExperimentOnDemandViewMounting = NO;
-
-BOOL RCTExperimentGetOnDemandViewMounting()
-{
-  return RCTExperimentOnDemandViewMounting;
-}
-
-void RCTExperimentSetOnDemandViewMounting(BOOL value)
-{
-  RCTExperimentOnDemandViewMounting = value;
-}
-
-/*
- * Optimized hit-testing
+ * Preemptive View Allocation
  */
-static BOOL RCTExperimentOptimizedHitTesting = NO;
+static BOOL RCTExperimentPreemptiveViewAllocationDisabled = NO;
 
-BOOL RCTExperimentGetOptimizedHitTesting()
+BOOL RCTExperimentGetPreemptiveViewAllocationDisabled()
 {
-  return RCTExperimentOptimizedHitTesting;
+  return RCTExperimentPreemptiveViewAllocationDisabled;
 }
 
-void RCTExperimentSetOptimizedHitTesting(BOOL value)
+void RCTExperimentSetPreemptiveViewAllocationDisabled(BOOL value)
 {
-  RCTExperimentOptimizedHitTesting = value;
+  RCTExperimentPreemptiveViewAllocationDisabled = value;
 }
 
 /*
- * Preemptive View Allocation
+ * Remove clipped subviews
  */
-static BOOL RCTExperimentPreemptiveViewAllocationDisabled = NO;
+static BOOL RCTRemoveClippedSubviewsEnabled = NO;
 
-BOOL RCTExperimentGetPreemptiveViewAllocationDisabled()
+BOOL RCTGetRemoveClippedSubviewsEnabled(void)
 {
-  return RCTExperimentPreemptiveViewAllocationDisabled;
+  return RCTRemoveClippedSubviewsEnabled;
 }
 
-void RCTExperimentSetPreemptiveViewAllocationDisabled(BOOL value)
+void RCTSetRemoveClippedSubviewsEnabled(BOOL value)
 {
-  RCTExperimentPreemptiveViewAllocationDisabled = value;
+  RCTRemoveClippedSubviewsEnabled = value;
 }

package/React/Base/RCTConvert.h

@@ -74,7 +74,7 @@ typedef NSURL RCTFileURL;
 #endif
 
 #if TARGET_OS_IPHONE
-+ (WKDataDetectorTypes)WKDataDetectorTypes:(id)json API_AVAILABLE(ios(10.0));
++ (WKDataDetectorTypes)WKDataDetectorTypes:(id)json;
 #endif
 
 + (UIViewContentMode)UIViewContentMode:(id)json;