react-native-tvos 0.81.4-0 → 0.82.0-0

package/Libraries/AppDelegate/RCTReactNativeFactory.mm

@@ -52,17 +52,12 @@ using namespace facebook::react;
     self.delegate = delegate;
     [self _setUpFeatureFlags:releaseLevel];
 
-    auto newArchEnabled = [self newArchEnabled];
-    auto fabricEnabled = [self fabricEnabled];
-
     [RCTColorSpaceUtils applyDefaultColorSpace:[self defaultColorSpace]];
-    RCTEnableTurboModule([self turboModuleEnabled]);
+    RCTEnableTurboModule(YES);
 
     self.rootViewFactory = [self createRCTRootViewFactory];
 
-    if (newArchEnabled || fabricEnabled) {
-      [RCTComponentViewFactory currentComponentViewFactory].thirdPartyFabricComponentsProvider = self;
-    }
+    [RCTComponentViewFactory currentComponentViewFactory].thirdPartyFabricComponentsProvider = self;
   }
 
   return self;
@@ -126,37 +121,22 @@ using namespace facebook::react;
 
 - (BOOL)newArchEnabled
 {
-  if ([_delegate respondsToSelector:@selector(newArchEnabled)]) {
-    return _delegate.newArchEnabled;
-  }
-  return RCTIsNewArchEnabled();
+  return YES;
 }
 
 - (BOOL)fabricEnabled
 {
-  if ([_delegate respondsToSelector:@selector(fabricEnabled)]) {
-    return _delegate.fabricEnabled;
-  }
-
-  return [self newArchEnabled];
+  return YES;
 }
 
 - (BOOL)turboModuleEnabled
 {
-  if ([_delegate respondsToSelector:@selector(turboModuleEnabled)]) {
-    return _delegate.turboModuleEnabled;
-  }
-
-  return [self newArchEnabled];
+  return YES;
 }
 
 - (BOOL)bridgelessEnabled
 {
-  if ([_delegate respondsToSelector:@selector(bridgelessEnabled)]) {
-    return _delegate.bridgelessEnabled;
-  }
-
-  return [self newArchEnabled];
+  return YES;
 }
 
 #pragma mark - RCTTurboModuleManagerDelegate
@@ -166,6 +146,12 @@ using namespace facebook::react;
 #if RN_DISABLE_OSS_PLUGIN_HEADER
   return RCTTurboModulePluginClassProvider(name);
 #else
+  if ([_delegate respondsToSelector:@selector(getModuleClassFromName:)]) {
+    Class moduleClass = [_delegate getModuleClassFromName:name];
+    if (moduleClass != nil) {
+      return moduleClass;
+    }
+  }
   return RCTCoreModulesClassProvider(name);
 #endif
 }
@@ -196,7 +182,12 @@ using namespace facebook::react;
                 format:@"Delegate must provide a valid dependencyProvider"];
   }
 #endif
-
+  if ([_delegate respondsToSelector:@selector(getModuleInstanceFromClass:)]) {
+    id<RCTTurboModule> moduleInstance = [_delegate getModuleInstanceFromClass:moduleClass];
+    if (moduleInstance != nil) {
+      return moduleInstance;
+    }
+  }
   return RCTAppSetupDefaultModuleFromClass(moduleClass, self.delegate.dependencyProvider);
 }
 
