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

package/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.mm

@@ -59,7 +59,7 @@ static NSString *RCTNormalizeAnimatedEventName(NSString *eventName)
 - (instancetype)initWithBridge:(nullable RCTBridge *)bridge
               surfacePresenter:(id<RCTSurfacePresenterStub>)surfacePresenter
 {
-  if ((self = [super init])) {
+  if ((self = [super init]) != nullptr) {
     _bridge = bridge;
     _surfacePresenter = surfacePresenter;
     _animationNodes = [NSMutableDictionary new];
@@ -72,7 +72,7 @@ static NSString *RCTNormalizeAnimatedEventName(NSString *eventName)
 - (BOOL)isNodeManagedByFabric:(NSNumber *)tag
 {
   RCTAnimatedNode *node = _animationNodes[tag];
-  if (node) {
+  if (node != nullptr) {
     return [node isManagedByFabric];
   }
   return false;
@@ -106,7 +106,7 @@ static NSString *RCTNormalizeAnimatedEventName(NSString *eventName)
   NSString *nodeType = [RCTConvert NSString:config[@"type"]];
 
   Class nodeClass = map[nodeType];
-  if (!nodeClass) {
+  if (nodeClass == nullptr) {
     RCTLogError(@"Animated node type %@ not supported natively", nodeType);
     return;
   }
@@ -187,7 +187,7 @@ static NSString *RCTNormalizeAnimatedEventName(NSString *eventName)
 - (void)dropAnimatedNode:(NSNumber *)tag
 {
   RCTAnimatedNode *node = _animationNodes[tag];
-  if (node) {
+  if (node != nullptr) {
     [node detachNode];
     [_animationNodes removeObjectForKey:tag];
   }
@@ -345,7 +345,7 @@ static NSString *RCTNormalizeAnimatedEventName(NSString *eventName)
   NSNumber *nodeTag = [RCTConvert NSNumber:eventMapping[@"animatedValueTag"]];
   RCTAnimatedNode *node = _animationNodes[nodeTag];
 
-  if (!node) {
+  if (node == nullptr) {
     RCTLogError(@"Animated node with tag %@ does not exist", nodeTag);
     return;
   }
@@ -407,7 +407,7 @@ static NSString *RCTNormalizeAnimatedEventName(NSString *eventName)
 
   NSString *key = [NSString stringWithFormat:@"%@%@", event.viewTag, RCTNormalizeAnimatedEventName(event.eventName)];
   NSMutableArray<RCTEventAnimation *> *driversForKey = _eventDrivers[key];
-  if (driversForKey) {
+  if (driversForKey != nullptr) {
     for (RCTEventAnimation *driver in driversForKey) {
       [self stopAnimationsForNode:driver.valueNode];
       [driver updateWithEvent:event];
@@ -439,7 +439,7 @@ static NSString *RCTNormalizeAnimatedEventName(NSString *eventName)
 
 - (void)startAnimationLoopIfNeeded
 {
-  if (!_displayLink && _activeAnimations.count > 0) {
+  if ((_displayLink == nullptr) && _activeAnimations.count > 0) {
     _displayLink = [CADisplayLink displayLinkWithTarget:self selector:@selector(stepAnimations:)];
     [_displayLink addToRunLoop:[NSRunLoop mainRunLoop] forMode:NSRunLoopCommonModes];
   }
@@ -454,7 +454,7 @@ static NSString *RCTNormalizeAnimatedEventName(NSString *eventName)
 
 - (void)stopAnimationLoop
 {
-  if (_displayLink) {
+  if (_displayLink != nullptr) {
     [_displayLink invalidate];
     _displayLink = nil;
   }
@@ -486,7 +486,7 @@ static NSString *RCTNormalizeAnimatedEventName(NSString *eventName)
   NSArray<RCTEventAnimation *> *eventAnimations = _eventDrivers[key];
   for (RCTEventAnimation *animation in eventAnimations) {
     NSNumber *nodeTag = [animation.valueNode nodeTag];
-    if (nodeTag) {
+    if (nodeTag != nullptr) {
       [tags addObject:nodeTag];
     }
     for (NSNumber *childNodeKey in [animation.valueNode childNodes]) {

package/Libraries/NativeAnimation/RCTNativeAnimatedTurboModule.mm

@@ -108,11 +108,9 @@ RCT_EXPORT_METHOD(disconnectAnimatedNodes : (double)parentTag childTag : (double
   }];
 }
 
-RCT_EXPORT_METHOD(startAnimatingNode
-                  : (double)animationId nodeTag
-                  : (double)nodeTag config
-                  : (NSDictionary<NSString *, id> *)config endCallback
-                  : (RCTResponseSenderBlock)callBack)
+RCT_EXPORT_METHOD(
+    startAnimatingNode : (double)animationId nodeTag : (double)nodeTag config : (NSDictionary<NSString *, id> *)
+        config endCallback : (RCTResponseSenderBlock)callBack)
 {
   [self queueFlushedOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
     [nodesManager startAnimatingNode:[NSNumber numberWithDouble:animationId]
@@ -204,10 +202,9 @@ RCT_EXPORT_METHOD(stopListeningToAnimatedNodeValue : (double)tag)
   }];
 }
 
-RCT_EXPORT_METHOD(addAnimatedEventToView
-                  : (double)viewTag eventName
-                  : (nonnull NSString *)eventName eventMapping
-                  : (JS::NativeAnimatedModule::EventMapping &)eventMapping)
+RCT_EXPORT_METHOD(
+    addAnimatedEventToView : (double)viewTag eventName : (nonnull NSString *)
+        eventName eventMapping : (JS::NativeAnimatedModule::EventMapping &)eventMapping)
 {
   NSMutableDictionary *eventMappingDict = [NSMutableDictionary new];
   eventMappingDict[@"nativeEventPath"] = RCTConvertVecToArray(eventMapping.nativeEventPath());
@@ -223,10 +220,9 @@ RCT_EXPORT_METHOD(addAnimatedEventToView
   }];
 }
 
-RCT_EXPORT_METHOD(removeAnimatedEventFromView
-                  : (double)viewTag eventName
-                  : (nonnull NSString *)eventName animatedNodeTag
-                  : (double)animatedNodeTag)
+RCT_EXPORT_METHOD(
+    removeAnimatedEventFromView : (double)viewTag eventName : (nonnull NSString *)eventName animatedNodeTag : (double)
+        animatedNodeTag)
 {
   [self queueOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
     [nodesManager removeAnimatedEventFromView:[NSNumber numberWithDouble:viewTag]

package/Libraries/NativeComponent/BaseViewConfig.android.js

@@ -187,8 +187,17 @@ const validAttributesForNonEventProps = {
   backgroundColor: {process: require('../StyleSheet/processColor').default},
   transform: true,
   transformOrigin: true,
-  experimental_backgroundImage: {
-    process: require('../StyleSheet/processBackgroundImage').default,
+  experimental_backgroundImage: ReactNativeFeatureFlags.enableNativeCSSParsing()
+    ? (true as const)
+    : {process: require('../StyleSheet/processBackgroundImage').default},
+  experimental_backgroundSize: {
+    process: require('../StyleSheet/processBackgroundSize').default,
+  },
+  experimental_backgroundPosition: {
+    process: require('../StyleSheet/processBackgroundPosition').default,
+  },
+  experimental_backgroundRepeat: {
+    process: require('../StyleSheet/processBackgroundRepeat').default,
   },
   boxShadow: ReactNativeFeatureFlags.enableNativeCSSParsing()
     ? (true as const)

package/Libraries/NativeComponent/NativeComponentRegistry.d.ts

@@ -0,0 +1,98 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ */
+
+import type {HostComponent} from '../../types/public/ReactNativeTypes';
+import * as React from 'react';
+
+/**
+ * Configures a function that is called to determine whether a given component
+ * should be registered using reflection of the native component at runtime.
+ *
+ * The provider should return null if the native component is unavailable in
+ * the current environment.
+ */
+export function setRuntimeConfigProvider(
+  runtimeConfigProvider: (name: string) => {
+    native: boolean;
+    verify: boolean;
+  } | null,
+): void;
+
+/**
+ * Gets a `NativeComponent` that can be rendered by React Native.
+ *
+ * The supplied `viewConfigProvider` may or may not be invoked and utilized,
+ * depending on how `setRuntimeConfigProvider` is configured.
+ */
+export function get<Config extends object>(
+  name: string,
+  viewConfigProvider: () => PartialViewConfig,
+): HostComponent<Config>;
+
+/**
+ * Same as `NativeComponentRegistry.get(...)`, except this will check either
+ * the `setRuntimeConfigProvider` configuration or use native reflection (slow)
+ * to determine whether this native component is available.
+ *
+ * If the native component is not available, a stub component is returned. Note
+ * that the return value of this is not `HostComponent` because the returned
+ * component instance is not guaranteed to have native methods.
+ */
+export function getWithFallback_DEPRECATED<Config extends object>(
+  name: string,
+  viewConfigProvider: () => PartialViewConfig,
+): React.ComponentType<Config>;
+
+/**
+ * Unstable API. Do not use!
+ *
+ * This method returns if there is a StaticViewConfig registered for the
+ * component name received as a parameter.
+ */
+export function unstable_hasStaticViewConfig(name: string): boolean;
+
+type AttributeType<T, V> =
+  | true
+  | {
+      readonly diff?: ((arg1: T, arg2: T) => boolean) | undefined;
+      readonly process?: ((arg1: V) => T) | undefined;
+    };
+type AnyAttributeType = AttributeType<any, any>;
+type AttributeConfiguration = {
+  readonly [propName: string]: AnyAttributeType | void;
+  readonly style?:
+    | {
+        readonly [propName: string]: AnyAttributeType;
+      }
+    | undefined;
+};
+
+type PartialViewConfig = Readonly<{
+  bubblingEventTypes?:
+    | {
+        readonly [eventName: string]: {
+          readonly phasedRegistrationNames: {
+            readonly bubbled: string;
+            readonly captured: string;
+            readonly skipBubbling?: boolean | undefined;
+          };
+        };
+      }
+    | undefined;
+  directEventTypes?:
+    | {
+        readonly [eventName: string]: {
+          readonly registrationName: string;
+        };
+      }
+    | undefined;
+  supportsRawText?: boolean | undefined;
+  uiViewClassName: string;
+  validAttributes?: AttributeConfiguration | undefined;
+}>;

package/Libraries/NativeComponent/NativeComponentRegistry.js

@@ -129,11 +129,13 @@ export function getWithFallback_DEPRECATED<Config: {...}>(
     // `getRuntimeConfig == null` when static view configs are disabled
     // If `setRuntimeConfigProvider` is not configured, use native reflection.
     if (hasNativeViewConfig(name)) {
+      /* $FlowFixMe[incompatible-type] Extra ref prop */
       return get<Config>(name, viewConfigProvider);
     }
   } else {
     // If there is no runtime config, then the native component is unavailable.
     if (getRuntimeConfig(name) != null) {
+      /* $FlowFixMe[incompatible-type] Extra ref prop */
       return get<Config>(name, viewConfigProvider);
     }
   }

package/Libraries/NativeComponent/NativeComponentRegistryUnstable.js

@@ -23,7 +23,9 @@ export function unstable_hasComponent(name: string): boolean {
       hasNativeComponent = global.__nativeComponentRegistry__hasComponent(name);
       componentNameToExists.set(name, hasNativeComponent);
     } else {
-      throw `unstable_hasComponent('${name}'): Global function is not registered`;
+      throw new Error(
+        `unstable_hasComponent('${name}'): Global function is not registered`,
+      );
     }
   }
   return hasNativeComponent;

package/Libraries/Network/RCTDataRequestHandler.mm

@@ -25,7 +25,7 @@ RCT_EXPORT_MODULE()
 - (void)invalidate
 {
   std::lock_guard<std::mutex> lock(_operationHandlerMutexLock);
-  if (_queue) {
+  if (_queue != nullptr) {
     for (NSOperation *operation in _queue.operations) {
       if (!operation.isCancelled && !operation.isFinished) {
         [operation cancel];
@@ -44,7 +44,7 @@ RCT_EXPORT_MODULE()
 {
   std::lock_guard<std::mutex> lock(_operationHandlerMutexLock);
   // Lazy setup
-  if (!_queue) {
+  if (_queue == nullptr) {
     _queue = [NSOperationQueue new];
     _queue.maxConcurrentOperationCount = 2;
   }
@@ -59,7 +59,7 @@ RCT_EXPORT_MODULE()
     // Get mime type
     NSRange firstSemicolon = [request.URL.resourceSpecifier rangeOfString:@";"];
     NSString *mimeType =
-        firstSemicolon.length ? [request.URL.resourceSpecifier substringToIndex:firstSemicolon.location] : nil;
+        (firstSemicolon.length != 0u) ? [request.URL.resourceSpecifier substringToIndex:firstSemicolon.location] : nil;
 
     // Send response
     NSURLResponse *response = [[NSURLResponse alloc] initWithURL:request.URL
@@ -72,7 +72,7 @@ RCT_EXPORT_MODULE()
     // Load data
     NSError *error;
     NSData *data = [NSData dataWithContentsOfURL:request.URL options:NSDataReadingMappedIfSafe error:&error];
-    if (data) {
+    if (data != nullptr) {
       [delegate URLRequest:strongOp didReceiveData:data];
     }
     [delegate URLRequest:strongOp didCompleteWithError:error];

package/Libraries/Network/RCTHTTPRequestHandler.h

@@ -13,7 +13,7 @@ typedef NSURLSessionConfiguration * (^NSURLSessionConfigurationProvider)(void);
  *  The block provided via this function will provide the NSURLSessionConfiguration for all HTTP requests made by the
  * app.
  */
-RCT_EXTERN void RCTSetCustomNSURLSessionConfigurationProvider(NSURLSessionConfigurationProvider);
+RCT_EXTERN void RCTSetCustomNSURLSessionConfigurationProvider(NSURLSessionConfigurationProvider /*provider*/);
 /**
  * This is the default RCTURLRequestHandler implementation for HTTP requests.
  */

package/Libraries/Network/RCTHTTPRequestHandler.mm

@@ -46,7 +46,7 @@ RCT_EXPORT_MODULE()
 - (BOOL)isValid
 {
   // if session == nil and delegates != nil, we've been invalidated
-  return _session || !_delegates;
+  return (_session != nullptr) || (_delegates == nullptr);
 }
 
 #pragma mark - NSURLRequestHandler
@@ -67,7 +67,7 @@ RCT_EXPORT_MODULE()
 {
   std::lock_guard<std::mutex> lock(_mutex);
   // Lazy setup
-  if (!_session && [self isValid]) {
+  if ((_session == nullptr) && [self isValid]) {
     // You can override default NSURLSession instance property allowsCellularAccess (default value YES)
     //  by providing the following key to your RN project (edit ios/project/Info.plist file in Xcode):
     // <key>ReactNetworkForceWifiOnly</key>    <true/>
@@ -80,12 +80,12 @@ RCT_EXPORT_MODULE()
     callbackQueue.maxConcurrentOperationCount = 1;
     callbackQueue.underlyingQueue = [[_moduleRegistry moduleForName:"Networking"] methodQueue];
     NSURLSessionConfiguration *configuration;
-    if (urlSessionConfigurationProvider) {
+    if (urlSessionConfigurationProvider != nullptr) {
       configuration = urlSessionConfigurationProvider();
     } else {
       configuration = [NSURLSessionConfiguration defaultSessionConfiguration];
       // Set allowsCellularAccess to NO ONLY if key ReactNetworkForceWifiOnly exists AND its value is YES
-      if (useWifiOnly) {
+      if (useWifiOnly != nullptr) {
         configuration.allowsCellularAccess = ![useWifiOnly boolValue];
       }
       [configuration setHTTPShouldSetCookies:YES];

package/Libraries/Network/RCTInspectorNetworkReporter.h

@@ -27,7 +27,7 @@
  * - Corresponds to `PerformanceResourceTiming.requestStart` (specifically,
  *   marking when the native request was initiated).
  */
-+ (void)reportRequestStart:(NSNumber *)requestId
++ (void)reportRequestStart:(NSString *)requestId
                    request:(NSURLRequest *)request
          encodedDataLength:(int)encodedDataLength;
 
@@ -40,7 +40,7 @@
  *   `PerformanceResourceTiming.connectStart`. Defined as "immediately before
  *   the browser starts to establish the connection to the server".
  */
-+ (void)reportConnectionTiming:(NSNumber *)requestId request:(NSURLRequest *)request;
++ (void)reportConnectionTiming:(NSString *)requestId request:(NSURLRequest *)request;
 
 /**
  * Report when HTTP response headers have been received, corresponding to
@@ -49,7 +49,7 @@
  * - Corresponds to `Network.responseReceived` in CDP.
  * - Corresponds to `PerformanceResourceTiming.responseStart`.
  */
-+ (void)reportResponseStart:(NSNumber *)requestId
++ (void)reportResponseStart:(NSString *)requestId
                    response:(NSURLResponse *)response
                  statusCode:(int)statusCode
                     headers:(NSDictionary<NSString *, NSString *> *)headers;
@@ -59,7 +59,7 @@
  *
  * Corresponds to `Network.dataReceived` in CDP.
  */
-+ (void)reportDataReceived:(NSNumber *)requestId data:(NSData *)data;
++ (void)reportDataReceived:(NSString *)requestId data:(NSData *)data;
 
 /**
  * Report when a network request is complete and we are no longer receiving
@@ -68,20 +68,20 @@
  * - Corresponds to `Network.loadingFinished` in CDP.
  * - Corresponds to `PerformanceResourceTiming.responseEnd`.
  */
-+ (void)reportResponseEnd:(NSNumber *)requestId encodedDataLength:(int)encodedDataLength;
++ (void)reportResponseEnd:(NSString *)requestId encodedDataLength:(int)encodedDataLength;
 
 /**
  * Report when a network request has failed.
  *
  * - Corresponds to `Network.loadingFailed` in CDP.
  */
-+ (void)reportRequestFailed:(NSNumber *)requestId cancelled:(BOOL)cancelled;
++ (void)reportRequestFailed:(NSString *)requestId cancelled:(BOOL)cancelled;
 
 /**
  * Store response body preview. This is an optional reporting method, and is a
  * no-op if CDP debugging is disabled.
  */
-+ (void)maybeStoreResponseBody:(NSNumber *)requestId data:(NSData *)data base64Encoded:(bool)base64Encoded;
++ (void)maybeStoreResponseBody:(NSString *)requestId data:(NSData *)data base64Encoded:(bool)base64Encoded;
 
 /**
  * Incrementally store a response body preview, when a string response is
@@ -91,6 +91,6 @@
  * As with `maybeStoreResponseBody`, calling this method is optional and a
  * no-op if CDP debugging is disabled.
  */
-+ (void)maybeStoreResponseBodyIncremental:(NSNumber *)requestId data:(NSString *)data;
++ (void)maybeStoreResponseBodyIncremental:(NSString *)requestId data:(NSString *)data;
 
 @end

package/Libraries/Network/RCTInspectorNetworkReporter.mm

@@ -10,9 +10,9 @@
 #import "RCTNetworkConversions.h"
 
 #import <React/RCTLog.h>
-#import <jsinspector-modern/network/NetworkReporter.h>
+#import <react/networking/NetworkReporter.h>
 
-using namespace facebook::react::jsinspector_modern;
+using namespace facebook::react;
 
 #ifdef REACT_NATIVE_DEBUGGER_ENABLED
 namespace {
@@ -48,14 +48,14 @@ std::string convertRequestBodyToStringTruncated(NSURLRequest *request)
 #ifdef REACT_NATIVE_DEBUGGER_ENABLED
 
 // Dictionary to buffer incremental response bodies (CDP debugging active only)
-static const NSMutableDictionary<NSNumber *, NSMutableString *> *responseBuffers = nil;
+static const NSMutableDictionary<NSString *, NSMutableString *> *responseBuffers = nil;
 
 #endif
 
 @implementation RCTInspectorNetworkReporter {
 }
 
-+ (void)reportRequestStart:(NSNumber *)requestId
++ (void)reportRequestStart:(NSString *)requestId
                    request:(NSURLRequest *)request
          encodedDataLength:(int)encodedDataLength
 {
@@ -68,11 +68,10 @@ static const NSMutableDictionary<NSNumber *, NSMutableString *> *responseBuffers
   requestInfo.httpBody = convertRequestBodyToStringTruncated(request);
 #endif
 
-  NetworkReporter::getInstance().reportRequestStart(
-      requestId.stringValue.UTF8String, requestInfo, encodedDataLength, std::nullopt);
+  NetworkReporter::getInstance().reportRequestStart(requestId.UTF8String, requestInfo, encodedDataLength, std::nullopt);
 }
 
-+ (void)reportConnectionTiming:(NSNumber *)requestId request:(NSURLRequest *)request
++ (void)reportConnectionTiming:(NSString *)requestId request:(NSURLRequest *)request
 {
   Headers headersMap;
 
@@ -81,10 +80,10 @@ static const NSMutableDictionary<NSNumber *, NSMutableString *> *responseBuffers
   headersMap = convertNSDictionaryToHeaders(request.allHTTPHeaderFields);
 #endif
 
-  NetworkReporter::getInstance().reportConnectionTiming(requestId.stringValue.UTF8String, headersMap);
+  NetworkReporter::getInstance().reportConnectionTiming(requestId.UTF8String, headersMap);
 }
 
-+ (void)reportResponseStart:(NSNumber *)requestId
++ (void)reportResponseStart:(NSString *)requestId
                    response:(NSURLResponse *)response
                  statusCode:(int)statusCode
                     headers:(NSDictionary<NSString *, NSString *> *)headers
@@ -99,17 +98,17 @@ static const NSMutableDictionary<NSNumber *, NSMutableString *> *responseBuffers
 #endif
 
   NetworkReporter::getInstance().reportResponseStart(
-      requestId.stringValue.UTF8String, responseInfo, response.expectedContentLength);
+      requestId.UTF8String, responseInfo, response.expectedContentLength);
 }
 
-+ (void)reportDataReceived:(NSNumber *)requestId data:(NSData *)data
++ (void)reportDataReceived:(NSString *)requestId data:(NSData *)data
 {
-  NetworkReporter::getInstance().reportDataReceived(requestId.stringValue.UTF8String, (int)data.length, std::nullopt);
+  NetworkReporter::getInstance().reportDataReceived(requestId.UTF8String, (int)data.length, std::nullopt);
 }
 
-+ (void)reportResponseEnd:(NSNumber *)requestId encodedDataLength:(int)encodedDataLength
++ (void)reportResponseEnd:(NSString *)requestId encodedDataLength:(int)encodedDataLength
 {
-  NetworkReporter::getInstance().reportResponseEnd(requestId.stringValue.UTF8String, encodedDataLength);
+  NetworkReporter::getInstance().reportResponseEnd(requestId.UTF8String, encodedDataLength);
 
 #ifdef REACT_NATIVE_DEBUGGER_ENABLED
   // Debug build: Check for buffered response body and flush to NetworkReporter
@@ -118,7 +117,7 @@ static const NSMutableDictionary<NSNumber *, NSMutableString *> *responseBuffers
     if (buffer != nullptr) {
       if (buffer.length > 0) {
         NetworkReporter::getInstance().storeResponseBody(
-            requestId.stringValue.UTF8String, RCTStringViewFromNSString(buffer), false);
+            requestId.UTF8String, RCTStringViewFromNSString(buffer), false);
       }
       [responseBuffers removeObjectForKey:requestId];
     }
@@ -126,9 +125,9 @@ static const NSMutableDictionary<NSNumber *, NSMutableString *> *responseBuffers
 #endif
 }
 
-+ (void)reportRequestFailed:(NSNumber *)requestId cancelled:(bool)cancelled
++ (void)reportRequestFailed:(NSString *)requestId cancelled:(bool)cancelled
 {
-  NetworkReporter::getInstance().reportRequestFailed(requestId.stringValue.UTF8String, cancelled);
+  NetworkReporter::getInstance().reportRequestFailed(requestId.UTF8String, cancelled);
 
 #ifdef REACT_NATIVE_DEBUGGER_ENABLED
   // Debug build: Clear buffer for request
@@ -138,7 +137,7 @@ static const NSMutableDictionary<NSNumber *, NSMutableString *> *responseBuffers
 #endif
 }
 
-+ (void)maybeStoreResponseBody:(NSNumber *)requestId data:(id)data base64Encoded:(bool)base64Encoded
++ (void)maybeStoreResponseBody:(NSString *)requestId data:(id)data base64Encoded:(bool)base64Encoded
 {
 #ifdef REACT_NATIVE_DEBUGGER_ENABLED
   // Debug build: Process response body and report to NetworkReporter
@@ -152,7 +151,7 @@ static const NSMutableDictionary<NSNumber *, NSMutableString *> *responseBuffers
       NSString *encodedString = [(NSData *)data base64EncodedStringWithOptions:0];
       if (encodedString != nullptr) {
         networkReporter.storeResponseBody(
-            requestId.stringValue.UTF8String, RCTStringViewFromNSString(encodedString), base64Encoded);
+            requestId.UTF8String, RCTStringViewFromNSString(encodedString), base64Encoded);
       } else {
         RCTLogWarn(@"Failed to encode response data for request %@", requestId);
       }
@@ -160,13 +159,12 @@ static const NSMutableDictionary<NSNumber *, NSMutableString *> *responseBuffers
       RCTLogWarn(@"Exception while encoding response data: %@", exception.reason);
     }
   } else if ([data isKindOfClass:[NSString class]] && [(NSString *)data length] > 0) {
-    networkReporter.storeResponseBody(
-        requestId.stringValue.UTF8String, RCTStringViewFromNSString((NSString *)data), base64Encoded);
+    networkReporter.storeResponseBody(requestId.UTF8String, RCTStringViewFromNSString((NSString *)data), base64Encoded);
   }
 #endif
 }
 
-+ (void)maybeStoreResponseBodyIncremental:(NSNumber *)requestId data:(NSString *)data
++ (void)maybeStoreResponseBodyIncremental:(NSString *)requestId data:(NSString *)data
 {
 #ifdef REACT_NATIVE_DEBUGGER_ENABLED
   // Debug build: Buffer incremental response body contents

package/Libraries/Network/RCTNetworkTask.h

@@ -28,6 +28,7 @@ typedef NS_ENUM(NSInteger, RCTNetworkTaskStatus) {
 @property (nonatomic, readonly) NSNumber *requestID;
 @property (nonatomic, readonly, weak) id requestToken;
 @property (nonatomic, readonly) NSURLResponse *response;
+@property (nonatomic, readonly) NSString *devToolsRequestId;
 
 @property (nonatomic, copy) RCTURLRequestCompletionBlock completionBlock;
 @property (nonatomic, copy) RCTURLRequestProgressBlock downloadProgressBlock;
@@ -40,7 +41,10 @@ typedef NS_ENUM(NSInteger, RCTNetworkTaskStatus) {
 - (instancetype)initWithRequest:(NSURLRequest *)request
                         handler:(id<RCTURLRequestHandler>)handler
                   callbackQueue:(dispatch_queue_t)callbackQueue NS_DESIGNATED_INITIALIZER;
-
+- (instancetype)initWithDevToolsRequestId:(NSString *)devToolsRequestId
+                                  request:(NSURLRequest *)request
+                                  handler:(id<RCTURLRequestHandler>)handler
+                            callbackQueue:(dispatch_queue_t)callbackQueue;
 - (void)start;
 - (void)cancel;
 

package/Libraries/Network/RCTNetworkTask.mm

@@ -26,6 +26,15 @@ static auto currentRequestId = std::atomic<NSUInteger>(0);
 - (instancetype)initWithRequest:(NSURLRequest *)request
                         handler:(id<RCTURLRequestHandler>)handler
                   callbackQueue:(dispatch_queue_t)callbackQueue
+{
+  self = [self initWithDevToolsRequestId:nil request:request handler:handler callbackQueue:callbackQueue];
+  return self;
+}
+
+- (instancetype)initWithDevToolsRequestId:(NSString *)devToolsRequestId
+                                  request:(NSURLRequest *)request
+                                  handler:(id<RCTURLRequestHandler>)handler
+                            callbackQueue:(dispatch_queue_t)callbackQueue
 {
   RCTAssertParam(request);
   RCTAssertParam(handler);
@@ -33,6 +42,10 @@ static auto currentRequestId = std::atomic<NSUInteger>(0);
 
   if ((self = [super init])) {
     _requestID = @(currentRequestId++);
+    _devToolsRequestId = devToolsRequestId;
+    if (_devToolsRequestId == nil) {
+      _devToolsRequestId = [[NSUUID UUID] UUIDString];
+    }
     _request = request;
     _handler = handler;
     _callbackQueue = callbackQueue;

package/Libraries/Network/RCTNetworking+Internal.h

@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import "RCTNetworking.h"
+
+@protocol RCTNetworkingTextResponseHandler <NSObject>
+
+- (BOOL)canHandleNetworkingTextResponseForRequest:(NSURLRequest *)request;
+- (void)handleNetworkingResponseText:(NSString *)responseText request:(NSURLRequest *)request;
+
+@end
+
+@interface RCTNetworking (Internal)
+
+- (void)addTextResponseHandler:(id<RCTNetworkingTextResponseHandler>)handler;
+
+@end

package/Libraries/Network/RCTNetworking.android.js

@@ -77,12 +77,14 @@ const RCTNetworking = {
       }));
     }
     const requestId = generateRequestId();
+    const devToolsRequestId =
+      global.__NETWORK_REPORTER__?.createDevToolsRequestId();
     NativeNetworkingAndroid.sendRequest(
       method,
       url,
       requestId,
       convertHeadersMapToArray(headers),
-      {...body, trackingName},
+      {...body, trackingName, devToolsRequestId},
       responseType,
       incrementalUpdates,
       timeout,

package/Libraries/Network/RCTNetworking.h

@@ -47,6 +47,9 @@
  */
 - (RCTNetworkTask *)networkTaskWithRequest:(NSURLRequest *)request
                            completionBlock:(RCTURLRequestCompletionBlock)completionBlock;
+- (RCTNetworkTask *)networkTaskWithDevToolsRequestId:(NSString *)devToolsRequestId
+                                             request:(NSURLRequest *)request
+                                     completionBlock:(RCTURLRequestCompletionBlock)completionBlock;
 
 - (void)addRequestHandler:(id<RCTNetworkingRequestHandler>)handler;
 

package/Libraries/Network/RCTNetworking.ios.js

@@ -40,6 +40,8 @@ const RCTNetworking = {
     withCredentials: boolean,
   ) {
     const body = convertRequestBody(data);
+    const devToolsRequestId =
+      global.__NETWORK_REPORTER__?.createDevToolsRequestId();
     NativeNetworkingIOS.sendRequest(
       {
         method,
@@ -50,6 +52,7 @@ const RCTNetworking = {
         incrementalUpdates,
         timeout,
         withCredentials,
+        unstable_devToolsRequestId: devToolsRequestId,
       },
       callback,
     );