Skip to content

Commit fabea25

Browse files
sandersnsandersn
authored
Merge branch 'master' into caret-color
2 parents b5f32bc + 0a169d8 commit fabea25

File tree

8 files changed

+34
-21
lines changed

8 files changed

+34
-21
lines changed

‎baselines/dom.generated.d.ts

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2604,6 +2604,8 @@ interface CSSStyleDeclaration {
26042604
gridTemplateColumns: string | null;
26052605
gridTemplateRows: string | null;
26062606
height: string | null;
2607+
imageOrientation: string;
2608+
imageRendering: string;
26072609
imeMode: string | null;
26082610
justifyContent: string | null;
26092611
justifyItems: string | null;
@@ -2686,8 +2688,8 @@ interface CSSStyleDeclaration {
26862688
msWrapFlow: string;
26872689
msWrapMargin: any;
26882690
msWrapThrough: string;
2689-
objectFit: string | null;
2690-
objectPosition: string | null;
2691+
objectFit: string;
2692+
objectPosition: string;
26912693
opacity: string | null;
26922694
order: string | null;
26932695
orphans: string | null;
@@ -4367,10 +4369,6 @@ interface Document extends Node, NonElementParentNode, DocumentOrShadowRoot, Par
43674369
*/
43684370
createElementNS(namespaceURI: "http://www.w3.org/1999/xhtml", qualifiedName: string): HTMLElement;
43694371
createElementNS<K extends keyof SVGElementTagNameMap>(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: K): SVGElementTagNameMap[K];
4370-
createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "a"): SVGAElement;
4371-
createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "script"): SVGScriptElement;
4372-
createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "style"): SVGStyleElement;
4373-
createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "title"): SVGTitleElement;
43744372
createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: string): SVGElement;
43754373
createElementNS(namespaceURI: string | null, qualifiedName: string, options?: ElementCreationOptions): Element;
43764374
createElementNS(namespace: string | null, qualifiedName: string, options?: string | ElementCreationOptions): Element;
@@ -6990,7 +6988,10 @@ interface HTMLInputElement extends HTMLElement {
69906988
* Returns the value of the data at the cursor's current position.
69916989
*/
69926990
value: string;
6993-
valueAsDate: any;
6991+
/**
6992+
* Returns a Date object representing the form control's value, if applicable; otherwise, returns null. Can be set, to change the value. Throws an "InvalidStateError" DOMException if the control isn't date- or time-based.
6993+
*/
6994+
valueAsDate: Date | null;
69946995
/**
69956996
* Returns the input field value as a number.
69966997
*/
@@ -17729,6 +17730,7 @@ interface HTMLElementDeprecatedTagNameMap {
1772917730
}
1773017731

1773117732
interface SVGElementTagNameMap {
17733+
"a": SVGAElement;
1773217734
"circle": SVGCircleElement;
1773317735
"clipPath": SVGClipPathElement;
1773417736
"defs": SVGDefsElement;
@@ -17773,19 +17775,22 @@ interface SVGElementTagNameMap {
1777317775
"polyline": SVGPolylineElement;
1777417776
"radialGradient": SVGRadialGradientElement;
1777517777
"rect": SVGRectElement;
17778+
"script": SVGScriptElement;
1777617779
"stop": SVGStopElement;
17780+
"style": SVGStyleElement;
1777717781
"svg": SVGSVGElement;
1777817782
"switch": SVGSwitchElement;
1777917783
"symbol": SVGSymbolElement;
1778017784
"text": SVGTextElement;
1778117785
"textPath": SVGTextPathElement;
17786+
"title": SVGTitleElement;
1778217787
"tspan": SVGTSpanElement;
1778317788
"use": SVGUseElement;
1778417789
"view": SVGViewElement;
1778517790
}
1778617791

1778717792
/** @deprecated Directly use HTMLElementTagNameMap or SVGElementTagNameMap as appropriate, instead. */
17788-
interface ElementTagNameMap extends HTMLElementTagNameMap, SVGElementTagNameMap { }
17793+
type ElementTagNameMap = HTMLElementTagNameMap & Pick<SVGElementTagNameMap, Exclude<keyof SVGElementTagNameMap, keyof HTMLElementTagNameMap>>;
1778917794

1779017795
declare var Audio: {
1779117796
new(src?: string): HTMLAudioElement;

‎inputfiles/addedTypes.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -718,10 +718,6 @@
718718
"additional-signatures": [
719719
"createElementNS(namespaceURI: \"http://www.w3.org/1999/xhtml\", qualifiedName: string): HTMLElement",
720720
"createElementNS<K extends keyof SVGElementTagNameMap>(namespaceURI: \"http://www.w3.org/2000/svg\", qualifiedName: K): SVGElementTagNameMap[K]",
721-
"createElementNS(namespaceURI: \"http://www.w3.org/2000/svg\", qualifiedName: \"a\"): SVGAElement",
722-
"createElementNS(namespaceURI: \"http://www.w3.org/2000/svg\", qualifiedName: \"script\"): SVGScriptElement",
723-
"createElementNS(namespaceURI: \"http://www.w3.org/2000/svg\", qualifiedName: \"style\"): SVGStyleElement",
724-
"createElementNS(namespaceURI: \"http://www.w3.org/2000/svg\", qualifiedName: \"title\"): SVGTitleElement",
725721
"createElementNS(namespaceURI: \"http://www.w3.org/2000/svg\", qualifiedName: string): SVGElement",
726722
"createElementNS(namespaceURI: string | null, qualifiedName: string, options?: ElementCreationOptions): Element"
727723
]

‎inputfiles/comments.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1096,6 +1096,9 @@
10961096
"value": {
10971097
"comment": "/**\r\n * Returns the value of the data at the cursor's current position.\r\n */"
10981098
},
1099+
"valueAsDate": {
1100+
"comment": "/**\r\n * Returns a Date object representing the form control's value, if applicable; otherwise, returns null. Can be set, to change the value. Throws an \"InvalidStateError\" DOMException if the control isn't date- or time-based.\r\n */"
1101+
},
10991102
"src": {
11001103
"comment": "/**\r\n * The address or URL of the a media resource that is to be considered.\r\n */"
11011104
},

‎inputfiles/idl/CSS Images.widl

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
partial interface CSSStyleDeclaration {
2+
[CEReactions] attribute [TreatNullAs=EmptyString] CSSOMString objectFit;
3+
[CEReactions] attribute [TreatNullAs=EmptyString] CSSOMString objectPosition;
4+
[CEReactions] attribute [TreatNullAs=EmptyString] CSSOMString imageOrientation;
5+
[CEReactions] attribute [TreatNullAs=EmptyString] CSSOMString imageRendering;
6+
};

‎inputfiles/idlSources.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616
"url": "https://www.w3.org/TR/css-ui-3/",
1717
"title": "CSS Basic User Interface"
1818
},
19+
{
20+
"url": "https://drafts.csswg.org/css-images-3/",
21+
"title": "CSS Images"
22+
},
1923
{
2024
"url": "https://drafts.csswg.org/cssom-view/",
2125
"title": "CSSOM View"

‎inputfiles/overridingTypes.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1459,6 +1459,10 @@
14591459
"name": "form",
14601460
"read-only": 1,
14611461
"override-type": "HTMLFormElement | null"
1462+
},
1463+
"valueAsDate": {
1464+
"name": "valueAsDate",
1465+
"override-type": "Date | null"
14621466
}
14631467
}
14641468
},

