From c417a38ff1d8d4786cb0c2175394781cedf9cd3f Mon Sep 17 00:00:00 2001 From: Sam Zhou Date: Fri, 20 Nov 2026 21:31:39 -0800 Subject: [PATCH] Fix Flow types that use `void` for a missing value Summary: Under Flow's `experimental.ts_void`, `void` is TypeScript's `void`, which flows only into `void`, `any` and `unknown`, so a value typed `void` can't be passed where an optional value or `undefined` is expected. This updates React Native's Flow types for projects that check React Native's sources with that option: - Library definitions say `undefined` where the TypeScript definitions do: `babel/traverse`'s `Scope#getBinding()` and `child_process.spawnSync()`'s `error`. execa's `env` is read-only, so it accepts both `process.env` and objects with `void` values. - `BackHandler` handlers and the RN tester's stall handler may return nothing. - `EventTarget`'s listener maps and codegen's `bubblingType` use maybe types instead of `void`, `componentDidMount()` in `TouchableNativeFeedback` returns `void`, and two RN tester components that render nothing return `undefined`. - Where the only fix needs the `undefined` type, which this repository's Flow config doesn't enable, the error is suppressed. Without that option, `void` and `undefined` are the same type, so nothing changes. Changelog: [General][Changed] - Allow `BackHandler` event listeners to return nothing [General][Changed] - Type `TouchableNativeFeedback`'s `componentDidMount()` as returning `void` Differential Revision: D133660807 --- flow-typed/environment/node.js | 2 +- flow-typed/npm/babel-traverse_v7.x.x.js | 2 +- flow-typed/npm/execa_v5.x.x.js | 2 +- .../src/parsers/flow/components/events.js | 2 +- .../src/parsers/parsers-commons.js | 2 +- .../src/parsers/typescript/components/events.js | 2 +- .../Touchable/TouchableNativeFeedback.js | 2 +- .../Libraries/Pressability/Pressability.js | 1 + .../Libraries/ReactNative/AppContainer-dev.js | 1 + .../Libraries/Utilities/BackHandler.android.js | 2 +- .../Libraries/Utilities/BackHandler.ios.js | 2 +- .../Libraries/Utilities/BackHandler.js.flow | 2 +- packages/react-native/ReactNativeApi.d.ts | 16 ++++++++-------- packages/react-native/scripts/setup-apple-spm.js | 1 + .../private/webapis/dom/events/EventTarget.js | 4 ++-- .../ActivityIndicatorExample.js | 1 + .../EffectInRenderExample.js | 2 ++ .../js/examples/Snapshot/SnapshotExample.js | 1 + .../rn-tester/js/utils/JSEventLoopWatchdog.js | 6 +++++- .../reporter/terminalImages.js | 2 +- private/react-native-fantom/runner/runner.js | 1 + 21 files changed, 34 insertions(+), 22 deletions(-) diff --git a/flow-typed/environment/node.js b/flow-typed/environment/node.js index 295853ae60c7..63512062494b 100644 --- a/flow-typed/environment/node.js +++ b/flow-typed/environment/node.js @@ -426,7 +426,7 @@ type child_process$spawnSyncRet = Readonly<{ // TODO: subprocess.status may be null in case of error or signal status: number, signal: string | null, - error: Error | void, + error: Error | undefined, }>; type child_process$spawnSyncOpts = Readonly<{ diff --git a/flow-typed/npm/babel-traverse_v7.x.x.js b/flow-typed/npm/babel-traverse_v7.x.x.js index c5988473f338..ba55c17b8a10 100644 --- a/flow-typed/npm/babel-traverse_v7.x.x.js +++ b/flow-typed/npm/babel-traverse_v7.x.x.js @@ -533,7 +533,7 @@ declare module '@babel/traverse' { bindingIdentifierEquals(name: string, node: BabelNode): boolean; - getBinding(name: string): Binding | void; + getBinding(name: string): Binding | undefined; getOwnBinding(name: string): Binding | void; diff --git a/flow-typed/npm/execa_v5.x.x.js b/flow-typed/npm/execa_v5.x.x.js index 6029a675a377..7e19ef048bbb 100644 --- a/flow-typed/npm/execa_v5.x.x.js +++ b/flow-typed/npm/execa_v5.x.x.js @@ -21,7 +21,7 @@ declare module 'execa' { cwd?: string, detached?: boolean, encoding?: string, - env?: {[key: string]: string | void, ...}, + env?: Readonly<{[key: string]: string | void, ...}>, extendEnv?: boolean, gid?: number, killSignal?: string | number, diff --git a/packages/react-native-codegen/src/parsers/flow/components/events.js b/packages/react-native-codegen/src/parsers/flow/components/events.js index 0a31c9fb0212..b047edc0cdee 100644 --- a/packages/react-native-codegen/src/parsers/flow/components/events.js +++ b/packages/react-native-codegen/src/parsers/flow/components/events.js @@ -182,7 +182,7 @@ function findEventArgumentsAndType( parser: Parser, typeAnnotation: $FlowFixMe, types: TypeMap, - bubblingType: void | 'direct' | 'bubble', + bubblingType: ?('direct' | 'bubble'), paperName: ?$FlowFixMe, ): EventArgumentReturnType { throwIfEventHasNoName(typeAnnotation, parser); diff --git a/packages/react-native-codegen/src/parsers/parsers-commons.js b/packages/react-native-codegen/src/parsers/parsers-commons.js index f1c20648f8f6..43ab4ebb39fa 100644 --- a/packages/react-native-codegen/src/parsers/parsers-commons.js +++ b/packages/react-native-codegen/src/parsers/parsers-commons.js @@ -1332,7 +1332,7 @@ function handleEventHandler( parser: Parser, typeAnnotation: $FlowFixMe, types: TypeDeclarationMap, - bubblingType: void | 'direct' | 'bubble', + bubblingType: ?('direct' | 'bubble'), paperName: ?$FlowFixMe, ) => EventArgumentReturnType, ): EventArgumentReturnType { diff --git a/packages/react-native-codegen/src/parsers/typescript/components/events.js b/packages/react-native-codegen/src/parsers/typescript/components/events.js index 05015df3aa07..396d9105c3b0 100644 --- a/packages/react-native-codegen/src/parsers/typescript/components/events.js +++ b/packages/react-native-codegen/src/parsers/typescript/components/events.js @@ -175,7 +175,7 @@ function findEventArgumentsAndType( parser: Parser, typeAnnotation: $FlowFixMe, types: TypeDeclarationMap, - bubblingType: void | 'direct' | 'bubble', + bubblingType: ?('direct' | 'bubble'), paperName: ?$FlowFixMe, ): { argumentProps: ?ReadonlyArray<$FlowFixMe>, diff --git a/packages/react-native/Libraries/Components/Touchable/TouchableNativeFeedback.js b/packages/react-native/Libraries/Components/Touchable/TouchableNativeFeedback.js index 2caaee82292c..aae50b8d178c 100644 --- a/packages/react-native/Libraries/Components/Touchable/TouchableNativeFeedback.js +++ b/packages/react-native/Libraries/Components/Touchable/TouchableNativeFeedback.js @@ -363,7 +363,7 @@ class TouchableNativeFeedback extends React.Component< this.state.pressability.configure(this._createPressabilityConfig()); } - componentDidMount(): unknown { + componentDidMount(): void { this.state.pressability.configure(this._createPressabilityConfig()); } diff --git a/packages/react-native/Libraries/Pressability/Pressability.js b/packages/react-native/Libraries/Pressability/Pressability.js index efed84e54345..0a263060cdc0 100644 --- a/packages/react-native/Libraries/Pressability/Pressability.js +++ b/packages/react-native/Libraries/Pressability/Pressability.js @@ -606,6 +606,7 @@ export default class Pressability { } }; } + // $FlowFixMe[incompatible-type] `void` is not `undefined` under experimental.ts_void return { ...focusEventHandlers, ...responderEventHandlers, diff --git a/packages/react-native/Libraries/ReactNative/AppContainer-dev.js b/packages/react-native/Libraries/ReactNative/AppContainer-dev.js index a9457cf09b36..e22db422a0c5 100644 --- a/packages/react-native/Libraries/ReactNative/AppContainer-dev.js +++ b/packages/react-native/Libraries/ReactNative/AppContainer-dev.js @@ -188,6 +188,7 @@ const AppContainer = ({ externalInspection.externalInspectingEnabled) && ( ?boolean; +type BackPressHandler = (event: HardwareBackPressEvent) => ?boolean | void; const _backPressSubscriptions: Array = []; diff --git a/packages/react-native/Libraries/Utilities/BackHandler.ios.js b/packages/react-native/Libraries/Utilities/BackHandler.ios.js index e9bb65f193bb..605575e840c2 100644 --- a/packages/react-native/Libraries/Utilities/BackHandler.ios.js +++ b/packages/react-native/Libraries/Utilities/BackHandler.ios.js @@ -11,7 +11,7 @@ import type {HardwareBackPressEvent} from './HardwareBackPressEvent'; type BackPressEventName = 'backPress' | 'hardwareBackPress'; -type BackPressHandler = (event: HardwareBackPressEvent) => ?boolean; +type BackPressHandler = (event: HardwareBackPressEvent) => ?boolean | void; function emptyFunction(): void {} diff --git a/packages/react-native/Libraries/Utilities/BackHandler.js.flow b/packages/react-native/Libraries/Utilities/BackHandler.js.flow index 4c1debea88b0..591ac05bffda 100644 --- a/packages/react-native/Libraries/Utilities/BackHandler.js.flow +++ b/packages/react-native/Libraries/Utilities/BackHandler.js.flow @@ -26,7 +26,7 @@ type TBackHandler = { exitApp(): void, addEventListener( eventName: BackPressEventName, - handler: (event: HardwareBackPressEvent) => ?boolean, + handler: (event: HardwareBackPressEvent) => ?boolean | void, ): {remove: () => void, ...}, }; diff --git a/packages/react-native/ReactNativeApi.d.ts b/packages/react-native/ReactNativeApi.d.ts index 55e761e65927..1b1fcc723561 100644 --- a/packages/react-native/ReactNativeApi.d.ts +++ b/packages/react-native/ReactNativeApi.d.ts @@ -4,7 +4,7 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @generated SignedSource<> + * @generated SignedSource<<1844fb63742cd2547a287716f2881ac4>> * * This file was generated by scripts/js-api/build-types/index.js. */ @@ -4949,7 +4949,7 @@ declare type TaskProvider = () => HeadlessTask declare type TBackHandler = { addEventListener( eventName: BackPressEventName, - handler: (event: HardwareBackPressEvent) => boolean | undefined, + handler: (event: HardwareBackPressEvent) => (boolean | undefined) | void, ): { remove: () => void } @@ -5380,7 +5380,7 @@ declare class TouchableNativeFeedback extends React.Component< readonly rippleRadius: number | undefined readonly type: "ThemeAttrAndroid" } - componentDidMount(): unknown + componentDidMount(): void componentDidUpdate( prevProps: TouchableNativeFeedbackProps, prevState: TouchableNativeFeedbackState, @@ -5902,12 +5902,12 @@ export { AssetDestPathResolver, // 59047424 AssetRegistry, // 6070bb45 AutoCapitalize, // c0e857a0 - BackHandler, // f139fc69 + BackHandler, // 29f7039a BackPressEventName, // 4620fb76 BlurEvent, // 00c596e2 BoxShadowValue, // b679703f - Button, // 8a7997de - ButtonInstance, // 6c48e56a + Button, // 8edd088d + ButtonInstance, // cfe07901 ButtonProps, // 2fe658e4 CodegenTypes, // d0052fd4 ColorSchemeName, // 6615edd6 @@ -6150,8 +6150,8 @@ export { TouchableHighlight, // 0a900542 TouchableHighlightInstance, // 7fb6781a TouchableHighlightProps, // d0b13d30 - TouchableNativeFeedback, // 06d2a186 - TouchableNativeFeedbackInstance, // bb702365 + TouchableNativeFeedback, // 4c640471 + TouchableNativeFeedbackInstance, // d25e33ae TouchableNativeFeedbackProps, // 9e5a4301 TouchableOpacity, // 4dac793e TouchableOpacityInstance, // dca89710 diff --git a/packages/react-native/scripts/setup-apple-spm.js b/packages/react-native/scripts/setup-apple-spm.js index 736d8f5517c8..98076c2c03d6 100644 --- a/packages/react-native/scripts/setup-apple-spm.js +++ b/packages/react-native/scripts/setup-apple-spm.js @@ -1213,6 +1213,7 @@ async function main(argv /*:: ?: Array */) /*: Promise */ { log('Generating autolinking.json (CLI config)...'); autolinkingConfigResult = generateAutolinkingConfigOrFailClosed({ projectRoot, + // $FlowFixMe[incompatible-type] `void` is not `undefined` under experimental.ts_void configCommand: resolveExplicitConfigCommand(args, appRoot), }); if (autolinkingConfigResult == null) { diff --git a/packages/react-native/src/private/webapis/dom/events/EventTarget.js b/packages/react-native/src/private/webapis/dom/events/EventTarget.js index 31e5bfe17207..73920f62d022 100644 --- a/packages/react-native/src/private/webapis/dom/events/EventTarget.js +++ b/packages/react-native/src/private/webapis/dom/events/EventTarget.js @@ -64,8 +64,8 @@ type EventListenerRegistration = { type ListenersMap = Map>; export default class EventTarget { - [CAPTURING_LISTENERS_KEY]: ListenersMap | void; - [BUBBLING_LISTENERS_KEY]: ListenersMap | void; + [CAPTURING_LISTENERS_KEY]: ?ListenersMap; + [BUBBLING_LISTENERS_KEY]: ?ListenersMap; addEventListener( type: string, diff --git a/packages/rn-tester/js/examples/ActivityIndicator/ActivityIndicatorExample.js b/packages/rn-tester/js/examples/ActivityIndicator/ActivityIndicatorExample.js index dfb5d8c93caa..139956310d44 100644 --- a/packages/rn-tester/js/examples/ActivityIndicator/ActivityIndicatorExample.js +++ b/packages/rn-tester/js/examples/ActivityIndicator/ActivityIndicatorExample.js @@ -31,6 +31,7 @@ function ToggleAnimatingActivityIndicator() { setToggleTimeout(); return () => { + // $FlowFixMe[incompatible-type] `void` is not `undefined` under experimental.ts_void clearTimeout(timer.current); }; }, [timer, setToggleTimeout]); diff --git a/packages/rn-tester/js/examples/Performance/performanceComparisonExamples/EffectInRenderExample.js b/packages/rn-tester/js/examples/Performance/performanceComparisonExamples/EffectInRenderExample.js index 676ed3d9c38e..783e61a4bd89 100644 --- a/packages/rn-tester/js/examples/Performance/performanceComparisonExamples/EffectInRenderExample.js +++ b/packages/rn-tester/js/examples/Performance/performanceComparisonExamples/EffectInRenderExample.js @@ -41,6 +41,7 @@ function ItemFetcherBadExample(props: { onFetched(items); // $FlowFixMe[incompatible-type] }, console.error); + return undefined; } function ItemFetcherGoodExample(props: { @@ -64,6 +65,7 @@ function ItemFetcherGoodExample(props: { // $FlowFixMe[incompatible-type] }, console.error); }, [onFetched, count]); + return undefined; } const ItemFetcherBadExampleMemo = memo(ItemFetcherBadExample); diff --git a/packages/rn-tester/js/examples/Snapshot/SnapshotExample.js b/packages/rn-tester/js/examples/Snapshot/SnapshotExample.js index 85660887a680..e78d0a531c19 100644 --- a/packages/rn-tester/js/examples/Snapshot/SnapshotExample.js +++ b/packages/rn-tester/js/examples/Snapshot/SnapshotExample.js @@ -32,6 +32,7 @@ class ScreenshotExample extends React.Component<{...}, $FlowFixMe> { style={[style.button, {color: theme.LabelColor}]}> Click to take a screenshot + {/* $FlowFixMe[incompatible-use] `void` is not `undefined` under experimental.ts_void */} void, - onStall: (params: {lastInterval: number, busyTime: number, ...}) => ?string, + onStall: (params: { + lastInterval: number, + busyTime: number, + ... + }) => ?string | void, ... }; diff --git a/private/react-native-fantom/reporter/terminalImages.js b/private/react-native-fantom/reporter/terminalImages.js index 528fed9faec7..52dbd83b2b6e 100644 --- a/private/react-native-fantom/reporter/terminalImages.js +++ b/private/react-native-fantom/reporter/terminalImages.js @@ -11,7 +11,7 @@ import {getPngDimensions} from '../runner/screenshots/pngUtils'; export type ImageProtocol = 'iterm2' | 'kitty'; -export type TerminalEnvironment = {[key: string]: string | void}; +export type TerminalEnvironment = Readonly<{[key: string]: string | void}>; export function getImageProtocol( isTTY: ?boolean, diff --git a/private/react-native-fantom/runner/runner.js b/private/react-native-fantom/runner/runner.js index 9593a03a1786..457685a8922d 100644 --- a/private/react-native-fantom/runner/runner.js +++ b/private/react-native-fantom/runner/runner.js @@ -566,6 +566,7 @@ module.exports = async function runTest( }); } + // $FlowFixMe[incompatible-type] `void` is not `undefined` under experimental.ts_void testResultsByConfig.push(testResults); coverageMap = processedResult.coverageMap || {};