react-native-tvos 0.79.2-0 → 0.80.0-0

package/Libraries/Image/RCTImageLoader.mm

@@ -317,6 +317,45 @@ static UIImage *RCTResizeImageIfNeeded(UIImage *image, CGSize size, CGFloat scal
   return image;
 }
 
+/*
+ * This function abstracts away the migration from loadImageForURL to loadImageURL by handling checking whether
+ * the interface responds to the new function signature and calling the appropriate function based on the result.
+ */
+static RCTImageLoaderCancellationBlock RCTLoadImageURLFromLoader(
+    id<RCTImageURLLoader> loadHandler,
+    NSURL *imageURL,
+    CGSize size,
+    CGFloat scale,
+    RCTResizeMode resizeMode,
+    RCTImageLoaderProgressBlock progressHandler,
+    RCTImageLoaderPartialLoadBlock partialLoadHandler,
+    RCTImageLoaderCompletionBlockWithMetadata completionHandler)
+{
+  if ([loadHandler respondsToSelector:@selector(loadImageForURL:
+                                                           size:scale:resizeMode:progressHandler:partialLoadHandler
+                                                               :completionHandlerWithMetadata:)]) {
+    return [loadHandler loadImageForURL:imageURL
+                                   size:size
+                                  scale:scale
+                             resizeMode:resizeMode
+                        progressHandler:progressHandler
+                     partialLoadHandler:partialLoadHandler
+          completionHandlerWithMetadata:^(NSError *error, UIImage *image, id metadata) {
+            completionHandler(error, image, metadata);
+          }];
+  } else {
+    return [loadHandler loadImageForURL:imageURL
+                                   size:size
+                                  scale:scale
+                             resizeMode:resizeMode
+                        progressHandler:progressHandler
+                     partialLoadHandler:partialLoadHandler
+                      completionHandler:^(NSError *error, UIImage *image) {
+                        completionHandler(error, image, nil);
+                      }];
+  }
+}
+
 #pragma mark - RCTImageLoaderProtocol 2/3
 
 - (nullable RCTImageLoaderCancellationBlock)loadImageWithURLRequest:(NSURLRequest *)imageURLRequest
@@ -566,15 +605,18 @@ static UIImage *RCTResizeImageIfNeeded(UIImage *image, CGSize size, CGFloat scal
              completionHandler(error, image, metadata, nil);
            }];
     }
-    RCTImageLoaderCancellationBlock cb = [loadHandler loadImageForURL:request.URL
-                                                                 size:size
-                                                                scale:scale
-                                                           resizeMode:resizeMode
-                                                      progressHandler:progressHandler
-                                                   partialLoadHandler:partialLoadHandler
-                                                    completionHandler:^(NSError *error, UIImage *image) {
-                                                      completionHandler(error, image, nil, nil);
-                                                    }];
+
+    RCTImageLoaderCancellationBlock cb = RCTLoadImageURLFromLoader(
+        loadHandler,
+        request.URL,
+        size,
+        scale,
+        resizeMode,
+        progressHandler,
+        partialLoadHandler,
+        ^(NSError *error, UIImage *image, id metadata) {
+          completionHandler(error, image, metadata, nil);
+        });
     return [[RCTImageURLLoaderRequest alloc] initWithRequestId:nil imageURL:request.URL cancellationBlock:cb];
   }
 
@@ -608,15 +650,17 @@ static UIImage *RCTResizeImageIfNeeded(UIImage *image, CGSize size, CGFloat scal
              }];
         cancelLoadLocal = loaderRequest.cancellationBlock;
       } else {
-        cancelLoadLocal = [loadHandler loadImageForURL:request.URL
-                                                  size:size
-                                                 scale:scale
-                                            resizeMode:resizeMode
-                                       progressHandler:progressHandler
-                                    partialLoadHandler:partialLoadHandler
-                                     completionHandler:^(NSError *error, UIImage *image) {
-                                       completionHandler(error, image, nil, nil);
-                                     }];
+        cancelLoadLocal = RCTLoadImageURLFromLoader(
+            loadHandler,
+            request.URL,
+            size,
+            scale,
+            resizeMode,
+            progressHandler,
+            partialLoadHandler,
+            ^(NSError *error, UIImage *image, id metadata) {
+              completionHandler(error, image, metadata, nil);
+            });
       }
       [cancelLoadLock lock];
       cancelLoad = cancelLoadLocal;
