react-native-tvos 0.82.1-0 → 0.83.0-0

package/Libraries/Network/RCTNetworking.mm

@@ -12,7 +12,6 @@
 #import <React/RCTConvert.h>
 #import <React/RCTLog.h>
 #import <React/RCTNetworkTask.h>
-#import <React/RCTNetworking.h>
 #import <React/RCTUtils.h>
 
 #import <React/RCTHTTPRequestHandler.h>
@@ -20,6 +19,8 @@
 
 #import "RCTInspectorNetworkReporter.h"
 #import "RCTNetworkPlugins.h"
+#import "RCTNetworking+Internal.h"
+#import "RCTNetworking.h"
 
 typedef RCTURLRequestCancellationBlock (^RCTHTTPQueryResult)(NSError *error, NSDictionary<NSString *, id> *result);
 
@@ -28,6 +29,7 @@ NSString *const RCTNetworkingPHUploadHackScheme = @"ph-upload";
 @interface RCTNetworking () <NativeNetworkingIOSSpec>
 
 - (RCTURLRequestCancellationBlock)processDataForHTTPQuery:(NSDictionary<NSString *, id> *)data
+                                        devToolsRequestId:(NSString *)devToolsRequestId
                                                  callback:(RCTHTTPQueryResult)callback;
 @end
 
@@ -69,7 +71,9 @@ static NSString *RCTGenerateFormBoundary()
                                   freeWhenDone:YES];
 }
 
-- (RCTURLRequestCancellationBlock)process:(NSArray<NSDictionary *> *)formData callback:(RCTHTTPQueryResult)callback
+- (RCTURLRequestCancellationBlock)process:(NSArray<NSDictionary *> *)formData
+                        devToolsRequestId:(NSString *)devToolsRequestId
+                                 callback:(RCTHTTPQueryResult)callback
 {
   RCTAssertThread(_networker.methodQueue, @"process: must be called on request queue");
 
@@ -93,12 +97,15 @@ static NSString *RCTGenerateFormBoundary()
   }
 
   return [_networker processDataForHTTPQuery:_parts[0]
+                           devToolsRequestId:devToolsRequestId
                                     callback:^(NSError *error, NSDictionary<NSString *, id> *result) {
-                                      return [self handleResult:result error:error];
+                                      return [self handleResult:result error:error devToolsRequestId:devToolsRequestId];
                                     }];
 }
 
-- (RCTURLRequestCancellationBlock)handleResult:(NSDictionary<NSString *, id> *)result error:(NSError *)error
+- (RCTURLRequestCancellationBlock)handleResult:(NSDictionary<NSString *, id> *)result
+                                         error:(NSError *)error
+                             devToolsRequestId:(NSString *)devToolsRequestId
 {
   RCTAssertThread(_networker.methodQueue, @"handleResult: must be called on request queue");
 
@@ -129,8 +136,9 @@ static NSString *RCTGenerateFormBoundary()
   [_parts removeObjectAtIndex:0];
   if (_parts.count) {
     return [_networker processDataForHTTPQuery:_parts[0]
+                             devToolsRequestId:devToolsRequestId
                                       callback:^(NSError *err, NSDictionary<NSString *, id> *res) {
-                                        return [self handleResult:res error:err];
+                                        return [self handleResult:res error:err devToolsRequestId:devToolsRequestId];
                                       }];
   }
 
@@ -153,6 +161,7 @@ static NSString *RCTGenerateFormBoundary()
   NSArray<id<RCTURLRequestHandler>> * (^_handlersProvider)(RCTModuleRegistry *);
   NSMutableArray<id<RCTNetworkingRequestHandler>> *_requestHandlers;
   NSMutableArray<id<RCTNetworkingResponseHandler>> *_responseHandlers;
+  NSMutableArray<id<RCTNetworkingTextResponseHandler>> *_textResponseHandlers;
   dispatch_queue_t _requestQueue;
 }
 
@@ -300,6 +309,7 @@ RCT_EXPORT_MODULE()
 }
 
 - (RCTURLRequestCancellationBlock)buildRequest:(NSDictionary<NSString *, id> *)query
