react-native-tvos 0.73.1-3 → 0.73.4-0rc0

package/Libraries/AppDelegate/RCTAppDelegate.h

@@ -100,8 +100,6 @@
  * By default, it assigns the rootView to the view property of the rootViewController
  * If you are not using a simple UIViewController, then there could be other methods to use to setup the rootView.
  * For example: UISplitViewController requires `setViewController(_:for:)`
- *
- * @return: void
  */
 - (void)setRootView:(UIView *)rootView toRootViewController:(UIViewController *)rootViewController;
 

package/Libraries/AppDelegate/RCTAppDelegate.mm

@@ -49,6 +49,19 @@ static NSString *const kRNConcurrentRoot = @"concurrentRoot";
 
 #endif
 
+static NSDictionary *updateInitialProps(NSDictionary *initialProps, BOOL isFabricEnabled)
+{
+#ifdef RCT_NEW_ARCH_ENABLED
+  NSMutableDictionary *mutableProps = [initialProps mutableCopy] ?: [NSMutableDictionary new];
+  // Hardcoding the Concurrent Root as it it not recommended to
+  // have the concurrentRoot turned off when Fabric is enabled.
+  mutableProps[kRNConcurrentRoot] = @(isFabricEnabled);
+  return mutableProps;
+#else
+  return initialProps;
+#endif
+}
+
 @interface RCTAppDelegate () <RCTCxxBridgeDelegate> {
   std::shared_ptr<facebook::react::RuntimeScheduler> _runtimeScheduler;
 }