‎package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/emitter.ts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -456,11 +456,6 @@ export function emitWebIdl(webidl: Browser.WebIdl, flavor: Flavor) {
456456
printer.printLine("interface SVGElementTagNameMap {");
457457
printer.increaseIndent();
458458
for (const [e, value] of Object.entries(tagNameToEleName.svgResult).sort()) {
459-
if (e in tagNameToEleName.htmlResult) {
460-
// Skip conflicting fields with HTMLElementTagNameMap
461-
// to be compatible with deprecated ElementTagNameMap
462-
continue;
463-
}
464459
printer.printLine(`"${e}": ${value};`);
465460
}
466461
printer.decreaseIndent();
@@ -470,7 +465,7 @@ export function emitWebIdl(webidl: Browser.WebIdl, flavor: Flavor) {
470465

471466
function emitElementTagNameMap() {
472467
printer.printLine("/** @deprecated Directly use HTMLElementTagNameMap or SVGElementTagNameMap as appropriate, instead. */");
473-
printer.printLine("interface ElementTagNameMap extends HTMLElementTagNameMap, SVGElementTagNameMap { }");
468+
printer.printLine("type ElementTagNameMap = HTMLElementTagNameMap & Pick<SVGElementTagNameMap, Exclude<keyof SVGElementTagNameMap, keyof HTMLElementTagNameMap>>;");
474469
printer.printLine("");
475470
}
476471

0 commit comments

Comments
 (0)