Skip to content

Commit 3d9c46f

Browse files
authored
Merge pull request #398 from rch850/file-reader
Add type to FileReader event target.
2 parents 2c51f06 + ba5a702 commit 3d9c46f

File tree

5 files changed

+65
-18
lines changed

5 files changed

+65
-18
lines changed

baselines/dom.generated.d.ts

+16-12
Original file line numberDiff line numberDiff line change
@@ -4722,12 +4722,12 @@ interface FileReaderEventMap {
47224722

47234723
interface FileReader extends EventTarget {
47244724
readonly error: DOMException | null;
4725-
onabort: ((this: FileReader, ev: ProgressEvent) => any) | null;
4726-
onerror: ((this: FileReader, ev: ProgressEvent) => any) | null;
4727-
onload: ((this: FileReader, ev: ProgressEvent) => any) | null;
4728-
onloadend: ((this: FileReader, ev: ProgressEvent) => any) | null;
4729-
onloadstart: ((this: FileReader, ev: ProgressEvent) => any) | null;
4730-
onprogress: ((this: FileReader, ev: ProgressEvent) => any) | null;
4725+
onabort: ((this: FileReader, ev: FileReaderProgressEvent) => any) | null;
4726+
onerror: ((this: FileReader, ev: FileReaderProgressEvent) => any) | null;
4727+
onload: ((this: FileReader, ev: FileReaderProgressEvent) => any) | null;
4728+
onloadend: ((this: FileReader, ev: FileReaderProgressEvent) => any) | null;
4729+
onloadstart: ((this: FileReader, ev: FileReaderProgressEvent) => any) | null;
4730+
onprogress: ((this: FileReader, ev: FileReaderProgressEvent) => any) | null;
47314731
readonly readyState: number;
47324732
readonly result: any;
47334733
abort(): void;
@@ -4752,6 +4752,10 @@ declare var FileReader: {
47524752
readonly LOADING: number;
47534753
};
47544754

4755+
interface FileReaderProgressEvent extends ProgressEvent {
4756+
readonly target: FileReader | null;
4757+
}
4758+
47554759
interface FocusEvent extends UIEvent {
47564760
readonly relatedTarget: EventTarget;
47574761
initFocusEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, relatedTargetArg: EventTarget): void;
@@ -9681,6 +9685,12 @@ declare var PannerNode: {
96819685
new(): PannerNode;
96829686
};
96839687

9688+
interface ParentNode {
9689+
readonly childElementCount: number;
9690+
readonly firstElementChild: Element | null;
9691+
readonly lastElementChild: Element | null;
9692+
}
9693+
96849694
interface ParentNode {
96859695
readonly children: HTMLCollection;
96869696
querySelector<K extends keyof HTMLElementTagNameMap>(selectors: K): HTMLElementTagNameMap[K] | null;
@@ -9691,12 +9701,6 @@ interface ParentNode {
96919701
querySelectorAll<E extends Element = Element>(selectors: string): NodeListOf<E>;
96929702
}
96939703

9694-
interface ParentNode {
9695-
readonly childElementCount: number;
9696-
readonly firstElementChild: Element | null;
9697-
readonly lastElementChild: Element | null;
9698-
}
9699-
97009704
interface Path2D extends CanvasPathMethods {
97019705
}
97029706

baselines/webworker.generated.d.ts

+10-6
Original file line numberDiff line numberDiff line change
@@ -588,12 +588,12 @@ interface FileReaderEventMap {
588588

589589
interface FileReader extends EventTarget {
590590
readonly error: DOMException | null;
591-
onabort: ((this: FileReader, ev: ProgressEvent) => any) | null;
592-
onerror: ((this: FileReader, ev: ProgressEvent) => any) | null;
593-
onload: ((this: FileReader, ev: ProgressEvent) => any) | null;
594-
onloadend: ((this: FileReader, ev: ProgressEvent) => any) | null;
595-
onloadstart: ((this: FileReader, ev: ProgressEvent) => any) | null;
596-
onprogress: ((this: FileReader, ev: ProgressEvent) => any) | null;
591+
onabort: ((this: FileReader, ev: FileReaderProgressEvent) => any) | null;
592+
onerror: ((this: FileReader, ev: FileReaderProgressEvent) => any) | null;
593+
onload: ((this: FileReader, ev: FileReaderProgressEvent) => any) | null;
594+
onloadend: ((this: FileReader, ev: FileReaderProgressEvent) => any) | null;
595+
onloadstart: ((this: FileReader, ev: FileReaderProgressEvent) => any) | null;
596+
onprogress: ((this: FileReader, ev: FileReaderProgressEvent) => any) | null;
597597
readonly readyState: number;
598598
readonly result: any;
599599
abort(): void;
@@ -618,6 +618,10 @@ declare var FileReader: {
618618
readonly LOADING: number;
619619
};
620620

621+
interface FileReaderProgressEvent extends ProgressEvent {
622+
readonly target: FileReader | null;
623+
}
624+
621625
interface FileReaderSync {
622626
readAsArrayBuffer(blob: Blob): any;
623627
readAsBinaryString(blob: Blob): void;

inputfiles/addedTypes.json

+14
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,20 @@
4747
}
4848
}
4949
},
50+
"FileReaderProgressEvent": {
51+
"name": "FileReaderProgressEvent",
52+
"extends": "ProgressEvent",
53+
"properties": {
54+
"property": {
55+
"name": {
56+
"name": "target",
57+
"read-only": 1,
58+
"override-type": "FileReader | null"
59+
}
60+
}
61+
},
62+
"no-interface-object": "1"
63+
},
5064
"BroadcastChannel": {
5165
"name": "BroadcastChannel",
5266
"extends": "EventTarget",

inputfiles/knownWorkerTypes.json

+1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
"File",
3838
"FileList",
3939
"FileReader",
40+
"FileReaderProgressEvent",
4041
"FormData",
4142
"Headers",
4243
"IDBCursor",

inputfiles/overridingTypes.json

+24
Original file line numberDiff line numberDiff line change
@@ -1761,6 +1761,30 @@
17611761
"name": "FileReader",
17621762
"properties": {
17631763
"property": {
1764+
"onloadstart": {
1765+
"name": "onloadstart",
1766+
"override-type": "(this: FileReader, ev: FileReaderProgressEvent) => any"
1767+
},
1768+
"onprogress": {
1769+
"name": "onprogress",
1770+
"override-type": "(this: FileReader, ev: FileReaderProgressEvent) => any"
1771+
},
1772+
"onload": {
1773+
"name": "onload",
1774+
"override-type": "(this: FileReader, ev: FileReaderProgressEvent) => any"
1775+
},
1776+
"onabort": {
1777+
"name": "onabort",
1778+
"override-type": "(this: FileReader, ev: FileReaderProgressEvent) => any"
1779+
},
1780+
"onerror": {
1781+
"name": "onerror",
1782+
"override-type": "(this: FileReader, ev: FileReaderProgressEvent) => any"
1783+
},
1784+
"onloadend": {
1785+
"name": "onloadend",
1786+
"override-type": "(this: FileReader, ev: FileReaderProgressEvent) => any"
1787+
},
17641788
"result": {
17651789
"name": "result",
17661790
"override-type": "any"

0 commit comments

Comments
 (0)