Skip to content
This repository was archived by the owner on Jan 6, 2025. It is now read-only.

Commit 97c24af

Browse files
authored
build: update typings to support Node v18 (#1424)
1 parent 77a9b62 commit 97c24af

File tree

5 files changed

+1117
-862
lines changed

5 files changed

+1117
-862
lines changed

projects/apps/demo-app/src/styles.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* You can add global styles to this file, and also import other style files */
2-
@import '~@angular/material/prebuilt-themes/indigo-pink.css';
2+
@import '@angular/material/prebuilt-themes/indigo-pink.css';
33

44
body {
55
margin: 50px;

projects/libs/flex-layout/core/match-media/match-media.ts

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -187,23 +187,21 @@ function buildQueryCss(mediaQueries: string[], _document: Document) {
187187
}
188188
}
189189

190+
function buildMockMql(query: string) {
191+
const et: any = new EventTarget();
192+
et.matches = query === 'all' || query === '';
193+
et.media = query;
194+
et.addListener = () => {};
195+
et.removeListener = () => {};
196+
et.addEventListener = () => {};
197+
et.dispatchEvent = () => false;
198+
et.onchange = null;
199+
200+
return et as MediaQueryList;
201+
}
202+
190203
function constructMql(query: string, isBrowser: boolean): MediaQueryList {
191204
const canListen = isBrowser && !!(<Window>window).matchMedia('all').addListener;
192205

193-
return canListen ? (<Window>window).matchMedia(query) : {
194-
matches: query === 'all' || query === '',
195-
media: query,
196-
addListener: () => {
197-
},
198-
removeListener: () => {
199-
},
200-
onchange: null,
201-
addEventListener() {
202-
},
203-
removeEventListener() {
204-
},
205-
dispatchEvent() {
206-
return false;
207-
}
208-
} as MediaQueryList;
206+
return canListen ? (<Window>window).matchMedia(query) : buildMockMql(query);
209207
}

projects/libs/flex-layout/core/match-media/mock/mock-match-media.ts

Lines changed: 3 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ export class MockMatchMedia extends MatchMedia {
165165
* - supports manual activation to simulate mediaQuery matching
166166
* - manages listeners
167167
*/
168-
export class MockMediaQueryList implements MediaQueryList {
168+
export class MockMediaQueryList extends EventTarget implements MediaQueryList {
169169
private _isActive = false;
170170
private _listeners: MediaQueryListListener[] = [];
171171

@@ -178,6 +178,7 @@ export class MockMediaQueryList implements MediaQueryList {
178178
}
179179

180180
constructor(private _mediaQuery: string) {
181+
super();
181182
}
182183

183184
/**
@@ -228,31 +229,7 @@ export class MockMediaQueryList implements MediaQueryList {
228229
removeListener(_: MediaQueryListListener | null) {
229230
}
230231

231-
addEventListener<K extends keyof MediaQueryListEventMap>(
232-
_: K,
233-
__: (this: MediaQueryList,
234-
ev: MediaQueryListEventMap[K]) => any,
235-
___?: boolean | AddEventListenerOptions): void;
236-
237-
addEventListener(
238-
_: string,
239-
__: EventListenerOrEventListenerObject,
240-
___?: boolean | AddEventListenerOptions) {
241-
}
242-
243-
removeEventListener<K extends keyof MediaQueryListEventMap>(
244-
_: K,
245-
__: (this: MediaQueryList,
246-
ev: MediaQueryListEventMap[K]) => any,
247-
___?: boolean | EventListenerOptions): void;
248-
249-
removeEventListener(
250-
_: string,
251-
__: EventListenerOrEventListenerObject,
252-
___?: boolean | EventListenerOptions) {
253-
}
254-
255-
dispatchEvent(_: Event): boolean {
232+
override dispatchEvent(_: Event): boolean {
256233
return false;
257234
}
258235

projects/libs/flex-layout/server/server-match-media.ts

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import {
2020
* - supports manual activation to simulate mediaQuery matching
2121
* - manages listeners
2222
*/
23-
export class ServerMediaQueryList implements MediaQueryList {
23+
export class ServerMediaQueryList extends EventTarget implements MediaQueryList {
2424
private _listeners: MediaQueryListListener[] = [];
2525

2626
get matches(): boolean {
@@ -31,7 +31,9 @@ export class ServerMediaQueryList implements MediaQueryList {
3131
return this._mediaQuery;
3232
}
3333

34-
constructor(private _mediaQuery: string, private _isActive = false) {}
34+
constructor(private _mediaQuery: string, private _isActive = false) {
35+
super();
36+
}
3537

3638
/**
3739
* Destroy the current list by deactivating the
@@ -81,13 +83,13 @@ export class ServerMediaQueryList implements MediaQueryList {
8183
removeListener() {
8284
}
8385

84-
addEventListener() {
86+
override addEventListener() {
8587
}
8688

87-
removeEventListener() {
89+
override removeEventListener() {
8890
}
8991

90-
dispatchEvent(_: Event): boolean {
92+
override dispatchEvent(_: Event): boolean {
9193
return false;
9294
}
9395

0 commit comments

Comments
 (0)