@@ -76,10 +89,13 @@ static NSString *const kRNConcurrentRoot = @"concurrentRoot";
 {
   BOOL enableTM = NO;
   BOOL enableBridgeless = NO;
+  BOOL fabricEnabled = NO;
 #if RCT_NEW_ARCH_ENABLED
   enableTM = self.turboModuleEnabled;
   enableBridgeless = self.bridgelessEnabled;
+  fabricEnabled = [self fabricEnabled];
 #endif
+  NSDictionary *initProps = updateInitialProps([self prepareInitialProps], fabricEnabled);
 
   RCTAppSetupPrepareApp(application, enableTM);
 
@@ -88,7 +104,7 @@ static NSString *const kRNConcurrentRoot = @"concurrentRoot";
   if (enableBridgeless) {
 #if RCT_NEW_ARCH_ENABLED
     // Enable native view config interop only if both bridgeless mode and Fabric is enabled.
-    RCTSetUseNativeViewConfigsInBridgelessMode([self fabricEnabled]);
+    RCTSetUseNativeViewConfigsInBridgelessMode(fabricEnabled);
 
     // Enable TurboModule interop by default in Bridgeless mode
     RCTEnableTurboModuleInterop(YES);
@@ -97,8 +113,7 @@ static NSString *const kRNConcurrentRoot = @"concurrentRoot";
     [self createReactHost];
     [self unstable_registerLegacyComponents];
     [RCTComponentViewFactory currentComponentViewFactory].thirdPartyFabricComponentsProvider = self;
-    RCTFabricSurface *surface = [_reactHost createSurfaceWithModuleName:self.moduleName
-                                                      initialProperties:launchOptions];
+    RCTFabricSurface *surface = [_reactHost createSurfaceWithModuleName:self.moduleName initialProperties:initProps];
 
     RCTSurfaceHostingProxyRootView *surfaceHostingProxyRootView = [[RCTSurfaceHostingProxyRootView alloc]
         initWithSurface:surface
@@ -118,7 +133,7 @@ static NSString *const kRNConcurrentRoot = @"concurrentRoot";
     [self unstable_registerLegacyComponents];
     [RCTComponentViewFactory currentComponentViewFactory].thirdPartyFabricComponentsProvider = self;
 #endif
-    NSDictionary *initProps = [self prepareInitialProps];
+
     rootView = [self createRootViewWithBridge:self.bridge moduleName:self.moduleName initProps:initProps];
   }
   self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
@@ -140,15 +155,7 @@ static NSString *const kRNConcurrentRoot = @"concurrentRoot";
 
 - (NSDictionary *)prepareInitialProps
 {
-  NSMutableDictionary *initProps = self.initialProps ? [self.initialProps mutableCopy] : [NSMutableDictionary new];
-
-#ifdef RCT_NEW_ARCH_ENABLED
-  // Hardcoding the Concurrent Root as it it not recommended to
-  // have the concurrentRoot turned off when Fabric is enabled.
-  initProps[kRNConcurrentRoot] = @([self fabricEnabled]);
-#endif
-
-  return initProps;
+  return self.initialProps;
 }
 
 - (RCTBridge *)createBridgeWithDelegate:(id<RCTBridgeDelegate>)delegate launchOptions:(NSDictionary *)launchOptions

package/Libraries/Components/Touchable/TouchableBounce.js

@@ -234,6 +234,10 @@ class TouchableBounce extends React.Component<Props, State> {
     this.state.pressability.configure(this._createPressabilityConfig());
   }
 
+  componentDidMount(): mixed {
+    this.state.pressability.configure(this._createPressabilityConfig());
+  }
+
   componentWillUnmount(): void {
     if (Platform.isTV) {
       if (this._tvTouchable != null) {

package/Libraries/Components/Touchable/TouchableHighlight.js

@@ -408,6 +408,7 @@ class TouchableHighlight extends React.Component<Props, State> {
         },
       });
     }
+    this.state.pressability.configure(this._createPressabilityConfig());
   }
 
   componentDidUpdate(prevProps: Props, prevState: State) {

package/Libraries/Components/Touchable/TouchableNativeFeedback.js

@@ -371,6 +371,10 @@ class TouchableNativeFeedback extends React.Component<Props, State> {
     this.state.pressability.configure(this._createPressabilityConfig());
   }
 
+  componentDidMount(): mixed {
+    this.state.pressability.configure(this._createPressabilityConfig());
+  }
+
   componentWillUnmount(): void {
     if (Platform.isTV) {
       if (this._tvTouchable != null) {

package/Libraries/Components/Touchable/TouchableOpacity.js

@@ -356,6 +356,10 @@ class TouchableOpacity extends React.Component<Props, State> {
     }
   }
 
+  componentDidMount(): void {
+    this.state.pressability.configure(this._createPressabilityConfig());
+  }
+
   componentWillUnmount(): void {
     if (Platform.isTV) {
       if (this._tvTouchable != null) {

package/Libraries/Components/Touchable/TouchableWithoutFeedback.js

@@ -223,6 +223,10 @@ class TouchableWithoutFeedback extends React.Component<Props, State> {
     this.state.pressability.configure(createPressabilityConfig(this.props));
   }
 
+  componentDidMount(): mixed {
+    this.state.pressability.configure(createPressabilityConfig(this.props));
+  }
+
   componentWillUnmount(): void {
     if (Platform.isTV) {
       if (this._tvTouchable != null) {

package/Libraries/Core/ReactNativeVersion.js

@@ -12,6 +12,6 @@
 exports.version = {
   major: 0,
   minor: 73,
-  patch: 1,
-  prerelease: '3',
+  patch: 4,
+  prerelease: '0rc0',
 };

package/Libraries/Inspector/NetworkOverlay.js

@@ -10,7 +10,7 @@
 
 'use strict';
 
-import type {RenderItemProps} from '@react-native/virtualized-lists';
+import type {RenderItemProps} from '@react-native-tvos/virtualized-lists';
 
 const ScrollView = require('../Components/ScrollView/ScrollView');
 const TouchableHighlight = require('../Components/Touchable/TouchableHighlight');

package/Libraries/Lists/FillRateHelper.js

@@ -10,10 +10,10 @@
 
 'use strict';
 
-import {typeof FillRateHelper as FillRateHelperType} from '@react-native/virtualized-lists';
+import {typeof FillRateHelper as FillRateHelperType} from '@react-native-tvos/virtualized-lists';
 
 const FillRateHelper: FillRateHelperType =
-  require('@react-native/virtualized-lists').FillRateHelper;
+  require('@react-native-tvos/virtualized-lists').FillRateHelper;
 
-export type {FillRateInfo} from '@react-native/virtualized-lists';
+export type {FillRateInfo} from '@react-native-tvos/virtualized-lists';
 module.exports = FillRateHelper;

package/Libraries/Lists/FlatList.d.ts

@@ -13,7 +13,7 @@ import type {
   ViewToken,
   VirtualizedListProps,
   ViewabilityConfig,
-} from '@react-native/virtualized-lists';
+} from '@react-native-tvos/virtualized-lists';
 import type {ScrollViewComponent} from '../Components/ScrollView/ScrollView';
 import type {StyleProp} from '../StyleSheet/StyleSheet';
 import type {ViewStyle} from '../StyleSheet/StyleSheetTypes';

package/Libraries/Lists/FlatList.js

@@ -15,13 +15,13 @@ import type {
   RenderItemType,
   ViewabilityConfigCallbackPair,
   ViewToken,
-} from '@react-native/virtualized-lists';
+} from '@react-native-tvos/virtualized-lists';
 
 import {type ScrollResponderType} from '../Components/ScrollView/ScrollView';
 import {
   VirtualizedList,
   keyExtractor as defaultKeyExtractor,
-} from '@react-native/virtualized-lists';
+} from '@react-native-tvos/virtualized-lists';
 import memoizeOne from 'memoize-one';
 
 const View = require('../Components/View/View');

package/Libraries/Lists/SectionList.d.ts

@@ -11,7 +11,7 @@ import type * as React from 'react';
 import type {
   ListRenderItemInfo,
   VirtualizedListWithoutRenderItemProps,
-} from '@react-native/virtualized-lists';
+} from '@react-native-tvos/virtualized-lists';
 import type {
   ScrollView,
   ScrollViewProps,

package/Libraries/Lists/SectionList.js

@@ -15,10 +15,10 @@ import type {
   ScrollToLocationParamsType,
   SectionBase as _SectionBase,
   VirtualizedSectionListProps,
-} from '@react-native/virtualized-lists';
+} from '@react-native-tvos/virtualized-lists';
 
 import Platform from '../Utilities/Platform';
-import {VirtualizedSectionList} from '@react-native/virtualized-lists';
+import {VirtualizedSectionList} from '@react-native-tvos/virtualized-lists';
 import * as React from 'react';
 
 type Item = any;

package/Libraries/Lists/SectionListModern.js

@@ -15,11 +15,11 @@ import type {
   ScrollToLocationParamsType,
   SectionBase as _SectionBase,
   VirtualizedSectionListProps,
-} from '@react-native/virtualized-lists';
+} from '@react-native-tvos/virtualized-lists';
 import type {AbstractComponent, Element, ElementRef} from 'react';
 
 import Platform from '../Utilities/Platform';
-import {VirtualizedSectionList} from '@react-native/virtualized-lists';
+import {VirtualizedSectionList} from '@react-native-tvos/virtualized-lists';
 import React, {forwardRef, useImperativeHandle, useRef} from 'react';
 
 type Item = any;

package/Libraries/Lists/ViewabilityHelper.js

@@ -14,11 +14,11 @@ export type {
   ViewToken,
   ViewabilityConfig,
   ViewabilityConfigCallbackPair,
-} from '@react-native/virtualized-lists';
+} from '@react-native-tvos/virtualized-lists';
 
-import {typeof ViewabilityHelper as ViewabilityHelperType} from '@react-native/virtualized-lists';
+import {typeof ViewabilityHelper as ViewabilityHelperType} from '@react-native-tvos/virtualized-lists';
 
 const ViewabilityHelper: ViewabilityHelperType =
-  require('@react-native/virtualized-lists').ViewabilityHelper;
+  require('@react-native-tvos/virtualized-lists').ViewabilityHelper;
 
 module.exports = ViewabilityHelper;

package/Libraries/Lists/VirtualizeUtils.js

@@ -10,9 +10,9 @@
 
 'use strict';
 
-import {typeof keyExtractor as KeyExtractorType} from '@react-native/virtualized-lists';
+import {typeof keyExtractor as KeyExtractorType} from '@react-native-tvos/virtualized-lists';
 
 const keyExtractor: KeyExtractorType =
-  require('@react-native/virtualized-lists').keyExtractor;
+  require('@react-native-tvos/virtualized-lists').keyExtractor;
 
 module.exports = {keyExtractor};