@@ -867,7 +911,7 @@ static UIImage *RCTResizeImageIfNeeded(UIImage *image, CGSize size, CGFloat scal
 {
   id<RCTImageURLLoader> loadHandler = [self imageURLLoaderForURL:url];
   if ([loadHandler respondsToSelector:@selector(shouldEnablePerfLogging)]) {
-    return [(id<RCTImageURLLoaderWithAttribution>)loadHandler shouldEnablePerfLogging];
+    return [(id<RCTImageLoaderLoggable>)loadHandler shouldEnablePerfLogging];
   }
   return NO;
 }

package/Libraries/Image/RCTImageStoreManager.mm

@@ -21,12 +21,6 @@
 #import "RCTImagePlugins.h"
 
 static NSString *const RCTImageStoreURLScheme = @"rct-image-store";
-static BOOL gImageStoreManagerStorageQueueEnabled = NO;
-
-void RCTEnableImageStoreManagerStorageQueue(BOOL enabled)
-{
-  gImageStoreManagerStorageQueueEnabled = enabled;
-}
 
 @interface RCTImageStoreManager () <NativeImageStoreIOSSpec>
 @end
@@ -34,7 +28,6 @@ void RCTEnableImageStoreManagerStorageQueue(BOOL enabled)
 @implementation RCTImageStoreManager {
   NSMutableDictionary<NSString *, NSData *> *_store;
   NSUInteger _id;
-  dispatch_queue_t _storageQueue;
 }
 
 @synthesize methodQueue = _methodQueue;
@@ -46,21 +39,6 @@ RCT_EXPORT_MODULE()
   return NO;
 }
 
