react-native-tvos 0.87.1-1 → 0.88.0-0rc2

package/Libraries/ActionSheetIOS/React-RCTActionSheet.podspec

@@ -31,4 +31,6 @@ Pod::Spec.new do |s|
   s.header_dir             = "RCTActionSheet"
 
   s.dependency "React-Core/RCTActionSheetHeaders", version
+
+  mark_as_react_native_build(s)
 end

package/Libraries/Alert/Alert.js

@@ -17,10 +17,7 @@ import {alertWithArgs} from './RCTAlertManager';
  * @platform ios
  */
 export type AlertType =
-  | 'default'
-  | 'plain-text'
-  | 'secure-text'
-  | 'login-password';
+  'default' | 'plain-text' | 'secure-text' | 'login-password';
 
 /**
  * @platform ios

package/Libraries/Animated/AnimatedEvent.js

@@ -21,9 +21,7 @@ import AnimatedValueXY from './nodes/AnimatedValueXY';
 import invariant from 'invariant';
 
 export type Mapping =
-  | {[key: string]: Mapping, ...}
-  | AnimatedValue
-  | AnimatedValueXY;
+  {[key: string]: Mapping, ...} | AnimatedValue | AnimatedValueXY;
 export type EventConfig<T> = {
   listener?: ?(NativeSyntheticEvent<T>) => unknown,
   useNativeDriver: boolean,

package/Libraries/Animated/AnimationTimingUtils.js

@@ -0,0 +1,39 @@
+/**
+ * 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
+ */
+
+'use strict';
+
+export type AnimationTimeProvider = () => number;
+
+const defaultAnimationTimeProvider: AnimationTimeProvider = () => Date.now();
+
+let animationTimeProvider: AnimationTimeProvider = defaultAnimationTimeProvider;
+
+/**
+ * Returns the current time, in milliseconds, used to drive JavaScript-based
+ * animations (timing, spring and decay).
+ *
+ * Defaults to `Date.now()`. The value can be overridden with
+ * `setAnimationTimeProvider`, e.g. to drive animations from a controlled clock
+ * in tests.
+ */
+export function getCurrentAnimationTime(): number {
+  return animationTimeProvider();
+}
+
+/**
+ * Overrides the time source used by `getCurrentAnimationTime`. Pass `null` to restore
+ * the default `Date.now()`-based provider.
+ */
+export function setAnimationTimeProvider(
+  provider: ?AnimationTimeProvider,
+): void {
+  animationTimeProvider = provider ?? defaultAnimationTimeProvider;
+}

package/Libraries/Animated/animations/DecayAnimation.js

@@ -12,6 +12,7 @@ import type {PlatformConfig} from '../AnimatedPlatformConfig';
 import type AnimatedValue from '../nodes/AnimatedValue';
 import type {AnimationConfig, EndCallback} from './Animation';
 
