react-native-tvos 0.76.0-0rc6 → 0.76.1-0

package/Libraries/AppDelegate/RCTAppDelegate.mm

@@ -76,7 +76,8 @@
   self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
   UIViewController *rootViewController = [self createRootViewController];
   [self setRootView:rootView toRootViewController:rootViewController];
-  self.window.rootViewController = rootViewController;
+  _window.windowScene.delegate = self;
+  _window.rootViewController = rootViewController;
 #if TARGET_OS_TV
   UIUserInterfaceStyle style = rootViewController.traitCollection.userInterfaceStyle;
   if (style == UIUserInterfaceStyleDark) {
@@ -85,7 +86,7 @@
     rootView.backgroundColor = [UIColor colorWithRed:1.0 green:1.0 blue:1.0 alpha:1.0];
   }
 #endif
-  [self.window makeKeyAndVisible];
+  [_window makeKeyAndVisible];
 }
 
 - (void)applicationDidEnterBackground:(UIApplication *)application

package/Libraries/Components/Pressable/Pressable.js

@@ -392,52 +392,19 @@ function Pressable(
   // $FlowFixMe[incompatible-call]
   const eventHandlers = usePressability(config);
 
-  const pressableTVFocusEventHandler = React.useCallback(
-    (evt: any) => {
-      if (isTVSelectable !== false || focusable !== false) {
-        // $FlowFixMe[prop-missing]
-        if (evt?.eventType === 'focus') {
-          shouldUpdatePressed && setFocused(true);
-          onFocus && onFocus(evt);
-          // $FlowFixMe[prop-missing]
-        } else if (evt.eventType === 'blur') {
-          onBlur && onBlur(evt);
-          shouldUpdatePressed && setFocused(false);
-        }
-      }
-      // $FlowFixMe[prop-missing]
-      if (evt.eventType === 'select') {
-        // $FlowFixMe[incompatible-exact]
-        onPress && onPress(evt);
-      }
-      // $FlowFixMe[prop-missing]
-      if (evt.eventType === 'longSelect') {
-        // $FlowFixMe[incompatible-exact]
-        onLongPress && onLongPress(evt);
-      }
-    },
-    [
-      onBlur,
-      onFocus,
-      onLongPress,
-      onPress,
-      focusable,
-      isTVSelectable,
-      shouldUpdatePressed,
-    ],
-  );
-
   React.useEffect(() => {
     if (!tvFocusEventHandler) {
       return;
     }
+    const pressableTVFocusEventHandler = (evt: any) =>
+      eventHandlers?.onTVEvent(evt);
     // $FlowFixMe[prop-missing]
     const viewTag = tagForComponentOrHandle(viewRef?.current);
     tvFocusEventHandler.register(viewTag, pressableTVFocusEventHandler);
     return () => {
       tvFocusEventHandler.unregister(viewTag);
     };
-  }, [pressableTVFocusEventHandler, viewRef]);
+  }, [eventHandlers, viewRef]);
 
   return (
     <View

package/Libraries/Components/Pressable/useAndroidRippleForView.js

@@ -80,8 +80,8 @@ export default function useAndroidRippleForView(
           if (view != null) {
             Commands.hotspotUpdate(
               view,
-              event.nativeEvent.locationX ?? 0,
-              event.nativeEvent.locationY ?? 0,
+              event.nativeEvent?.locationX ?? 0,
+              event.nativeEvent?.locationY ?? 0,
             );
             Commands.setPressed(view, true);
           }
@@ -91,8 +91,8 @@ export default function useAndroidRippleForView(
           if (view != null) {
             Commands.hotspotUpdate(
               view,
-              event.nativeEvent.locationX ?? 0,
-              event.nativeEvent.locationY ?? 0,
+              event.nativeEvent?.locationX ?? 0,
+              event.nativeEvent?.locationY ?? 0,
             );
           }
         },

package/Libraries/Components/TV/TVViewPropTypes.js

@@ -85,4 +85,5 @@ export type TVViewProps = $ReadOnly<{|
   enabled?: boolean,
   autoFocus?: boolean,
   safePadding?: string | null,
+  onTVEvent?: (event: any) => void,
 |}>;

package/Libraries/Core/ReactNativeVersion.js

@@ -16,8 +16,8 @@ const version: $ReadOnly<{
 }> = {
   major: 0,
   minor: 76,
-  patch: 0,
-  prerelease: '0rc6',
+  patch: 1,
+  prerelease: '0',
 };
 
 module.exports = {version};

package/Libraries/Pressability/Pressability.js

@@ -131,6 +131,11 @@ export type PressabilityConfig = $ReadOnly<{|
    */
   onPressOut?: ?(event: PressEvent) => mixed,
 
+  /**
+   * Called when a TV event is passed to the config.
+   */
+  onTVEvent?: ?(event: any) => void,
+
   /**
    * Whether to prevent any other native components from becoming responder
    * while this pressable is responder.
@@ -152,6 +157,7 @@ export type EventHandlers = $ReadOnly<{|
   onResponderTerminate: (event: PressEvent) => void,
   onResponderTerminationRequest: () => boolean,
   onStartShouldSetResponder: () => boolean,
+  onTVEvent: (event: any) => void,
 |}>;
 
 type TouchState =
@@ -430,6 +436,35 @@ export default class Pressability {
   }
 
   _createEventHandlers(): EventHandlers {
+    const tvEventHandlers = {
+      onTVEvent: (evt: any): void => {
+        if (this._config.disabled !== false) {
+          // $FlowFixMe[prop-missing]
+          if (evt?.eventType === 'focus') {
+            const {onFocus} = this._config;
+            onFocus && onFocus(evt);
+            // $FlowFixMe[prop-missing]
+          } else if (evt.eventType === 'blur') {
+            const {onBlur} = this._config;
+            onBlur && onBlur(evt);
+          } else if (evt.eventType === 'select') {
+            const {onPress, onPressIn, onPressOut} = this._config;
+            // $FlowFixMe[incompatible-exact]
+            onPressIn && onPressIn(evt);
+            onPress && onPress(evt);
+            setTimeout(() => {
+              onPressOut && onPressOut(evt);
+            }, this._config.minPressDuration ?? DEFAULT_MIN_PRESS_DURATION);
+          } else if (evt.eventType === 'longSelect') {
+            const {onLongPress, onPressIn, onPressOut} = this._config;
+            onLongPress && onLongPress(evt);
+            evt?.eventKeyAction === 0
+              ? onPressIn && onPressIn(evt)
+              : onPressOut && onPressOut(evt);
+          }
+        }
+      },
+    };
     const focusEventHandlers = {
       onBlur: (event: BlurEvent): void => {
         const {onBlur} = this._config;
@@ -610,6 +645,7 @@ export default class Pressability {
         };
       }
       return {
+        ...tvEventHandlers,
         ...focusEventHandlers,
         ...responderEventHandlers,
         ...hoverPointerEvents,
@@ -662,6 +698,7 @@ export default class Pressability {
               },
             };
       return {
+        ...tvEventHandlers,
         ...focusEventHandlers,
         ...responderEventHandlers,
         ...mouseEventHandlers,

package/Libraries/ReactNative/AppRegistry.js

@@ -13,7 +13,7 @@ import type {RootTag} from '../Types/RootTagTypes';
 import type {IPerformanceLogger} from '../Utilities/createPerformanceLogger';
 import type {DisplayModeType} from './DisplayMode';
 
-import BatchedBridge from '../BatchedBridge/BatchedBridge';
+import registerCallableModule from '../Core/registerCallableModule';
 import BugReporting from '../BugReporting/BugReporting';
 import createPerformanceLogger from '../Utilities/createPerformanceLogger';
 import infoLog from '../Utilities/infoLog';
@@ -363,8 +363,8 @@ global.RN$SurfaceRegistry = {
 
 if (global.RN$Bridgeless === true) {
   console.log('Bridgeless mode is enabled');
-} else {
-  BatchedBridge.registerCallableModule('AppRegistry', AppRegistry);
 }
 
+registerCallableModule('AppRegistry', AppRegistry);
+
 module.exports = AppRegistry;

package/README.md

@@ -2,7 +2,7 @@
 
 Apple TV and Android TV support for React Native are maintained here and in the corresponding `react-native-tvos` NPM package, and not in the [core repo](https://github.com/facebook/react-native/).  This is a full fork of the main repository, with only the changes needed to support Apple TV and Android TV.
 
-Releases of `react-native-tvos` will be based on a public release of `react-native`; e.g. the 0.75.2-0 release of this package will be derived from the 0.75.0 release of `react-native`. All releases of this repo will follow the 0.xx.x-y format, where x digits are from a specific RN core release, and y represents the additional versioning from this repo.
+Releases of `react-native-tvos` will be based on a public release of `react-native`; e.g. the 0.76.0-0 release of this package will be derived from the 0.76.0 release of `react-native`. All releases of this repo will follow the 0.xx.x-y format, where x digits are from a specific RN core release, and y represents the additional versioning from this repo.
 
 Releases will be published on npmjs.org and you may find the latest release version here: https://www.npmjs.com/package/react-native-tvos?activeTab=versions or use the tag `@latest`
 
@@ -23,20 +23,29 @@ This README covers only TV-specific features. For more general documentation and
 
 ### Hermes JS support
 
-As of the 0.71 release, Hermes is fully working on both Apple TV and Android TV, and is enabled by default.
+- As of the 0.71 release, Hermes is fully working on both Apple TV and Android TV, and is enabled by default.
 
 ### React Native new architecture (Fabric) support
 
-- _Apple TV_: Modify your app's Podfile to set the `:fabric_enabled` value to `true` in both iOS and tvOS targets. After that, run `pod install` to pick up the additional pods needed for the new architecture. Components that have not been reimplemented in the new architecture will show up as an "unimplemented component".
-- _Android TV_: To enable Fabric, modify `android/gradle.properties` in your app and set `newArchEnabled=true`, then rebuild your app.
+React Native TV 0.76 enables the New Architecture by default. You can read more about it in this blog post from the RN core team: [The New Architecture Is Here](https://reactnative.dev/blog/2024/10/23/the-new-architecture-is-here)
 
-As of the 0.74 release, bridgeless is the default when Fabric is enabled. If you need to use Fabric without bridgeless on Apple TV, you can override the default by adding the method below in `AppDelegate.mm`:
+If, for any reason, the New Architecture is not behaving properly in your application, there is always the option to opt-out from it until you are ready to turn it on again.
 
-```objc
-- (BOOL)bridgelessEnabled
-{
-  return false;
-}
+To opt-out from the New Architecture:
+
+- _Expo apps_: RN 0.76 will be supported in SDK 52. See the [SDK 52 beta release notes](https://expo.dev/changelog/2024/10-24-sdk-52-beta) for more information on new arch support in Expo.
+
+- _Apple TV_: You can reinstall the dependencies by running the command:
+
+```sh
+RCT_NEW_ARCH_ENABLED=0 bundle exec pod install
+```
+
+- _Android TV_: On Android, modify the android/gradle.properties file and turn off the newArchEnabled flag, then do a clean rebuild:
+
+```diff
+-newArchEnabled=true
++newArchEnabled=false
 ```
 
 ### Typescript
@@ -51,17 +60,19 @@ The RNTester app supports Apple TV and Android TV.  In this repo, `RNTester/Podf
 
 Minimum operating system versions:
 
-- Apple TV: tvOS 13.4
+- Apple TV:
+  - tvOS 13.4 (for the 0.74 and 0.75 releases)
+  - tvOS 15.1 (for the 0.76 release)
 - Android TV:
-  - API level 21 (for the 0.73 releases)
-  - API level 23 (for the 0.74 release)
+  - API level 23 (for the 0.74 and 0.75 releases)
+  - API level 24 (for the 0.76 release)
 
 ## Build changes
 
-- _Native layer for Apple TV_: React Native Xcode projects all now have Apple TV build targets, with names ending in the string '-tvOS'.  Changes in the React Native podspecs in 0.73 now require that your application `Podfile` only have one target. This repo supports either an iOS target or a tvOS target, but both targets should not be active at the same time. The new app template now has the iOS target commented out.
+- _Native layer for Apple TV_: Changes in the React Native podspecs (in 0.73 and later) require that your application `Podfile` only have one target. This repo supports either an iOS target or a tvOS target.
 - _Maven artifacts for Android TV_: In 0.71 and later releases, the React Native Android prebuilt archives are published to Maven instead of being included in the NPM. We are following the same model, except that the Maven artifacts will be in group `io.github.react-native-tvos` instead of `com.facebook.react`. The `@react-native/gradle-plugin` module has been upgraded so that the Android dependencies will be detected correctly during build.
 
-## _(New)_ TV project creation in React Native 0.75 and later
+## TV project creation in React Native 0.75 and later
 
 > _Warning:_ Make sure you do not globally install `react-native` or `react-native-tvos`. If you have done this the wrong way, you may get error messages like `ld: library not found for -lPods-TestApp-tvOS`.
 
@@ -81,7 +92,7 @@ As of React Native 0.75.x, the template that used to reside in the `react-native
 
 > _Note:_ The new TV template will only build apps for Apple TV and Android TV. Multiple platform targets are no longer supported in React Native app Podfiles.
 
-To create a new project:
+To create a new project for RNTV 0.76:
 
 ```sh
 # 
@@ -115,7 +126,7 @@ $ npx @react-native-community/cli@latest init TVTest --template @react-native-tv
                ######                ######               
                                                           
 
-              Welcome to React Native 0.75.2!                
+              Welcome to React Native 0.76!                
                  Learn once, write anywhere               
 
 ✔ Downloading template
@@ -135,8 +146,6 @@ npx react-native run-ios --simulator "Apple TV"
 npx react-native run:android --device tv_api_31
 ```
 
-See [this document](https://docs.expo.dev/bare/using-expo-cli/) for more details on Expo CLI functionality. (Note that many of these features require that Expo SDK modules be built into your app. Expo SDK support requires a different project configuration as described below.)
-
 ## How to support TV specific file extensions
 
 The template contains an [example Metro configuration](./packages/react-native/template/metro.config.js) that allows Metro to resolve application source files with TV-specific code, indicated by specific file extensions (e.g. `*.ios.tv.tsx`, `*.android.tv.tsx`, `*.tv.tsx`). The config will work the same way with the other standard source file extensions (`.js`, etc.), as documented in [Metro docs](https://metrobundler.dev/docs/configuration/#sourceexts)
@@ -169,13 +178,18 @@ var running_on_apple_tv = Platform.isTVOS;
 
 - _Access to touchable controls_:  The `Touchable` mixin has code added to detect focus changes and use existing methods to style the components properly and initiate the proper actions when the view is selected using the TV remote, so `TouchableWithoutFeedback`, `TouchableHighlight` and `TouchableOpacity` will "just work" on both Apple TV and Android TV. In particular:
 
-  - `onFocus` will be executed when the touchable view goes into focus
-  - `onBlur` will be executed when the touchable view goes out of focus
-  - `onPress` will be executed when the touchable view is actually selected by pressing the "select" button on the TV remote (center button on Apple TV remote, or center button on Android TV DPad).
-  - `onLongPress` will be executed twice if the "select" button is held down for a length of time. The two events passed into `onLongPress()` will have different values for their `eventKeyAction` property, 0 for key down (start) and 1 for key up (end).
+  - `onFocus()` will be executed when the touchable view goes into focus
+  - `onBlur()` will be executed when the touchable view goes out of focus
+  - `onPress()` will be executed when the touchable view is actually selected by pressing the "select" button on the TV remote (center button on Apple TV remote, or center button on Android TV DPad).
+  - `onLongPress()` will be executed twice if the "select" button is held down for a length of time. The two events passed into `onLongPress()` will have different values for their `eventKeyAction` property, 0 for key down (start) and 1 for key up (end).
 
 - _Pressable controls_: The `Pressable` API works with TV.  Additional `onFocus` and `onBlur` props are provided to allow you to customize behavior when a Pressable enters or leaves focus. Similar to the `pressed` state that is true while a user is pressing the component on a touchscreen, the `focused` state will be true when it is focused on TV.  `PressableExample` in RNTester has been modified appropriately. The `onPress()` and `onLongPress()` methods work the same way as with `Touchable` components.
 
+- _Tailwind styles for Pressable controls_: For the 0.76 release, the `Pressable` component also generates the `onPressIn()` and `onPressOut()` events needed to support the [`active:` pseudo class for Tailwind styles](https://www.nativewind.dev/v4/core-concepts/states#hover-focus-and-active-).
+  - For `onPress()` events (the "select" button on the remote is pressed once), `onPressIn()` is generated, then `onPressOut()` is generated a short time later.
+  - For `onLongPress()` events (the "select" button on the remote is held down for a length of time), `onPressIn()` is generated once the press down is detected, and `onPressOut()` is generated when the button is released.
+  - The `focus:` pseudo class is also supported via the `onFocus()` and `onBlur()` events.
+
 - _TV remote/keyboard input_: Application code that needs to implement custom handling of TV remote events can create an instance of `TVEventHandler` and listen for these events.  For a more convenient API, we provide `useTVEventHandler`.
 
 ```javascript
@@ -244,8 +258,6 @@ class Game2048 extends React.Component {
   }
 ```
 
-- _Flipper_: We do not support Flipper.
-
 - _LogBox_: The LogBox error/warning display (which replaced YellowBox in 0.63) is working as expected on TV platforms, after a few adjustments to make the controls accessible to the focus engine.
 
 - _Dev Menu support_: On the Apple TV simulator, cmd-D will bring up the developer menu, just like on iOS. To bring it up on a real Apple TV device, make a long press on the play/pause button on the remote. (Please do not shake the Apple TV device, that will not work :) ). Android TV dev menu behavior is the same as on Android phone.
@@ -259,7 +271,7 @@ class Game2048 extends React.Component {
   - `enableTVPanGesture`/`disableTVPanGesture`: Methods to enable and disable detection of finger touches that pan across the touch surface of the Siri remote. See `TVEventHandlerExample` in the `RNTester` app for a demo.
   - `enableGestureHandlersCancelTouches`/`disableGestureHandlersCancelTouches`: Methods to turn on and turn off cancellation of touches by the gesture handlers in `RCTTVRemoteHandler` (see #366). Cancellation of touches is turned on (enabled) by default in 0.69 and earlier releases.
 
-- Accessibility: We have an additional `accessibilityFocus` [accessibility action](https://reactnative.dev/docs/accessibility#accessibility-actions) on Android that you can use for detecting focus changes on every *accessible* element (like a regular `Text`) when `TalkBack` is enabled.
+- _Accessibility_: We have an additional `accessibilityFocus` [accessibility action](https://reactnative.dev/docs/accessibility#accessibility-actions) on Android that you can use for detecting focus changes on every *accessible* element (like a regular `Text`) when `TalkBack` is enabled.
 
 - _TVFocusGuideView_: This component provides support for Apple's `UIFocusGuide` API and is implemented in the same way for Android TV, to help ensure that focusable controls can be navigated to, even if they are not directly in line with other controls.  An example is provided in `RNTester` that shows two different ways of using this component.
 

package/React/Base/RCTVersion.m

@@ -23,8 +23,8 @@ NSDictionary* RCTGetReactNativeVersion(void)
     __rnVersion = @{
                   RCTVersionMajor: @(0),
                   RCTVersionMinor: @(76),
-                  RCTVersionPatch: @(0),
-                  RCTVersionPrerelease: @"0rc6",
+                  RCTVersionPatch: @(1),
+                  RCTVersionPrerelease: @"0",
                   };
   });
   return __rnVersion;

package/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm

@@ -1479,6 +1479,8 @@ static RCTBorderStyle RCTBorderStyleFromBorderStyle(BorderStyle borderStyle)
       _backgroundColorLayer.mask = maskLayer;
       _backgroundColorLayer.cornerRadius = 0;
     }
+
+    [_backgroundColorLayer removeAllAnimations];
   }
 
   // borders

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.76.0-0rc6
+VERSION_NAME=0.76.1-0
 react.internal.publishingGroup=io.github.react-native-tvos
 
 android.useAndroidX=true

package/ReactAndroid/src/main/java/com/facebook/react/HeadlessJsTaskService.java

@@ -124,15 +124,11 @@ public abstract class HeadlessJsTaskService extends Service implements HeadlessJ
   @Override
   public void onDestroy() {
     super.onDestroy();
+    ReactContext reactContext = getReactContext();
 
-    if (getReactNativeHost().hasInstance()) {
-      ReactInstanceManager reactInstanceManager = getReactNativeHost().getReactInstanceManager();
-      ReactContext reactContext = reactInstanceManager.getCurrentReactContext();
-      if (reactContext != null) {
-        HeadlessJsTaskContext headlessJsTaskContext =
-            HeadlessJsTaskContext.getInstance(reactContext);
-        headlessJsTaskContext.removeTaskEventListener(this);
-      }
+    if (reactContext != null) {
+      HeadlessJsTaskContext headlessJsTaskContext = HeadlessJsTaskContext.getInstance(reactContext);
+      headlessJsTaskContext.removeTaskEventListener(this);
     }
     if (sWakeLock != null) {
       sWakeLock.release();

package/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultReactNativeHost.kt

@@ -111,7 +111,7 @@ protected constructor(
           packages,
           jsMainModuleName,
           bundleAssetName ?: "index",
-          null,
+          jsBundleFile,
           isHermesEnabled ?: true,
           useDeveloperSupport,
       )

package/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java

@@ -17,6 +17,6 @@ public class ReactNativeVersion {
   public static final Map<String, Object> VERSION = MapBuilder.<String, Object>of(
       "major", 0,
       "minor", 76,
-      "patch", 0,
-      "prerelease", "0rc6");
+      "patch", 1,
+      "prerelease", "0");
 }

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -17,8 +17,8 @@ namespace facebook::react {
 constexpr struct {
   int32_t Major = 0;
   int32_t Minor = 76;
-  int32_t Patch = 0;
-  std::string_view Prerelease = "0rc6";
+  int32_t Patch = 1;
+  std::string_view Prerelease = "0";
 } ReactNativeVersion;
 
 } // namespace facebook::react

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-tvos",
-  "version": "0.76.0-0rc6",
+  "version": "0.76.1-0",
   "description": "A framework for building native apps using React",
   "license": "MIT",
   "repository": {
@@ -110,13 +110,13 @@
   },
   "dependencies": {
     "@jest/create-cache-key-function": "^29.6.3",
-    "@react-native/assets-registry": "0.76.0-rc.6",
-    "@react-native/codegen": "0.76.0-rc.6",
-    "@react-native/community-cli-plugin": "0.76.0-rc.6",
-    "@react-native/gradle-plugin": "0.76.0-rc.6",
-    "@react-native/js-polyfills": "0.76.0-rc.6",
-    "@react-native/normalize-colors": "0.76.0-rc.6",
-    "@react-native-tvos/virtualized-lists": "0.76.0-0rc6",
+    "@react-native/assets-registry": "0.76.1",
+    "@react-native/codegen": "0.76.1",
+    "@react-native/community-cli-plugin": "0.76.1",
+    "@react-native/gradle-plugin": "0.76.1",
+    "@react-native/js-polyfills": "0.76.1",
+    "@react-native/normalize-colors": "0.76.1",
+    "@react-native-tvos/virtualized-lists": "0.76.1-0",
     "abort-controller": "^3.0.0",
     "anser": "^1.4.9",
     "ansi-regex": "^5.0.0",

package/scripts/cocoapods/utils.rb

@@ -3,6 +3,8 @@
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
 
+require 'shellwords'
+
 require_relative "./helpers.rb"
 
 # Utilities class for React Native Cocoapods
@@ -237,8 +239,8 @@ class ReactNativePodsUtils
             # When installing pods with a yarn alias, yarn creates a fake yarn and node executables
             # in a temporary folder.
             # Using `node --print "process.argv[0]";` we are able to retrieve the actual path from which node is running.
-            # see https://github.com/facebook/react-native/issues/43285 for more info
-            node_binary = `node --print "process.argv[0]";`
+            # see https://github.com/facebook/react-native/issues/43285 for more info. We've tweaked this slightly.
+            node_binary = Shellwords.escape(`node --print "process.argv[0]"`.strip)
             system("echo 'export NODE_BINARY=#{node_binary}' > #{file_path}.local")
         end
     end

package/scripts/codegen/generate-artifacts-executor.js

@@ -490,11 +490,22 @@ function rootCodegenTargetNeedsThirdPartyComponentProvider(pkgJson, platform) {
   return !pkgJsonIncludesGeneratedCode(pkgJson) && platform === 'ios';
 }
 
-function dependencyNeedsThirdPartyComponentProvider(schemaInfo, platform) {
+function dependencyNeedsThirdPartyComponentProvider(
+  schemaInfo,
+  platform,
+  appCondegenConfigSpec,
+) {
   // Filter the react native core library out.
   // In the future, core library and third party library should
   // use the same way to generate/register the fabric components.
-  return !isReactNativeCoreLibrary(schemaInfo.library.config.name, platform);
+  // We also have to filter out the the components defined in the app
+  // because the RCTThirdPartyComponentProvider is generated inside Fabric,
+  // which lives in a different target from the app and it has no visibility over
+  // the symbols defined in the app.
+  return (
+    !isReactNativeCoreLibrary(schemaInfo.library.config.name, platform) &&
+    schemaInfo.library.config.name !== appCondegenConfigSpec
+  );
 }
 
 function mustGenerateNativeCode(includeLibraryPath, schemaInfo) {
@@ -705,8 +716,12 @@ function execute(projectRoot, targetPlatform, baseOutputPath) {
       if (
         rootCodegenTargetNeedsThirdPartyComponentProvider(pkgJson, platform)
       ) {
-        const filteredSchemas = schemaInfos.filter(
-          dependencyNeedsThirdPartyComponentProvider,
+        const filteredSchemas = schemaInfos.filter(schemaInfo =>
+          dependencyNeedsThirdPartyComponentProvider(
+            schemaInfo,
+            platform,
+            pkgJson.codegenConfig?.appCondegenConfigSpec,
+          ),
         );
         const schemas = filteredSchemas.map(schemaInfo => schemaInfo.schema);
         const supportedApplePlatforms = filteredSchemas.map(