-- (instancetype)init
-{
-  if (self = [super init]) {
-    if (gImageStoreManagerStorageQueueEnabled) {
-      _storageQueue = dispatch_queue_create("com.facebook.react.imagestoremanager.storage", DISPATCH_QUEUE_SERIAL);
-    }
-  }
-  return self;
-}
-
-- (dispatch_queue_t)_getAsyncQueue
-{
-  return gImageStoreManagerStorageQueueEnabled ? _storageQueue : _methodQueue;
-}
-
 - (float)handlerPriority
 {
   return 1;
@@ -68,7 +46,7 @@ RCT_EXPORT_MODULE()
 
 - (void)removeImageForTag:(NSString *)imageTag withBlock:(void (^)(void))block
 {
-  dispatch_async([self _getAsyncQueue], ^{
+  dispatch_async(_methodQueue, ^{
     [self removeImageForTag:imageTag];
     if (block) {
       block();
@@ -78,7 +56,7 @@ RCT_EXPORT_MODULE()
 
 - (NSString *)_storeImageData:(NSData *)imageData
 {
-  RCTAssertThread([self _getAsyncQueue], @"Must be called on RCTImageStoreManager thread");
+  RCTAssertThread(_methodQueue, @"Must be called on RCTImageStoreManager thread");
 
   if (!_store) {
     _store = [NSMutableDictionary new];
@@ -93,7 +71,7 @@ RCT_EXPORT_MODULE()
 - (void)storeImageData:(NSData *)imageData withBlock:(void (^)(NSString *imageTag))block
 {
   RCTAssertParam(block);
-  dispatch_async([self _getAsyncQueue], ^{
+  dispatch_async(_methodQueue, ^{
     block([self _storeImageData:imageData]);
   });
 }
@@ -101,7 +79,7 @@ RCT_EXPORT_MODULE()
 - (void)getImageDataForTag:(NSString *)imageTag withBlock:(void (^)(NSData *imageData))block
 {
   RCTAssertParam(block);
-  dispatch_async([self _getAsyncQueue], ^{
+  dispatch_async(_methodQueue, ^{
     block(self->_store[imageTag]);
   });
 }
@@ -109,7 +87,7 @@ RCT_EXPORT_MODULE()
 - (void)storeImage:(UIImage *)image withBlock:(void (^)(NSString *imageTag))block
 {
   RCTAssertParam(block);
-  dispatch_async([self _getAsyncQueue], ^{
+  dispatch_async(_methodQueue, ^{
     NSString *imageTag = [self _storeImageData:RCTGetImageData(image, 0.75)];
     dispatch_async(dispatch_get_main_queue(), ^{
       block(imageTag);
@@ -155,7 +133,7 @@ RCT_EXPORT_METHOD(addImageFromBase64
   dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
     NSData *imageData = [[NSData alloc] initWithBase64EncodedString:base64String options:0];
     if (imageData) {
-      dispatch_async([self _getAsyncQueue], ^{
+      dispatch_async(self->_methodQueue, ^{
         successCallback(@[ [self _storeImageData:imageData] ]);
       });
     } else {
@@ -179,7 +157,7 @@ RCT_EXPORT_METHOD(addImageFromBase64
   };
 
   // Dispatch async to give caller time to cancel the request
-  dispatch_async([self _getAsyncQueue], ^{
+  dispatch_async(_methodQueue, ^{
     if (cancelled->load()) {
       return;
     }
@@ -240,7 +218,7 @@ RCT_EXPORT_METHOD(addImageFromBase64
   RCTLogWarn(
       @"RCTImageStoreManager.storeImage() is deprecated and has poor performance. Use an alternative method instead.");
   __block NSString *imageTag;
-  dispatch_sync([self _getAsyncQueue], ^{
+  dispatch_sync(_methodQueue, ^{
     imageTag = [self _storeImageData:RCTGetImageData(image, 0.75)];
   });
   return imageTag;
@@ -252,7 +230,7 @@ RCT_EXPORT_METHOD(addImageFromBase64
   RCTLogWarn(
       @"RCTImageStoreManager.imageForTag() is deprecated and has poor performance. Use an alternative method instead.");
   __block NSData *imageData;
-  dispatch_sync([self _getAsyncQueue], ^{
+  dispatch_sync(_methodQueue, ^{
     imageData = self->_store[imageTag];
   });
   return [UIImage imageWithData:imageData];
@@ -261,7 +239,7 @@ RCT_EXPORT_METHOD(addImageFromBase64
 - (void)getImageForTag:(NSString *)imageTag withBlock:(void (^)(UIImage *image))block
 {
   RCTAssertParam(block);
-  dispatch_async([self _getAsyncQueue], ^{
+  dispatch_async(_methodQueue, ^{
     NSData *imageData = self->_store[imageTag];
     dispatch_async(dispatch_get_main_queue(), ^{
       // imageWithData: is not thread-safe, so we can't do this on methodQueue

package/Libraries/Image/RCTImageURLLoader.h

@@ -38,6 +38,8 @@ typedef dispatch_block_t RCTImageLoaderCancellationBlock;
 - (BOOL)canLoadImageURL:(NSURL *)requestURL;
 
 /**
+ * DEPRECATED: Please use updated signature for loadImageForURL which uses
+ * completionHandlerWithMetadata instead.
  * Send a network request to load the request URL. The method should call the
  * progressHandler (if applicable) and the completionHandler when the request
  * has finished. The method should also return a cancellation block, if
@@ -49,10 +51,26 @@ typedef dispatch_block_t RCTImageLoaderCancellationBlock;
                                                  resizeMode:(RCTResizeMode)resizeMode
                                             progressHandler:(RCTImageLoaderProgressBlock)progressHandler
                                          partialLoadHandler:(RCTImageLoaderPartialLoadBlock)partialLoadHandler
-                                          completionHandler:(RCTImageLoaderCompletionBlock)completionHandler;
+                                          completionHandler:(RCTImageLoaderCompletionBlock)completionHandler
+    RCT_DEPRECATED;
 
 @optional
 
+/*
+ * Send a network request to load the request URL. The method should call the
+ * progressHandler (if applicable) and the completionHandler when the request
+ * has finished. The method should also return a cancellation block, if
+ * applicable.
+ */
+- (nullable RCTImageLoaderCancellationBlock)loadImageForURL:(NSURL *)imageURL
+                                                       size:(CGSize)size
+                                                      scale:(CGFloat)scale
+                                                 resizeMode:(RCTResizeMode)resizeMode
+                                            progressHandler:(RCTImageLoaderProgressBlock)progressHandler
+                                         partialLoadHandler:(RCTImageLoaderPartialLoadBlock)partialLoadHandler
+                              completionHandlerWithMetadata:
+                                  (RCTImageLoaderCompletionBlockWithMetadata)completionHandlerWithMetadata;
+
 /**
  * If more than one RCTImageURLLoader responds YES to `-canLoadImageURL:`
  * then `loaderPriority` is used to determine which one to use. The loader

package/Libraries/Image/RCTUIImageViewAnimated.mm

@@ -33,7 +33,7 @@ static NSUInteger RCTDeviceFreeMemory(void)
   return (vm_stat.free_count - vm_stat.speculative_count) * page_size;
 }
 
-@interface RCTUIImageViewAnimated () <CALayerDelegate, RCTDisplayRefreshable>
+@interface RCTUIImageViewAnimated () <RCTDisplayRefreshable>
 
 @property (nonatomic, assign) NSUInteger maxBufferSize;
 @property (nonatomic, strong, readwrite) UIImage *currentFrame;
@@ -48,7 +48,6 @@ static NSUInteger RCTDeviceFreeMemory(void)
 @property (nonatomic, assign) NSUInteger maxBufferCount;
 @property (nonatomic, strong) NSOperationQueue *fetchQueue;
 @property (nonatomic, strong) dispatch_semaphore_t lock;
-@property (nonatomic, assign) CGFloat animatedImageScale;
 @property (nonatomic, strong) CADisplayLink *displayLink;
 
 @end
@@ -78,7 +77,6 @@ static NSUInteger RCTDeviceFreeMemory(void)
   self.currentTime = 0;
   self.bufferMiss = NO;
   self.maxBufferCount = 0;
-  self.animatedImageScale = 1;
   [_fetchQueue cancelAllOperations];
   _fetchQueue = nil;
   dispatch_semaphore_wait(self.lock, DISPATCH_TIME_FOREVER);
@@ -89,7 +87,8 @@ static NSUInteger RCTDeviceFreeMemory(void)
 
 - (void)setImage:(UIImage *)image
 {
-  if (self.image == image) {
+  UIImage *thisImage = self.animatedImage != nil ? self.animatedImage : super.image;
+  if (image == thisImage) {
     return;
   }
 
@@ -110,8 +109,6 @@ static NSUInteger RCTDeviceFreeMemory(void)
     // Get the current frame and loop count.
     self.totalLoopCount = self.animatedImage.animatedImageLoopCount;
 
-    self.animatedImageScale = image.scale;
-
     self.currentFrame = image;
 
     dispatch_semaphore_wait(self.lock, DISPATCH_TIME_FOREVER);
@@ -126,11 +123,9 @@ static NSUInteger RCTDeviceFreeMemory(void)
     if ([self paused]) {
       [self start];
     }
-
-    [self.layer setNeedsDisplay];
-  } else {
-    super.image = image;
   }
+
+  super.image = image;
 }
 
 #pragma mark - Private
@@ -247,8 +242,8 @@ static NSUInteger RCTDeviceFreeMemory(void)
     }
     dispatch_semaphore_signal(self.lock);
     self.currentFrame = currentFrame;
+    super.image = currentFrame;
     self.bufferMiss = NO;
-    [self.layer setNeedsDisplay];
   } else {
     self.bufferMiss = YES;
   }
@@ -278,18 +273,6 @@ static NSUInteger RCTDeviceFreeMemory(void)
   [self prefetchNextFrame:fetchFrame fetchFrameIndex:fetchFrameIndex];
 }
 
-#pragma mark - CALayerDelegate
-
-- (void)displayLayer:(CALayer *)layer
-{
-  if (_currentFrame) {
-    layer.contentsScale = self.animatedImageScale;
-    layer.contents = (__bridge id)_currentFrame.CGImage;
-  } else {
-    [super displayLayer:layer];
-  }
-}
-
 #pragma mark - Util
 
 - (void)calculateMaxBufferCount

package/Libraries/Image/React-RCTImage.podspec

@@ -16,12 +16,7 @@ else
   source[:tag] = "v#{version}"
 end
 
-folly_config = get_folly_config()
-folly_compiler_flags = folly_config[:compiler_flags]
-folly_version = folly_config[:version]
-
 header_search_paths = [
-  "\"$(PODS_ROOT)/RCT-Folly\"",
   "\"${PODS_ROOT}/Headers/Public/ReactCodegen/react/renderer/components\"",
 ]
 
@@ -35,7 +30,7 @@ Pod::Spec.new do |s|
   s.license                = package["license"]
   s.author                 = "Meta Platforms, Inc. and its affiliates"
   s.platforms              = min_supported_versions
-  s.compiler_flags         = folly_compiler_flags + ' -Wno-nullability-completeness'
+  s.compiler_flags         = '-Wno-nullability-completeness'
   s.source                 = source
   s.source_files           = "*.{m,mm}"
   s.preserve_paths         = "package.json", "LICENSE", "LICENSE-docs"
@@ -47,7 +42,6 @@ Pod::Spec.new do |s|
                              }
   s.framework              = ["Accelerate", "UIKit", "QuartzCore", "ImageIO", "CoreGraphics"]
 
-  s.dependency "RCT-Folly", folly_version
   s.dependency "RCTTypeSafety"
   s.dependency "React-jsi"
   s.dependency "React-Core/RCTImageHeaders"
@@ -57,4 +51,5 @@ Pod::Spec.new do |s|
   add_dependency(s, "ReactCommon", :subspec => "turbomodule/core", :additional_framework_paths => ["react/nativemodule/core"])
   add_dependency(s, "React-NativeModulesApple")
 
+  add_rn_third_party_dependencies(s)
 end

package/Libraries/Interaction/InteractionManager.d.ts

@@ -20,6 +20,9 @@ export type PromiseTask = {
   gen: () => Promise<any>;
 };
 
+/**
+ * @deprecated
+ */
 export interface InteractionManagerStatic {
   Events: {
     interactionStart: string;
@@ -36,6 +39,8 @@ export interface InteractionManagerStatic {
    *   emitted
    * @param context - Optional context object to use when invoking the
    *   listener
+   *
+   * @deprecated
    */
   addListener(
     eventType: string,
@@ -46,6 +51,8 @@ export interface InteractionManagerStatic {
   /**
    * Schedule a function to run after all interactions have completed.
    * Returns a cancellable
+   *
+   * @deprecated
    */
   runAfterInteractions(task?: (() => any) | SimpleTask | PromiseTask): {
     then: (onfulfilled?: () => any, onrejected?: () => any) => Promise<any>;
@@ -55,11 +62,15 @@ export interface InteractionManagerStatic {
 
   /**
    * Notify manager that an interaction has started.
+   *
+   * @deprecated
    */
   createInteractionHandle(): Handle;
 
   /**
    * Notify manager that an interaction has completed.
+   *
+   * @deprecated
    */
   clearInteractionHandle(handle: Handle): void;
 
@@ -67,6 +78,8 @@ export interface InteractionManagerStatic {
    * A positive number will use setTimeout to schedule any tasks after
    * the eventLoopRunningTime hits the deadline value, otherwise all
    * tasks will be executed in one setImmediate batch (default).
+   *
+   * @deprecated
    */
   setDeadline(deadline: number): void;
 }

package/Libraries/Interaction/InteractionManager.js

@@ -8,11 +8,11 @@
  * @flow strict-local
  */
 
+import type {EventSubscription} from '../vendor/emitter/EventEmitter';
 import type {Task} from './TaskQueue';
 
 import * as ReactNativeFeatureFlags from '../../src/private/featureflags/ReactNativeFeatureFlags';
 import EventEmitter from '../vendor/emitter/EventEmitter';
-import type {EventSubscription} from '../vendor/emitter/EventEmitter';
 
 const BatchedBridge = require('../BatchedBridge/BatchedBridge').default;
 const infoLog = require('../Utilities/infoLog').default;

package/Libraries/Interaction/PanResponder.js

@@ -193,7 +193,7 @@ type PassiveCallback = (
   gestureState: PanResponderGestureState,
 ) => mixed;
 
-export type GestureResponderHandlers = {
+export type GestureResponderHandlerMethods = {
   onMoveShouldSetResponder: (event: GestureResponderEvent) => boolean,
   onMoveShouldSetResponderCapture: (event: GestureResponderEvent) => boolean,
   onResponderEnd: (event: GestureResponderEvent) => void,
@@ -333,7 +333,7 @@ const PanResponder = {
    */
   _updateGestureStateOnMove(
     gestureState: PanResponderGestureState,
-    touchHistory: $PropertyType<GestureResponderEvent, 'touchHistory'>,
+    touchHistory: GestureResponderEvent['touchHistory'],
   ) {
     gestureState.numberActiveTouches = touchHistory.numberActiveTouches;
     gestureState.moveX = currentCentroidXOfTouchesChangedAfter(
@@ -403,7 +403,7 @@ const PanResponder = {
    */
   create(config: PanResponderCallbacks): {
     getInteractionHandle: () => ?number,
-    panHandlers: GestureResponderHandlers,
+    panHandlers: GestureResponderHandlerMethods,
   } {
     const interactionState = {
       handle: (null: ?number),

package/Libraries/Interaction/TaskQueue.js

@@ -117,6 +117,7 @@ class TaskQueue {
       } catch (e) {
         e.message =
           // $FlowFixMe[incompatible-type]
+          // $FlowFixMe[incompatible-use]
           'TaskQueue: Error with task ' + (task.name || '') + ': ' + e.message;
         throw e;
       }

package/Libraries/LayoutAnimation/LayoutAnimation.js

@@ -20,14 +20,14 @@ import * as ReactNativeFeatureFlags from '../../src/private/featureflags/ReactNa
 import {getFabricUIManager} from '../ReactNative/FabricUIManager';
 import Platform from '../Utilities/Platform';
 
+const UIManager = require('../ReactNative/UIManager').default;
+
 export type {
   LayoutAnimationType,
   LayoutAnimationProperty,
   LayoutAnimationAnimationConfig as LayoutAnimationAnim,
 } from '../Renderer/shims/ReactNativeTypes';
 
-const UIManager = require('../ReactNative/UIManager').default;
-
 // Reexport type
 export type LayoutAnimationConfig = LayoutAnimationConfig_;
 

package/Libraries/Linking/Linking.js

@@ -34,7 +34,7 @@ class LinkingImpl extends NativeEventEmitter<LinkingEventDefinitions> {
    */
   addEventListener<K: $Keys<LinkingEventDefinitions>>(
     eventType: K,
-    listener: (...$ElementType<LinkingEventDefinitions, K>) => mixed,
+    listener: (...LinkingEventDefinitions[K]) => mixed,
   ): EventSubscription {
     return this.addListener(eventType, listener);
   }

package/Libraries/LinkingIOS/React-RCTLinking.podspec

@@ -16,12 +16,7 @@ else
   source[:tag] = "v#{version}"
 end
 
-folly_config = get_folly_config()
-folly_compiler_flags = folly_config[:compiler_flags]
-folly_version = folly_config[:version]
-
 header_search_paths = [
-  "\"$(PODS_ROOT)/RCT-Folly\"",
   "\"${PODS_ROOT}/Headers/Public/ReactCodegen/react/renderer/components\"",
 ]
 
@@ -34,7 +29,7 @@ Pod::Spec.new do |s|
   s.license                = package["license"]
   s.author                 = "Meta Platforms, Inc. and its affiliates"
   s.platforms              = min_supported_versions
-  s.compiler_flags         = folly_compiler_flags + ' -Wno-nullability-completeness'
+  s.compiler_flags         = '-Wno-nullability-completeness'
   s.source                 = source
   s.source_files           = "*.{m,mm}"
   s.preserve_paths         = "package.json", "LICENSE", "LICENSE-docs"

package/Libraries/Lists/FlatList.d.ts

@@ -228,8 +228,8 @@ export abstract class FlatListComponent<
    * Provides a reference to the underlying host component
    */
   getNativeScrollRef: () =>
-    | React.ElementRef<typeof View>
-    | React.ElementRef<typeof ScrollViewComponent>
+    | React.ComponentRef<typeof View>
+    | React.ComponentRef<typeof ScrollViewComponent>
     | null
     | undefined;
 

package/Libraries/Lists/FlatList.js

@@ -22,7 +22,7 @@ import {type ScrollResponderType} from '../Components/ScrollView/ScrollView';
 import View from '../Components/View/View';
 import VirtualizedLists from '@react-native-tvos/virtualized-lists';
 import memoizeOne from 'memoize-one';
-import React from 'react';
+import * as React from 'react';
 
 const StyleSheet = require('../StyleSheet/StyleSheet').default;
 const deepDiffer = require('../Utilities/differ/deepDiffer').default;
@@ -184,17 +184,14 @@ type FlatListBaseProps<ItemT> = {
 type VirtualizedListProps = React.ElementConfig<typeof VirtualizedList>;
 
 export type FlatListProps<ItemT> = {
-  ...$Diff<
+  ...Omit<
     VirtualizedListProps,
-    {
-      data: $PropertyType<VirtualizedListProps, 'data'>,
-      getItem: $PropertyType<VirtualizedListProps, 'getItem'>,
-      getItemCount: $PropertyType<VirtualizedListProps, 'getItemCount'>,
-      getItemLayout: $PropertyType<VirtualizedListProps, 'getItemLayout'>,
-      renderItem: $PropertyType<VirtualizedListProps, 'renderItem'>,
-      keyExtractor: $PropertyType<VirtualizedListProps, 'keyExtractor'>,
-      ...
-    },
+    | 'data'
+    | 'getItem'
+    | 'getItemCount'
+    | 'getItemLayout'
+    | 'renderItem'
+    | 'keyExtractor',
   >,
   ...FlatListBaseProps<ItemT>,
   ...