Skip to content

Commit d937cbe

Browse files
authored
Merge pull request #500 from saschanaz/cssom-view
Add CSSOM View types
2 parents b7801f4 + 79dcf78 commit d937cbe

File tree

9 files changed

+239
-100
lines changed

9 files changed

+239
-100
lines changed

baselines/dom.generated.d.ts

Lines changed: 60 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -910,6 +910,11 @@ interface MediaKeySystemMediaCapability {
910910
robustness?: string;
911911
}
912912

913+
interface MediaQueryListEventInit extends EventInit {
914+
matches?: boolean;
915+
media?: string;
916+
}
917+
913918
interface MediaStreamAudioSourceOptions {
914919
mediaStream: MediaStream;
915920
}
@@ -3261,6 +3266,17 @@ declare var CanvasRenderingContext2D: {
32613266
new(): CanvasRenderingContext2D;
32623267
};
32633268

3269+
interface CaretPosition {
3270+
readonly offset: number;
3271+
readonly offsetNode: Node;
3272+
getClientRect(): DOMRect | null;
3273+
}
3274+
3275+
declare var CaretPosition: {
3276+
prototype: CaretPosition;
3277+
new(): CaretPosition;
3278+
};
3279+
32643280
interface ChannelMergerNode extends AudioNode {
32653281
}
32663282

