From f596bb3d1a621e95052e864aa6673b5f3535d0bb Mon Sep 17 00:00:00 2001 From: Marco Wang Date: Fri, 6 Mar 2026 11:24:12 -0800 Subject: [PATCH] transformTypeParamBound codemod 8/9 (#55949) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/55949 js1 flow-runner codemod flow/transformTypeParamBound --format-files=false xplat/js Changelog: [Internal] Reviewed By: SamChou19815 Differential Revision: D95429359 fbshipit-source-id: fc5bfa68cd5267ec5e74358592eace97c9a6f662 --- .../src/__tests__/FetchUtils.js | 4 +- .../src/__tests__/InspectorDeviceUtils.js | 2 +- .../src/__tests__/InspectorProtocolUtils.js | 8 +- .../src/inspector-proxy/cdp-types/messages.js | 6 +- .../dev-middleware/src/types/EventReporter.js | 6 +- packages/jest-preset/jest/mock.js | 2 +- packages/jest-preset/jest/mockComponent.js | 4 +- .../jest-preset/jest/mockNativeComponent.js | 4 +- .../jest/mocks/requireNativeComponent.js | 2 +- packages/polyfills/error-guard.js | 6 +- .../src/__mocks__/test-helpers.js | 4 +- .../__fixtures__/kitchen-sink-input.js | 2 +- .../src/TypeDiffing.js | 4 +- .../Animated/__tests__/Interpolation-test.js | 2 +- .../Animated/createAnimatedComponent.js | 14 +- .../Animated/nodes/AnimatedAddition.js | 2 +- .../Animated/nodes/AnimatedDiffClamp.js | 2 +- .../Animated/nodes/AnimatedDivision.js | 2 +- .../Animated/nodes/AnimatedInterpolation.js | 20 +- .../Animated/nodes/AnimatedModulo.js | 2 +- .../Animated/nodes/AnimatedMultiplication.js | 2 +- .../Libraries/Animated/nodes/AnimatedStyle.js | 4 +- .../Animated/nodes/AnimatedSubtraction.js | 2 +- .../Libraries/Animated/nodes/AnimatedValue.js | 2 +- .../Libraries/AppState/AppState.js | 2 +- .../AccessibilityInfo/AccessibilityInfo.js | 2 +- .../Libraries/Components/Keyboard/Keyboard.js | 6 +- .../EventEmitter/NativeEventEmitter.js | 14 +- .../EventEmitter/RCTDeviceEventEmitter.js | 2 +- .../__mocks__/NativeEventEmitter.js | 14 +- .../react-native/Libraries/Linking/Linking.js | 2 +- .../NativeComponentRegistry.js | 4 +- .../NativeComponent/ViewConfigIgnore.js | 6 +- .../Network/RCTNetworking.android.js | 2 +- .../Libraries/Network/RCTNetworking.ios.js | 2 +- .../Libraries/Network/RCTNetworking.js.flow | 2 +- .../__tests__/Pressability-test.js | 2 +- .../ReactNative/RendererImplementation.js | 14 +- .../ReactNative/renderApplication.js | 2 +- .../ReactNative/requireNativeComponent.js | 2 +- .../Libraries/StyleSheet/StyleSheet.js | 2 +- .../Libraries/StyleSheet/StyleSheet.js.flow | 4 +- .../Libraries/StyleSheet/StyleSheetExports.js | 2 +- .../StyleSheet/StyleSheetExports.js.flow | 2 +- .../Libraries/StyleSheet/StyleSheetTypes.js | 8 +- .../Libraries/StyleSheet/flattenStyle.js | 2 +- .../StyleSheet/private/_TransformStyle.js | 2 +- .../Libraries/TurboModule/RCTExport.js | 2 +- .../TurboModule/TurboModuleRegistry.js | 6 +- .../Libraries/Types/CodegenTypes.js | 11 +- .../Libraries/Types/ReactDevToolsTypes.js | 2 +- .../Utilities/codegenNativeCommands.js | 2 +- .../Utilities/codegenNativeComponent.js | 4 +- .../deepFreezeAndThrowOnMutationInDev.js | 2 +- .../Libraries/vendor/core/ErrorUtils.js | 8 +- .../Libraries/vendor/emitter/EventEmitter.js | 40 ++-- .../react-native/flow/HermesInternalType.js | 2 +- packages/react-native/flow/dom.js.flow | 178 +++++++++--------- .../scripts/featureflags/types.js | 8 +- .../__tests__/utilities/isUnreachable.js | 2 +- .../animated/NativeAnimatedValidation.js | 2 +- .../animated/createAnimatedPropsHook.js | 4 +- .../__tests__/VirtualView-itest.js | 4 +- 63 files changed, 263 insertions(+), 222 deletions(-) diff --git a/packages/dev-middleware/src/__tests__/FetchUtils.js b/packages/dev-middleware/src/__tests__/FetchUtils.js index b5b6ba250c8..78ddfe01d54 100644 --- a/packages/dev-middleware/src/__tests__/FetchUtils.js +++ b/packages/dev-middleware/src/__tests__/FetchUtils.js @@ -48,7 +48,9 @@ export async function requestLocal( }; } -export async function fetchJson(url: string): Promise { +export async function fetchJson( + url: string, +): Promise { const response = await requestLocal(url); if (response.statusCode !== 200) { throw new Error(`HTTP ${response.statusCode}`); diff --git a/packages/dev-middleware/src/__tests__/InspectorDeviceUtils.js b/packages/dev-middleware/src/__tests__/InspectorDeviceUtils.js index 0a0245cf614..89bf99736d0 100644 --- a/packages/dev-middleware/src/__tests__/InspectorDeviceUtils.js +++ b/packages/dev-middleware/src/__tests__/InspectorDeviceUtils.js @@ -142,7 +142,7 @@ export class DeviceMock extends DeviceAgent { } } - #sendPayloadIfNonNull( + #sendPayloadIfNonNull( event: Event, maybePayload: | MessageFromDevice['payload'] diff --git a/packages/dev-middleware/src/__tests__/InspectorProtocolUtils.js b/packages/dev-middleware/src/__tests__/InspectorProtocolUtils.js index c3793887818..45a93b79559 100644 --- a/packages/dev-middleware/src/__tests__/InspectorProtocolUtils.js +++ b/packages/dev-middleware/src/__tests__/InspectorProtocolUtils.js @@ -42,7 +42,9 @@ export type CdpMessageToTarget = Readonly<{ * Send a CDP message from from the target with the given pageId to the debugger. * Returns the message as received by the debugger. */ -export async function sendFromTargetToDebugger( +export async function sendFromTargetToDebugger< + Message extends CdpMessageFromTarget, +>( device: DeviceMock, debugger_: DebuggerMock, pageId: string, @@ -76,7 +78,9 @@ export async function sendFromTargetToDebugger( * Send a CDP message from the debugger to the target with the given pageId. * Returns the message as received by the target. */ -export async function sendFromDebuggerToTarget( +export async function sendFromDebuggerToTarget< + Message extends CdpMessageToTarget, +>( debugger_: DebuggerMock, device: DeviceMock, pageId: string, diff --git a/packages/dev-middleware/src/inspector-proxy/cdp-types/messages.js b/packages/dev-middleware/src/inspector-proxy/cdp-types/messages.js index e2c0e2d3fa6..5aa391be5f8 100644 --- a/packages/dev-middleware/src/inspector-proxy/cdp-types/messages.js +++ b/packages/dev-middleware/src/inspector-proxy/cdp-types/messages.js @@ -12,18 +12,18 @@ import type {JSONSerializable} from '../types'; import type {Commands, Events} from './protocol'; // Note: A CDP event is a JSON-RPC notification with no `id` member. -export type CDPEvent = { +export type CDPEvent = { method: TEvent, params: Events[TEvent], }; -export type CDPRequest = { +export type CDPRequest = { method: TCommand, params: Commands[TCommand]['paramsType'], id: number, }; -export type CDPResponse = +export type CDPResponse = | { result: Commands[TCommand]['resultType'], id: number, diff --git a/packages/dev-middleware/src/types/EventReporter.js b/packages/dev-middleware/src/types/EventReporter.js index 1bd0fe65ae8..69d83c866f6 100644 --- a/packages/dev-middleware/src/types/EventReporter.js +++ b/packages/dev-middleware/src/types/EventReporter.js @@ -10,18 +10,18 @@ import type {DebuggerShellPreparationResult} from './DevToolLauncher'; -type SuccessResult = { +type SuccessResult = { status: 'success', ...Props, }; -type ErrorResult = { +type ErrorResult = { status: 'error', error: ErrorT, ...Props, }; -type CodedErrorResult = { +type CodedErrorResult = { status: 'coded_error', errorCode: ErrorCode, errorDetails?: string, diff --git a/packages/jest-preset/jest/mock.js b/packages/jest-preset/jest/mock.js index 05eb87e543f..90c0145b2f6 100644 --- a/packages/jest-preset/jest/mock.js +++ b/packages/jest-preset/jest/mock.js @@ -16,7 +16,7 @@ * If `factoryRef` is provided, it is expected to reference a module that * exports the same type signature as the module referenced by `moduleRef`. */ -export default function mock>( +export default function mock>( moduleRef: TModuleRef, factoryRef?: NoInfer, ): void { diff --git a/packages/jest-preset/jest/mockComponent.js b/packages/jest-preset/jest/mockComponent.js index 856350d3dd7..3b222ff0196 100644 --- a/packages/jest-preset/jest/mockComponent.js +++ b/packages/jest-preset/jest/mockComponent.js @@ -21,8 +21,8 @@ type TComponentType = React.ComponentType<{...}>; * a major footgun. Be careful when using this function! */ export default function mockComponent< - TComponentModule: Modulish, - TIsESModule: boolean, + TComponentModule extends Modulish, + TIsESModule extends boolean, >( moduleName: string, instanceMethods: ?interface {}, diff --git a/packages/jest-preset/jest/mockNativeComponent.js b/packages/jest-preset/jest/mockNativeComponent.js index f0dbdab1b67..01f2e912239 100644 --- a/packages/jest-preset/jest/mockNativeComponent.js +++ b/packages/jest-preset/jest/mockNativeComponent.js @@ -15,12 +15,12 @@ import {createElement} from 'react'; let nativeTag = 1; -type MockNativeComponent = component( +type MockNativeComponent = component( ref?: ?React.RefSetter, ...props: TProps ); -export default function mockNativeComponent( +export default function mockNativeComponent( viewName: string, ): MockNativeComponent { const Component = class extends React.Component { diff --git a/packages/jest-preset/jest/mocks/requireNativeComponent.js b/packages/jest-preset/jest/mocks/requireNativeComponent.js index 7c56610c683..9138367e4ce 100644 --- a/packages/jest-preset/jest/mocks/requireNativeComponent.js +++ b/packages/jest-preset/jest/mocks/requireNativeComponent.js @@ -15,7 +15,7 @@ const mockNativeComponent = jest.requireActual( '../mockNativeComponent', ).default; -export default function requireNativeComponent( +export default function requireNativeComponent( uiViewClassName: string, ): HostComponent { return mockNativeComponent(uiViewClassName); diff --git a/packages/polyfills/error-guard.js b/packages/polyfills/error-guard.js index 433bb27a3be..4be5c403698 100644 --- a/packages/polyfills/error-guard.js +++ b/packages/polyfills/error-guard.js @@ -52,7 +52,7 @@ const ErrorUtils = { * Condition roll out. See https://fburl.com/workplace/1v97vimq. */ _globalHandler && _globalHandler(error, true); }, - applyWithGuard, TOut>( + applyWithGuard, TOut>( fun: Fn, context?: ?unknown, args?: ?TArgs, @@ -75,7 +75,7 @@ const ErrorUtils = { } return null; }, - applyWithGuardIfNeeded, TOut>( + applyWithGuardIfNeeded, TOut>( fun: Fn, context?: ?unknown, args?: ?TArgs, @@ -94,7 +94,7 @@ const ErrorUtils = { inGuard(): boolean { return !!_inGuard; }, - guard, TOut>( + guard, TOut>( fun: Fn, name?: ?string, context?: ?unknown, diff --git a/packages/react-native-babel-preset/src/__mocks__/test-helpers.js b/packages/react-native-babel-preset/src/__mocks__/test-helpers.js index ff84ab5a753..af52a7222d6 100644 --- a/packages/react-native-babel-preset/src/__mocks__/test-helpers.js +++ b/packages/react-native-babel-preset/src/__mocks__/test-helpers.js @@ -17,7 +17,7 @@ const generate = require('@babel/generator').default; const t = require('@babel/types'); const nullthrows = require('nullthrows'); -function makeTransformOptions( +function makeTransformOptions( plugins: ReadonlyArray, options: OptionsT, ): BabelCoreOptions { @@ -52,7 +52,7 @@ function validateOutputAst(ast: BabelNode) { }); } -function transformToAst( +function transformToAst( plugins: ReadonlyArray, code: string, options: T, diff --git a/packages/react-native-babel-preset/src/__tests__/__fixtures__/kitchen-sink-input.js b/packages/react-native-babel-preset/src/__tests__/__fixtures__/kitchen-sink-input.js index 761f2a2eabb..d6cf667105c 100644 --- a/packages/react-native-babel-preset/src/__tests__/__fixtures__/kitchen-sink-input.js +++ b/packages/react-native-babel-preset/src/__tests__/__fixtures__/kitchen-sink-input.js @@ -124,7 +124,7 @@ function processUser({ } // Spread operators -function mergeConfigs( +function mergeConfigs( base: T, ...overrides: ReadonlyArray> ): T { diff --git a/packages/react-native-compatibility-check/src/TypeDiffing.js b/packages/react-native-compatibility-check/src/TypeDiffing.js index 8822c70e1b5..14a9b7171ad 100644 --- a/packages/react-native-compatibility-check/src/TypeDiffing.js +++ b/packages/react-native-compatibility-check/src/TypeDiffing.js @@ -276,7 +276,7 @@ export function compareTypeAnnotation( } } -function compareObjectTypeProperty( +function compareObjectTypeProperty( first: NamedShape, second: NamedShape, ): number { @@ -520,7 +520,7 @@ function comparePropertyArrays( return result; } -export function compareObjectTypes( +export function compareObjectTypes( newerPropertyTypes: ReadonlyArray>, olderPropertyTypes: ReadonlyArray>, ): ComparisonResult { diff --git a/packages/react-native/Libraries/Animated/__tests__/Interpolation-test.js b/packages/react-native/Libraries/Animated/__tests__/Interpolation-test.js index ee7827538e9..fc0fb879264 100644 --- a/packages/react-native/Libraries/Animated/__tests__/Interpolation-test.js +++ b/packages/react-native/Libraries/Animated/__tests__/Interpolation-test.js @@ -17,7 +17,7 @@ import {PlatformColor} from '../../../Libraries/StyleSheet/PlatformColorValueTyp import Easing from '../Easing'; import AnimatedInterpolation from '../nodes/AnimatedInterpolation'; -function createInterpolation( +function createInterpolation( config: InterpolationConfigType, ): number => T { let parentValue = null; diff --git a/packages/react-native/Libraries/Animated/createAnimatedComponent.js b/packages/react-native/Libraries/Animated/createAnimatedComponent.js index 4668a7ece37..ba58374c208 100644 --- a/packages/react-native/Libraries/Animated/createAnimatedComponent.js +++ b/packages/react-native/Libraries/Animated/createAnimatedComponent.js @@ -65,12 +65,12 @@ type PassThroughProps = Readonly<{ passthroughAnimatedPropExplicitValues?: ViewProps | null, }>; -type LooseOmit = Pick< +type LooseOmit = Pick< O, Exclude, >; -export type AnimatedProps = LooseOmit< +export type AnimatedProps = LooseOmit< { [K in keyof Props]: K extends NonAnimatedProps ? Props[K] @@ -80,7 +80,7 @@ export type AnimatedProps = LooseOmit< > & PassThroughProps; -export type AnimatedBaseProps = LooseOmit< +export type AnimatedBaseProps = LooseOmit< { [K in keyof Props]: K extends NonAnimatedProps ? Props[K] @@ -90,12 +90,12 @@ export type AnimatedBaseProps = LooseOmit< >; export type AnimatedComponentType< - Props: {...}, + Props extends {...}, +Instance = unknown, > = component(ref?: React.RefSetter, ...AnimatedProps); export default function createAnimatedComponent< - TInstance: React.ComponentType, + TInstance extends React.ComponentType, >( Component: TInstance, ): AnimatedComponentType< @@ -106,8 +106,8 @@ export default function createAnimatedComponent< } export function unstable_createAnimatedComponentWithAllowlist< - TProps: {...}, - TInstance: React.ComponentType, + TProps extends {...}, + TInstance extends React.ComponentType, >( Component: TInstance, allowlist: ?AnimatedPropsAllowlist, diff --git a/packages/react-native/Libraries/Animated/nodes/AnimatedAddition.js b/packages/react-native/Libraries/Animated/nodes/AnimatedAddition.js index 7b885521c28..91d686f5af3 100644 --- a/packages/react-native/Libraries/Animated/nodes/AnimatedAddition.js +++ b/packages/react-native/Libraries/Animated/nodes/AnimatedAddition.js @@ -43,7 +43,7 @@ export default class AnimatedAddition extends AnimatedWithChildren { return this._a.__getValue() + this._b.__getValue(); } - interpolate( + interpolate( config: InterpolationConfigType, ): AnimatedInterpolation { return new AnimatedInterpolation(this, config); diff --git a/packages/react-native/Libraries/Animated/nodes/AnimatedDiffClamp.js b/packages/react-native/Libraries/Animated/nodes/AnimatedDiffClamp.js index a192bee7215..94fef85aa0e 100644 --- a/packages/react-native/Libraries/Animated/nodes/AnimatedDiffClamp.js +++ b/packages/react-native/Libraries/Animated/nodes/AnimatedDiffClamp.js @@ -44,7 +44,7 @@ export default class AnimatedDiffClamp extends AnimatedWithChildren { super.__makeNative(platformConfig); } - interpolate( + interpolate( config: InterpolationConfigType, ): AnimatedInterpolation { return new AnimatedInterpolation(this, config); diff --git a/packages/react-native/Libraries/Animated/nodes/AnimatedDivision.js b/packages/react-native/Libraries/Animated/nodes/AnimatedDivision.js index 39c6eff566e..6b73ff7d993 100644 --- a/packages/react-native/Libraries/Animated/nodes/AnimatedDivision.js +++ b/packages/react-native/Libraries/Animated/nodes/AnimatedDivision.js @@ -59,7 +59,7 @@ export default class AnimatedDivision extends AnimatedWithChildren { return a / b; } - interpolate( + interpolate( config: InterpolationConfigType, ): AnimatedInterpolation { return new AnimatedInterpolation(this, config); diff --git a/packages/react-native/Libraries/Animated/nodes/AnimatedInterpolation.js b/packages/react-native/Libraries/Animated/nodes/AnimatedInterpolation.js index f5b36eea5ba..6784906c901 100644 --- a/packages/react-native/Libraries/Animated/nodes/AnimatedInterpolation.js +++ b/packages/react-native/Libraries/Animated/nodes/AnimatedInterpolation.js @@ -33,7 +33,7 @@ export type InterpolationConfigSupportedOutputType = | NativeColorValue; export type InterpolationConfigType< - OutputT: InterpolationConfigSupportedOutputType, + OutputT extends InterpolationConfigSupportedOutputType, > = Readonly<{ ...AnimatedNodeConfig, inputRange: ReadonlyArray, @@ -307,10 +307,9 @@ function findRange(input: number, inputRange: ReadonlyArray) { return i - 1; } -function checkValidRanges( - inputRange: ReadonlyArray, - outputRange: ReadonlyArray, -) { +function checkValidRanges< + OutputT extends InterpolationConfigSupportedOutputType, +>(inputRange: ReadonlyArray, outputRange: ReadonlyArray) { checkInfiniteRange('outputRange', outputRange); checkInfiniteRange('inputRange', inputRange); checkValidInputRange(inputRange); @@ -334,10 +333,9 @@ function checkValidInputRange(arr: ReadonlyArray) { } } -function checkInfiniteRange( - name: string, - arr: ReadonlyArray, -) { +function checkInfiniteRange< + OutputT extends InterpolationConfigSupportedOutputType, +>(name: string, arr: ReadonlyArray) { invariant(arr.length >= 2, name + ' must have at least 2 elements'); invariant( arr.length !== 2 || arr[0] !== -Infinity || arr[1] !== Infinity, @@ -352,7 +350,7 @@ function checkInfiniteRange( } export default class AnimatedInterpolation< - OutputT: InterpolationConfigSupportedOutputType, + OutputT extends InterpolationConfigSupportedOutputType, > extends AnimatedWithChildren { _parent: AnimatedNode; _config: InterpolationConfigType; @@ -402,7 +400,7 @@ export default class AnimatedInterpolation< return this._getInterpolation()(parentValue); } - interpolate( + interpolate( config: InterpolationConfigType, ): AnimatedInterpolation { return new AnimatedInterpolation(this, config); diff --git a/packages/react-native/Libraries/Animated/nodes/AnimatedModulo.js b/packages/react-native/Libraries/Animated/nodes/AnimatedModulo.js index 0766ae7918c..32a698afbda 100644 --- a/packages/react-native/Libraries/Animated/nodes/AnimatedModulo.js +++ b/packages/react-native/Libraries/Animated/nodes/AnimatedModulo.js @@ -39,7 +39,7 @@ export default class AnimatedModulo extends AnimatedWithChildren { ); } - interpolate( + interpolate( config: InterpolationConfigType, ): AnimatedInterpolation { return new AnimatedInterpolation(this, config); diff --git a/packages/react-native/Libraries/Animated/nodes/AnimatedMultiplication.js b/packages/react-native/Libraries/Animated/nodes/AnimatedMultiplication.js index dcf3066e708..93764f86c75 100644 --- a/packages/react-native/Libraries/Animated/nodes/AnimatedMultiplication.js +++ b/packages/react-native/Libraries/Animated/nodes/AnimatedMultiplication.js @@ -43,7 +43,7 @@ export default class AnimatedMultiplication extends AnimatedWithChildren { return this._a.__getValue() * this._b.__getValue(); } - interpolate( + interpolate( config: InterpolationConfigType, ): AnimatedInterpolation { return new AnimatedInterpolation(this, config); diff --git a/packages/react-native/Libraries/Animated/nodes/AnimatedStyle.js b/packages/react-native/Libraries/Animated/nodes/AnimatedStyle.js index 54160fcc367..3b04b8ba283 100644 --- a/packages/react-native/Libraries/Animated/nodes/AnimatedStyle.js +++ b/packages/react-native/Libraries/Animated/nodes/AnimatedStyle.js @@ -22,7 +22,7 @@ import AnimatedWithChildren from './AnimatedWithChildren'; export type AnimatedStyleAllowlist = Readonly<{[string]: true}>; type FlatStyle = {[string]: unknown}; -type FlatStyleForWeb = [unknown, TStyle]; +type FlatStyleForWeb = [unknown, TStyle]; function createAnimatedStyle( flatStyle: FlatStyle, @@ -154,7 +154,7 @@ export default class AnimatedStyle extends AnimatedWithChildren { /** * See the constructor, where this is shadowed on web platforms. */ - __getValueForStyle( + __getValueForStyle( style: TStyle, ): FlatStyleForWeb | TStyle { return style; diff --git a/packages/react-native/Libraries/Animated/nodes/AnimatedSubtraction.js b/packages/react-native/Libraries/Animated/nodes/AnimatedSubtraction.js index 39601816e98..04181bda7b2 100644 --- a/packages/react-native/Libraries/Animated/nodes/AnimatedSubtraction.js +++ b/packages/react-native/Libraries/Animated/nodes/AnimatedSubtraction.js @@ -43,7 +43,7 @@ export default class AnimatedSubtraction extends AnimatedWithChildren { return this._a.__getValue() - this._b.__getValue(); } - interpolate( + interpolate( config: InterpolationConfigType, ): AnimatedInterpolation { return new AnimatedInterpolation(this, config); diff --git a/packages/react-native/Libraries/Animated/nodes/AnimatedValue.js b/packages/react-native/Libraries/Animated/nodes/AnimatedValue.js index 1d8ec17bdbb..30b94a3a67f 100644 --- a/packages/react-native/Libraries/Animated/nodes/AnimatedValue.js +++ b/packages/react-native/Libraries/Animated/nodes/AnimatedValue.js @@ -301,7 +301,7 @@ export default class AnimatedValue extends AnimatedWithChildren { * Interpolates the value before updating the property, e.g. mapping 0-1 to * 0-10. */ - interpolate( + interpolate( config: InterpolationConfigType, ): AnimatedInterpolation { return new AnimatedInterpolation(this, config); diff --git a/packages/react-native/Libraries/AppState/AppState.js b/packages/react-native/Libraries/AppState/AppState.js index b1456ec048e..f84de45e7cf 100644 --- a/packages/react-native/Libraries/AppState/AppState.js +++ b/packages/react-native/Libraries/AppState/AppState.js @@ -110,7 +110,7 @@ class AppStateImpl { * * See https://reactnative.dev/docs/appstate#addeventlistener */ - addEventListener( + addEventListener( type: K, handler: (...AppStateEventDefinitions[K]) => void, ): EventSubscription { diff --git a/packages/react-native/Libraries/Components/AccessibilityInfo/AccessibilityInfo.js b/packages/react-native/Libraries/Components/AccessibilityInfo/AccessibilityInfo.js index 223f6149ddb..3d92cf5e6c6 100644 --- a/packages/react-native/Libraries/Components/AccessibilityInfo/AccessibilityInfo.js +++ b/packages/react-native/Libraries/Components/AccessibilityInfo/AccessibilityInfo.js @@ -424,7 +424,7 @@ const AccessibilityInfo = { * * See https://reactnative.dev/docs/accessibilityinfo#addeventlistener */ - addEventListener( + addEventListener( eventName: K, // $FlowFixMe[incompatible-type] - Flow bug with unions and generics (T128099423) handler: (...AccessibilityEventDefinitions[K]) => void, diff --git a/packages/react-native/Libraries/Components/Keyboard/Keyboard.js b/packages/react-native/Libraries/Components/Keyboard/Keyboard.js index b5e1e3a37b1..685c3a7018d 100644 --- a/packages/react-native/Libraries/Components/Keyboard/Keyboard.js +++ b/packages/react-native/Libraries/Components/Keyboard/Keyboard.js @@ -146,7 +146,7 @@ class KeyboardImpl { * * @param {function} callback function to be called when the event fires. */ - addListener( + addListener( eventType: K, listener: (...KeyboardEventDefinitions[K]) => unknown, context?: unknown, @@ -159,7 +159,9 @@ class KeyboardImpl { * * @param {string} eventType The native event string listeners are watching which will be removed. */ - removeAllListeners(eventType: ?K): void { + removeAllListeners( + eventType: ?K, + ): void { this._emitter.removeAllListeners(eventType); } diff --git a/packages/react-native/Libraries/EventEmitter/NativeEventEmitter.js b/packages/react-native/Libraries/EventEmitter/NativeEventEmitter.js index 86c356f95d3..579a06e6beb 100644 --- a/packages/react-native/Libraries/EventEmitter/NativeEventEmitter.js +++ b/packages/react-native/Libraries/EventEmitter/NativeEventEmitter.js @@ -45,7 +45,7 @@ type UnsafeNativeEventObject = Object; * can theoretically listen to `RCTDeviceEventEmitter` (although discouraged). */ export default class NativeEventEmitter< - TEventToArgsMap: Readonly< + TEventToArgsMap extends Readonly< Record>, > = Readonly>>, > implements IEventEmitter @@ -83,7 +83,7 @@ export default class NativeEventEmitter< } } - addListener( + addListener( eventType: TEvent, listener: (...args: TEventToArgsMap[TEvent]) => unknown, context?: unknown, @@ -107,7 +107,7 @@ export default class NativeEventEmitter< }; } - emit( + emit( eventType: TEvent, ...args: TEventToArgsMap[TEvent] ): void { @@ -116,7 +116,9 @@ export default class NativeEventEmitter< RCTDeviceEventEmitter.emit(eventType, ...args); } - removeAllListeners(eventType?: ?TEvent): void { + removeAllListeners( + eventType?: ?TEvent, + ): void { invariant( eventType != null, '`NativeEventEmitter.removeAllListener()` requires a non-null argument.', @@ -125,7 +127,9 @@ export default class NativeEventEmitter< RCTDeviceEventEmitter.removeAllListeners(eventType); } - listenerCount(eventType: TEvent): number { + listenerCount( + eventType: TEvent, + ): number { return RCTDeviceEventEmitter.listenerCount(eventType); } } diff --git a/packages/react-native/Libraries/EventEmitter/RCTDeviceEventEmitter.js b/packages/react-native/Libraries/EventEmitter/RCTDeviceEventEmitter.js index e8e00e49d08..31cca7fe4f6 100644 --- a/packages/react-native/Libraries/EventEmitter/RCTDeviceEventEmitter.js +++ b/packages/react-native/Libraries/EventEmitter/RCTDeviceEventEmitter.js @@ -25,7 +25,7 @@ type RCTDeviceEventDefinitions = {[name: string]: Array}; */ class RCTDeviceEventEmitterImpl extends EventEmitter { // Add systrace to RCTDeviceEventEmitter.emit method for debugging - emit( + emit( eventType: TEvent, ...args: RCTDeviceEventDefinitions[TEvent] ): void { diff --git a/packages/react-native/Libraries/EventEmitter/__mocks__/NativeEventEmitter.js b/packages/react-native/Libraries/EventEmitter/__mocks__/NativeEventEmitter.js index bf137ac0ed6..9670253ebb4 100644 --- a/packages/react-native/Libraries/EventEmitter/__mocks__/NativeEventEmitter.js +++ b/packages/react-native/Libraries/EventEmitter/__mocks__/NativeEventEmitter.js @@ -19,10 +19,10 @@ import RCTDeviceEventEmitter from '../RCTDeviceEventEmitter'; * Mock `NativeEventEmitter` to ignore Native Modules. */ export default class NativeEventEmitter< - TEventToArgsMap: Readonly>>, + TEventToArgsMap extends Readonly>>, > implements IEventEmitter { - addListener( + addListener( eventType: TEvent, listener: (...args: TEventToArgsMap[TEvent]) => unknown, context?: unknown, @@ -30,18 +30,22 @@ export default class NativeEventEmitter< return RCTDeviceEventEmitter.addListener(eventType, listener, context); } - emit( + emit( eventType: TEvent, ...args: TEventToArgsMap[TEvent] ): void { RCTDeviceEventEmitter.emit(eventType, ...args); } - removeAllListeners(eventType?: ?TEvent): void { + removeAllListeners( + eventType?: ?TEvent, + ): void { RCTDeviceEventEmitter.removeAllListeners(eventType); } - listenerCount(eventType: TEvent): number { + listenerCount( + eventType: TEvent, + ): number { return RCTDeviceEventEmitter.listenerCount(eventType); } } diff --git a/packages/react-native/Libraries/Linking/Linking.js b/packages/react-native/Libraries/Linking/Linking.js index 3af2375e2bb..605597b115b 100644 --- a/packages/react-native/Libraries/Linking/Linking.js +++ b/packages/react-native/Libraries/Linking/Linking.js @@ -32,7 +32,7 @@ class LinkingImpl extends NativeEventEmitter { * * See https://reactnative.dev/docs/linking#addeventlistener */ - addEventListener( + addEventListener( eventType: K, listener: (...LinkingEventDefinitions[K]) => unknown, ): EventSubscription { diff --git a/packages/react-native/Libraries/NativeComponent/NativeComponentRegistry.js b/packages/react-native/Libraries/NativeComponent/NativeComponentRegistry.js index ba81528445b..deedfb00904 100644 --- a/packages/react-native/Libraries/NativeComponent/NativeComponentRegistry.js +++ b/packages/react-native/Libraries/NativeComponent/NativeComponentRegistry.js @@ -48,7 +48,7 @@ export function setRuntimeConfigProvider( * The supplied `viewConfigProvider` may or may not be invoked and utilized, * depending on how `setRuntimeConfigProvider` is configured. */ -export function get( +export function get( name: string, viewConfigProvider: () => PartialViewConfig, ): HostComponent { @@ -121,7 +121,7 @@ export function get( * that the return value of this is not `HostComponent` because the returned * component instance is not guaranteed to have native methods. */ -export function getWithFallback_DEPRECATED( +export function getWithFallback_DEPRECATED( name: string, viewConfigProvider: () => PartialViewConfig, ): React.ComponentType { diff --git a/packages/react-native/Libraries/NativeComponent/ViewConfigIgnore.js b/packages/react-native/Libraries/NativeComponent/ViewConfigIgnore.js index 21ccc9f31a2..d45d688c6e2 100644 --- a/packages/react-native/Libraries/NativeComponent/ViewConfigIgnore.js +++ b/packages/react-native/Libraries/NativeComponent/ViewConfigIgnore.js @@ -16,7 +16,9 @@ const ignoredViewConfigProps = new WeakSet<{...}>(); * Decorates ViewConfig values that are dynamically injected by the library, * react-native-gesture-handler. (T45765076) */ -export function DynamicallyInjectedByGestureHandler(object: T): T { +export function DynamicallyInjectedByGestureHandler( + object: T, +): T { ignoredViewConfigProps.add(object); return object; } @@ -35,7 +37,7 @@ export function DynamicallyInjectedByGestureHandler(object: T): T { * TODO(T110872225): Remove this logic, after achieving platform-consistency */ export function ConditionallyIgnoredEventHandlers< - const T: {+[name: string]: true}, + const T extends {+[name: string]: true}, >(value: T): T | void { if (Platform.OS === 'ios') { return value; diff --git a/packages/react-native/Libraries/Network/RCTNetworking.android.js b/packages/react-native/Libraries/Network/RCTNetworking.android.js index 78b68da1ee3..c79b584a4d3 100644 --- a/packages/react-native/Libraries/Network/RCTNetworking.android.js +++ b/packages/react-native/Libraries/Network/RCTNetworking.android.js @@ -48,7 +48,7 @@ const emitter = new NativeEventEmitter<$FlowFixMe>( * requestId to each network request that can be used to abort that request later on. */ const RCTNetworking = { - addListener( + addListener( eventType: K, listener: (...RCTNetworkingEventDefinitions[K]) => unknown, context?: unknown, diff --git a/packages/react-native/Libraries/Network/RCTNetworking.ios.js b/packages/react-native/Libraries/Network/RCTNetworking.ios.js index ec4720f9f46..a97c96dec1f 100644 --- a/packages/react-native/Libraries/Network/RCTNetworking.ios.js +++ b/packages/react-native/Libraries/Network/RCTNetworking.ios.js @@ -18,7 +18,7 @@ import {type RCTNetworkingEventDefinitions} from './RCTNetworkingEventDefinition import {type NativeResponseType} from './XMLHttpRequest'; const RCTNetworking = { - addListener( + addListener( eventType: K, listener: (...RCTNetworkingEventDefinitions[K]) => unknown, context?: unknown, diff --git a/packages/react-native/Libraries/Network/RCTNetworking.js.flow b/packages/react-native/Libraries/Network/RCTNetworking.js.flow index dcafeb05bc4..c1802972b4e 100644 --- a/packages/react-native/Libraries/Network/RCTNetworking.js.flow +++ b/packages/react-native/Libraries/Network/RCTNetworking.js.flow @@ -16,7 +16,7 @@ import type {RCTNetworkingEventDefinitions} from './RCTNetworkingEventDefinition import type {NativeResponseType} from './XMLHttpRequest'; declare const RCTNetworking: interface { - addListener( + addListener( eventType: K, // $FlowFixMe[invalid-computed-prop] listener: (...RCTNetworkingEventDefinitions[K]) => unknown, diff --git a/packages/react-native/Libraries/Pressability/__tests__/Pressability-test.js b/packages/react-native/Libraries/Pressability/__tests__/Pressability-test.js index 34cd473be92..8f4de8f5369 100644 --- a/packages/react-native/Libraries/Pressability/__tests__/Pressability-test.js +++ b/packages/react-native/Libraries/Pressability/__tests__/Pressability-test.js @@ -23,7 +23,7 @@ const itif = (condition: boolean) => { }; // TODO: Move this util to a shared location. -function getMock, TReturn>( +function getMock, TReturn>( fn: (...args: TArguments) => TReturn, ): JestMockFn { if (!jest.isMockFunction(fn)) { diff --git a/packages/react-native/Libraries/ReactNative/RendererImplementation.js b/packages/react-native/Libraries/ReactNative/RendererImplementation.js index 5874de821cf..a62650ef1a2 100644 --- a/packages/react-native/Libraries/ReactNative/RendererImplementation.js +++ b/packages/react-native/Libraries/ReactNative/RendererImplementation.js @@ -37,11 +37,11 @@ function getPaperRenderer(): ReactNativeType { return cachedPaperRenderer; } -const getMethod: (( +const getMethod: (( () => ReactFabricType, MethodName, ) => ReactFabricType[MethodName]) & - (( + (( () => ReactNativeType, MethodName, ) => ReactNativeType[MethodName]) = (getRenderer, methodName) => { @@ -59,13 +59,13 @@ const getMethod: (( }; }; -function getFabricMethod( +function getFabricMethod( methodName: MethodName, ): ReactFabricType[MethodName] { return getMethod(getFabricRenderer, methodName); } -function getPaperMethod( +function getPaperMethod( methodName: MethodName, ): ReactNativeType[MethodName] { return getMethod(getPaperRenderer, methodName); @@ -133,12 +133,14 @@ export function dispatchCommand( } } -export const findHostInstance_DEPRECATED: ( +export const findHostInstance_DEPRECATED: < + TElementType extends React.ElementType, +>( // $FlowExpectedError[incompatible-type] componentOrHandle: ?(React.ElementRef | number), ) => ?HostInstance = getPaperMethod('findHostInstance_DEPRECATED'); -export const findNodeHandle: ( +export const findNodeHandle: ( // $FlowExpectedError[incompatible-type] componentOrHandle: ?(React.ElementRef | number), ) => ?number = getPaperMethod('findNodeHandle'); diff --git a/packages/react-native/Libraries/ReactNative/renderApplication.js b/packages/react-native/Libraries/ReactNative/renderApplication.js index 5a6ebb897c3..875e3fef4be 100644 --- a/packages/react-native/Libraries/ReactNative/renderApplication.js +++ b/packages/react-native/Libraries/ReactNative/renderApplication.js @@ -31,7 +31,7 @@ type ActivityType = component( } ); -export default function renderApplication( +export default function renderApplication( RootComponent: React.ComponentType, initialProps: Props, rootTag: any, diff --git a/packages/react-native/Libraries/ReactNative/requireNativeComponent.js b/packages/react-native/Libraries/ReactNative/requireNativeComponent.js index b9c8d575954..786593125c3 100644 --- a/packages/react-native/Libraries/ReactNative/requireNativeComponent.js +++ b/packages/react-native/Libraries/ReactNative/requireNativeComponent.js @@ -26,7 +26,7 @@ const getNativeComponentAttributes = * */ -const requireNativeComponent = ( +const requireNativeComponent = ( uiViewClassName: string, ): HostComponent => ((createReactNativeComponentClass(uiViewClassName, () => diff --git a/packages/react-native/Libraries/StyleSheet/StyleSheet.js b/packages/react-native/Libraries/StyleSheet/StyleSheet.js index 23dedbe8552..5752cf1e736 100644 --- a/packages/react-native/Libraries/StyleSheet/StyleSheet.js +++ b/packages/react-native/Libraries/StyleSheet/StyleSheet.js @@ -118,7 +118,7 @@ export type DangerouslyImpreciseStyleProp = * This will correctly give you the type 'absolute' | 'relative' */ export type TypeForStyleKey< - +key: keyof ____DangerouslyImpreciseStyle_Internal, + +key extends keyof ____DangerouslyImpreciseStyle_Internal, > = ____DangerouslyImpreciseStyle_Internal[key]; /** diff --git a/packages/react-native/Libraries/StyleSheet/StyleSheet.js.flow b/packages/react-native/Libraries/StyleSheet/StyleSheet.js.flow index f72489b8815..ba8532ba334 100644 --- a/packages/react-native/Libraries/StyleSheet/StyleSheet.js.flow +++ b/packages/react-native/Libraries/StyleSheet/StyleSheet.js.flow @@ -34,7 +34,7 @@ export type { export type StyleSheetProperties = { hairlineWidth: number, - flatten(style: T): T, + flatten(style: T): T, }; /** @@ -119,7 +119,7 @@ export type DangerouslyImpreciseStyleProp = * This will correctly give you the type 'absolute' | 'relative' */ export type TypeForStyleKey< - +key: keyof ____DangerouslyImpreciseStyle_Internal, + +key extends keyof ____DangerouslyImpreciseStyle_Internal, > = ____DangerouslyImpreciseStyle_Internal[key]; /** diff --git a/packages/react-native/Libraries/StyleSheet/StyleSheetExports.js b/packages/react-native/Libraries/StyleSheet/StyleSheetExports.js index cb26d2f1128..152cd00dc92 100644 --- a/packages/react-native/Libraries/StyleSheet/StyleSheetExports.js +++ b/packages/react-native/Libraries/StyleSheet/StyleSheetExports.js @@ -179,7 +179,7 @@ export default { * An identity function for creating style sheets. */ // $FlowFixMe[unsupported-variance-annotation] - create<+S: ____Styles_Internal>(obj: S): Readonly { + create<+S extends ____Styles_Internal>(obj: S): Readonly { // TODO: This should return S as the return type. But first, // we need to codemod all the callsites that are typing this // return value as a number (even though it was opaque). diff --git a/packages/react-native/Libraries/StyleSheet/StyleSheetExports.js.flow b/packages/react-native/Libraries/StyleSheet/StyleSheetExports.js.flow index 78e429c9d33..869bcd0c440 100644 --- a/packages/react-native/Libraries/StyleSheet/StyleSheetExports.js.flow +++ b/packages/react-native/Libraries/StyleSheet/StyleSheetExports.js.flow @@ -95,6 +95,6 @@ declare export const setStyleAttributePreprocessor: ( * An identity function for creating style sheets. */ // $FlowFixMe[unsupported-variance-annotation] -declare export const create: <+S: ____Styles_Internal>( +declare export const create: <+S extends ____Styles_Internal>( obj: S & ____Styles_Internal, ) => Readonly; diff --git a/packages/react-native/Libraries/StyleSheet/StyleSheetTypes.js b/packages/react-native/Libraries/StyleSheet/StyleSheetTypes.js index 063523fcb57..c0c4b5b825e 100644 --- a/packages/react-native/Libraries/StyleSheet/StyleSheetTypes.js +++ b/packages/react-native/Libraries/StyleSheet/StyleSheetTypes.js @@ -1102,8 +1102,8 @@ export type ____Styles_Internal = { // ____FlattenStyleProp_Helper should be considered internal. type FlattenDepthLimiter = [void, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; type ____FlattenStyleProp_Helper< - +TStyleProp: StyleProp, - Depth: Values = 9, + +TStyleProp extends StyleProp, + Depth extends Values = 9, > = Depth extends 0 ? empty : TStyleProp extends null | void | false | '' @@ -1115,7 +1115,9 @@ type ____FlattenStyleProp_Helper< > : TStyleProp; -export type ____FlattenStyleProp_Internal<+TStyleProp: StyleProp> = +export type ____FlattenStyleProp_Internal< + +TStyleProp extends StyleProp, +> = ____FlattenStyleProp_Helper extends empty // $FlowFixMe[unclear-type] ? any : ____FlattenStyleProp_Helper; diff --git a/packages/react-native/Libraries/StyleSheet/flattenStyle.js b/packages/react-native/Libraries/StyleSheet/flattenStyle.js index f367f693d76..5d787128aa4 100644 --- a/packages/react-native/Libraries/StyleSheet/flattenStyle.js +++ b/packages/react-native/Libraries/StyleSheet/flattenStyle.js @@ -21,7 +21,7 @@ type NonAnimatedNodeObject = TStyleProp extends AnimatedNode : TStyleProp; function flattenStyle< - TStyleProp: ____DangerouslyImpreciseAnimatedStyleProp_Internal, + TStyleProp extends ____DangerouslyImpreciseAnimatedStyleProp_Internal, >( style: ?TStyleProp, // $FlowFixMe[underconstrained-implicit-instantiation] diff --git a/packages/react-native/Libraries/StyleSheet/private/_TransformStyle.js b/packages/react-native/Libraries/StyleSheet/private/_TransformStyle.js index b152e41164b..21f65735371 100644 --- a/packages/react-native/Libraries/StyleSheet/private/_TransformStyle.js +++ b/packages/react-native/Libraries/StyleSheet/private/_TransformStyle.js @@ -23,7 +23,7 @@ type ValueOfUnion = T extends any type MergeUnion = { [K in KeysOfUnion]?: ValueOfUnion, }; -type MaximumOneOf = Values<{ +type MaximumOneOf = Values<{ [K in keyof T]: $Exact<{ [P in keyof T]?: P extends K ? T[P] : empty, }>, diff --git a/packages/react-native/Libraries/TurboModule/RCTExport.js b/packages/react-native/Libraries/TurboModule/RCTExport.js index ff9e3c423b2..09761f057ac 100644 --- a/packages/react-native/Libraries/TurboModule/RCTExport.js +++ b/packages/react-native/Libraries/TurboModule/RCTExport.js @@ -29,7 +29,7 @@ */ // eslint-disable-next-line no-unused-vars -export interface DEPRECATED_RCTExport { +export interface DEPRECATED_RCTExport { +getConstants?: () => {...}; } diff --git a/packages/react-native/Libraries/TurboModule/TurboModuleRegistry.js b/packages/react-native/Libraries/TurboModule/TurboModuleRegistry.js index 719603df82d..21fbee1f276 100644 --- a/packages/react-native/Libraries/TurboModule/TurboModuleRegistry.js +++ b/packages/react-native/Libraries/TurboModule/TurboModuleRegistry.js @@ -16,7 +16,7 @@ const NativeModules = require('../BatchedBridge/NativeModules').default; const turboModuleProxy = global.__turboModuleProxy; -function requireModule(name: string): ?T { +function requireModule(name: string): ?T { if (turboModuleProxy != null) { const module: ?T = turboModuleProxy(name); if (module != null) { @@ -32,11 +32,11 @@ function requireModule(name: string): ?T { return null; } -export function get(name: string): ?T { +export function get(name: string): ?T { return requireModule(name); } -export function getEnforcing(name: string): T { +export function getEnforcing(name: string): T { const module = requireModule(name); invariant( module != null, diff --git a/packages/react-native/Libraries/Types/CodegenTypes.js b/packages/react-native/Libraries/Types/CodegenTypes.js index 78164b950e1..b700b228197 100644 --- a/packages/react-native/Libraries/Types/CodegenTypes.js +++ b/packages/react-native/Libraries/Types/CodegenTypes.js @@ -18,11 +18,11 @@ import type {NativeSyntheticEvent} from './CoreEventTypes'; export type BubblingEventHandler< T, - PaperName: string | empty = empty, // eslint-disable-line no-unused-vars + PaperName extends string | empty = empty, // eslint-disable-line no-unused-vars > = (event: NativeSyntheticEvent) => void | Promise; export type DirectEventHandler< T, - PaperName: string | empty = empty, // eslint-disable-line no-unused-vars + PaperName extends string | empty = empty, // eslint-disable-line no-unused-vars > = (event: NativeSyntheticEvent) => void | Promise; // Prop types @@ -40,8 +40,11 @@ type DefaultTypes = number | boolean | string | ReadonlyArray; // TODO: (rickhanlonii) T44881457 If a default is provided, it should always be optional // but that is currently not supported in the codegen since we require a default // -// eslint-disable-next-line no-unused-vars -export type WithDefault = ?Type; +export type WithDefault< + Type extends DefaultTypes, + // eslint-disable-next-line no-unused-vars + Value extends ?Type | string, +> = ?Type; export type EventEmitter = ( handler: (T) => void | Promise, diff --git a/packages/react-native/Libraries/Types/ReactDevToolsTypes.js b/packages/react-native/Libraries/Types/ReactDevToolsTypes.js index 767f5461f29..f8cbc110e83 100644 --- a/packages/react-native/Libraries/Types/ReactDevToolsTypes.js +++ b/packages/react-native/Libraries/Types/ReactDevToolsTypes.js @@ -34,7 +34,7 @@ export type ReactDevToolsAgentEvents = { export type ReactDevToolsAgent = { selectNode(node: unknown): void, stopInspectingNative(value: boolean): void, - addListener( + addListener( event: Event, listener: (...ReactDevToolsAgentEvents[Event]) => void, ): void, diff --git a/packages/react-native/Libraries/Utilities/codegenNativeCommands.js b/packages/react-native/Libraries/Utilities/codegenNativeCommands.js index f3a82973837..acc8f9cc0ab 100644 --- a/packages/react-native/Libraries/Utilities/codegenNativeCommands.js +++ b/packages/react-native/Libraries/Utilities/codegenNativeCommands.js @@ -14,7 +14,7 @@ type NativeCommandsOptions = Readonly<{ supportedCommands: ReadonlyArray, }>; -function codegenNativeCommands( +function codegenNativeCommands( options: NativeCommandsOptions, ): T { const commandObj: {[keyof T]: (...ReadonlyArray) => void} = {}; diff --git a/packages/react-native/Libraries/Utilities/codegenNativeComponent.js b/packages/react-native/Libraries/Utilities/codegenNativeComponent.js index cf9b2eccbcf..b0f1c6fba59 100644 --- a/packages/react-native/Libraries/Utilities/codegenNativeComponent.js +++ b/packages/react-native/Libraries/Utilities/codegenNativeComponent.js @@ -23,7 +23,7 @@ type NativeComponentOptions = Readonly<{ excludedPlatforms?: ReadonlyArray<'iOS' | 'android'>, }>; -export type NativeComponentType = HostComponent; +export type NativeComponentType = HostComponent; // If this function runs then that means the view configs were not // generated at build time using `GenerateViewConfigJs.js`. Thus @@ -31,7 +31,7 @@ export type NativeComponentType = HostComponent; // `requireNativeComponent` is not available in Bridgeless mode. // e.g. This function runs at runtime if `codegenNativeComponent` was not called // from a file suffixed with NativeComponent.js. -function codegenNativeComponent( +function codegenNativeComponent( componentName: string, options?: NativeComponentOptions, ): NativeComponentType { diff --git a/packages/react-native/Libraries/Utilities/deepFreezeAndThrowOnMutationInDev.js b/packages/react-native/Libraries/Utilities/deepFreezeAndThrowOnMutationInDev.js index 44577bc19d4..082c1a492ed 100644 --- a/packages/react-native/Libraries/Utilities/deepFreezeAndThrowOnMutationInDev.js +++ b/packages/react-native/Libraries/Utilities/deepFreezeAndThrowOnMutationInDev.js @@ -27,7 +27,7 @@ * Freezing the object and adding the throw mechanism is expensive and will * only be used in DEV. */ -function deepFreezeAndThrowOnMutationInDev>( +function deepFreezeAndThrowOnMutationInDev>( object: T, ): T { if (__DEV__) { diff --git a/packages/react-native/Libraries/vendor/core/ErrorUtils.js b/packages/react-native/Libraries/vendor/core/ErrorUtils.js index 137f555d3e5..fe496b4aa74 100644 --- a/packages/react-native/Libraries/vendor/core/ErrorUtils.js +++ b/packages/react-native/Libraries/vendor/core/ErrorUtils.js @@ -10,22 +10,22 @@ // From @react-native/js-polyfills type ErrorHandler = (error: unknown, isFatal: boolean) => void; -type Fn, Return> = (...Args) => Return; +type Fn, Return> = (...Args) => Return; export type ErrorUtils = { - applyWithGuard, TOut>( + applyWithGuard, TOut>( fun: Fn, context?: unknown, args?: ?TArgs, unused_onError?: null, unused_name?: ?string, ): ?TOut, - applyWithGuardIfNeeded, TOut>( + applyWithGuardIfNeeded, TOut>( fun: Fn, context?: unknown, args?: ?TArgs, ): ?TOut, getGlobalHandler(): ErrorHandler, - guard, TOut>( + guard, TOut>( fun: Fn, name?: ?string, context?: unknown, diff --git a/packages/react-native/Libraries/vendor/emitter/EventEmitter.js b/packages/react-native/Libraries/vendor/emitter/EventEmitter.js index 08d04a95f2c..4b722443197 100644 --- a/packages/react-native/Libraries/vendor/emitter/EventEmitter.js +++ b/packages/react-native/Libraries/vendor/emitter/EventEmitter.js @@ -16,22 +16,28 @@ export interface EventSubscription { } export interface IEventEmitter< - TEventToArgsMap: Readonly>>, + TEventToArgsMap extends Readonly< + Record>, + >, > { - addListener( + addListener( eventType: TEvent, listener: (...args: TEventToArgsMap[TEvent]) => unknown, context?: unknown, ): EventSubscription; - emit( + emit( eventType: TEvent, ...args: TEventToArgsMap[TEvent] ): void; - removeAllListeners(eventType?: ?TEvent): void; + removeAllListeners( + eventType?: ?TEvent, + ): void; - listenerCount(eventType: TEvent): number; + listenerCount( + eventType: TEvent, + ): number; } interface Registration { @@ -41,7 +47,9 @@ interface Registration { } type Registry< - TEventToArgsMap: Readonly>>, + TEventToArgsMap extends Readonly< + Record>, + >, > = { [K in keyof TEventToArgsMap]: Set>, }; @@ -67,7 +75,7 @@ type Registry< * */ export default class EventEmitter< - TEventToArgsMap: Readonly< + TEventToArgsMap extends Readonly< Record>, > = Readonly>>, > implements IEventEmitter @@ -83,7 +91,7 @@ export default class EventEmitter< * Registers a listener that is called when the supplied event is emitted. * Returns a subscription that has a `remove` method to undo registration. */ - addListener( + addListener( eventType: TEvent, listener: (...args: TEventToArgsMap[TEvent]) => unknown, context: unknown, @@ -116,7 +124,7 @@ export default class EventEmitter< * If a listener modifies the listeners registered for the same event, those * changes will not be reflected in the current invocation of `emit`. */ - emit( + emit( eventType: TEvent, ...args: TEventToArgsMap[TEvent] ): void { @@ -134,7 +142,9 @@ export default class EventEmitter< /** * Removes all registered listeners. */ - removeAllListeners(eventType?: ?TEvent): void { + removeAllListeners( + eventType?: ?TEvent, + ): void { if (eventType == null) { // $FlowFixMe[incompatible-type] this.#registry = {}; @@ -146,7 +156,9 @@ export default class EventEmitter< /** * Returns the number of registered listeners for the supplied event. */ - listenerCount(eventType: TEvent): number { + listenerCount( + eventType: TEvent, + ): number { const registrations: ?Set> = this.#registry[eventType]; return registrations == null ? 0 : registrations.size; @@ -154,8 +166,10 @@ export default class EventEmitter< } function allocate< - TEventToArgsMap: Readonly>>, - TEvent: keyof TEventToArgsMap, + TEventToArgsMap extends Readonly< + Record>, + >, + TEvent extends keyof TEventToArgsMap, >( registry: Registry, eventType: TEvent, diff --git a/packages/react-native/flow/HermesInternalType.js b/packages/react-native/flow/HermesInternalType.js index 3850908e27f..eb017fc41d5 100644 --- a/packages/react-native/flow/HermesInternalType.js +++ b/packages/react-native/flow/HermesInternalType.js @@ -108,7 +108,7 @@ declare type $HermesInternalType = { /** * Enqueue a JavaScript callback function as a Job into the engine Job queue. */ - +enqueueJob?: >( + +enqueueJob?: >( jobCallback: (...args: TArguments) => unknown, ) => void, }; diff --git a/packages/react-native/flow/dom.js.flow b/packages/react-native/flow/dom.js.flow index 011d882b89b..de74fda8b26 100644 --- a/packages/react-native/flow/dom.js.flow +++ b/packages/react-native/flow/dom.js.flow @@ -1300,21 +1300,21 @@ declare class Node extends EventTarget { previousSibling: ?Node; rootNode: Node; textContent: string; - appendChild(newChild: T): T; + appendChild(newChild: T): T; cloneNode(deep?: boolean): this; compareDocumentPosition(other: Node): number; contains(other: ?Node): boolean; getRootNode(options?: {composed: boolean, ...}): Node; hasChildNodes(): boolean; - insertBefore(newChild: T, refChild?: ?Node): T; + insertBefore(newChild: T, refChild?: ?Node): T; isDefaultNamespace(namespaceURI: string): boolean; isEqualNode(arg: Node): boolean; isSameNode(other: Node): boolean; lookupNamespaceURI(prefix: string): string; lookupPrefix(namespaceURI: string): string; normalize(): void; - removeChild(oldChild: T): T; - replaceChild(newChild: Node, oldChild: T): T; + removeChild(oldChild: T): T; + replaceChild(newChild: Node, oldChild: T): T; replaceChildren(...nodes: ReadonlyArray): void; static ATTRIBUTE_NODE: number; static CDATA_SECTION_NODE: number; @@ -1379,7 +1379,7 @@ declare class Attr extends Node { localName: string; } -declare class HTMLCollection<+Elem: HTMLElement> { +declare class HTMLCollection<+Elem extends HTMLElement> { @@iterator(): Iterator; length: number; item(nameOrIndex?: any, optionalIndex?: any): Elem | null; @@ -1430,7 +1430,7 @@ declare class Document extends Node { +timeline: DocumentTimeline; getAnimations(): Array; +URL: string; - adoptNode(source: T): T; + adoptNode(source: T): T; anchors: HTMLCollection; applets: HTMLCollection; body: HTMLBodyElement | null; @@ -2034,7 +2034,7 @@ declare class Document extends Node { head: HTMLHeadElement | null; images: HTMLCollection; +implementation: DOMImplementation; - importNode(importedNode: T, deep: boolean): T; + importNode(importedNode: T, deep: boolean): T; /** * Legacy alias of `characterSet` * @deprecated @@ -2237,12 +2237,12 @@ declare class Document extends Node { // NodeFilter.SHOW_ATTRIBUTE === 1), RootNodeT must be Attr, and when // RootNodeT is Attr, bitmasks other than NodeFilter.SHOW_ATTRIBUTE are // meaningless. - createNodeIterator( + createNodeIterator( root: RootNodeT, whatToShow: 2, filter?: NodeFilterInterface, ): NodeIterator; - createTreeWalker( + createTreeWalker( root: RootNodeT, whatToShow: 2, filter?: NodeFilterInterface, @@ -2254,122 +2254,122 @@ declare class Document extends Node { // When (whatToShow & NodeFilter.SHOW_DOCUMENT === 1 || whatToShow & // NodeFilter.SHOW_DOCUMENT_TYPE === 1), RootNodeT must be Document. - createNodeIterator( + createNodeIterator( root: RootNodeT, whatToShow: 256, filter?: NodeFilterInterface, ): NodeIterator; - createNodeIterator( + createNodeIterator( root: RootNodeT, whatToShow: 257, filter?: NodeFilterInterface, ): NodeIterator; - createNodeIterator( + createNodeIterator( root: RootNodeT, whatToShow: 260, filter?: NodeFilterInterface, ): NodeIterator; - createNodeIterator( + createNodeIterator( root: RootNodeT, whatToShow: 261, filter?: NodeFilterInterface, ): NodeIterator; - createNodeIterator( + createNodeIterator( root: RootNodeT, whatToShow: 384, filter?: NodeFilterInterface, ): NodeIterator; - createNodeIterator( + createNodeIterator( root: RootNodeT, whatToShow: 385, filter?: NodeFilterInterface, ): NodeIterator; - createNodeIterator( + createNodeIterator( root: RootNodeT, whatToShow: 388, filter?: NodeFilterInterface, ): NodeIterator; - createNodeIterator( + createNodeIterator( root: RootNodeT, whatToShow: 389, filter?: NodeFilterInterface, ): NodeIterator; - createNodeIterator( + createNodeIterator( root: RootNodeT, whatToShow: 512, filter?: NodeFilterInterface, ): NodeIterator; - createNodeIterator( + createNodeIterator( root: RootNodeT, whatToShow: 513, filter?: NodeFilterInterface, ): NodeIterator; - createNodeIterator( + createNodeIterator( root: RootNodeT, whatToShow: 516, filter?: NodeFilterInterface, ): NodeIterator; - createNodeIterator( + createNodeIterator( root: RootNodeT, whatToShow: 517, filter?: NodeFilterInterface, ): NodeIterator; - createNodeIterator( + createNodeIterator( root: RootNodeT, whatToShow: 640, filter?: NodeFilterInterface, ): NodeIterator; - createNodeIterator( + createNodeIterator( root: RootNodeT, whatToShow: 641, filter?: NodeFilterInterface, ): NodeIterator; - createNodeIterator( + createNodeIterator( root: RootNodeT, whatToShow: 644, filter?: NodeFilterInterface, ): NodeIterator; - createNodeIterator( + createNodeIterator( root: RootNodeT, whatToShow: 645, filter?: NodeFilterInterface, ): NodeIterator; - createNodeIterator( + createNodeIterator( root: RootNodeT, whatToShow: 768, filter?: NodeFilterInterface, ): NodeIterator; - createNodeIterator( + createNodeIterator( root: RootNodeT, whatToShow: 769, filter?: NodeFilterInterface, ): NodeIterator; - createNodeIterator( + createNodeIterator( root: RootNodeT, whatToShow: 772, filter?: NodeFilterInterface, ): NodeIterator; - createNodeIterator( + createNodeIterator( root: RootNodeT, whatToShow: 773, filter?: NodeFilterInterface, ): NodeIterator; - createNodeIterator( + createNodeIterator( root: RootNodeT, whatToShow: 896, filter?: NodeFilterInterface, ): NodeIterator; - createNodeIterator( + createNodeIterator( root: RootNodeT, whatToShow: 897, filter?: NodeFilterInterface, ): NodeIterator; - createNodeIterator( + createNodeIterator( root: RootNodeT, whatToShow: 900, filter?: NodeFilterInterface, ): NodeIterator; - createNodeIterator( + createNodeIterator( root: RootNodeT, whatToShow: 901, filter?: NodeFilterInterface, @@ -2377,145 +2377,145 @@ declare class Document extends Node { RootNodeT, DocumentType | Document | Element | Text | Comment, >; - createTreeWalker( + createTreeWalker( root: RootNodeT, whatToShow: 256, filter?: NodeFilterInterface, entityReferenceExpansion?: boolean, ): TreeWalker; - createTreeWalker( + createTreeWalker( root: RootNodeT, whatToShow: 257, filter?: NodeFilterInterface, entityReferenceExpansion?: boolean, ): TreeWalker; - createTreeWalker( + createTreeWalker( root: RootNodeT, whatToShow: 260, filter?: NodeFilterInterface, entityReferenceExpansion?: boolean, ): TreeWalker; - createTreeWalker( + createTreeWalker( root: RootNodeT, whatToShow: 261, filter?: NodeFilterInterface, entityReferenceExpansion?: boolean, ): TreeWalker; - createTreeWalker( + createTreeWalker( root: RootNodeT, whatToShow: 384, filter?: NodeFilterInterface, entityReferenceExpansion?: boolean, ): TreeWalker; - createTreeWalker( + createTreeWalker( root: RootNodeT, whatToShow: 385, filter?: NodeFilterInterface, entityReferenceExpansion?: boolean, ): TreeWalker; - createTreeWalker( + createTreeWalker( root: RootNodeT, whatToShow: 388, filter?: NodeFilterInterface, entityReferenceExpansion?: boolean, ): TreeWalker; - createTreeWalker( + createTreeWalker( root: RootNodeT, whatToShow: 389, filter?: NodeFilterInterface, entityReferenceExpansion?: boolean, ): TreeWalker; - createTreeWalker( + createTreeWalker( root: RootNodeT, whatToShow: 512, filter?: NodeFilterInterface, entityReferenceExpansion?: boolean, ): TreeWalker; - createTreeWalker( + createTreeWalker( root: RootNodeT, whatToShow: 513, filter?: NodeFilterInterface, entityReferenceExpansion?: boolean, ): TreeWalker; - createTreeWalker( + createTreeWalker( root: RootNodeT, whatToShow: 516, filter?: NodeFilterInterface, entityReferenceExpansion?: boolean, ): TreeWalker; - createTreeWalker( + createTreeWalker( root: RootNodeT, whatToShow: 517, filter?: NodeFilterInterface, entityReferenceExpansion?: boolean, ): TreeWalker; - createTreeWalker( + createTreeWalker( root: RootNodeT, whatToShow: 640, filter?: NodeFilterInterface, entityReferenceExpansion?: boolean, ): TreeWalker; - createTreeWalker( + createTreeWalker( root: RootNodeT, whatToShow: 641, filter?: NodeFilterInterface, entityReferenceExpansion?: boolean, ): TreeWalker; - createTreeWalker( + createTreeWalker( root: RootNodeT, whatToShow: 644, filter?: NodeFilterInterface, entityReferenceExpansion?: boolean, ): TreeWalker; - createTreeWalker( + createTreeWalker( root: RootNodeT, whatToShow: 645, filter?: NodeFilterInterface, entityReferenceExpansion?: boolean, ): TreeWalker; - createTreeWalker( + createTreeWalker( root: RootNodeT, whatToShow: 768, filter?: NodeFilterInterface, entityReferenceExpansion?: boolean, ): TreeWalker; - createTreeWalker( + createTreeWalker( root: RootNodeT, whatToShow: 769, filter?: NodeFilterInterface, entityReferenceExpansion?: boolean, ): TreeWalker; - createTreeWalker( + createTreeWalker( root: RootNodeT, whatToShow: 772, filter?: NodeFilterInterface, entityReferenceExpansion?: boolean, ): TreeWalker; - createTreeWalker( + createTreeWalker( root: RootNodeT, whatToShow: 773, filter?: NodeFilterInterface, entityReferenceExpansion?: boolean, ): TreeWalker; - createTreeWalker( + createTreeWalker( root: RootNodeT, whatToShow: 896, filter?: NodeFilterInterface, entityReferenceExpansion?: boolean, ): TreeWalker; - createTreeWalker( + createTreeWalker( root: RootNodeT, whatToShow: 897, filter?: NodeFilterInterface, entityReferenceExpansion?: boolean, ): TreeWalker; - createTreeWalker( + createTreeWalker( root: RootNodeT, whatToShow: 900, filter?: NodeFilterInterface, entityReferenceExpansion?: boolean, ): TreeWalker; - createTreeWalker( + createTreeWalker( root: RootNodeT, whatToShow: 901, filter?: NodeFilterInterface, @@ -2524,89 +2524,89 @@ declare class Document extends Node { // When (whatToShow & NodeFilter.SHOW_DOCUMENT_FRAGMENT === 1), RootNodeT // must be a DocumentFragment. - createNodeIterator( + createNodeIterator( root: RootNodeT, whatToShow: 1024, filter?: NodeFilterInterface, ): NodeIterator; - createNodeIterator( + createNodeIterator( root: RootNodeT, whatToShow: 1025, filter?: NodeFilterInterface, ): NodeIterator; - createNodeIterator( + createNodeIterator( root: RootNodeT, whatToShow: 1028, filter?: NodeFilterInterface, ): NodeIterator; - createNodeIterator( + createNodeIterator( root: RootNodeT, whatToShow: 1029, filter?: NodeFilterInterface, ): NodeIterator; - createNodeIterator( + createNodeIterator( root: RootNodeT, whatToShow: 1152, filter?: NodeFilterInterface, ): NodeIterator; - createNodeIterator( + createNodeIterator( root: RootNodeT, whatToShow: 1153, filter?: NodeFilterInterface, ): NodeIterator; - createNodeIterator( + createNodeIterator( root: RootNodeT, whatToShow: 1156, filter?: NodeFilterInterface, ): NodeIterator; - createNodeIterator( + createNodeIterator( root: RootNodeT, whatToShow: 1157, filter?: NodeFilterInterface, ): NodeIterator; - createTreeWalker( + createTreeWalker( root: RootNodeT, whatToShow: 1024, filter?: NodeFilterInterface, entityReferenceExpansion?: boolean, ): TreeWalker; - createTreeWalker( + createTreeWalker( root: RootNodeT, whatToShow: 1025, filter?: NodeFilterInterface, entityReferenceExpansion?: boolean, ): TreeWalker; - createTreeWalker( + createTreeWalker( root: RootNodeT, whatToShow: 1028, filter?: NodeFilterInterface, entityReferenceExpansion?: boolean, ): TreeWalker; - createTreeWalker( + createTreeWalker( root: RootNodeT, whatToShow: 1029, filter?: NodeFilterInterface, entityReferenceExpansion?: boolean, ): TreeWalker; - createTreeWalker( + createTreeWalker( root: RootNodeT, whatToShow: 1152, filter?: NodeFilterInterface, entityReferenceExpansion?: boolean, ): TreeWalker; - createTreeWalker( + createTreeWalker( root: RootNodeT, whatToShow: 1153, filter?: NodeFilterInterface, entityReferenceExpansion?: boolean, ): TreeWalker; - createTreeWalker( + createTreeWalker( root: RootNodeT, whatToShow: 1156, filter?: NodeFilterInterface, entityReferenceExpansion?: boolean, ): TreeWalker; - createTreeWalker( + createTreeWalker( root: RootNodeT, whatToShow: 1157, filter?: NodeFilterInterface, @@ -2616,78 +2616,78 @@ declare class Document extends Node { // In the general case, RootNodeT may be any Node and whatToShow may be // NodeFilter.SHOW_ALL or any combination of NodeFilter.SHOW_ELEMENT, // NodeFilter.SHOW_TEXT and/or NodeFilter.SHOW_COMMENT - createNodeIterator( + createNodeIterator( root: RootNodeT, whatToShow: 1, filter?: NodeFilterInterface, ): NodeIterator; - createNodeIterator( + createNodeIterator( root: RootNodeT, whatToShow: 4, filter?: NodeFilterInterface, ): NodeIterator; - createNodeIterator( + createNodeIterator( root: RootNodeT, whatToShow: 5, filter?: NodeFilterInterface, ): NodeIterator; - createNodeIterator( + createNodeIterator( root: RootNodeT, whatToShow: 128, filter?: NodeFilterInterface, ): NodeIterator; - createNodeIterator( + createNodeIterator( root: RootNodeT, whatToShow: 129, filter?: NodeFilterInterface, ): NodeIterator; - createNodeIterator( + createNodeIterator( root: RootNodeT, whatToShow: 132, filter?: NodeFilterInterface, ): NodeIterator; - createNodeIterator( + createNodeIterator( root: RootNodeT, whatToShow: 133, filter?: NodeFilterInterface, ): NodeIterator; - createTreeWalker( + createTreeWalker( root: RootNodeT, whatToShow: 1, filter?: NodeFilterInterface, entityReferenceExpansion?: boolean, ): TreeWalker; - createTreeWalker( + createTreeWalker( root: RootNodeT, whatToShow: 4, filter?: NodeFilterInterface, entityReferenceExpansion?: boolean, ): TreeWalker; - createTreeWalker( + createTreeWalker( root: RootNodeT, whatToShow: 5, filter?: NodeFilterInterface, entityReferenceExpansion?: boolean, ): TreeWalker; - createTreeWalker( + createTreeWalker( root: RootNodeT, whatToShow: 128, filter?: NodeFilterInterface, entityReferenceExpansion?: boolean, ): TreeWalker; - createTreeWalker( + createTreeWalker( root: RootNodeT, whatToShow: 129, filter?: NodeFilterInterface, entityReferenceExpansion?: boolean, ): TreeWalker; - createTreeWalker( + createTreeWalker( root: RootNodeT, whatToShow: 132, filter?: NodeFilterInterface, entityReferenceExpansion?: boolean, ): TreeWalker; - createTreeWalker( + createTreeWalker( root: RootNodeT, whatToShow: 133, filter?: NodeFilterInterface, @@ -2696,12 +2696,12 @@ declare class Document extends Node { // Catch all for when we don't know the value of `whatToShow` // And for when whatToShow is not provided, it is assumed to be SHOW_ALL - createNodeIterator( + createNodeIterator( root: RootNodeT, whatToShow?: number, filter?: NodeFilterInterface, ): NodeIterator; - createTreeWalker( + createTreeWalker( root: RootNodeT, whatToShow?: number, filter?: NodeFilterInterface, diff --git a/packages/react-native/scripts/featureflags/types.js b/packages/react-native/scripts/featureflags/types.js index 54ce4fbb9dd..086d3f9bbe0 100644 --- a/packages/react-native/scripts/featureflags/types.js +++ b/packages/react-native/scripts/featureflags/types.js @@ -29,7 +29,7 @@ export type OSSReleaseStageValue = | 'stable'; export type CommonFeatureFlagConfig< - TValue: FeatureFlagValue = FeatureFlagValue, + TValue extends FeatureFlagValue = FeatureFlagValue, > = Readonly<{ defaultValue: TValue, metadata: FeatureFlagMetadata, @@ -44,7 +44,7 @@ export type CommonFeatureFlagList = Readonly<{ }>; export type JsOnlyFeatureFlagConfig< - TValue: FeatureFlagValue = FeatureFlagValue, + TValue extends FeatureFlagValue = FeatureFlagValue, > = Readonly<{ defaultValue: TValue, metadata: FeatureFlagMetadata, @@ -55,7 +55,9 @@ export type JsOnlyFeatureFlagList = Readonly<{ [flagName: string]: JsOnlyFeatureFlagConfig<>, }>; -export type FeatureFlagMetadata = +export type FeatureFlagMetadata< + TValue extends FeatureFlagValue = FeatureFlagValue, +> = | Readonly<{ purpose: 'experimentation', /** diff --git a/packages/react-native/src/private/__tests__/utilities/isUnreachable.js b/packages/react-native/src/private/__tests__/utilities/isUnreachable.js index 478b481ec14..1bd18634c98 100644 --- a/packages/react-native/src/private/__tests__/utilities/isUnreachable.js +++ b/packages/react-native/src/private/__tests__/utilities/isUnreachable.js @@ -10,7 +10,7 @@ import * as Fantom from '@react-native/fantom'; -export default function isUnreachable( +export default function isUnreachable( weakRef: WeakRef, ): boolean { let unreachable = true; diff --git a/packages/react-native/src/private/animated/NativeAnimatedValidation.js b/packages/react-native/src/private/animated/NativeAnimatedValidation.js index 5638267a278..159605f00eb 100644 --- a/packages/react-native/src/private/animated/NativeAnimatedValidation.js +++ b/packages/react-native/src/private/animated/NativeAnimatedValidation.js @@ -20,7 +20,7 @@ import { } from '../../../Libraries/Animated/NativeAnimatedAllowlist'; export function validateInterpolation< - OutputT: InterpolationConfigSupportedOutputType, + OutputT extends InterpolationConfigSupportedOutputType, >(config: InterpolationConfigType): void { for (const key in config) { if (key !== 'debugID' && !isSupportedInterpolationParam(key)) { diff --git a/packages/react-native/src/private/animated/createAnimatedPropsHook.js b/packages/react-native/src/private/animated/createAnimatedPropsHook.js index 46a09964d81..0d5745be8fe 100644 --- a/packages/react-native/src/private/animated/createAnimatedPropsHook.js +++ b/packages/react-native/src/private/animated/createAnimatedPropsHook.js @@ -36,7 +36,7 @@ type ReducedProps = { }; type CallbackRef = T => unknown; -export type AnimatedPropsHook = ( +export type AnimatedPropsHook = ( props: TProps, ) => [ReducedProps, CallbackRef]; @@ -55,7 +55,7 @@ export default function createAnimatedPropsHook( const useNativePropsInFabric = ReactNativeFeatureFlags.shouldUseSetNativePropsInFabric(); - return function useAnimatedProps( + return function useAnimatedProps( props: TProps, ): [ReducedProps, CallbackRef] { const [, scheduleUpdate] = useReducer(count => count + 1, 0); diff --git a/packages/react-native/src/private/components/virtualview/__tests__/VirtualView-itest.js b/packages/react-native/src/private/components/virtualview/__tests__/VirtualView-itest.js index dd5311a36ad..bcc17b87f05 100644 --- a/packages/react-native/src/private/components/virtualview/__tests__/VirtualView-itest.js +++ b/packages/react-native/src/private/components/virtualview/__tests__/VirtualView-itest.js @@ -355,7 +355,9 @@ export function dispatchModeChangeEvent( /** * Helper to create a callback ref that records instances using WeakRefs. */ -function createWeakRefCallback(): Readonly<{ +function createWeakRefCallback< + T extends interface {} = interface {}, +>(): Readonly<{ weakRefs: ReadonlyArray>, callbackRef: React.RefSetter, }> {