Skip to content

Commit 434a306

Browse files
SamChou19815meta-codesync[bot]
authored andcommitted
Cleanup legacy library types in xplat: 1/n (#58609)
Summary: Pull Request resolved: #58609 Changelog: [Internal] Differential Revision: D120838256 fbshipit-source-id: 1dd13e2748802bf50e6746257182fe1d0e4241ab
1 parent a7e4224 commit 434a306

8 files changed

Lines changed: 38 additions & 39 deletions

File tree

packages/community-cli-plugin/src/dev-server/version.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ function buildDiffUrl(oldVersion: string, newVersion: string) {
153153
* Returns the most recent React Native version available to upgrade to.
154154
*/
155155
async function getLatestRnDiffPurgeVersion(): Promise<LatestVersions | void> {
156-
const options: RequestOptions = {
156+
const options: RequestInit = {
157157
// https://developer.github.com/v3/#user-agent-required
158158
headers: {'User-Agent': '@react-native/community-cli-plugin'} as Headers,
159159
};

packages/react-native/Libraries/Animated/animations/DecayAnimation.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ export default class DecayAnimation extends Animation {
4242
_deceleration: number;
4343
_velocity: number;
4444
_onUpdate: (value: number) => void;
45-
_animationFrame: ?AnimationFrameID;
45+
_animationFrame: ?number;
4646
_platformConfig: ?PlatformConfig;
4747

4848
constructor(config: DecayAnimationConfigSingle) {

packages/react-native/Libraries/Animated/animations/SpringAnimation.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ export default class SpringAnimation extends Animation {
104104
_lastTime: number;
105105
_frameTime: number;
106106
_onUpdate: (value: number) => void;
107-
_animationFrame: ?AnimationFrameID;
107+
_animationFrame: ?number;
108108
_platformConfig: ?PlatformConfig;
109109

110110
constructor(config: SpringAnimationConfigSingle) {

packages/react-native/Libraries/Animated/animations/TimingAnimation.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ export default class TimingAnimation extends Animation {
6868
_delay: number;
6969
_easing: (value: number) => number;
7070
_onUpdate: (value: number) => void;
71-
_animationFrame: ?AnimationFrameID;
71+
_animationFrame: ?number;
7272
_timeout: ?TimeoutID;
7373
_platformConfig: ?PlatformConfig;
7474
_deferredStart: boolean;

packages/react-native/flow/bom.js.flow

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -479,14 +479,14 @@ declare class XMLHttpRequest extends EventTarget {
479479
LOADING: number;
480480
msCaching: string;
481481
msCachingEnabled(): boolean;
482-
onabort: ProgressEventHandler;
483-
onerror: ProgressEventHandler;
484-
onload: ProgressEventHandler;
485-
onloadend: ProgressEventHandler;
486-
onloadstart: ProgressEventHandler;
487-
onprogress: ProgressEventHandler;
482+
onabort: (event: ProgressEvent) => unknown;
483+
onerror: (event: ProgressEvent) => unknown;
484+
onload: (event: ProgressEvent) => unknown;
485+
onloadend: (event: ProgressEvent) => unknown;
486+
onloadstart: (event: ProgressEvent) => unknown;
487+
onprogress: (event: ProgressEvent) => unknown;
488488
onreadystatechange: (ev: $FlowFixMe) => unknown;
489-
ontimeout: ProgressEventHandler;
489+
ontimeout: (event: ProgressEvent) => unknown;
490490
open(
491491
method: string,
492492
url: string,
@@ -518,13 +518,13 @@ declare class XMLHttpRequest extends EventTarget {
518518
}
519519

520520
declare class XMLHttpRequestEventTarget extends EventTarget {
521-
onabort: ProgressEventHandler;
522-
onerror: ProgressEventHandler;
523-
onload: ProgressEventHandler;
524-
onloadend: ProgressEventHandler;
525-
onloadstart: ProgressEventHandler;
526-
onprogress: ProgressEventHandler;
527-
ontimeout: ProgressEventHandler;
521+
onabort: (event: ProgressEvent) => unknown;
522+
onerror: (event: ProgressEvent) => unknown;
523+
onload: (event: ProgressEvent) => unknown;
524+
onloadend: (event: ProgressEvent) => unknown;
525+
onloadstart: (event: ProgressEvent) => unknown;
526+
onprogress: (event: ProgressEvent) => unknown;
527+
ontimeout: (event: ProgressEvent) => unknown;
528528
}
529529

530530
// this part of spec is not finished yet, apparently
@@ -625,7 +625,7 @@ type BodyInit =
625625

626626
type RequestInfo = Request | URL | string;
627627

628-
type RequestOptions = {
628+
type RequestInit = {
629629
body?: ?BodyInit,
630630
cache?: CacheType,
631631
credentials?: CredentialsType,
@@ -684,7 +684,7 @@ declare class Request {
684684

685685
cache: CacheType;
686686
clone(): Request;
687-
constructor(input: RequestInfo, init?: RequestOptions): void;
687+
constructor(input: RequestInfo, init?: RequestInit): void;
688688
credentials: CredentialsType;
689689
formData(): Promise<FormData>;
690690
headers: Headers;
@@ -720,7 +720,7 @@ declare class AbortSignal extends EventTarget {
720720

721721
declare function fetch(
722722
input: RequestInfo,
723-
init?: RequestOptions,
723+
init?: RequestInit,
724724
): Promise<Response>;
725725

726726
declare class Location {
@@ -740,11 +740,6 @@ declare class Location {
740740
toString(): string;
741741
}
742742

743-
declare class CanvasCaptureMediaStream extends MediaStream {
744-
canvas: HTMLCanvasElement;
745-
requestFrame(): void;
746-
}
747-
748743
declare type FileSystemHandleKind = 'file' | 'directory';
749744

750745
// https://wicg.github.io/file-system-access/#api-filesystemhandle

packages/react-native/flow/dom.js.flow

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1260,7 +1260,7 @@ declare class SecurityPolicyViolationEvent extends Event {
12601260

12611261
// https://developer.mozilla.org/en-US/docs/Web/API/USBConnectionEvent
12621262
declare class USBConnectionEvent extends Event {
1263-
device: USBDevice;
1263+
device: unknown;
12641264
}
12651265

12661266
// TODO: *Event
@@ -4965,6 +4965,12 @@ declare class WebGLContextEvent extends Event {
49654965
// http://www.w3.org/TR/html5/scripting-1.html#renderingcontext
49664966
type RenderingContext = CanvasRenderingContext2D | WebGLRenderingContext;
49674967

4968+
type CanvasCaptureMediaStream = MediaStream & {
4969+
canvas: HTMLCanvasElement,
4970+
requestFrame(): void,
4971+
...
4972+
};
4973+
49684974
// https://www.w3.org/TR/html5/scripting-1.html#htmlcanvaselement
49694975
declare class HTMLCanvasElement extends HTMLElement {
49704976
tagName: 'CANVAS';
@@ -6100,21 +6106,19 @@ declare function getComputedStyle(
61006106
elt: Element,
61016107
pseudoElt?: string,
61026108
): CSSStyleDeclaration;
6103-
declare opaque type AnimationFrameID;
61046109
declare function requestAnimationFrame(
61056110
callback: (timestamp: number) => void,
6106-
): AnimationFrameID;
6107-
declare function cancelAnimationFrame(requestId: AnimationFrameID): void;
6108-
declare opaque type IdleCallbackID;
6111+
): number;
6112+
declare function cancelAnimationFrame(requestId: number): void;
61096113
declare function requestIdleCallback(
61106114
cb: (deadline: {
61116115
didTimeout: boolean,
61126116
timeRemaining: () => number,
61136117
...
61146118
}) => void,
61156119
opts?: {timeout: number, ...},
6116-
): IdleCallbackID;
6117-
declare function cancelIdleCallback(id: IdleCallbackID): void;
6120+
): number;
6121+
declare function cancelIdleCallback(id: number): void;
61186122
declare var localStorage: Storage;
61196123
declare var devicePixelRatio: number;
61206124
declare function focus(): void;

packages/rn-tester/IntegrationTests/TimersTest.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class TimersTest extends React.Component<Props, State> {
3232
_timeoutIDs: Set<TimeoutID> = new Set();
3333
_intervalIDs: Set<IntervalID> = new Set();
3434
_immediateIDs: Set<ImmediateID> = new Set();
35-
_animationFrameIDs: Set<AnimationFrameID> = new Set();
35+
_animationFrameIDs: Set<number> = new Set();
3636

3737
state: State = {
3838
count: 0,
@@ -81,8 +81,8 @@ class TimersTest extends React.Component<Props, State> {
8181
return id;
8282
}
8383

84-
requestAnimationFrame(fn: () => void): AnimationFrameID {
85-
const id: AnimationFrameID = requestAnimationFrame(() => {
84+
requestAnimationFrame(fn: () => void): number {
85+
const id: number = requestAnimationFrame(() => {
8686
this._animationFrameIDs.delete(id);
8787
fn();
8888
});
@@ -92,7 +92,7 @@ class TimersTest extends React.Component<Props, State> {
9292
return id;
9393
}
9494

95-
cancelAnimationFrame(id: AnimationFrameID): void {
95+
cancelAnimationFrame(id: number): void {
9696
this._animationFrameIDs.delete(id);
9797
cancelAnimationFrame(id);
9898
}

packages/rn-tester/js/examples/Timer/TimerExample.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class RequestIdleCallbackTester extends React.Component<
3333
message: '-',
3434
};
3535

36-
_idleTimer: ?IdleCallbackID = null;
36+
_idleTimer: ?number = null;
3737
_iters = 0;
3838

3939
componentWillUnmount() {
@@ -156,7 +156,7 @@ class TimerTester extends React.Component<TimerTesterProps> {
156156
_iters = 0;
157157
_start = 0;
158158
_timerId: ?TimeoutID = null;
159-
_rafId: ?AnimationFrameID = null;
159+
_rafId: ?number = null;
160160
_intervalId: ?IntervalID = null;
161161
_immediateId: ?Object = null;
162162
_timerFn: ?() => any = null;

0 commit comments

Comments
 (0)