Skip to content

Commit

Permalink
Cherry-pick PR microsoft#45554 into release-4.4
Browse files Browse the repository at this point in the history
Component commits:
c9846f8 Restore HTMLDocument constructable value in DOM
Don't touch anything else in the DOM.
  • Loading branch information
sandersn authored and typescript-bot committed Aug 23, 2021
1 parent 7b0e665 commit 23f4bea
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 7 deletions.
8 changes: 6 additions & 2 deletions src/lib/dom.generated.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6380,6 +6380,12 @@ interface HTMLDocument extends Document {
removeEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | EventListenerOptions): void;
}

/** @deprecated */
declare var HTMLDocument: {
prototype: HTMLDocument;
new(): HTMLDocument;
};

interface HTMLElementEventMap extends ElementEventMap, DocumentAndElementEventHandlersEventMap, GlobalEventHandlersEventMap {
}

Expand Down Expand Up @@ -17181,7 +17187,6 @@ interface WindowEventMap extends GlobalEventHandlersEventMap, WindowEventHandler

/** A window containing a DOM document; the document property points to the DOM document loaded in that window. */
interface Window extends EventTarget, AnimationFrameProvider, GlobalEventHandlers, WindowEventHandlers, WindowLocalStorage, WindowOrWorkerGlobalScope, WindowSessionStorage {
HTMLDocument: Document;
/** @deprecated This is a legacy alias of `navigator`. */
readonly clientInformation: Navigator;
/**
Expand Down Expand Up @@ -18246,7 +18251,6 @@ declare var Image: {
declare var Option: {
new(text?: string, value?: string, defaultSelected?: boolean, selected?: boolean): HTMLOptionElement;
};
declare var HTMLDocument: Document;
/** @deprecated This is a legacy alias of `navigator`. */
declare var clientInformation: Navigator;
/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ tests/cases/compiler/intersectionsOfLargeUnions2.ts(31,15): error TS2536: Type '
interface ElementTagNameMap {
~~~~~~~~~~~~~~~~~
!!! error TS2300: Duplicate identifier 'ElementTagNameMap'.
!!! related TS6203 /.ts/lib.dom.d.ts:18258:6: 'ElementTagNameMap' was also declared here.
!!! related TS6203 /.ts/lib.dom.d.ts:18263:6: 'ElementTagNameMap' was also declared here.
[index: number]: HTMLElement
}

Expand Down
8 changes: 4 additions & 4 deletions tests/baselines/reference/mappedTypeRecursiveInference.types

Large diffs are not rendered by default.

0 comments on commit 23f4bea

Please sign in to comment.