react-native-tvos 0.85.3-0 → 0.86.0-0

package/Libraries/Utilities/HardwareBackPressEvent.js

@@ -0,0 +1,22 @@
+/**
+ * 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.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+import type {EventInit} from '../../src/private/webapis/dom/events/Event';
+
+import Event from '../../src/private/webapis/dom/events/Event';
+
+/**
+ * Event dispatched when the hardware back button is pressed on Android.
+ */
+export class HardwareBackPressEvent extends Event {
+  constructor(options?: ?EventInit) {
+    super('hardwareBackPress', options);
+  }
+}

package/Libraries/Utilities/ReactNativeTestTools.js

@@ -106,14 +106,14 @@ function maximumDepthError(
 }
 
 function expectNoConsoleWarn() {
-  (jest: $FlowFixMe).spyOn(console, 'warn').mockImplementation((...args) => {
+  (jest as $FlowFixMe).spyOn(console, 'warn').mockImplementation((...args) => {
     expect(args).toBeFalsy();
   });
 }
 
 function expectNoConsoleError() {
   let hasNotFailed = true;
-  (jest: $FlowFixMe).spyOn(console, 'error').mockImplementation((...args) => {
+  (jest as $FlowFixMe).spyOn(console, 'error').mockImplementation((...args) => {
     if (hasNotFailed) {
       hasNotFailed = false; // set false to prevent infinite recursion
       expect(args).toBeFalsy();
@@ -172,7 +172,7 @@ function renderWithStrictMode(element: React.Node): ReactTestRendererType {
   const WorkAroundBugWithStrictModeInTestRenderer = (prps: {
     children: React.Node,
   }) => prps.children;
-  const StrictMode = (React: $FlowFixMe).StrictMode;
+  const StrictMode = (React as $FlowFixMe).StrictMode;
   return ReactTestRenderer.create(
     <WorkAroundBugWithStrictModeInTestRenderer>
       <StrictMode>{element}</StrictMode>
@@ -217,7 +217,7 @@ function scrollToBottom(instance: ReactTestInstance) {
 // To make error messages a little bit better, we attach a custom toString
 // implementation to a predicate
 function withMessage(fn: Predicate, message: string): Predicate {
-  (fn: any).toString = () => message;
+  (fn as any).toString = () => message;
   return fn;
 }
 

package/Libraries/Utilities/binaryToBase64.js

@@ -24,7 +24,7 @@ function binaryToBase64(data: ArrayBuffer | $ArrayBufferView): string {
     throw new Error('data must be ArrayBuffer or typed array');
   }
   // Already checked that `data` is `DataView` in `ArrayBuffer.isView(data)`
-  const {buffer, byteOffset, byteLength}: DataView = (data: $FlowFixMe);
+  const {buffer, byteOffset, byteLength}: DataView = data as $FlowFixMe;
   return base64.fromByteArray(new Uint8Array(buffer, byteOffset, byteLength));
 }
 

package/Libraries/Utilities/codegenNativeCommands.js

@@ -14,7 +14,7 @@ type NativeCommandsOptions<T = string> = Readonly<{
   supportedCommands: ReadonlyArray<T>,
 }>;
 
-function codegenNativeCommands<T: interface {}>(
+function codegenNativeCommands<T extends interface {}>(
   options: NativeCommandsOptions<keyof T>,
 ): T {
   const commandObj: {[keyof T]: (...ReadonlyArray<unknown>) => void} = {};
@@ -27,7 +27,7 @@ function codegenNativeCommands<T: interface {}>(
     };
   });
 
-  return ((commandObj: any): T);
+  return commandObj as any as T;
 }
 
 export default codegenNativeCommands;

package/Libraries/Utilities/codegenNativeComponent.js

@@ -23,7 +23,7 @@ type NativeComponentOptions = Readonly<{
   excludedPlatforms?: ReadonlyArray<'iOS' | 'android'>,
 }>;
 
-export type NativeComponentType<T: {...}> = HostComponent<T>;
+export type NativeComponentType<T extends {...}> = HostComponent<T>;
 
 // If this function runs then that means the view configs were not
 // generated at build time using `GenerateViewConfigJs.js`. Thus
@@ -31,7 +31,7 @@ export type NativeComponentType<T: {...}> = HostComponent<T>;
 // `requireNativeComponent` is not available in Bridgeless mode.
 // e.g. This function runs at runtime if `codegenNativeComponent` was not called
 // from a file suffixed with NativeComponent.js.
-function codegenNativeComponent<Props: {...}>(
+function codegenNativeComponent<Props extends {...}>(
   componentName: string,
   options?: NativeComponentOptions,
 ): NativeComponentType<Props> {
@@ -64,10 +64,10 @@ function codegenNativeComponent<Props: {...}>(
     }
   }
 
-  return (requireNativeComponent<Props>(
+  return requireNativeComponent<Props>(
     // $FlowFixMe[incompatible-type]
     componentNameInUse,
-  ): HostComponent<Props>);
+  ) as HostComponent<Props>;
 }
 
 export default codegenNativeComponent;

package/Libraries/Utilities/deepFreezeAndThrowOnMutationInDev.js

@@ -27,7 +27,7 @@
  * Freezing the object and adding the throw mechanism is expensive and will
  * only be used in DEV.
  */
-function deepFreezeAndThrowOnMutationInDev<T: {...} | Array<unknown>>(
+function deepFreezeAndThrowOnMutationInDev<T extends {...} | Array<unknown>>(
   object: T,
 ): T {
   if (__DEV__) {
@@ -43,7 +43,7 @@ function deepFreezeAndThrowOnMutationInDev<T: {...} | Array<unknown>>(
     }
 
     // $FlowFixMe[not-an-object] `object` can be an array, but Object.keys works with arrays too
-    const keys = Object.keys((object: {...} | Array<unknown>));
+    const keys = Object.keys(object as {...} | Array<unknown>);
     // $FlowFixMe[method-unbinding] added when improving typing for this parameters
     const hasOwnProperty = Object.prototype.hasOwnProperty;
 

package/Libraries/Utilities/stringifySafe.js

@@ -64,7 +64,7 @@ export function createStringifySafeWithLimits(limits: {
         retval = `{ ... object with ${keys.length} keys ... }`;
       } else if (keys.length > maxObjectKeysLimit) {
         // Return a sample of the keys.
-        retval = ({}: {[string]: unknown});
+        retval = {} as {[string]: unknown};
         for (let k of keys.slice(0, maxObjectKeysLimit)) {
           retval[k] = value[k];
         }

package/Libraries/promiseRejectionTrackingOptions.js

@@ -39,7 +39,7 @@ const rejectionTrackingOptions: NonNullable<Parameters<enable>[0]> = {
         message =
           typeof rejection === 'string'
             ? rejection
-            : JSON.stringify((rejection: $FlowFixMe));
+            : JSON.stringify(rejection as $FlowFixMe);
       }
     }
 

package/Libraries/vendor/core/ErrorUtils.js

@@ -10,22 +10,22 @@
 
 // From @react-native/js-polyfills
 type ErrorHandler = (error: unknown, isFatal: boolean) => void;
-type Fn<Args: ReadonlyArray<unknown>, Return> = (...Args) => Return;
+type Fn<Args extends ReadonlyArray<unknown>, Return> = (...Args) => Return;
 export type ErrorUtils = {
-  applyWithGuard<TArgs: ReadonlyArray<unknown>, TOut>(
+  applyWithGuard<TArgs extends ReadonlyArray<unknown>, TOut>(
     fun: Fn<TArgs, TOut>,
     context?: unknown,
     args?: ?TArgs,
     unused_onError?: null,
     unused_name?: ?string,
   ): ?TOut,
-  applyWithGuardIfNeeded<TArgs: ReadonlyArray<unknown>, TOut>(
+  applyWithGuardIfNeeded<TArgs extends ReadonlyArray<unknown>, TOut>(
     fun: Fn<TArgs, TOut>,
     context?: unknown,
     args?: ?TArgs,
   ): ?TOut,
   getGlobalHandler(): ErrorHandler,
-  guard<TArgs: ReadonlyArray<unknown>, TOut>(
+  guard<TArgs extends ReadonlyArray<unknown>, TOut>(
     fun: Fn<TArgs, TOut>,
     name?: ?string,
     context?: unknown,

package/Libraries/vendor/emitter/EventEmitter.js

@@ -16,22 +16,28 @@ export interface EventSubscription {
 }
 
 export interface IEventEmitter<
-  TEventToArgsMap: Readonly<Record<string, ReadonlyArray<UnsafeEventObject>>>,
+  TEventToArgsMap extends Readonly<
+    Record<string, ReadonlyArray<UnsafeEventObject>>,
+  >,
 > {
-  addListener<TEvent: keyof TEventToArgsMap>(
+  addListener<TEvent extends keyof TEventToArgsMap>(
     eventType: TEvent,
     listener: (...args: TEventToArgsMap[TEvent]) => unknown,
     context?: unknown,
   ): EventSubscription;
 
-  emit<TEvent: keyof TEventToArgsMap>(
+  emit<TEvent extends keyof TEventToArgsMap>(
     eventType: TEvent,
     ...args: TEventToArgsMap[TEvent]
   ): void;
 
-  removeAllListeners<TEvent: keyof TEventToArgsMap>(eventType?: ?TEvent): void;
+  removeAllListeners<TEvent extends keyof TEventToArgsMap>(
+    eventType?: ?TEvent,
+  ): void;
 
-  listenerCount<TEvent: keyof TEventToArgsMap>(eventType: TEvent): number;
+  listenerCount<TEvent extends keyof TEventToArgsMap>(
+    eventType: TEvent,
+  ): number;
 }
 
 interface Registration<TArgs> {
@@ -41,7 +47,9 @@ interface Registration<TArgs> {
 }
 
 type Registry<
-  TEventToArgsMap: Readonly<Record<string, ReadonlyArray<UnsafeEventObject>>>,
+  TEventToArgsMap extends Readonly<
+    Record<string, ReadonlyArray<UnsafeEventObject>>,
+  >,
 > = {
   [K in keyof TEventToArgsMap]: Set<Registration<TEventToArgsMap[K]>>,
 };
@@ -67,7 +75,7 @@ type Registry<
  *
  */
 export default class EventEmitter<
-  TEventToArgsMap: Readonly<
+  TEventToArgsMap extends Readonly<
     Record<string, ReadonlyArray<UnsafeEventObject>>,
   > = Readonly<Record<string, ReadonlyArray<UnsafeEventObject>>>,
 > implements IEventEmitter<TEventToArgsMap>
@@ -83,7 +91,7 @@ export default class EventEmitter<
    * Registers a listener that is called when the supplied event is emitted.
    * Returns a subscription that has a `remove` method to undo registration.
    */
-  addListener<TEvent: keyof TEventToArgsMap>(
+  addListener<TEvent extends keyof TEventToArgsMap>(
     eventType: TEvent,
     listener: (...args: TEventToArgsMap[TEvent]) => unknown,
     context: unknown,
@@ -116,7 +124,7 @@ export default class EventEmitter<
    * If a listener modifies the listeners registered for the same event, those
    * changes will not be reflected in the current invocation of `emit`.
    */
-  emit<TEvent: keyof TEventToArgsMap>(
+  emit<TEvent extends keyof TEventToArgsMap>(
     eventType: TEvent,
     ...args: TEventToArgsMap[TEvent]
   ): void {
@@ -134,7 +142,9 @@ export default class EventEmitter<
   /**
    * Removes all registered listeners.
    */
-  removeAllListeners<TEvent: keyof TEventToArgsMap>(eventType?: ?TEvent): void {
+  removeAllListeners<TEvent extends keyof TEventToArgsMap>(
+    eventType?: ?TEvent,
+  ): void {
     if (eventType == null) {
       // $FlowFixMe[incompatible-type]
       this.#registry = {};
@@ -146,7 +156,9 @@ export default class EventEmitter<
   /**
    * Returns the number of registered listeners for the supplied event.
    */
-  listenerCount<TEvent: keyof TEventToArgsMap>(eventType: TEvent): number {
+  listenerCount<TEvent extends keyof TEventToArgsMap>(
+    eventType: TEvent,
+  ): number {
     const registrations: ?Set<Registration<TEventToArgsMap[TEvent]>> =
       this.#registry[eventType];
     return registrations == null ? 0 : registrations.size;
@@ -154,8 +166,10 @@ export default class EventEmitter<
 }
 
 function allocate<
-  TEventToArgsMap: Readonly<Record<string, ReadonlyArray<UnsafeEventObject>>>,
-  TEvent: keyof TEventToArgsMap,
+  TEventToArgsMap extends Readonly<
+    Record<string, ReadonlyArray<UnsafeEventObject>>,
+  >,
+  TEvent extends keyof TEventToArgsMap,
 >(
   registry: Registry<TEventToArgsMap>,
   eventType: TEvent,

package/README.md

@@ -272,6 +272,7 @@ class Game2048 extends React.Component {
   | Prop (View) | Value | Description |
   |---|---|---|
   | scrollSnapAlign | `'start'` \| `'center'` \| `'end'` | Controls where this item snaps inside its parent ScrollView. Only used when the parent has `snapToAlignment="item"`. |
+  | scrollSnapOffset | `number` | Per-item pixel offset (in dp/pt). When set, the focus engine lands this item's leading edge at `scrollSnapOffset` from the viewport origin. Standalone alternative to `scrollSnapAlign` — takes precedence if both are set on the same item. Only used when the parent has `snapToAlignment="item"`. |
 
   ```jsx
   <ScrollView
@@ -291,6 +292,16 @@ class Game2048 extends React.Component {
   </ScrollView>
   ```
 
+  `scrollSnapOffset` is useful when different items in the same ScrollView need to land at different positions — e.g. a hero row peeking 27dp from the top while poster rows peek 550dp:
+
+  ```jsx
+  <ScrollView snapToAlignment="item">
+    <View scrollSnapOffset={27}><Hero /></View>
+    <View scrollSnapOffset={100}><Featured /></View>
+    <View scrollSnapOffset={550}><PosterRow /></View>
+  </ScrollView>
+  ```
+
   - _ScrollView animation control_: The `scrollAnimationEnabled` prop allows disabling scroll animations when focus changes on TV. When set to `false`, the scroll view jumps instantly to the focused item instead of animating. This only affects TV platforms and has no effect on mobile.
 
   | Prop (ScrollView) | Value | Description |
@@ -307,7 +318,8 @@ class Game2048 extends React.Component {
 
   - _Interaction with existing ScrollView props_: The TV scroll props build on top of existing React Native ScrollView behavior. Here is how they interact:
 
-    - `snapToAlignment="item"` does not require `snapToInterval` to be set. It works as a standalone snapping mode where each child's `scrollSnapAlign` determines the snap position. If `snapToInterval` is also set, the interval is applied as an additional constraint after the item offset is computed.
+    - `snapToAlignment="item"` does not require `snapToInterval` to be set. It works as a standalone snapping mode where each child's `scrollSnapAlign` or `scrollSnapOffset` determines the snap position. If `snapToInterval` is also set, the interval is applied as an additional constraint after the item offset is computed.
+    - `scrollSnapOffset` ignores `snapToItemPadding`. The padding is a global value applied to `scrollSnapAlign` cases; `scrollSnapOffset` is itself a per-item pixel offset that fully specifies where the item lands.
     - `snapToAlignment="item"` should not be combined with `pagingEnabled`. Both attempt to control scroll positioning independently, which leads to unpredictable behavior. Use one or the other.
     - `snapToStart` and `snapToEnd` work independently of `snapToAlignment="item"`. They control edge behavior during swipe/drag momentum (whether the scroll view snaps to the first or last position), but do not affect focus driven item snapping.
     - `scrollAnimationEnabled={false}` disables all scroll animations, including programmatic `scrollTo({animated: true})` calls. When disabled, all scrolling is instant.

package/React/Base/RCTBundleURLProvider.h

@@ -7,8 +7,9 @@
 
 #import <Foundation/Foundation.h>
 
+#import <React/RCTDefines.h>
+
 #import "RCTBundleManager.h"
-#import "RCTDefines.h"
 
 RCT_EXTERN NSString *_Nonnull const RCTBundleURLProviderUpdatedNotification;
 RCT_EXTERN const NSUInteger kRCTBundleURLProviderDefaultPort;
@@ -57,6 +58,23 @@ NS_ASSUME_NONNULL_BEGIN
  */
 + (BOOL)isPackagerRunning:(NSString *)hostPort scheme:(NSString *__nullable)scheme;
 
+/**
+ * Asynchronously checks if there's a packager running at the given host:port.
+ * The port is optional, if not specified, kRCTBundleURLProviderDefaultPort will be used
+ * The completion handler is called on an arbitrary queue.
+ */
++ (void)isPackagerRunningAsync:(NSString *)hostPort completion:(void (^)(BOOL isRunning))completion;
+
+/**
+ * Asynchronously checks 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
+ * The completion handler is called on an arbitrary queue.
+ */
++ (void)isPackagerRunningAsync:(NSString *)hostPort
+                        scheme:(NSString *__nullable)scheme
+                    completion:(void (^)(BOOL isRunning))completion;
+
 /**
  * Returns the jsBundleURL for a given bundle entrypoint and
  * the fallback offline JS bundle if the packager is not running.

package/React/Base/RCTBundleURLProvider.mm

@@ -94,6 +94,9 @@ static NSURL *serverRootWithHostPort(NSString *hostPort, NSString *scheme)
   }
 
   NSURL *url = [serverRootWithHostPort(hostPort, scheme) URLByAppendingPathComponent:@"status"];
+  if (url == nil) {
+    return NO;
+  }
 
   NSURLSession *session = [NSURLSession sharedSession];
   NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:url
@@ -133,6 +136,73 @@ static NSURL *serverRootWithHostPort(NSString *hostPort, NSString *scheme)
   return isRunning;
 }
 
++ (void)isPackagerRunningAsync:(NSString *)hostPort completion:(void (^)(BOOL isRunning))completion
+{
+  [RCTBundleURLProvider isPackagerRunningAsync:hostPort scheme:nil completion:completion];
+}
+
++ (void)isPackagerRunningAsync:(NSString *)hostPort
+                        scheme:(NSString *)scheme
+                    completion:(void (^)(BOOL isRunning))completion
+{
+  if (!kRCTAllowPackagerAccess) {
+    completion(NO);
+    return;
+  }
+
+  NSURL *url = [serverRootWithHostPort(hostPort, scheme) URLByAppendingPathComponent:@"status"];
+  if (url == nil) {
+    completion(NO);
+    return;
+  }
+
+  NSURLSession *session = [NSURLSession sharedSession];
+  NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:url
+                                                         cachePolicy:NSURLRequestUseProtocolCachePolicy
+                                                     timeoutInterval:kRCTPackagerStatusRequestTimeout];
+  [[RCTDevSupportHttpHeaders sharedInstance] applyHeadersToRequest:request];
+
+  __block BOOL hasCompleted = NO;
+  NSObject *lock = [[NSObject alloc] init];
+
+  void (^safeCompletion)(BOOL) = ^(BOOL isRunning) {
+    @synchronized(lock) {
+      if (!hasCompleted) {
+        hasCompleted = YES;
+        completion(isRunning);
+      }
+    }
+  };
+
+  NSURLSessionDataTask *task = [session dataTaskWithRequest:request
+                                          completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
+                                            if (error != nil || data == nil) {
+                                              safeCompletion(NO);
+                                              return;
+                                            }
+                                            NSString *status = [[NSString alloc] initWithData:data
+                                                                                     encoding:NSUTF8StringEncoding];
+                                            BOOL isRunning = [status isEqualToString:@"packager-status:running"];
+                                            safeCompletion(isRunning);
+                                          }];
+  [task resume];
+
+  dispatch_after(
+      dispatch_time(
+          DISPATCH_TIME_NOW,
+          (int64_t)((kRCTPackagerStatusRequestTimeout + kRCTPackagerStatusRequestTimeoutGraceTime) * NSEC_PER_SEC)),
+      dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0),
+      ^{
+        @synchronized(lock) {
+          if (!hasCompleted) {
+            hasCompleted = YES;
+            [task cancel];
+            completion(NO);
+          }
+        }
+      });
+}
+
 - (NSString *)guessPackagerHost
 {
   static NSString *ipGuess;
@@ -160,6 +230,18 @@ static NSURL *serverRootWithHostPort(NSString *hostPort, NSString *scheme)
 {
   return false;
 }
+
++ (void)isPackagerRunningAsync:(NSString *)hostPort completion:(void (^)(BOOL isRunning))completion
+{
+  completion(NO);
+}
+
++ (void)isPackagerRunningAsync:(NSString *)hostPort
+                        scheme:(NSString *)scheme
+                    completion:(void (^)(BOOL isRunning))completion
+{
+  completion(NO);
+}
 #endif
 
 - (NSString *)packagerServerHost

package/React/Base/RCTDefines.h

@@ -67,7 +67,7 @@
 #endif
 
 #ifndef RCT_ENABLE_INSPECTOR
-#if (RCT_DEV || RCT_REMOTE_PROFILE) && __has_include(<React/RCTInspectorDevServerHelper.h>)
+#if (RCT_DEV || RCT_REMOTE_PROFILE)
 #define RCT_ENABLE_INSPECTOR 1
 #else
 #define RCT_ENABLE_INSPECTOR 0

package/React/Base/RCTMultipartDataTask.h

@@ -17,7 +17,7 @@ typedef void (^RCTMultipartDataTaskCallback)(
     NSError *error,
     BOOL done);
 
-typedef NSURLRequest * _Nullable (^RCTMultipartDataTaskRequestInterceptor)(NSURLRequest *request);
+typedef NSURLRequest *_Nullable (^RCTMultipartDataTaskRequestInterceptor)(NSURLRequest *request);
 /**
  * The block provided via this function can inspect/modify multipart data task
  * requests before they are sent. Return a modified request to override, or nil

package/React/Base/RCTMultipartDataTask.m

@@ -14,8 +14,6 @@ void RCTSetCustomMultipartDataTaskRequestInterceptor(RCTMultipartDataTaskRequest
   multipartRequestInterceptor = interceptor;
 }
 
-#import "RCTDevSupportHttpHeaders.h"
-
 @interface RCTMultipartDataTask () <NSURLSessionDataDelegate, NSURLSessionDataDelegate>
 
 @end
@@ -49,7 +47,6 @@ void RCTSetCustomMultipartDataTaskRequestInterceptor(RCTMultipartDataTaskRequest
                                                    delegateQueue:nil];
   NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:_url];
   [request addValue:@"multipart/mixed" forHTTPHeaderField:@"Accept"];
-  [[RCTDevSupportHttpHeaders sharedInstance] applyHeadersToRequest:request];
   NSURLRequest *finalRequest = request;
   if (multipartRequestInterceptor != nil) {
     NSURLRequest *intercepted = multipartRequestInterceptor(request);

package/React/Base/RCTRootView.h

@@ -54,6 +54,8 @@ extern
  * like any ordinary UIView. You can have multiple RCTRootViews on screen at
  * once, all controlled by the same JavaScript application.
  */
+#pragma clang diagnostic push
+#pragma clang diagnostic warning "-Wdeprecated"
 __attribute__((deprecated("This API will be removed along with the legacy architecture.")))
 #if TARGET_OS_TV
 @interface RCTRootView : UIView <RCTTVRemoteSelectHandlerDelegate>
@@ -190,4 +192,6 @@ __attribute__((deprecated("This API will be removed along with the legacy archit
 
 @end
 
+#pragma clang diagnostic pop
+
 NS_ASSUME_NONNULL_END

package/React/Base/RCTRootViewDelegate.h

@@ -6,8 +6,7 @@
  */
 
 #import <Foundation/Foundation.h>
-
-@class RCTRootView;
+#import <React/RCTRootView.h>
 
 @protocol RCTRootViewDelegate <NSObject>
 
@@ -25,6 +24,10 @@
  * The new intrinsic content size is available via the `intrinsicContentSize`
  * property of the root view. The view will not resize itself.
  */
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated"
 - (void)rootViewDidChangeIntrinsicSize:(RCTRootView *)rootView;
+#pragma clang diagnostic pop
 
 @end

package/React/Base/RCTVersion.m

@@ -22,8 +22,8 @@ NSDictionary* RCTGetReactNativeVersion(void)
   dispatch_once(&onceToken, ^(void){
     __rnVersion = @{
                   RCTVersionMajor: @(0),
-                  RCTVersionMinor: @(85),
-                  RCTVersionPatch: @(3),
+                  RCTVersionMinor: @(86),
+                  RCTVersionPatch: @(0),
                   RCTVersionPrerelease: @"0",
                   };
   });

package/React/Base/Surface/RCTSurface.h

@@ -32,8 +32,11 @@ NS_ASSUME_NONNULL_BEGIN
  *  * ability to create a UIView instance on demand (later);
  *  * ability to communicate the current stage of the surface granularly.
  */
+#pragma clang diagnostic push
+#pragma clang diagnostic warning "-Wdeprecated"
 __deprecated_msg("This API will be removed along with the legacy architecture.") @interface RCTSurface
     : NSObject<RCTSurfaceProtocol>
+#pragma clang diagnostic pop
 
 - (instancetype)initWithBridge:(RCTBridge *)bridge
                     moduleName:(NSString *)moduleName

package/React/Base/Surface/RCTSurfaceDelegate.h

@@ -7,12 +7,11 @@
 
 #import <UIKit/UIKit.h>
 
+#import <React/RCTSurface.h>
 #import <React/RCTSurfaceStage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
-@class RCTSurface;
-
 @protocol RCTSurfaceDelegate <NSObject>
 
 @optional
@@ -21,13 +20,18 @@ NS_ASSUME_NONNULL_BEGIN
  * Notifies a receiver that a surface transitioned to a new stage.
  * See `RCTSurfaceStage` for more details.
  */
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated"
 - (void)surface:(RCTSurface *)surface didChangeStage:(RCTSurfaceStage)stage;
-
+#pragma clang diagnostic pop
 /**
  * Notifies a receiver that root view got a new (intrinsic) size during the last
  * layout pass.
  */
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated"
 - (void)surface:(RCTSurface *)surface didChangeIntrinsicSize:(CGSize)intrinsicSize;
+#pragma clang diagnostic pop
 
 @end
 

package/React/Base/Surface/RCTSurfaceRootView.mm

@@ -7,7 +7,7 @@
 
 #import "RCTSurfaceRootView.h"
 
-#import "RCTDefines.h"
+#import <React/RCTDefines.h>
 
 @implementation RCTSurfaceRootView
 

package/React/Base/Surface/RCTSurfaceView.mm

@@ -8,7 +8,8 @@
 #import "RCTSurfaceView.h"
 #import "RCTSurfaceView+Internal.h"
 
-#import "RCTDefines.h"
+#import <React/RCTDefines.h>
+
 #import "RCTSurface.h"
 #import "RCTSurfaceProtocol.h"
 #import "RCTSurfaceRootView.h"

package/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingProxyRootView.mm

@@ -182,6 +182,8 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : (NSCoder *)aDecoder)
 #if TARGET_OS_TV
      self.tvRemoteHandler = [[RCTTVRemoteHandler alloc] initWithView:[self contentView]];
      self.tvRemoteSelectHandler = [[RCTTVRemoteSelectHandler alloc] initWithView:self];
+     [self setNeedsFocusUpdate];
+     [self updateFocusIfNeeded];
 #endif
     });
   }

package/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.h

@@ -12,9 +12,6 @@
 #import <React/RCTSurfaceSizeMeasureMode.h>
 #import <React/RCTSurfaceStage.h>
 
-@class RCTBridge;
-@class RCTSurface;
-
 typedef UIView *_Nullable (^RCTSurfaceHostingViewActivityIndicatorViewFactory)(void);
 
 NS_ASSUME_NONNULL_BEGIN

package/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.mm

@@ -6,8 +6,10 @@
  */
 
 #import "RCTSurfaceHostingView.h"
+
+#import <React/RCTDefines.h>
+
 #import "RCTConstants.h"
-#import "RCTDefines.h"
 #import "RCTSurface.h"
 #import "RCTSurfaceDelegate.h"
 #import "RCTSurfaceView.h"