+                             devToolsRequestId:(NSString *)devToolsRequestId
                                completionBlock:(void (^)(NSURLRequest *request))block
 {
   RCTAssertThread(_methodQueue, @"buildRequest: must be called on request queue");
@@ -330,6 +340,7 @@ RCT_EXPORT_MODULE()
     [NSURLProtocol setProperty:trackingName forKey:@"trackingName" inRequest:request];
   }
   return [self processDataForHTTPQuery:data
+                     devToolsRequestId:devToolsRequestId
                               callback:^(NSError *error, NSDictionary<NSString *, id> *result) {
                                 if (error) {
                                   RCTLogError(@"Error processing request body: %@", error);
@@ -396,6 +407,7 @@ RCT_EXPORT_MODULE()
  */
 - (RCTURLRequestCancellationBlock)
     processDataForHTTPQuery:(nullable NSDictionary<NSString *, id> *)query
+          devToolsRequestId:(NSString *)devToolsRequestId
                    callback:(RCTURLRequestCancellationBlock (^)(NSError *error, NSDictionary<NSString *, id> *result))
                                 callback
 {
@@ -425,23 +437,24 @@ RCT_EXPORT_MODULE()
   NSURLRequest *request = [RCTConvert NSURLRequest:query[@"uri"]];
   if (request) {
     __block RCTURLRequestCancellationBlock cancellationBlock = nil;
-    RCTNetworkTask *task =
-        [self networkTaskWithRequest:request
-                     completionBlock:^(NSURLResponse *response, NSData *data, NSError *error) {
-                       dispatch_async(self->_methodQueue, ^{
-                         cancellationBlock = callback(
-                             error, data ? @{@"body" : data, @"contentType" : RCTNullIfNil(response.MIMEType)} : nil);
-                       });
-                     }];
+    RCTNetworkTask *task = [self
+        networkTaskWithDevToolsRequestId:devToolsRequestId
+                                 request:request
+                         completionBlock:^(NSURLResponse *response, NSData *data, NSError *error) {
+                           dispatch_async(self->_methodQueue, ^{
+                             cancellationBlock = callback(
+                                 error,
+                                 data ? @{@"body" : data, @"contentType" : RCTNullIfNil(response.MIMEType)} : nil);
+                           });
+                         }];
 
     [task start];
 
     __weak RCTNetworkTask *weakTask = task;
-    NSNumber *requestId = [task.requestID copy];
     return ^{
       [weakTask cancel];
       if (facebook::react::ReactNativeFeatureFlags::enableNetworkEventReporting()) {
-        [RCTInspectorNetworkReporter reportRequestFailed:requestId cancelled:YES];
+        [RCTInspectorNetworkReporter reportRequestFailed:devToolsRequestId cancelled:YES];
       }
       if (cancellationBlock) {
         cancellationBlock();
@@ -452,7 +465,7 @@ RCT_EXPORT_MODULE()
   if (formData) {
     RCTHTTPFormDataHelper *formDataHelper = [RCTHTTPFormDataHelper new];
     formDataHelper.networker = self;
-    return [formDataHelper process:formData callback:callback];
+    return [formDataHelper process:formData devToolsRequestId:devToolsRequestId callback:callback];
   }
   // Nothing in the data payload, at least nothing we could understand anyway.
   // Ignore and treat it as if it were null.
@@ -571,7 +584,7 @@ RCT_EXPORT_MODULE()
     }
     bool base64Encoded = [responseType isEqualToString:@"base64"] || [responseType isEqualToString:@"blob"];
 
-    [RCTInspectorNetworkReporter maybeStoreResponseBody:task.requestID
+    [RCTInspectorNetworkReporter maybeStoreResponseBody:task.devToolsRequestId
                                                    data:responseDataForPreview
                                           base64Encoded:base64Encoded];
   }
@@ -583,6 +596,7 @@ RCT_EXPORT_MODULE()
           responseType:(NSString *)responseType
     incrementalUpdates:(BOOL)incrementalUpdates
         responseSender:(RCTResponseSenderBlock)responseSender
+     devToolsRequestId:(NSString *)devToolsRequestId
 {
   RCTAssertThread(_methodQueue, @"sendRequest: must be called on request queue");
   __weak __typeof(self) weakSelf = self;
@@ -608,7 +622,7 @@ RCT_EXPORT_MODULE()
     NSArray<id> *responseJSON = @[ task.requestID, @(status), headers, responseURL ];
 
     if (facebook::react::ReactNativeFeatureFlags::enableNetworkEventReporting()) {
-      [RCTInspectorNetworkReporter reportResponseStart:task.requestID
+      [RCTInspectorNetworkReporter reportResponseStart:task.devToolsRequestId
                                               response:response
                                             statusCode:status
                                                headers:headers];
@@ -648,8 +662,8 @@ RCT_EXPORT_MODULE()
         ];
 
         if (facebook::react::ReactNativeFeatureFlags::enableNetworkEventReporting()) {
-          [RCTInspectorNetworkReporter reportDataReceived:task.requestID data:data];
-          [RCTInspectorNetworkReporter maybeStoreResponseBodyIncremental:task.requestID data:responseString];
+          [RCTInspectorNetworkReporter reportDataReceived:task.devToolsRequestId data:data];
+          [RCTInspectorNetworkReporter maybeStoreResponseBodyIncremental:task.devToolsRequestId data:responseString];
         }
         [weakSelf sendEventWithName:@"didReceiveNetworkIncrementalData" body:responseJSON];
       };
@@ -672,21 +686,33 @@ RCT_EXPORT_MODULE()
     if (!(incrementalUpdates && [responseType isEqualToString:@"text"])) {
       [strongSelf sendData:data responseType:responseType response:response forTask:task];
     }
+
+    if ([responseType isEqualToString:@"text"]) {
+      for (id<RCTNetworkingTextResponseHandler> handler in strongSelf->_textResponseHandlers) {
+        if ([handler canHandleNetworkingTextResponseForRequest:task.request]) {
+          NSString *responseString = [RCTNetworking decodeTextData:data
+                                                      fromResponse:task.response
+                                                     withCarryData:[NSMutableData new]];
+          [handler handleNetworkingResponseText:responseString request:task.request];
+        }
+      }
+    }
+
     NSArray *responseJSON =
         @[ task.requestID, RCTNullIfNil(error.localizedDescription), error.code == kCFURLErrorTimedOut ? @YES : @NO ];
 
     if (facebook::react::ReactNativeFeatureFlags::enableNetworkEventReporting()) {
       if (error != nullptr) {
-        [RCTInspectorNetworkReporter reportRequestFailed:task.requestID cancelled:NO];
+        [RCTInspectorNetworkReporter reportRequestFailed:task.devToolsRequestId cancelled:NO];
       } else {
-        [RCTInspectorNetworkReporter reportResponseEnd:task.requestID encodedDataLength:data.length];
+        [RCTInspectorNetworkReporter reportResponseEnd:task.devToolsRequestId encodedDataLength:data.length];
       }
     }
     [strongSelf sendEventWithName:@"didCompleteNetworkResponse" body:responseJSON];
     [strongSelf->_tasksByRequestID removeObjectForKey:task.requestID];
   };
 
-  task = [self networkTaskWithRequest:request completionBlock:completionBlock];
+  task = [self networkTaskWithDevToolsRequestId:devToolsRequestId request:request completionBlock:completionBlock];
   task.downloadProgressBlock = downloadProgressBlock;
   task.incrementalDataBlock = incrementalDataBlock;
   task.responseBlock = responseBlock;
@@ -699,10 +725,10 @@ RCT_EXPORT_MODULE()
     _tasksByRequestID[task.requestID] = task;
     responseSender(@[ task.requestID ]);
     if (facebook::react::ReactNativeFeatureFlags::enableNetworkEventReporting()) {
-      [RCTInspectorNetworkReporter reportRequestStart:task.requestID
+      [RCTInspectorNetworkReporter reportRequestStart:task.devToolsRequestId
                                               request:request
                                     encodedDataLength:task.response.expectedContentLength];
-      [RCTInspectorNetworkReporter reportConnectionTiming:task.requestID request:task.request];
+      [RCTInspectorNetworkReporter reportConnectionTiming:task.devToolsRequestId request:task.request];
     }
   }
 
@@ -727,6 +753,14 @@ RCT_EXPORT_MODULE()
   [_responseHandlers addObject:handler];
 }
 
+- (void)addTextResponseHandler:(id<RCTNetworkingTextResponseHandler>)handler
+{
+  if (!_textResponseHandlers) {
+    _textResponseHandlers = [NSMutableArray new];
+  }
+  [_textResponseHandlers addObject:handler];
+}
+
 - (void)removeRequestHandler:(id<RCTNetworkingRequestHandler>)handler
 {
   [_requestHandlers removeObject:handler];
@@ -739,6 +773,13 @@ RCT_EXPORT_MODULE()
 
 - (RCTNetworkTask *)networkTaskWithRequest:(NSURLRequest *)request
                            completionBlock:(RCTURLRequestCompletionBlock)completionBlock
+{
+  return [self networkTaskWithDevToolsRequestId:nil request:request completionBlock:completionBlock];
+}
+
+- (RCTNetworkTask *)networkTaskWithDevToolsRequestId:(NSString *)devToolsRequestId
+                                             request:(NSURLRequest *)request
+                                     completionBlock:(RCTURLRequestCompletionBlock)completionBlock
 {
   id<RCTURLRequestHandler> handler = [self handlerForRequest:request];
   if (!handler) {
@@ -746,16 +787,19 @@ RCT_EXPORT_MODULE()
     return nil;
   }
 
-  RCTNetworkTask *task = [[RCTNetworkTask alloc] initWithRequest:request handler:handler callbackQueue:_methodQueue];
+  RCTNetworkTask *task = [[RCTNetworkTask alloc] initWithDevToolsRequestId:devToolsRequestId
+                                                                   request:request
+                                                                   handler:handler
+                                                             callbackQueue:_methodQueue];
   task.completionBlock = completionBlock;
   return task;
 }
 
 #pragma mark - JS API
 
-RCT_EXPORT_METHOD(sendRequest
-                  : (JS::NativeNetworkingIOS::SpecSendRequestQuery &)query callback
-                  : (RCTResponseSenderBlock)responseSender)
+RCT_EXPORT_METHOD(
+    sendRequest : (JS::NativeNetworkingIOS::SpecSendRequestQuery &)query callback : (RCTResponseSenderBlock)
+        responseSender)
 {
   NSString *method = query.method();
   NSString *url = query.url();
@@ -765,6 +809,7 @@ RCT_EXPORT_METHOD(sendRequest
   bool queryIncrementalUpdates = query.incrementalUpdates();
   double timeout = query.timeout();
   bool withCredentials = query.withCredentials();
+  NSString *devToolsRequestId = query.unstable_devToolsRequestId();
 
   dispatch_async(_methodQueue, ^{
     NSDictionary *queryDict = @{
@@ -782,14 +827,16 @@ RCT_EXPORT_METHOD(sendRequest
     // no way to invoke it, if, for example the request is cancelled while
     // loading a large file to build the request body
     [self buildRequest:queryDict
-        completionBlock:^(NSURLRequest *request) {
-          NSString *responseType = [RCTConvert NSString:queryDict[@"responseType"]];
-          BOOL incrementalUpdates = [RCTConvert BOOL:queryDict[@"incrementalUpdates"]];
-          [self sendRequest:request
-                    responseType:responseType
-              incrementalUpdates:incrementalUpdates
-                  responseSender:responseSender];
-        }];
+        devToolsRequestId:devToolsRequestId
+          completionBlock:^(NSURLRequest *request) {
+            NSString *responseType = [RCTConvert NSString:queryDict[@"responseType"]];
+            BOOL incrementalUpdates = [RCTConvert BOOL:queryDict[@"incrementalUpdates"]];
+            [self sendRequest:request
+                      responseType:responseType
+                incrementalUpdates:incrementalUpdates
+                    responseSender:responseSender
+                 devToolsRequestId:devToolsRequestId];
+          }];
   });
 }
 

package/Libraries/Network/React-RCTNetwork.podspec

@@ -50,6 +50,7 @@ Pod::Spec.new do |s|
   add_dependency(s, "React-jsinspectorcdp", :framework_name => 'jsinspector_moderncdp')
   add_dependency(s, "React-jsinspectornetwork", :framework_name => 'jsinspector_modernnetwork')
   add_dependency(s, "React-NativeModulesApple", :additional_framework_paths => ["build/generated/ios"])
+  add_dependency(s, "React-networking", :framework_name => 'React_networking')
 
   add_rn_third_party_dependencies(s)
   add_rncore_dependency(s)

package/Libraries/Network/XMLHttpRequest.js

@@ -14,7 +14,6 @@ import type {
   EventCallback,
   EventListener,
 } from '../../src/private/webapis/dom/events/EventTarget';
-import type Performance from '../../src/private/webapis/performance/Performance';
 import type {IPerformanceLogger} from '../Utilities/createPerformanceLogger';
 
 import Event from '../../src/private/webapis/dom/events/Event';
@@ -34,13 +33,7 @@ const RCTNetworking = require('./RCTNetworking').default;
 const base64 = require('base64-js');
 const invariant = require('invariant');
 
-const PERFORMANCE_TRACK_NAME = 'Network (JS-initiated only)';
-const PERFORMANCE_TRACK_GROUP = 'Chrome DevTools Temp Compat';
-
-declare var performance: Performance;
-
 const DEBUG_NETWORK_SEND_DELAY: false = false; // Set to a number of milliseconds when debugging
-const LABEL_FOR_MISSING_URL_FOR_PROFILING = 'Unknown URL';
 
 export type NativeResponseType = 'base64' | 'blob' | 'text';
 export type ResponseType =
@@ -141,7 +134,6 @@ class XMLHttpRequest extends EventTarget {
   static DONE: number = DONE;
 
   static _interceptor: ?XHRInterceptor = null;
-  static _profiling: boolean = false;
 
   UNSENT: number = UNSENT;
   OPENED: number = OPENED;
@@ -182,10 +174,6 @@ class XMLHttpRequest extends EventTarget {
     XMLHttpRequest._interceptor = interceptor;
   }
 
-  static enableProfiling(enableProfiling: boolean): void {
-    XMLHttpRequest._profiling = enableProfiling;
-  }
-
   constructor() {
     super();
     this._reset();
@@ -389,23 +377,12 @@ class XMLHttpRequest extends EventTarget {
       return;
     }
 
-    const start = XMLHttpRequest._profiling ? performance.now() : undefined;
-
     if (!this._response) {
       this._response = responseText;
     } else {
       this._response += responseText;
     }
 
-    if (XMLHttpRequest._profiling) {
-      console.timeStamp(
-        'Incremental Data: ' + this._getMeasureURL(),
-        start,
-        undefined,
-        PERFORMANCE_TRACK_NAME,
-        PERFORMANCE_TRACK_GROUP,
-      );
-    }
     XMLHttpRequest._interceptor &&
       XMLHttpRequest._interceptor.dataReceived(requestId, responseText);
 
@@ -450,16 +427,7 @@ class XMLHttpRequest extends EventTarget {
       this._clearSubscriptions();
       this._requestId = null;
       this.setReadyState(this.DONE);
-      if (XMLHttpRequest._profiling && this._startTime != null) {
-        const start = this._startTime;
-        console.timeStamp(
-          this._getMeasureURL(),
-          start,
-          undefined,
-          PERFORMANCE_TRACK_NAME,
-          PERFORMANCE_TRACK_GROUP,
-        );
-      }
+
       if (error) {
         XMLHttpRequest._interceptor &&
           XMLHttpRequest._interceptor.loadingFailed(requestId, error);
@@ -649,8 +617,6 @@ class XMLHttpRequest extends EventTarget {
         this._url,
         this._headers,
         data,
-        /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was found
-         * when making Flow check .android.js files. */
         nativeResponseType,
         incrementalEvents,
         this.timeout,
@@ -731,12 +697,6 @@ class XMLHttpRequest extends EventTarget {
     super.addEventListener(type, listener);
   }
 
-  _getMeasureURL(): string {
-    return (
-      this._trackingName ?? this._url ?? LABEL_FOR_MISSING_URL_FOR_PROFILING
-    );
-  }
-
   /*
    * `on<event>` event handling (without JS prototype magic).
    */

package/Libraries/Pressability/usePressability.js

@@ -8,15 +8,26 @@
  * @format
  */
 
+import * as ReactNativeFeatureFlags from '../../src/private/featureflags/ReactNativeFeatureFlags';
 import Pressability, {
   type EventHandlers,
   type PressabilityConfig,
 } from './Pressability';
-import {useEffect, useRef} from 'react';
+import {useEffect, useInsertionEffect, useRef} from 'react';
 
 declare function usePressability(config: PressabilityConfig): EventHandlers;
 declare function usePressability(config: null | void): null | EventHandlers;
 
+// Experiments with using `useInsertionEffect` instead of `useEffect`, which
+// changes whether `Pressability` is configured or reset when inm a hidden
+// Activity. With `useInsertionEffect`, `Pressability` behaves more like a
+// platform control (e.g. Pointer Events), especially with respect to events
+// like focus and blur.
+const useConfigurationEffect =
+  ReactNativeFeatureFlags.configurePressabilityDuringInsertion()
+    ? useInsertionEffect
+    : useEffect;
+
 /**
  * Creates a persistent instance of `Pressability` that automatically configures
  * itself and resets. Accepts null `config` to support lazy initialization. Once
@@ -40,7 +51,7 @@ export default function usePressability(
 
   // On the initial mount, this is a no-op. On updates, `pressability` will be
   // re-configured to use the new configuration.
-  useEffect(() => {
+  useConfigurationEffect(() => {
     if (config != null && pressability != null) {
       pressability.configure(config);
     }
@@ -48,7 +59,7 @@ export default function usePressability(
 
   // On unmount, reset pending state and timers inside `pressability`. This is
   // a separate effect because we do not want to reset when `config` changes.
-  useEffect(() => {
+  useConfigurationEffect(() => {
     if (pressability != null) {
       return () => {
         pressability.reset();

package/Libraries/PushNotificationIOS/RCTPushNotificationManager.mm

@@ -336,10 +336,9 @@ RCT_EXPORT_METHOD(getApplicationIconBadgeNumber : (RCTResponseSenderBlock)callba
   callback(@[ @(RCTSharedApplication().applicationIconBadgeNumber) ]);
 }
 
-RCT_EXPORT_METHOD(requestPermissions
-                  : (JS::NativePushNotificationManagerIOS::SpecRequestPermissionsPermission &)permissions resolve
-                  : (RCTPromiseResolveBlock)resolve reject
-                  : (RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(
+    requestPermissions : (JS::NativePushNotificationManagerIOS::SpecRequestPermissionsPermission &)
+        permissions resolve : (RCTPromiseResolveBlock)resolve reject : (RCTPromiseRejectBlock)reject)
 {
   if (RCTRunningInAppExtension()) {
     reject(
@@ -529,9 +528,8 @@ RCT_EXPORT_METHOD(cancelLocalNotifications : (NSDictionary<NSString *, id> *)use
 #endif
 }
 
-RCT_EXPORT_METHOD(getInitialNotification
-                  : (RCTPromiseResolveBlock)resolve reject
-                  : (__unused RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(
+    getInitialNotification : (RCTPromiseResolveBlock)resolve reject : (__unused RCTPromiseRejectBlock)reject)
 {
   // The user actioned a local or remote notification to launch the app. Notification is represented by UNNotification.
   // Set this property in the implementation of

package/Libraries/ReactNative/ReactFabricPublicInstance/ReactFabricPublicInstance.js

@@ -13,124 +13,62 @@
  * instances and get some data from them (like their instance handle / fiber).
  */
 
-import type ReactNativeDocumentT from '../../../src/private/webapis/dom/nodes/ReactNativeDocument';
-import typeof * as ReactNativeDocumentModuleT from '../../../src/private/webapis/dom/nodes/ReactNativeDocument';
-import type ReactNativeElementT from '../../../src/private/webapis/dom/nodes/ReactNativeElement';
-import type ReadOnlyTextT from '../../../src/private/webapis/dom/nodes/ReadOnlyText';
-import typeof * as RendererProxyT from '../../ReactNative/RendererProxy';
 import type {
   InternalInstanceHandle,
   Node,
   ViewConfig,
 } from '../../Renderer/shims/ReactNativeTypes';
 import type {RootTag} from '../RootTag';
-import type ReactFabricHostComponentT from './ReactFabricHostComponent';
 
-import * as ReactNativeFeatureFlags from '../../../src/private/featureflags/ReactNativeFeatureFlags';
+import ReactNativeDocument, {
+  createReactNativeDocument,
+} from '../../../src/private/webapis/dom/nodes/ReactNativeDocument';
+import ReactNativeElement from '../../../src/private/webapis/dom/nodes/ReactNativeElement';
+import ReadOnlyText from '../../../src/private/webapis/dom/nodes/ReadOnlyText';
+import * as RendererProxy from '../../ReactNative/RendererProxy';
 
 export opaque type PublicRootInstance = mixed;
 
-// Lazy loaded to avoid evaluating the module when using the legacy renderer.
-let ReactNativeDocumentModuleObject: ?ReactNativeDocumentModuleT;
-let ReactFabricHostComponentClass: Class<ReactFabricHostComponentT>;
-let ReactNativeElementClass: Class<ReactNativeElementT>;
-let ReadOnlyTextClass: Class<ReadOnlyTextT>;
-let RendererProxy: RendererProxyT;
-
-function getReactNativeDocumentModule(): ReactNativeDocumentModuleT {
-  if (ReactNativeDocumentModuleObject == null) {
-    // We initialize this lazily to avoid a require cycle.
-    ReactNativeDocumentModuleObject = require('../../../src/private/webapis/dom/nodes/ReactNativeDocument');
-  }
-
-  return ReactNativeDocumentModuleObject;
-}
-
-function getReactNativeElementClass(): Class<ReactNativeElementT> {
-  if (ReactNativeElementClass == null) {
-    ReactNativeElementClass =
-      require('../../../src/private/webapis/dom/nodes/ReactNativeElement').default;
-  }
-  return ReactNativeElementClass;
-}
-
-function getReactFabricHostComponentClass(): Class<ReactFabricHostComponentT> {
-  if (ReactFabricHostComponentClass == null) {
-    ReactFabricHostComponentClass =
-      require('./ReactFabricHostComponent').default;
-  }
-  return ReactFabricHostComponentClass;
-}
-
-function getReadOnlyTextClass(): Class<ReadOnlyTextT> {
-  if (ReadOnlyTextClass == null) {
-    ReadOnlyTextClass =
-      require('../../../src/private/webapis/dom/nodes/ReadOnlyText').default;
-  }
-  return ReadOnlyTextClass;
-}
-
 export function createPublicRootInstance(rootTag: RootTag): PublicRootInstance {
-  if (ReactNativeFeatureFlags.enableAccessToHostTreeInFabric()) {
-    const ReactNativeDocumentModule = getReactNativeDocumentModule();
-
-    // $FlowExpectedError[incompatible-return]
-    return ReactNativeDocumentModule.createReactNativeDocument(rootTag);
-  }
-
   // $FlowExpectedError[incompatible-return]
-  return null;
+  return createReactNativeDocument(rootTag);
 }
 
 export function createPublicInstance(
   tag: number,
   viewConfig: ViewConfig,
   internalInstanceHandle: InternalInstanceHandle,
-  ownerDocument: ReactNativeDocumentT,
-): ReactFabricHostComponentT | ReactNativeElementT {
-  if (ReactNativeFeatureFlags.enableAccessToHostTreeInFabric()) {
-    const ReactNativeElement = getReactNativeElementClass();
-    return new ReactNativeElement(
-      tag,
-      viewConfig,
-      internalInstanceHandle,
-      ownerDocument,
-    );
-  } else {
-    const ReactFabricHostComponent = getReactFabricHostComponentClass();
-    return new ReactFabricHostComponent(
-      tag,
-      viewConfig,
-      internalInstanceHandle,
-    );
-  }
+  ownerDocument: ReactNativeDocument,
+): ReactNativeElement {
+  return new ReactNativeElement(
+    tag,
+    viewConfig,
+    internalInstanceHandle,
+    ownerDocument,
+  );
 }
 
 export function createPublicTextInstance(
   internalInstanceHandle: InternalInstanceHandle,
-  ownerDocument: ReactNativeDocumentT,
-): ReadOnlyTextT {
-  const ReadOnlyText = getReadOnlyTextClass();
+  ownerDocument: ReactNativeDocument,
+): ReadOnlyText {
   return new ReadOnlyText(internalInstanceHandle, ownerDocument);
 }
 
 export function getNativeTagFromPublicInstance(
-  publicInstance: ReactFabricHostComponentT | ReactNativeElementT,
+  publicInstance: ReactNativeElement,
 ): number {
   return publicInstance.__nativeTag;
 }
 
 export function getNodeFromPublicInstance(
-  publicInstance: ReactFabricHostComponentT | ReactNativeElementT,
+  publicInstance: ReactNativeElement,
 ): ?Node {
   // Avoid loading ReactFabric if using an instance from the legacy renderer.
   if (publicInstance.__internalInstanceHandle == null) {
     return null;
   }
 
-  if (RendererProxy == null) {
-    RendererProxy = require('../../ReactNative/RendererProxy');
-  }
   return RendererProxy.getNodeFromInternalInstanceHandle(
     // $FlowExpectedError[incompatible-type] __internalInstanceHandle is always an InternalInstanceHandle from React when we get here.
     publicInstance.__internalInstanceHandle,
@@ -138,7 +76,7 @@ export function getNodeFromPublicInstance(
 }
 
 export function getInternalInstanceHandleFromPublicInstance(
-  publicInstance: ReactFabricHostComponentT | ReactNativeElementT,
+  publicInstance: ReactNativeElement,
 ): InternalInstanceHandle {
   // TODO(T174762768): Remove this once OSS versions of renderers will be synced.
   // $FlowExpectedError[prop-missing] Keeping this for backwards-compatibility with the renderers versions in open source.

package/Libraries/ReactNative/getNativeComponentAttributes.js

@@ -17,6 +17,12 @@ const ReactNativeStyleAttributes =
 const resolveAssetSource = require('../Image/resolveAssetSource').default;
 const processBackgroundImage =
   require('../StyleSheet/processBackgroundImage').default;
+const processBackgroundPosition =
+  require('../StyleSheet/processBackgroundPosition').default;
+const processBackgroundRepeat =
+  require('../StyleSheet/processBackgroundRepeat').default;
+const processBackgroundSize =
+  require('../StyleSheet/processBackgroundSize').default;
 const processColor = require('../StyleSheet/processColor').default;
 const processColorArray = require('../StyleSheet/processColorArray').default;
 const processFilter = require('../StyleSheet/processFilter').default;
@@ -203,6 +209,12 @@ function getProcessorForType(typeName: string): ?(nextProp: any) => any {
       return processFilter;
     case 'BackgroundImage':
       return processBackgroundImage;
+    case 'BackgroundPosition':
+      return processBackgroundPosition;
+    case 'BackgroundRepeat':
+      return processBackgroundRepeat;
+    case 'BackgroundSize':
+      return processBackgroundSize;
     case 'ImageSource':
       return resolveAssetSource;
     case 'BoxShadow':