@@ -4573,6 +4589,7 @@ interface Document extends Node, GlobalEventHandlers, ParentNode, DocumentEvent
45734589
adoptNode<T extends Node>(source: T): T;
45744590
/** @deprecated */
45754591
captureEvents(): void;
4592+
caretPositionFromPoint(x: number, y: number): CaretPosition | null;
45764593
caretRangeFromPoint(x: number, y: number): Range;
45774594
/** @deprecated */
45784595
clear(): void;
@@ -4703,7 +4720,7 @@ interface Document extends Node, GlobalEventHandlers, ParentNode, DocumentEvent
47034720
* @param x The x-offset
47044721
* @param y The y-offset
47054722
*/
4706-
elementFromPoint(x: number, y: number): Element;
4723+
elementFromPoint(x: number, y: number): Element | null;
47074724
elementsFromPoint(x: number, y: number): Element[];
47084725
evaluate(expression: string, contextNode: Node, resolver: XPathNSResolver | null, type: number, result: XPathResult | null): XPathResult;
47094726
/**
@@ -4851,6 +4868,7 @@ interface DocumentEvent {
48514868
createEvent(eventInterface: "MSMediaKeyNeededEvent"): MSMediaKeyNeededEvent;
48524869
createEvent(eventInterface: "MediaEncryptedEvent"): MediaEncryptedEvent;
48534870
createEvent(eventInterface: "MediaKeyMessageEvent"): MediaKeyMessageEvent;
4871+
createEvent(eventInterface: "MediaQueryListEvent"): MediaQueryListEvent;
48544872
createEvent(eventInterface: "MediaStreamErrorEvent"): MediaStreamErrorEvent;
48554873
createEvent(eventInterface: "MediaStreamEvent"): MediaStreamEvent;
48564874
createEvent(eventInterface: "MediaStreamTrackEvent"): MediaStreamTrackEvent;
@@ -6128,7 +6146,7 @@ interface HTMLElement extends Element, ElementCSSInlineStyle {
61286146
lang: string;
61296147
readonly offsetHeight: number;
61306148
readonly offsetLeft: number;
6131-
readonly offsetParent: Element;
6149+
readonly offsetParent: Element | null;
61326150
readonly offsetTop: number;
61336151
readonly offsetWidth: number;
61346152
onabort: ((this: HTMLElement, ev: UIEvent) => any) | null;
@@ -9797,18 +9815,37 @@ declare var MediaList: {
97979815
new(): MediaList;
97989816
};
97999817

9818+
interface MediaQueryListEventMap {
9819+
"change": Event;
9820+
}
9821+
98009822
interface MediaQueryList extends EventTarget {
98019823
readonly matches: boolean;
98029824
readonly media: string;
9803-
addListener(listener: MediaQueryListListener): void;
9804-
removeListener(listener: MediaQueryListListener): void;
9825+
onchange: ((this: MediaQueryList, ev: Event) => any) | null;
9826+
addListener(listener: EventListenerOrEventListenerObject | null): void;
9827+
removeListener(listener: EventListenerOrEventListenerObject | null): void;
9828+
addEventListener<K extends keyof MediaQueryListEventMap>(type: K, listener: (this: MediaQueryList, ev: MediaQueryListEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
9829+
addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
9830+
removeEventListener<K extends keyof MediaQueryListEventMap>(type: K, listener: (this: MediaQueryList, ev: MediaQueryListEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
9831+
removeEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | EventListenerOptions): void;
98059832
}
98069833

98079834
declare var MediaQueryList: {
98089835
prototype: MediaQueryList;
98099836
new(): MediaQueryList;
98109837
};
98119838

9839+
interface MediaQueryListEvent extends Event {
9840+
readonly matches: boolean;
9841+
readonly media: string;
9842+
}
9843+
9844+
declare var MediaQueryListEvent: {
9845+
prototype: MediaQueryListEvent;
9846+
new(type: string, eventInitDict?: MediaQueryListEventInit): MediaQueryListEvent;
9847+
};
9848+
98129849
interface MediaSource extends EventTarget {
98139850
readonly activeSourceBuffers: SourceBufferList;
98149851
duration: number;
@@ -13724,33 +13761,14 @@ declare var ScopedCredentialInfo: {
1372413761
new(): ScopedCredentialInfo;
1372513762
};
1372613763

13727-
interface ScreenEventMap {
13728-
"MSOrientationChange": Event;
13729-
}
13730-
13731-
interface Screen extends EventTarget {
13764+
interface Screen {
1373213765
readonly availHeight: number;
1373313766
readonly availWidth: number;
13734-
/** @deprecated */
13735-
bufferDepth: number;
1373613767
readonly colorDepth: number;
13737-
readonly deviceXDPI: number;
13738-
readonly deviceYDPI: number;
13739-
readonly fontSmoothingEnabled: boolean;
1374013768
readonly height: number;
13741-
readonly logicalXDPI: number;
13742-
readonly logicalYDPI: number;
13743-
readonly msOrientation: string;
13744-
onmsorientationchange: ((this: Screen, ev: Event) => any) | null;
1374513769
readonly orientation: ScreenOrientation;
1374613770
readonly pixelDepth: number;
13747-
readonly systemXDPI: number;
13748-
readonly systemYDPI: number;
1374913771
readonly width: number;
13750-
addEventListener<K extends keyof ScreenEventMap>(type: K, listener: (this: Screen, ev: ScreenEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
13751-
addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
13752-
removeEventListener<K extends keyof ScreenEventMap>(type: K, listener: (this: Screen, ev: ScreenEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
13753-
removeEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | EventListenerOptions): void;
1375413772
}
1375513773

1375613774
declare var Screen: {
@@ -16147,9 +16165,9 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
1614716165
getComputedStyle(elt: Element, pseudoElt?: string | null): CSSStyleDeclaration;
1614816166
getMatchedCSSRules(elt: Element, pseudoElt?: string | null): CSSRuleList;
1614916167
getSelection(): Selection;
16150-
matchMedia(mediaQuery: string): MediaQueryList;
16151-
moveBy(x?: number, y?: number): void;
16152-
moveTo(x?: number, y?: number): void;
16168+
matchMedia(query: string): MediaQueryList;
16169+
moveBy(x: number, y: number): void;
16170+
moveTo(x: number, y: number): void;
1615316171
msWriteProfilerMark(profilerMarkName: string): void;
1615416172
open(url?: string, target?: string, features?: string, replace?: boolean): Window | null;
1615516173
postMessage(message: any, targetOrigin: string, transfer?: any[]): void;
@@ -16158,14 +16176,14 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
1615816176
/** @deprecated */
1615916177
releaseEvents(): void;
1616016178
requestAnimationFrame(callback: FrameRequestCallback): number;
16161-
resizeBy(x?: number, y?: number): void;
16162-
resizeTo(x?: number, y?: number): void;
16179+
resizeBy(x: number, y: number): void;
16180+
resizeTo(x: number, y: number): void;
1616316181
scroll(options?: ScrollToOptions): void;
16164-
scroll(x?: number, y?: number): void;
16182+
scroll(x: number, y: number): void;
1616516183
scrollBy(options?: ScrollToOptions): void;
16166-
scrollBy(x?: number, y?: number): void;
16184+
scrollBy(x: number, y: number): void;
1616716185
scrollTo(options?: ScrollToOptions): void;
16168-
scrollTo(x?: number, y?: number): void;
16186+
scrollTo(x: number, y: number): void;
1616916187
stop(): void;
1617016188
webkitCancelAnimationFrame(handle: number): void;
1617116189
webkitConvertPointFromNodeToPage(node: Node, pt: WebKitPoint): WebKitPoint;
@@ -17063,9 +17081,9 @@ declare function focus(): void;
1706317081
declare function getComputedStyle(elt: Element, pseudoElt?: string | null): CSSStyleDeclaration;
1706417082
declare function getMatchedCSSRules(elt: Element, pseudoElt?: string | null): CSSRuleList;
1706517083
declare function getSelection(): Selection;
17066-
declare function matchMedia(mediaQuery: string): MediaQueryList;
17067-
declare function moveBy(x?: number, y?: number): void;
17068-
declare function moveTo(x?: number, y?: number): void;
17084+
declare function matchMedia(query: string): MediaQueryList;
17085+
declare function moveBy(x: number, y: number): void;
17086+
declare function moveTo(x: number, y: number): void;
1706917087
declare function msWriteProfilerMark(profilerMarkName: string): void;
1707017088
declare function open(url?: string, target?: string, features?: string, replace?: boolean): Window | null;
1707117089
declare function postMessage(message: any, targetOrigin: string, transfer?: any[]): void;
@@ -17074,14 +17092,14 @@ declare function prompt(message?: string, _default?: string): string | null;
1707417092
/** @deprecated */
1707517093
declare function releaseEvents(): void;
1707617094
declare function requestAnimationFrame(callback: FrameRequestCallback): number;
17077-
declare function resizeBy(x?: number, y?: number): void;
17078-
declare function resizeTo(x?: number, y?: number): void;
17095+
declare function resizeBy(x: number, y: number): void;
17096+
declare function resizeTo(x: number, y: number): void;
1707917097
declare function scroll(options?: ScrollToOptions): void;
17080-
declare function scroll(x?: number, y?: number): void;
17098+
declare function scroll(x: number, y: number): void;
1708117099
declare function scrollBy(options?: ScrollToOptions): void;
17082-
declare function scrollBy(x?: number, y?: number): void;
17100+
declare function scrollBy(x: number, y: number): void;
1708317101
declare function scrollTo(options?: ScrollToOptions): void;
17084-
declare function scrollTo(x?: number, y?: number): void;
17102+
declare function scrollTo(x: number, y: number): void;
1708517103
declare function stop(): void;
1708617104
declare function webkitCancelAnimationFrame(handle: number): void;
1708717105
declare function webkitConvertPointFromNodeToPage(node: Node, pt: WebKitPoint): WebKitPoint;
@@ -17145,8 +17163,6 @@ type VibratePattern = number | number[];
1714517163
type BufferSource = ArrayBufferView | ArrayBuffer;
1714617164
type DOMTimeStamp = number;
1714717165
type FormDataEntryValue = File | string;
17148-
type ScrollBehavior = "auto" | "instant" | "smooth";
17149-
type ScrollLogicalPosition = "start" | "center" | "end" | "nearest";
1715017166
type MouseWheelEvent = WheelEvent;
1715117167
type ScrollRestoration = "auto" | "manual";
1715217168
type InsertPosition = "beforebegin" | "afterbegin" | "beforeend" | "afterend";
@@ -17279,6 +17295,8 @@ type RequestMode = "navigate" | "same-origin" | "no-cors" | "cors";
1727917295
type RequestRedirect = "follow" | "error" | "manual";
1728017296
type ResponseType = "basic" | "cors" | "default" | "error" | "opaque" | "opaqueredirect";
1728117297
type ScopedCredentialType = "ScopedCred";
17298+
type ScrollBehavior = "auto" | "instant" | "smooth";
17299+
type ScrollLogicalPosition = "start" | "center" | "end" | "nearest";
1728217300
type SelectionMode = "select" | "start" | "end" | "preserve";
1728317301
type ServiceWorkerState = "installing" | "installed" | "activating" | "activated" | "redundant";
1728417302
type ServiceWorkerUpdateViaCache = "imports" | "all" | "none";

inputfiles/addedTypes.json

Lines changed: 0 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -318,24 +318,6 @@
318318
"createImageBitmap(image: HTMLImageElement | SVGImageElement | HTMLVideoElement | HTMLCanvasElement | ImageBitmap | ImageData | Blob, options?: ImageBitmapOptions): Promise<ImageBitmap>",
319319
"createImageBitmap(image: HTMLImageElement | SVGImageElement | HTMLVideoElement | HTMLCanvasElement | ImageBitmap | ImageData | Blob, sx: number, sy: number, sw: number, sh: number, options?: ImageBitmapOptions): Promise<ImageBitmap>"
320320
]
321-
},
322-
"scroll": {
323-
"name": "scroll",
324-
"additional-signatures": [
325-
"scroll(options?: ScrollToOptions): void"
326-
]
327-
},
328-
"scrollTo": {
329-
"name": "scrollTo",
330-
"additional-signatures": [
331-
"scrollTo(options?: ScrollToOptions): void"
332-
]
333-
},
334-
"scrollBy": {
335-
"name": "scrollBy",
336-
"additional-signatures": [
337-
"scrollBy(options?: ScrollToOptions): void"
338-
]
339321
}
340322
}
341323
},
@@ -532,33 +514,6 @@
532514
"closest(selector: string): Element | null"
533515
]
534516
},
535-
"scrollIntoView": {
536-
"name": "scrollIntoView",
537-
"override-signatures": [
538-
"scrollIntoView(arg?: boolean | ScrollIntoViewOptions): void"
539-
]
540-
},
541-
"scroll": {
542-
"name": "scroll",
543-
"override-signatures": [
544-
"scroll(options?: ScrollToOptions): void",
545-
"scroll(x: number, y: number): void"
546-
]
547-
},
548-
"scrollTo": {
549-
"name": "scrollTo",
550-
"override-signatures": [
551-
"scrollTo(options?: ScrollToOptions): void",
552-
"scrollTo(x: number, y: number): void"
553-
]
554-
},
555-
"scrollBy": {
556-
"name": "scrollBy",
557-
"override-signatures": [
558-
"scrollBy(options?: ScrollToOptions): void",
559-
"scrollBy(x: number, y: number): void"
560-
]
561-
},
562517
"insertAdjacentElement": {
563518
"name": "insertAdjacentElement",
564519
"override-signatures": [
@@ -2471,14 +2426,6 @@
24712426
},
24722427
"typedefs": {
24732428
"typedef": [
2474-
{
2475-
"override-type": "\"auto\" | \"instant\" | \"smooth\"",
2476-
"new-type": "ScrollBehavior"
2477-
},
2478-
{
2479-
"override-type": "\"start\" | \"center\" | \"end\" | \"nearest\"",
2480-
"new-type": "ScrollLogicalPosition"
2481-
},
24822429
{
24832430
"override-type": "WheelEvent",
24842431
"new-type": "MouseWheelEvent"

0 commit comments

Comments
 (0)