@@ -250,9 +241,9 @@ using namespace facebook::react;
 
   RCTRootViewFactoryConfiguration *configuration =
       [[RCTRootViewFactoryConfiguration alloc] initWithBundleURLBlock:bundleUrlBlock
-                                                       newArchEnabled:self.fabricEnabled
-                                                   turboModuleEnabled:self.turboModuleEnabled
-                                                    bridgelessEnabled:self.bridgelessEnabled];
+                                                       newArchEnabled:YES
+                                                   turboModuleEnabled:YES
+                                                    bridgelessEnabled:YES];
 
   configuration.createRootViewWithBridge = ^UIView *(RCTBridge *bridge, NSString *moduleName, NSDictionary *initProps) {
     return [weakSelf.delegate createRootViewWithBridge:bridge moduleName:moduleName initProps:initProps];
@@ -334,9 +325,7 @@ using namespace facebook::react;
   dispatch_once(&setupFeatureFlagsToken, ^{
     switch (releaseLevel) {
       case Stable:
-        if ([self bridgelessEnabled]) {
-          ReactNativeFeatureFlags::override(std::make_unique<ReactNativeFeatureFlagsOverridesOSSStable>());
-        }
+        ReactNativeFeatureFlags::override(std::make_unique<ReactNativeFeatureFlagsOverridesOSSStable>());
         break;
       case Canary:
         ReactNativeFeatureFlags::override(std::make_unique<ReactNativeFeatureFlagsOverridesOSSCanary>());

package/Libraries/AppDelegate/RCTRootViewFactory.h

@@ -65,14 +65,15 @@ typedef void (^RCTLoadSourceForBridgeBlock)(RCTBridge *bridge, RCTSourceLoadBloc
 - (instancetype)initWithBundleURLBlock:(RCTBundleURLBlock)bundleURLBlock
                         newArchEnabled:(BOOL)newArchEnabled
                     turboModuleEnabled:(BOOL)turboModuleEnabled
-                     bridgelessEnabled:(BOOL)bridgelessEnabled NS_DESIGNATED_INITIALIZER __deprecated;
+                     bridgelessEnabled:(BOOL)bridgelessEnabled __deprecated;
 
 - (instancetype)initWithBundleURL:(NSURL *)bundleURL
                    newArchEnabled:(BOOL)newArchEnabled
                turboModuleEnabled:(BOOL)turboModuleEnabled
                 bridgelessEnabled:(BOOL)bridgelessEnabled __deprecated;
 
-- (instancetype)initWithBundleURLBlock:(RCTBundleURLBlock)bundleURLBlock newArchEnabled:(BOOL)newArchEnabled;
+- (instancetype)initWithBundleURLBlock:(RCTBundleURLBlock)bundleURLBlock
+                        newArchEnabled:(BOOL)newArchEnabled NS_DESIGNATED_INITIALIZER;
 
 - (instancetype)initWithBundleURL:(NSURL *)bundleURL newArchEnabled:(BOOL)newArchEnabled;
 

package/Libraries/AppDelegate/RCTRootViewFactory.mm

@@ -38,18 +38,12 @@
 
 - (instancetype)initWithBundleURL:(NSURL *)bundleURL newArchEnabled:(BOOL)newArchEnabled
 {
-  return [self initWithBundleURL:bundleURL
-                  newArchEnabled:newArchEnabled
-              turboModuleEnabled:newArchEnabled
-               bridgelessEnabled:newArchEnabled];
+  return [self initWithBundleURL:bundleURL];
 }
 
 - (instancetype)initWithBundleURLBlock:(RCTBundleURLBlock)bundleURLBlock newArchEnabled:(BOOL)newArchEnabled
 {
-  return [self initWithBundleURLBlock:bundleURLBlock
-                       newArchEnabled:newArchEnabled
-                   turboModuleEnabled:newArchEnabled
-                    bridgelessEnabled:newArchEnabled];
+  return [self initWithBundleURLBlock:bundleURLBlock];
 }
 
 - (instancetype)initWithBundleURL:(NSURL *)bundleURL
@@ -57,13 +51,9 @@
                turboModuleEnabled:(BOOL)turboModuleEnabled
                 bridgelessEnabled:(BOOL)bridgelessEnabled
 {
-  return [self
-      initWithBundleURLBlock:^{
-        return bundleURL;
-      }
-              newArchEnabled:newArchEnabled
-          turboModuleEnabled:turboModuleEnabled
-           bridgelessEnabled:bridgelessEnabled];
+  return [self initWithBundleURLBlock:^{
+    return bundleURL;
+  }];
 }
 
 - (instancetype)initWithBundleURLBlock:(RCTBundleURLBlock)bundleURLBlock
@@ -73,17 +63,35 @@
 {
   if (self = [super init]) {
     _bundleURLBlock = bundleURLBlock;
-    _fabricEnabled = newArchEnabled;
-    _turboModuleEnabled = turboModuleEnabled;
-    _bridgelessEnabled = bridgelessEnabled;
+    _fabricEnabled = YES;
+    _turboModuleEnabled = YES;
+    _bridgelessEnabled = YES;
   }
   return self;
 }
 
+- (instancetype)initWithBundleURLBlock:(RCTBundleURLBlock)bundleURLBlock
+{
+  if (self = [super init]) {
+    _bundleURLBlock = bundleURLBlock;
+    _fabricEnabled = YES;
+    _turboModuleEnabled = YES;
+    _bridgelessEnabled = YES;
+  }
+  return self;
+}
+
+- (instancetype)initWithBundleURL:(NSURL *)bundleURL
+{
+  return [self initWithBundleURLBlock:^{
+    return bundleURL;
+  }];
+}
+
 @end
 
 @interface RCTRootViewFactory () <RCTCxxBridgeDelegate> {
-  facebook::react::ContextContainer::Shared _contextContainer;
+  std::shared_ptr<const facebook::react::ContextContainer> _contextContainer;
   std::shared_ptr<facebook::react::RuntimeScheduler> _runtimeScheduler;
 }
 @end
@@ -135,17 +143,12 @@
 
 - (void)initializeReactHostWithLaunchOptions:(NSDictionary *)launchOptions
 {
-  if (_configuration.bridgelessEnabled) {
-    // Enable TurboModule interop by default in Bridgeless mode
-    RCTEnableTurboModuleInterop(YES);
-    RCTEnableTurboModuleInteropBridgeProxy(YES);
-
-    [self createReactHostIfNeeded:launchOptions];
-    return;
-  }
+  // Enable TurboModule interop by default in Bridgeless mode
+  RCTEnableTurboModuleInterop(YES);
+  RCTEnableTurboModuleInteropBridgeProxy(YES);
 
-  [self createBridgeIfNeeded:launchOptions];
-  [self createBridgeAdapterIfNeeded];
+  [self createReactHostIfNeeded:launchOptions];
+  return;
 }
 
 - (UIView *)viewWithModuleName:(NSString *)moduleName
@@ -154,31 +157,19 @@
 {
   [self initializeReactHostWithLaunchOptions:launchOptions];
 
-  if (_configuration.bridgelessEnabled) {
-    RCTFabricSurface *surface = [self.reactHost createSurfaceWithModuleName:moduleName initialProperties:initProps];
+  RCTFabricSurface *surface = [self.reactHost createSurfaceWithModuleName:moduleName
+                                                        initialProperties:initProps ? initProps : @{}];
 
-    RCTSurfaceHostingProxyRootView *surfaceHostingProxyRootView =
-        [[RCTSurfaceHostingProxyRootView alloc] initWithSurface:surface];
+  RCTSurfaceHostingProxyRootView *surfaceHostingProxyRootView =
+      [[RCTSurfaceHostingProxyRootView alloc] initWithSurface:surface];
 
 #if !TARGET_OS_TV
-    surfaceHostingProxyRootView.backgroundColor = [UIColor systemBackgroundColor];
+  surfaceHostingProxyRootView.backgroundColor = [UIColor systemBackgroundColor];
 #endif
-    if (_configuration.customizeRootView != nil) {
-      _configuration.customizeRootView(surfaceHostingProxyRootView);
-    }
-    return surfaceHostingProxyRootView;
-  }
-
-  UIView *rootView;
-  if (_configuration.createRootViewWithBridge != nil) {
-    rootView = _configuration.createRootViewWithBridge(self.bridge, moduleName, initProps);
-  } else {
-    rootView = [self createRootViewWithBridge:self.bridge moduleName:moduleName initProps:initProps];
-  }
   if (_configuration.customizeRootView != nil) {
-    _configuration.customizeRootView(rootView);
+    _configuration.customizeRootView(surfaceHostingProxyRootView);
   }
-  return rootView;
+  return surfaceHostingProxyRootView;
 }
 
 - (RCTBridge *)createBridgeWithDelegate:(id<RCTBridgeDelegate>)delegate launchOptions:(NSDictionary *)launchOptions
@@ -190,9 +181,7 @@
                           moduleName:(NSString *)moduleName
                            initProps:(NSDictionary *)initProps
 {
-  BOOL enableFabric = _configuration.fabricEnabled;
-  UIView *rootView = RCTAppSetupDefaultRootView(bridge, moduleName, initProps, enableFabric);
-
+  UIView *rootView = RCTAppSetupDefaultRootView(bridge, moduleName, initProps, YES);
 #if !TARGET_OS_TV
   rootView.backgroundColor = [UIColor systemBackgroundColor];
 #endif
@@ -204,19 +193,15 @@
 - (std::unique_ptr<facebook::react::JSExecutorFactory>)jsExecutorFactoryForBridge:(RCTBridge *)bridge
 {
   _runtimeScheduler = std::make_shared<facebook::react::RuntimeScheduler>(RCTRuntimeExecutorFromBridge(bridge));
-  if (RCTIsNewArchEnabled()) {
-    std::shared_ptr<facebook::react::CallInvoker> callInvoker =
-        std::make_shared<facebook::react::RuntimeSchedulerCallInvoker>(_runtimeScheduler);
-    RCTTurboModuleManager *turboModuleManager =
-        [[RCTTurboModuleManager alloc] initWithBridge:bridge
-                                             delegate:_turboModuleManagerDelegate
-                                            jsInvoker:callInvoker];
-    _contextContainer->erase("RuntimeScheduler");
-    _contextContainer->insert("RuntimeScheduler", _runtimeScheduler);
-    return RCTAppSetupDefaultJsExecutorFactory(bridge, turboModuleManager, _runtimeScheduler);
-  } else {
-    return RCTAppSetupJsExecutorFactoryForOldArch(bridge, _runtimeScheduler);
-  }
+
+  std::shared_ptr<facebook::react::CallInvoker> callInvoker =
+      std::make_shared<facebook::react::RuntimeSchedulerCallInvoker>(_runtimeScheduler);
+  RCTTurboModuleManager *turboModuleManager = [[RCTTurboModuleManager alloc] initWithBridge:bridge
+                                                                                   delegate:_turboModuleManagerDelegate
+                                                                                  jsInvoker:callInvoker];
+  _contextContainer->erase(facebook::react::RuntimeSchedulerKey);
+  _contextContainer->insert(facebook::react::RuntimeSchedulerKey, _runtimeScheduler);
+  return RCTAppSetupDefaultJsExecutorFactory(bridge, turboModuleManager, _runtimeScheduler);
 }
 
 - (void)createBridgeIfNeeded:(NSDictionary *)launchOptions
@@ -234,7 +219,7 @@
 
 - (void)createBridgeAdapterIfNeeded
 {
-  if (!self->_configuration.fabricEnabled || self.bridgeAdapter) {
+  if (self.bridgeAdapter != nullptr) {
     return;
   }
 

package/Libraries/AppState/AppState.js

@@ -97,7 +97,7 @@ class AppStateImpl {
         // It's possible that the state will have changed here & listeners need to be notified
         if (!eventUpdated && this.currentState !== appStateData.app_state) {
           this.currentState = appStateData.app_state;
-          // $FlowFixMe[incompatible-call]
+          // $FlowFixMe[incompatible-type]
           emitter.emit('appStateDidChange', appStateData);
         }
       }, logError);
@@ -120,23 +120,27 @@ class AppStateImpl {
     }
     switch (type) {
       case 'change':
-        // $FlowIssue[invalid-tuple-arity] Flow cannot refine handler based on the event type
+        // $FlowFixMe[invalid-tuple-arity] Flow cannot refine handler based on the event type
         const changeHandler: AppStateStatus => void = handler;
         return emitter.addListener('appStateDidChange', appStateData => {
           changeHandler(appStateData.app_state);
         });
       case 'memoryWarning':
-        // $FlowIssue[invalid-tuple-arity] Flow cannot refine handler based on the event type
+        // $FlowFixMe[invalid-tuple-arity] Flow cannot refine handler based on the event type
         const memoryWarningHandler: () => void = handler;
         return emitter.addListener('memoryWarning', memoryWarningHandler);
       case 'blur':
       case 'focus':
-        // $FlowIssue[invalid-tuple-arity] Flow cannot refine handler based on the event type
+        // $FlowFixMe[invalid-tuple-arity] Flow cannot refine handler based on the event type
         const focusOrBlurHandler: () => void = handler;
         return emitter.addListener('appStateFocusChange', hasFocus => {
+          /* $FlowFixMe[invalid-compare] Error discovered during Constant
+           * Condition roll out. See https://fburl.com/workplace/4oq3zi07. */
           if (type === 'blur' && !hasFocus) {
             focusOrBlurHandler();
           }
+          /* $FlowFixMe[invalid-compare] Error discovered during Constant
+           * Condition roll out. See https://fburl.com/workplace/4oq3zi07. */
           if (type === 'focus' && hasFocus) {
             focusOrBlurHandler();
           }

package/Libraries/BatchedBridge/BatchedBridge.js

@@ -6,6 +6,7 @@
  *
  * @flow strict
  * @format
+ * @deprecated
  */
 
 'use strict';

package/Libraries/BatchedBridge/MessageQueue.js

@@ -6,6 +6,7 @@
  *
  * @flow strict
  * @format
+ * @deprecated
  */
 
 'use strict';
@@ -162,6 +163,8 @@ class MessageQueue {
 
   getCallableModule(name: string): {...} | null {
     const getValue = this._lazyCallableModules[name];
+    /* $FlowFixMe[constant-condition] Error discovered during Constant
+     * Condition roll out. See https://fburl.com/workplace/1v97vimq. */
     return getValue ? getValue() : null;
   }
 
@@ -466,6 +469,8 @@ class MessageQueue {
       const profileName = debug
         ? '<callback for ' + module + '.' + method + '>'
         : cbID;
+      /* $FlowFixMe[constant-condition] Error discovered during Constant
+       * Condition roll out. See https://fburl.com/workplace/1v97vimq. */
       if (callback && this.__spy) {
         this.__spy({type: TO_JS, module: null, method: profileName, args});
       }

package/Libraries/BatchedBridge/NativeModules.js

@@ -173,7 +173,7 @@ function updateErrorWithErrorData(
 ): ExtendedError {
   /* $FlowFixMe[class-object-subtyping] added when improving typing for this
    * parameters */
-  // $FlowFixMe[incompatible-return]
+  // $FlowFixMe[incompatible-type]
   // $FlowFixMe[unsafe-object-assign]
   return Object.assign(error, errorData || {});
 }

package/Libraries/Blob/BlobManager.js

@@ -86,7 +86,7 @@ class BlobManager {
     });
     const size = items.reduce((acc, curr) => {
       if (curr.type === 'string') {
-        /* $FlowFixMe[incompatible-call] Natural Inference rollout. See
+        /* $FlowFixMe[incompatible-type] Natural Inference rollout. See
          * https://fburl.com/workplace/6291gfvu */
         return acc + global.unescape(encodeURI(curr.data)).length;
       } else {

package/Libraries/Blob/URLSearchParams.js

@@ -18,6 +18,8 @@ export class URLSearchParams {
   }
 
   constructor(params?: Record<string, string> | string | [string, string][]) {
+    /* $FlowFixMe[invalid-compare] Error discovered during Constant Condition
+     * roll out. See https://fburl.com/workplace/5whu3i34. */
     if (params === null) {
       return;
     }

package/Libraries/Components/AccessibilityInfo/AccessibilityInfo.js

@@ -396,13 +396,13 @@ const AccessibilityInfo = {
    */
   addEventListener<K: $Keys<AccessibilityEventDefinitions>>(
     eventName: K,
-    // $FlowIssue[incompatible-type] - Flow bug with unions and generics (T128099423)
+    // $FlowFixMe[incompatible-type] - Flow bug with unions and generics (T128099423)
     handler: (...AccessibilityEventDefinitions[K]) => void,
   ): EventSubscription {
     const deviceEventName = EventNames.get(eventName);
     return deviceEventName == null
       ? {remove(): void {}}
-      : // $FlowFixMe[incompatible-call]
+      : // $FlowFixMe[incompatible-type]
         RCTDeviceEventEmitter.addListener(deviceEventName, handler);
   },
 

package/Libraries/Components/Button.js

@@ -63,7 +63,6 @@ export type ButtonProps = $ReadOnly<{
     @platform tv
 
     @default false
-    @deprecated Use `focusable` instead
    */
   hasTVPreferredFocus?: ?boolean,
 
@@ -386,7 +385,7 @@ const Button: component(
       touchSoundDisabled={touchSoundDisabled}
       // $FlowFixMe[incompatible-exact]
       // $FlowFixMe[prop-missing]
-      // $FlowFixMe[incompatible-type-arg]
+      // $FlowFixMe[incompatible-type]
       ref={ref}>
       <View style={buttonStyles}>
         <Text style={textStyles} disabled={disabled}>

package/Libraries/Components/Pressable/Pressable.d.ts

@@ -20,7 +20,7 @@ import {
 import {View} from '../View/View';
 import {AccessibilityProps} from '../View/ViewAccessibility';
 import {ViewProps} from '../View/ViewPropTypes';
-import {TVParallaxProperties} from '../../../types/index';
+import {TVParallaxProperties} from '../TV/TVParallaxProperties';
 
 export interface PressableStateCallbackType {
   readonly pressed: boolean;

package/Libraries/Components/Pressable/Pressable.js

@@ -136,6 +136,12 @@ type PressableBaseProps = $ReadOnly<{
    */
   onPressOut?: ?(event: GestureResponderEvent) => mixed,
 
+  /**
+   * Whether to prevent any other native components from becoming responder
+   * while this pressable is responder.
+   */
+  blockNativeResponder?: ?boolean,
+
   /**
    * Either view styles or a function that receives a boolean reflecting whether
    * the component is currently pressed and returns view styles.
@@ -207,6 +213,7 @@ function Pressable({
     'aria-expanded': ariaExpanded,
     'aria-label': ariaLabel,
     'aria-selected': ariaSelected,
+    blockNativeResponder,
     cancelable,
     children,
     delayHoverIn,
@@ -244,7 +251,7 @@ function Pressable({
   const android_rippleConfig = useAndroidRippleForView(android_ripple, viewRef);
 
   const [pressed, setPressed] = usePressState(testOnly_pressed === true);
-  const [focused, setFocused] = usePressState(false);
+  const [focused, setFocused] = useState(false);
 
   const shouldUpdatePressed =
     typeof children === 'function' || typeof style === 'function';
@@ -268,7 +275,7 @@ function Pressable({
   };
 
   const accessibilityLiveRegion =
-    ariaLive === 'off' ? 'none' : ariaLive ?? props.accessibilityLiveRegion;
+    ariaLive === 'off' ? 'none' : (ariaLive ?? props.accessibilityLiveRegion);
 
   const accessibilityLabel = ariaLabel ?? props.accessibilityLabel;
   const restPropsWithDefaults: React.ElementConfig<typeof View> = {
@@ -280,9 +287,6 @@ function Pressable({
     accessibilityLiveRegion,
     accessibilityLabel,
     accessibilityState: _accessibilityState,
-    focusable:
-      focusable !== false && disabled !== true && ariaDisabled !== true,
-    isTVSelectable: isTVSelectable !== false && accessible !== false,
     accessibilityValue,
     hitSlop,
   };
@@ -338,10 +342,12 @@ function Pressable({
           onPressOut(event);
         }
       },
+      blockNativeResponder,
     }),
     [
       android_disableSound,
       android_rippleConfig,
+      blockNativeResponder,
       cancelable,
       delayHoverIn,
       delayHoverOut,
@@ -367,6 +373,16 @@ function Pressable({
 
   const eventHandlers = usePressability(config);
 
+  const computedStyle = useMemo(() => {
+    return typeof style === 'function' ? style({pressed, focused}) : style;
+  }, [pressed, focused, style]);
+
+  const computedChildren = useMemo(() => {
+    return typeof children === 'function'
+      ? children({pressed, focused})
+      : children;
+  }, [pressed, focused, children]);
+
   return (
     <View
       {...restPropsWithDefaults}
@@ -377,16 +393,11 @@ function Pressable({
       nextFocusLeft={tagForComponentOrHandle(props.nextFocusLeft)}
       nextFocusRight={tagForComponentOrHandle(props.nextFocusRight)}
       nextFocusUp={tagForComponentOrHandle(props.nextFocusUp)}
-      isTVSelectable={
-        isTVSelectable !== false &&
-        accessible !== false &&
-        disabled !== true &&
-        ariaDisabled !== true
-      }
-      style={typeof style === 'function' ? style({pressed, focused}) : style}
+      focusable={focusable !== false && isTVSelectable !== false}
+      style={computedStyle}
       tvParallaxProperties={tvParallaxProperties}
       collapsable={false}>
-      {typeof children === 'function' ? children({pressed, focused}) : children}
+      {computedChildren}
       {__DEV__ ? <PressabilityDebugView color="red" hitSlop={hitSlop} /> : null}
     </View>
   );

package/Libraries/Components/Pressable/useAndroidRippleForView.js

@@ -71,9 +71,9 @@ export default function useAndroidRippleForView(
       return {
         viewProps:
           foreground === true
-            ? // $FlowFixMe[incompatible-return]
+            ? // $FlowFixMe[incompatible-type]
               {nativeForegroundAndroid: nativeRippleValue}
-            : // $FlowFixMe[incompatible-return]
+            : // $FlowFixMe[incompatible-type]
               {nativeBackgroundAndroid: nativeRippleValue},
         onPressIn(event: GestureResponderEvent): void {
           const view = viewRef.current;

package/Libraries/Components/ScrollView/ScrollView.js

@@ -31,6 +31,7 @@ import {
   VScrollContentViewNativeComponent,
   VScrollViewNativeComponent,
 } from '../../../src/private/components/scrollview/VScrollViewNativeComponents';
+import * as ReactNativeFeatureFlags from '../../../src/private/featureflags/ReactNativeFeatureFlags';
 import AnimatedImplementation from '../../Animated/AnimatedImplementation';
 import FrameRateLogger from '../../Interaction/FrameRateLogger';
 import {findNodeHandle} from '../../ReactNative/RendererProxy';
@@ -1175,6 +1176,7 @@ class ScrollView extends React.Component<ScrollViewProps, ScrollViewState> {
       // they are callable from the ref.
 
       // $FlowFixMe[prop-missing] - Known issue with appending custom methods.
+      // $FlowFixMe[incompatible-type]
       // $FlowFixMe[unsafe-object-assign]
       const publicInstance: PublicScrollViewInstance = Object.assign(
         nativeInstance,
@@ -1508,7 +1510,7 @@ class ScrollView extends React.Component<ScrollViewProps, ScrollViewState> {
         keyboardNeverPersistTaps &&
         this._keyboardIsDismissible() &&
         e.target != null &&
-        // $FlowFixMe[incompatible-type]
+        // $FlowFixMe[incompatible-type] Error supressed during the migration of HostInstance to ReactNativeElement
         !TextInputState.isTextInput(e.target)
       ) {
         return true;
@@ -1757,8 +1759,11 @@ class ScrollView extends React.Component<ScrollViewProps, ScrollViewState> {
 
     const baseStyle = horizontal ? styles.baseHorizontal : styles.baseVertical;
 
-    const {experimental_endDraggingSensitivityMultiplier, ...otherProps} =
-      this.props;
+    const {
+      experimental_endDraggingSensitivityMultiplier,
+      maintainVisibleContentPosition,
+      ...otherProps
+    } = this.props;
     const props = {
       ...otherProps,
       alwaysBounceHorizontal,
@@ -1813,6 +1818,10 @@ class ScrollView extends React.Component<ScrollViewProps, ScrollViewState> {
           this.props.snapToInterval != null ||
           this.props.snapToOffsets != null,
       }),
+      maintainVisibleContentPosition:
+        ReactNativeFeatureFlags.disableMaintainVisibleContentPosition()
+          ? undefined
+          : this.props.maintainVisibleContentPosition,
     };
 
     const {decelerationRate} = this.props;
@@ -1842,7 +1851,7 @@ class ScrollView extends React.Component<ScrollViewProps, ScrollViewState> {
         // Note: we should split props.style on the inner and outer props
         // however, the ScrollView still needs the baseStyle to be scrollable
         const {outer, inner} = splitLayoutProps(flattenStyle(props.style));
-        // $FlowFixMe[incompatible-call]
+        // $FlowFixMe[incompatible-type]
         return cloneElement(
           refreshControl,
           {style: StyleSheet.compose(baseStyle, outer)},

package/Libraries/Components/ScrollView/ScrollViewStickyHeader.js

@@ -78,7 +78,7 @@ const ScrollViewStickyHeader: component(
     setIsFabric(isFabricPublicInstance(ref));
   }, []);
   const ref: React.RefSetter<React.ElementRef<typeof Animated.View>> =
-    // $FlowFixMe[prop-missing] - Instance is mutated to have `setNextHeaderY`.
+    // $FlowFixMe[incompatible-type] - Instance is mutated to have `setNextHeaderY`.
     useMergeRefs<Instance>(callbackRef, forwardedRef);
 
   const offset = useMemo(

package/Libraries/Components/StatusBar/StatusBar.js

@@ -235,8 +235,8 @@ class StatusBar extends React.Component<StatusBarProps> {
   static _defaultProps: any = createStackEntry({
     backgroundColor:
       Platform.OS === 'android'
-        ? NativeStatusBarManagerAndroid.getConstants()
-            .DEFAULT_BACKGROUND_COLOR ?? 'black'
+        ? (NativeStatusBarManagerAndroid.getConstants()
+            .DEFAULT_BACKGROUND_COLOR ?? 'black')
         : 'black',
     barStyle: 'default',
     translucent: false,

package/Libraries/Components/Switch/Switch.js

@@ -215,7 +215,7 @@ const Switch: component(
       native.value != null && native.value !== jsValue;
     if (
       shouldUpdateNativeSwitch &&
-      // $FlowIssue[method-unbinding]
+      // $FlowFixMe[method-unbinding]
       nativeSwitchRef.current?.setNativeProps != null
     ) {
       if (Platform.OS === 'android') {