Skip to content

Commit 4e6b4a2

Browse files
committed
fix(material-experimental/mdc-progress-bar): update adapter based on MDC
changes
1 parent 182aba4 commit 4e6b4a2

File tree

1 file changed

+21
-14
lines changed

1 file changed

+21
-14
lines changed

src/material-experimental/mdc-progress-bar/progress-bar.ts

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,32 @@
66
* found in the LICENSE file at https://angular.io/license
77
*/
88

9+
import {Directionality} from '@angular/cdk/bidi';
910
import {
11+
AfterViewInit,
1012
ChangeDetectionStrategy,
1113
Component,
12-
ViewEncapsulation,
1314
ElementRef,
14-
NgZone,
15-
Optional,
15+
EventEmitter,
1616
Inject,
1717
Input,
18-
Output,
19-
EventEmitter,
20-
AfterViewInit,
18+
NgZone,
2119
OnDestroy,
20+
Optional,
21+
Output,
22+
ViewEncapsulation,
2223
} from '@angular/core';
2324
import {CanColor, CanColorCtor, mixinColor} from '@angular/material-experimental/mdc-core';
24-
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
2525
import {ProgressAnimationEnd} from '@angular/material/progress-bar';
26-
import {MDCLinearProgressAdapter, MDCLinearProgressFoundation} from '@material/linear-progress';
27-
import {Subscription, fromEvent, Observable} from 'rxjs';
26+
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
27+
import {
28+
MDCLinearProgressAdapter,
29+
MDCLinearProgressFoundation,
30+
WithMDCResizeObserver
31+
} from '@material/linear-progress';
32+
import {fromEvent, Observable, Subscription} from 'rxjs';
2833
import {filter} from 'rxjs/operators';
29-
import {Directionality} from '@angular/cdk/bidi';
34+
3035

3136
// Boilerplate for applying mixins to MatProgressBar.
3237
/** @docs-private */
@@ -93,10 +98,12 @@ export class MatProgressBar extends _MatProgressBarMixinBase implements AfterVie
9398
},
9499
getWidth: () => this._rootElement.offsetWidth,
95100
attachResizeObserver: (callback) => {
96-
if ((typeof window !== 'undefined') && window.ResizeObserver) {
97-
const ro = new ResizeObserver(callback);
98-
ro.observe(this._rootElement);
99-
return ro;
101+
if ((typeof window !== 'undefined') &&
102+
(window as unknown as WithMDCResizeObserver).ResizeObserver) {
103+
const ResizeObserver = (window as unknown as WithMDCResizeObserver).ResizeObserver;
104+
const resizeObserver = new ResizeObserver(callback);
105+
resizeObserver.observe(this._rootElement);
106+
return resizeObserver;
100107
}
101108

102109
return null;

0 commit comments

Comments
 (0)