Skip to content

TypeScript Issue # 18615. #299

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jan 8, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 44 additions & 7 deletions baselines/dom.generated.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3599,8 +3599,8 @@ interface Element extends Node, GlobalEventHandlers, ElementTraversal, NodeSelec
getAttributeNode(name: string): Attr;
getAttributeNodeNS(namespaceURI: string, localName: string): Attr;
getAttributeNS(namespaceURI: string, localName: string): string;
getBoundingClientRect(): ClientRect;
getClientRects(): ClientRectList;
getBoundingClientRect(): ClientRect | DOMRect;
getClientRects(): ClientRectList | DOMRectList;
getElementsByTagName<K extends keyof HTMLElementTagNameMap>(name: K): NodeListOf<HTMLElementTagNameMap[K]>;
getElementsByTagName<K extends keyof SVGElementTagNameMap>(name: K): NodeListOf<SVGElementTagNameMap[K]>;
getElementsByTagName(name: string): NodeListOf<Element>;
Expand Down Expand Up @@ -4898,6 +4898,7 @@ interface HTMLFormElement extends HTMLElement {
*/
submit(): void;
reportValidity(): boolean;
reportValidity(): boolean;
addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLFormElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLFormElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
Expand Down Expand Up @@ -7367,10 +7368,10 @@ declare var IntersectionObserver: {
};

interface IntersectionObserverEntry {
readonly boundingClientRect: ClientRect;
readonly boundingClientRect: ClientRect | DOMRect;
readonly intersectionRatio: number;
readonly intersectionRect: ClientRect;
readonly rootBounds: ClientRect;
readonly intersectionRect: ClientRect | DOMRect;
readonly rootBounds: ClientRect | DOMRect;
readonly target: Element;
readonly time: number;
readonly isIntersecting: boolean;
Expand Down Expand Up @@ -9168,8 +9169,8 @@ interface Range {
detach(): void;
expand(Unit: ExpandGranularity): boolean;
extractContents(): DocumentFragment;
getBoundingClientRect(): ClientRect;
getClientRects(): ClientRectList;
getBoundingClientRect(): ClientRect | DOMRect;
getClientRects(): ClientRectList | DOMRectList;
insertNode(newNode: Node): void;
selectNode(refNode: Node): void;
selectNodeContents(refNode: Node): void;
Expand Down Expand Up @@ -14662,6 +14663,23 @@ declare var HTMLSummaryElement: {
new(): HTMLSummaryElement;
};

interface DOMRectReadOnly {
readonly bottom: number;
readonly height: number;
readonly left: number;
readonly right: number;
readonly top: number;
readonly width: number;
readonly x: number;
readonly y: number;
}

declare var DOMRectReadOnly: {
prototype: DOMRectReadOnly;
new (x?: number, y?: number, width?: number, height?: number): DOMRectReadOnly;
fromRect(rectangle?: DOMRectInit): DOMRectReadOnly;
};

interface EXT_blend_minmax {
readonly MIN_EXT: number;
readonly MAX_EXT: number;
Expand All @@ -14680,6 +14698,25 @@ interface EXT_sRGB {
readonly FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING_EXT: number;
}

interface DOMRect extends DOMRectReadOnly {
height: number;
width: number;
x: number;
y: number;
}

declare var DOMRect: {
prototype: DOMRect;
new (x?: number, y?: number, width?: number, height?: number): DOMRect;
fromRect(rectangle?: DOMRectInit): DOMRect;
};

interface DOMRectList {
readonly length: number;
item(index: number): DOMRect | null;
[index: number]: DOMRect;
}

interface OES_vertex_array_object {
readonly VERTEX_ARRAY_BINDING_OES: number;
createVertexArrayOES(): WebGLVertexArrayObjectOES;
Expand Down
115 changes: 115 additions & 0 deletions inputfiles/addedTypes.json
Original file line number Diff line number Diff line change
Expand Up @@ -1929,6 +1929,57 @@
"extends": "HTMLElement",
"flavor": "Web"
},
{
"kind": "interface",
"name": "DOMRectReadOnly",
"flavor": "DOM",
"properties": [
{
"name": "bottom",
"readonly": true,
"type": "number"
},
{
"name": "height",
"readonly": true,
"type": "number"
},
{
"name": "left",
"readonly": true,
"type": "number"
},
{
"name": "right",
"readonly": true,
"type": "number"
},
{
"name": "top",
"readonly": true,
"type": "number"
},
{
"name": "width",
"readonly": true,
"type": "number"
},
{
"name": "x",
"readonly": true,
"type": "number"
},
{
"name": "y",
"readonly": true,
"type": "number"
}
],
"constructorSignatures": [
"new (x?: number, y?: number, width?: number, height?: number): DOMRectReadOnly",
"fromRect(rectangle?: DOMRectInit): DOMRectReadOnly"
]
},
{
"kind": "interface",
"name": "EXT_blend_minmax",
Expand Down Expand Up @@ -1985,6 +2036,70 @@
}
]
},
{
"kind": "interface",
"name": "DOMRect",
"extends": "DOMRectReadOnly",
"flavor": "DOM",
"properties": [
{
"name": "height",
"type": "number"
},
{
"name": "width",
"type": "number"
},
{
"name": "x",
"type": "number"
},
{
"name": "y",
"type": "number"
}
],
"constructorSignatures": [
"new (x?: number, y?: number, width?: number, height?: number): DOMRect",
"fromRect(rectangle?: DOMRectInit): DOMRect"
]
},
{
"kind": "interface",
"name": "DOMRectList",
"flavor": "DOM",
"properties": [
{
"name": "length",
"type": "number",
"readonly": true
}
],
"indexer": [
{
"signatures": [
"[index: number]: DOMRect"
]
}
],
"methods": [
{
"name": "item",
"signatures": [
"item(index: number): DOMRect | null"
]
}
]
},
{
"kind": "method",
"interface": "HTMLFormElement",
"name": "reportValidity",
"flavor": "DOM",
"signatures": [
"reportValidity(): boolean"
]
},
{
"kind": "interface",
"name": "OES_vertex_array_object",
Expand Down
51 changes: 51 additions & 0 deletions inputfiles/overridingTypes.json
Original file line number Diff line number Diff line change
Expand Up @@ -1666,6 +1666,49 @@
"getRegistration(clientURL?: USVString): Promise<ServiceWorkerRegistration | undefined>"
]
},
{
"kind": "method",
"interface": "Element",
"name": "getBoundingClientRect",
"signatures": ["getBoundingClientRect(): ClientRect | DOMRect"]
},
{
"kind": "method",
"interface": "Element",
"name": "getClientRects",
"signatures": [
"getClientRects(): ClientRectList | DOMRectList"
]
},
{
"kind": "property",
"interface": "IntersectionObserverEntry",
"name": "boundingClientRect",
"readonly": true,
"type": "ClientRect | DOMRect"
},
{
"kind": "property",
"interface": "IntersectionObserverEntry",
"name": "intersectionRect",
"readonly": true,
"type": "ClientRect | DOMRect"
},
{
"kind": "property",
"interface": "IntersectionObserverEntry",
"name": "rootBounds",
"readonly": true,
"type": "ClientRect | DOMRect"
},
{
"kind": "method",
"interface": "Range",
"name": "getBoundingClientRect",
"signatures": [
"getBoundingClientRect(): ClientRect | DOMRect"
]
},
{
"kind": "property",
"interface": "RequestInit",
Expand Down Expand Up @@ -1708,6 +1751,14 @@
"fill(path: Path2D, fillRule?: CanvasFillRule): void"
]
},
{
"kind": "method",
"interface": "Range",
"name": "getClientRects",
"signatures": [
"getClientRects(): ClientRectList | DOMRectList"
]
},
{
"kind": "method",
"interface": "CanvasRenderingContext2D",
Expand Down