+import {getCurrentAnimationTime} from '../AnimationTimingUtils';
 import Animation from './Animation';
 
 export type DecayAnimationConfig = Readonly<{
@@ -82,7 +83,7 @@ export default class DecayAnimation extends Animation {
     this._lastValue = fromValue;
     this._fromValue = fromValue;
     this._onUpdate = onUpdate;
-    this._startTime = Date.now();
+    this._startTime = getCurrentAnimationTime();
 
     const useNativeDriver = this.__startAnimationIfNative(animatedValue);
     // TODO: T274006331 - Remove js-only animation once shared backend is fully rolled out
@@ -92,7 +93,7 @@ export default class DecayAnimation extends Animation {
   }
 
   onUpdate(): void {
-    const now = Date.now();
+    const now = getCurrentAnimationTime();
 
     const value =
       this._fromValue +

package/Libraries/Animated/animations/SpringAnimation.js

@@ -14,6 +14,7 @@ import type AnimatedValue from '../nodes/AnimatedValue';
 import type AnimatedValueXY from '../nodes/AnimatedValueXY';
 import type {AnimationConfig, EndCallback} from './Animation';
 
+import {getCurrentAnimationTime} from '../AnimationTimingUtils';
 import AnimatedColor from '../nodes/AnimatedColor';
 import * as SpringConfig from '../SpringConfig';
 import Animation from './Animation';
@@ -211,7 +212,7 @@ export default class SpringAnimation extends Animation {
     this._lastPosition = this._startPosition;
 
     this._onUpdate = onUpdate;
-    this._lastTime = Date.now();
+    this._lastTime = getCurrentAnimationTime();
     this._frameTime = 0.0;
 
     if (previousAnimation instanceof SpringAnimation) {
@@ -274,7 +275,7 @@ export default class SpringAnimation extends Animation {
     // computation and will continue on the next frame. It's better to have it
     // running at faster speed than jumping to the end.
     const MAX_STEPS = 64;
-    let now = Date.now();
+    let now = getCurrentAnimationTime();
     if (now > this._lastTime + MAX_STEPS) {
       now = this._lastTime + MAX_STEPS;
     }

package/Libraries/Animated/animations/TimingAnimation.js

@@ -16,6 +16,7 @@ import type AnimatedValueXY from '../nodes/AnimatedValueXY';
 import type {AnimationConfig, EndCallback} from './Animation';
 
 import * as ReactNativeFeatureFlags from '../../../src/private/featureflags/ReactNativeFeatureFlags';
+import {getCurrentAnimationTime} from '../AnimationTimingUtils';
 import AnimatedColor from '../nodes/AnimatedColor';
 import Animation from './Animation';
 
@@ -126,7 +127,7 @@ export default class TimingAnimation extends Animation {
     }
 
     const start = () => {
-      this._startTime = Date.now();
+      this._startTime = getCurrentAnimationTime();
 
       const useNativeDriver = this.__startAnimationIfNative(animatedValue);
       // TODO: T274006331 - Remove js-only animation once shared backend is fully rolled out
@@ -150,7 +151,7 @@ export default class TimingAnimation extends Animation {
   }
 
   onUpdate(): void {
-    const now = Date.now();
+    const now = getCurrentAnimationTime();
     if (now >= this._startTime + this._duration) {
       if (this._duration === 0) {
         this._onUpdate(this._toValue);

package/Libraries/Animated/components/AnimatedFlatList.js

@@ -14,10 +14,12 @@ import FlatList, {type FlatListProps} from '../../Lists/FlatList';
 import createAnimatedComponent from '../createAnimatedComponent';
 import * as React from 'react';
 
-export default createAnimatedComponent(FlatList) as $FlowFixMe as component<
+const AnimatedFlatList: component<
   // $FlowExpectedError[unclear-type]
   ItemT = any,
 >(
   ref?: React.RefSetter<FlatList<ItemT>>,
   ...props: AnimatedProps<FlatListProps<ItemT>>
-);
+) = createAnimatedComponent(FlatList) as $FlowFixMe;
+
+export default AnimatedFlatList;

package/Libraries/Animated/components/AnimatedScrollView.js

@@ -14,7 +14,6 @@ import type {
   AnimatedProps,
 } from '../createAnimatedComponent';
 
-import RefreshControl from '../../Components/RefreshControl/RefreshControl';
 import ScrollView, {
   type ScrollViewProps,
 } from '../../Components/ScrollView/ScrollView';
@@ -83,7 +82,7 @@ const AnimatedScrollViewWithInvertedRefreshControl =
     ref?: React.RefSetter<AnimatedScrollViewInstance>,
     ...React.ElementConfig<typeof ScrollView>,
     // $FlowFixMe[unclear-type] Same Flow type as `refreshControl` in ScrollView
-    refreshControl: ExactReactElement_DEPRECATED<any>,
+    refreshControl: React.MixedElement,
   }) {
     // Split `props` into the animate-able props for the parent (RefreshControl)
     // and child (ScrollView).
@@ -105,11 +104,10 @@ const AnimatedScrollViewWithInvertedRefreshControl =
     >(intermediatePropsForRefreshControl);
     // NOTE: Assumes that refreshControl.ref` and `refreshControl.style` can be
     // safely clobbered.
-    const refreshControl: ExactReactElement_DEPRECATED<typeof RefreshControl> =
-      cloneElement(props.refreshControl, {
-        ...refreshControlAnimatedProps,
-        ref: refreshControlRef,
-      });
+    const refreshControl = cloneElement(props.refreshControl, {
+      ...refreshControlAnimatedProps,
+      ref: refreshControlRef,
+    });
 
     // Handle animated props on `NativeDirectionalScrollView`.
     const [scrollViewAnimatedProps, scrollViewRef] = useAnimatedProps<

package/Libraries/Animated/components/AnimatedSectionList.js

@@ -15,7 +15,7 @@ import createAnimatedComponent from '../createAnimatedComponent';
 import * as React from 'react';
 
 // $FlowFixMe[incompatible-type]
-export default createAnimatedComponent(SectionList) as $FlowFixMe as component<
+const AnimatedSectionList: component<
   // $FlowExpectedError[unclear-type]
   ItemT = any,
   // $FlowExpectedError[unclear-type]
@@ -23,4 +23,6 @@ export default createAnimatedComponent(SectionList) as $FlowFixMe as component<
 >(
   ref?: React.RefSetter<SectionList<ItemT, SectionT>>,
   ...props: AnimatedProps<SectionListProps<ItemT, SectionT>>
-);
+) = createAnimatedComponent(SectionList) as $FlowFixMe;
+
+export default AnimatedSectionList;

package/Libraries/Animated/createAnimatedComponent.js

@@ -34,20 +34,19 @@ type Builtin = (...ReadonlyArray<empty>) => unknown | Date | Error | RegExp;
 export type WithAnimatedValue<out T> = T extends Builtin | Nullable
   ? T
   : T extends Primitive
-    ?
-        | T
-        | AnimatedNode
-        | AnimatedAddition
-        | AnimatedSubtraction
-        | AnimatedDivision
-        | AnimatedMultiplication
-        | AnimatedModulo
-        | AnimatedDiffClamp
-        | AnimatedValue
-        | AnimatedInterpolation<number | string>
-        | AnimatedInterpolation<number>
-        | AnimatedInterpolation<string>
-        | AnimatedInterpolation<NativeColorValue>
+    ? | T
+      | AnimatedNode
+      | AnimatedAddition
+      | AnimatedSubtraction
+      | AnimatedDivision
+      | AnimatedMultiplication
+      | AnimatedModulo
+      | AnimatedDiffClamp
+      | AnimatedValue
+      | AnimatedInterpolation<number | string>
+      | AnimatedInterpolation<number>
+      | AnimatedInterpolation<string>
+      | AnimatedInterpolation<NativeColorValue>
     : T extends ReadonlyArray<infer P>
       ? ReadonlyArray<WithAnimatedValue<P>>
       : T extends {...}

package/Libraries/Animated/nodes/AnimatedAddition.js

@@ -20,6 +20,8 @@ import AnimatedValue from './AnimatedValue';
 import AnimatedWithChildren from './AnimatedWithChildren';
 
 export default class AnimatedAddition extends AnimatedWithChildren {
+  __isNativeValueNode: boolean = true;
+
   _a: AnimatedNode;
   _b: AnimatedNode;
 

package/Libraries/Animated/nodes/AnimatedDiffClamp.js

@@ -19,6 +19,8 @@ import AnimatedInterpolation from './AnimatedInterpolation';
 import AnimatedWithChildren from './AnimatedWithChildren';
 
 export default class AnimatedDiffClamp extends AnimatedWithChildren {
+  __isNativeValueNode: boolean = true;
+
   _a: AnimatedNode;
   _min: number;
   _max: number;

package/Libraries/Animated/nodes/AnimatedDivision.js

@@ -20,6 +20,8 @@ import AnimatedValue from './AnimatedValue';
 import AnimatedWithChildren from './AnimatedWithChildren';
 
 export default class AnimatedDivision extends AnimatedWithChildren {
+  __isNativeValueNode: boolean = true;
+
   _a: AnimatedNode;
   _b: AnimatedNode;
   _warnedAboutDivideByZero: boolean = false;

package/Libraries/Animated/nodes/AnimatedInterpolation.js

@@ -28,9 +28,7 @@ import invariant from 'invariant';
 type ExtrapolateType = 'extend' | 'identity' | 'clamp';
 
 export type InterpolationConfigSupportedOutputType =
-  | number
-  | string
-  | NativeColorValue;
+  number | string | NativeColorValue;
 
 export type InterpolationConfigType<
   OutputT extends InterpolationConfigSupportedOutputType,
@@ -446,6 +444,8 @@ function sampleEasingStops(
 export default class AnimatedInterpolation<
   OutputT extends InterpolationConfigSupportedOutputType,
 > extends AnimatedWithChildren {
+  __isNativeValueNode: boolean = true;
+
   _parent: AnimatedNode;
   _config: InterpolationConfigType<OutputT>;
   _interpolation: ?(input: number) => OutputT;

package/Libraries/Animated/nodes/AnimatedModulo.js

@@ -19,6 +19,8 @@ import AnimatedInterpolation from './AnimatedInterpolation';
 import AnimatedWithChildren from './AnimatedWithChildren';
 
 export default class AnimatedModulo extends AnimatedWithChildren {
+  __isNativeValueNode: boolean = true;
+
   _a: AnimatedNode;
   _modulus: number;
 

package/Libraries/Animated/nodes/AnimatedMultiplication.js

@@ -20,6 +20,8 @@ import AnimatedValue from './AnimatedValue';
 import AnimatedWithChildren from './AnimatedWithChildren';
 
 export default class AnimatedMultiplication extends AnimatedWithChildren {
+  __isNativeValueNode: boolean = true;
+
   _a: AnimatedNode;
   _b: AnimatedNode;
 

package/Libraries/Animated/nodes/AnimatedNode.js

@@ -8,9 +8,11 @@
  * @format
  */
 
+import type {EventSubscription} from '../../vendor/emitter/EventEmitter';
 import type {PlatformConfig} from '../AnimatedPlatformConfig';
 
 import NativeAnimatedHelper from '../../../src/private/animated/NativeAnimatedHelper';
+import * as ReactNativeFeatureFlags from '../../../src/private/featureflags/ReactNativeFeatureFlags';
 import invariant from 'invariant';
 
 export type ValueListenerCallback = (state: {value: number}) => unknown;
@@ -49,9 +51,16 @@ export default class AnimatedNode {
 
   __attach(): void {}
   __detach(): void {
-    this.removeAllListeners();
+    if (!ReactNativeFeatureFlags.animatedKeepListenersOnDetach()) {
+      this.removeAllListeners();
+    }
     if (this.__isNative && this.__nativeTag != null) {
-      NativeAnimatedHelper.API.dropAnimatedNode(this.__nativeTag);
+      const nativeTag = this.__nativeTag;
+      // The subscription must not outlive the native tag it observes. Any
+      // listeners kept around are re-subscribed by `__makeNative` if this node
+      // is attached again.
+      this.__updateSubscription?.remove();
+      NativeAnimatedHelper.API.dropAnimatedNode(nativeTag);
       this.__nativeTag = undefined;
     }
   }
@@ -70,6 +79,19 @@ export default class AnimatedNode {
   __nativeTag: ?number = undefined;
   __disableBatchingForNativeCreate: ?boolean = undefined;
 
+  /**
+   * Whether the native node backing this one holds a number, and therefore
+   * supports `startListeningToAnimatedNodeValue`. That native module method
+   * only accepts tags of "value" nodes (`ValueAnimatedNode` on Android and in
+   * C++, `RCTValueAnimatedNode` on iOS); passing any other tag throws on
+   * Android and is a no-op elsewhere.
+   *
+   * Subclasses backed by a non-value native node — props, style, transform,
+   * object, tracking and color — must leave this `false`.
+   */
+  __isNativeValueNode: boolean = false;
+  __updateSubscription: ?EventSubscription = null;
+
   __makeNative(platformConfig: ?PlatformConfig): void {
     // Subclasses are expected to set `__isNative` to true before this.
     invariant(
@@ -78,6 +100,9 @@ export default class AnimatedNode {
     );
 
     this._platformConfig = platformConfig;
+    if (this._listeners.size > 0) {
+      this.__ensureUpdateSubscriptionExists();
+    }
   }
 
   /**
@@ -90,6 +115,9 @@ export default class AnimatedNode {
   addListener(callback: (value: any) => unknown): string {
     const id = String(_uniqueId++);
     this._listeners.set(id, callback);
+    if (this.__isNative) {
+      this.__ensureUpdateSubscriptionExists();
+    }
     return id;
   }
 
@@ -101,6 +129,9 @@ export default class AnimatedNode {
    */
   removeListener(id: string): void {
     this._listeners.delete(id);
+    if (this.__isNative && this._listeners.size === 0) {
+      this.__updateSubscription?.remove();
+    }
   }
 
   /**
@@ -110,14 +141,53 @@ export default class AnimatedNode {
    */
   removeAllListeners(): void {
     this._listeners.clear();
+    if (this.__isNative) {
+      this.__updateSubscription?.remove();
+    }
   }
 
   hasListeners(): boolean {
     return this._listeners.size > 0;
   }
 
-  __onAnimatedValueUpdateReceived(value: number, offset: number): void {
-    this.__callListeners(value + offset);
+  /**
+   * Subscribes to native updates of this node's value, so that listeners keep
+   * firing for natively driven animations. No-op for nodes that are not backed
+   * by a native "value" node.
+   */
+  __ensureUpdateSubscriptionExists(): void {
+    if (!this.__isNativeValueNode || this.__updateSubscription != null) {
+      return;
+    }
+    const nativeTag = this.__getNativeTag();
+    NativeAnimatedHelper.API.startListeningToAnimatedNodeValue(nativeTag);
+    const subscription: EventSubscription =
+      NativeAnimatedHelper.nativeEventEmitter.addListener(
+        'onAnimatedValueUpdate',
+        data => {
+          if (data.tag === nativeTag) {
+            this.__onAnimatedValueUpdateReceived(data.value, data.offset);
+          }
+        },
+      );
+
+    this.__updateSubscription = {
+      remove: () => {
+        // Only this function assigns to `this.__updateSubscription`.
+        if (this.__updateSubscription == null) {
+          return;
+        }
+        this.__updateSubscription = null;
+        subscription.remove();
+        NativeAnimatedHelper.API.stopListeningToAnimatedNodeValue(nativeTag);
+      },
+    };
+  }
+
+  // NOTE: only Android sends an `offset`; iOS and the C++ backend omit it and
+  // report a value that already accounts for one.
+  __onAnimatedValueUpdateReceived(value: number, offset?: ?number): void {
+    this.__callListeners(value + (offset ?? 0));
   }
 
   __callListeners(value: number): void {

package/Libraries/Animated/nodes/AnimatedProps.js

@@ -384,4 +384,6 @@ export default class AnimatedProps extends AnimatedNode {
 const _hasOwnProp = Object.prototype.hasOwnProperty;
 const hasOwn: (obj: Readonly<{...}>, prop: string) => boolean =
   // $FlowFixMe[method-unbinding]
+  /* $FlowFixMe[invalid-this-arg] Error exposed after fixing this typing
+   * unsoundness in flow */
   Object.hasOwn ?? ((obj, prop) => _hasOwnProp.call(obj, prop));

package/Libraries/Animated/nodes/AnimatedStyle.js

@@ -255,4 +255,6 @@ export default class AnimatedStyle extends AnimatedWithChildren {
 const _hasOwnProp = Object.prototype.hasOwnProperty;
 const hasOwn: (obj: Readonly<{...}>, prop: string) => boolean =
   // $FlowFixMe[method-unbinding]
+  /* $FlowFixMe[invalid-this-arg] Error exposed after fixing this typing
+   * unsoundness in flow */
   Object.hasOwn ?? ((obj, prop) => _hasOwnProp.call(obj, prop));

package/Libraries/Animated/nodes/AnimatedSubtraction.js

@@ -20,6 +20,8 @@ import AnimatedValue from './AnimatedValue';
 import AnimatedWithChildren from './AnimatedWithChildren';
 
 export default class AnimatedSubtraction extends AnimatedWithChildren {
+  __isNativeValueNode: boolean = true;
+
   _a: AnimatedNode;
   _b: AnimatedNode;
 

package/Libraries/Animated/nodes/AnimatedValue.js

@@ -8,8 +8,6 @@
  * @format
  */
 
-import type {EventSubscription} from '../../vendor/emitter/EventEmitter';
-import type {PlatformConfig} from '../AnimatedPlatformConfig';
 import type Animation from '../animations/Animation';
 import type {EndCallback} from '../animations/Animation';
 import type {
@@ -88,8 +86,7 @@ function _executeAsAnimatedBatch(id: string, operation: () => void) {
  * See https://reactnative.dev/docs/animatedvalue
  */
 export default class AnimatedValue extends AnimatedWithChildren {
-  _listenerCount: number;
-  _updateSubscription: ?EventSubscription;
+  __isNativeValueNode: boolean = true;
 
   _value: number;
   _startingValue: number;
@@ -104,9 +101,6 @@ export default class AnimatedValue extends AnimatedWithChildren {
       throw new Error('AnimatedValue: Attempting to set value to undefined');
     }
 
-    this._listenerCount = 0;
-    this._updateSubscription = null;
-
     this._startingValue = this._value = value;
     this._offset = 0;
     this.__deferAnimationStart =
@@ -131,65 +125,12 @@ export default class AnimatedValue extends AnimatedWithChildren {
     return this._value + this._offset;
   }
 
-  __makeNative(platformConfig: ?PlatformConfig): void {
-    super.__makeNative(platformConfig);
-    if (this._listenerCount > 0) {
-      this.__ensureUpdateSubscriptionExists();
-    }
-  }
-
+  /**
+   * Narrows `AnimatedNode.addListener`: the value of an `Animated.Value` is
+   * always a number, so listeners always receive `{value: number}`.
+   */
   addListener(callback: ValueListenerCallback): string {
-    const id = super.addListener(callback);
-    this._listenerCount++;
-    if (this.__isNative) {
-      this.__ensureUpdateSubscriptionExists();
-    }
-    return id;
-  }
-
-  removeListener(id: string): void {
-    super.removeListener(id);
-    this._listenerCount--;
-    if (this.__isNative && this._listenerCount === 0) {
-      this._updateSubscription?.remove();
-    }
-  }
-
-  removeAllListeners(): void {
-    super.removeAllListeners();
-    this._listenerCount = 0;
-    if (this.__isNative) {
-      this._updateSubscription?.remove();
-    }
-  }
-
-  __ensureUpdateSubscriptionExists(): void {
-    if (this._updateSubscription != null) {
-      return;
-    }
-    const nativeTag = this.__getNativeTag();
-    NativeAnimatedAPI.startListeningToAnimatedNodeValue(nativeTag);
-    const subscription: EventSubscription =
-      NativeAnimatedHelper.nativeEventEmitter.addListener(
-        'onAnimatedValueUpdate',
-        data => {
-          if (data.tag === nativeTag) {
-            this.__onAnimatedValueUpdateReceived(data.value, data.offset);
-          }
-        },
-      );
-
-    this._updateSubscription = {
-      remove: () => {
-        // Only this function assigns to `this.#updateSubscription`.
-        if (this._updateSubscription == null) {
-          return;
-        }
-        this._updateSubscription = null;
-        subscription.remove();
-        NativeAnimatedAPI.stopListeningToAnimatedNodeValue(nativeTag);
-      },
-    };
+    return super.addListener(callback);
   }
 
   /**
@@ -294,7 +235,7 @@ export default class AnimatedValue extends AnimatedWithChildren {
     }
   }
 
-  __onAnimatedValueUpdateReceived(value: number, offset?: number): void {
+  __onAnimatedValueUpdateReceived(value: number, offset?: ?number): void {
     this._updateValue(value, false /*flush*/);
     if (offset != null) {
       this._offset = offset;

package/Libraries/AppDelegate/RCTAppDelegate.h

@@ -19,8 +19,12 @@
 NS_ASSUME_NONNULL_BEGIN
 
 /**
- * @deprecated RCTAppDelegate is deprecated and will be removed in a future version of React Native. Use
- `RCTReactNativeFactory` instead.
+ * @deprecated RCTAppDelegate is deprecated and will be removed in a future version of React Native. For new apps
+ * using the UIScene lifecycle, implement your own `SceneDelegate` with `RCTReactNativeFactory` (see integration
+ * docs). For AppDelegate-only apps, use `RCTReactNativeFactory` directly.
+ *
+ * Scene-based apps must keep `UIApplicationSupportsMultipleScenes` set to `false` in Info.plist. Define
+ * `RN_ALLOW_MULTIPLE_SCENES` on the app target to downgrade the unsupported-configuration crash to a warning.
  *
  * The RCTAppDelegate is an utility class that implements some base configurations for all the React Native apps.
  * It is not mandatory to use it, but it could simplify your AppDelegate code.
@@ -55,19 +59,12 @@ NS_ASSUME_NONNULL_BEGIN
  *   - (id<RCTTurboModule>)getModuleInstanceFromClass:(Class)moduleClass
  */
 __attribute__((deprecated(
-    "RCTAppDelegate is deprecated and will be removed in a future version of React Native. Use `RCTReactNativeFactory` instead.")))
+    "RCTAppDelegate is deprecated and will be removed in a future version of React Native. For UIScene apps implement your own SceneDelegate with RCTReactNativeFactory; otherwise use RCTReactNativeFactory.")))
 @interface RCTAppDelegate : RCTDefaultReactNativeFactoryDelegate<UIApplicationDelegate>
 
 /// The window object, used to render the UViewControllers
 @property (nonatomic, strong, nonnull) UIWindow *window;
 
-#if !defined(RCT_REMOVE_LEGACY_ARCH)
-@property (nonatomic, nullable) RCTBridge *bridge
-    __attribute__((deprecated("The bridge is deprecated and will be removed when removing the legacy architecture.")));
-@property (nonatomic, nullable) RCTSurfacePresenterBridgeAdapter *bridgeAdapter __attribute__((
-    deprecated("The bridge adapter is deprecated and will be removed when removing the legacy architecture.")));
-#endif
-
 @property (nonatomic, strong, nullable) NSString *moduleName;
 @property (nonatomic, strong, nullable) NSDictionary *initialProps;
 @property (nonatomic, strong) RCTReactNativeFactory *reactNativeFactory;

package/Libraries/AppDelegate/RCTDefaultReactNativeFactoryDelegate.mm

@@ -66,7 +66,7 @@
 
 - (NSURL *_Nullable)bundleURL
 {
-  [NSException raise:@"RCTAppDelegate::bundleURL not implemented"
+  [NSException raise:@"RCTReactNativeFactoryDelegate::bundleURL not implemented"
               format:@"Subclasses must implement a valid getBundleURL method"];
   return nullptr;
 }