Skip to content

refactor(observers): allow ElementRef to be passed to content observer #12762

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 21, 2018
Merged

refactor(observers): allow ElementRef to be passed to content observer #12762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions src/cdk/a11y/live-announcer/live-announcer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,13 +117,11 @@ export class CdkAriaLive implements OnDestroy {
this._subscription.unsubscribe();
this._subscription = null;
}
} else {
if (!this._subscription) {
this._subscription = this._ngZone.runOutsideAngular(
() => this._contentObserver.observe(this._elementRef.nativeElement).subscribe(
() => this._liveAnnouncer.announce(
this._elementRef.nativeElement.innerText, this._politeness)));
}
} else if (!this._subscription) {
this._subscription = this._ngZone.runOutsideAngular(
() => this._contentObserver.observe(this._elementRef).subscribe(
() => this._liveAnnouncer.announce(
this._elementRef.nativeElement.innerText, this._politeness)));
}
}
private _politeness: AriaLivePoliteness = 'off';
Expand Down
9 changes: 3 additions & 6 deletions src/cdk/observers/observe-content.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ import {Component, ElementRef, ViewChild} from '@angular/core';
import {async, ComponentFixture, fakeAsync, inject, TestBed, tick} from '@angular/core/testing';
import {ContentObserver, MutationObserverFactory, ObserversModule} from './observe-content';

// TODO(elad): `ProxyZone` doesn't seem to capture the events raised by
// `MutationObserver` and needs to be investigated

describe('Observe content directive', () => {
describe('basic usage', () => {
beforeEach(async(() => {
Expand Down Expand Up @@ -159,7 +156,7 @@ describe('ContentObserver injectable', () => {
const fixture = TestBed.createComponent(UnobservedComponentWithTextContent);
fixture.detectChanges();

contentObserver.observe(fixture.componentInstance.contentEl.nativeElement)
contentObserver.observe(fixture.componentInstance.contentEl)
.subscribe(() => spy());

expect(spy).not.toHaveBeenCalled();
Expand All @@ -177,9 +174,9 @@ describe('ContentObserver injectable', () => {
const fixture = TestBed.createComponent(UnobservedComponentWithTextContent);
fixture.detectChanges();

const sub1 = contentObserver.observe(fixture.componentInstance.contentEl.nativeElement)
const sub1 = contentObserver.observe(fixture.componentInstance.contentEl)
.subscribe(() => spy());
contentObserver.observe(fixture.componentInstance.contentEl.nativeElement)
contentObserver.observe(fixture.componentInstance.contentEl)
.subscribe(() => spy());

expect(mof.create).toHaveBeenCalledTimes(1);
Expand Down
14 changes: 12 additions & 2 deletions src/cdk/observers/observe-content.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,17 @@ export class ContentObserver implements OnDestroy {
* Observe content changes on an element.
* @param element The element to observe for content changes.
*/
observe(element: Element): Observable<MutationRecord[]> {
observe(element: Element): Observable<MutationRecord[]>;

/**
* Observe content changes on an element.
* @param element The element to observe for content changes.
*/
observe(element: ElementRef<Element>): Observable<MutationRecord[]>;

observe(elementOrRef: Element | ElementRef<Element>): Observable<MutationRecord[]> {
const element = elementOrRef instanceof ElementRef ? elementOrRef.nativeElement : elementOrRef;

return Observable.create(observer => {
const stream = this._observeElement(element);
const subscription = stream.subscribe(observer);
Expand Down Expand Up @@ -169,7 +179,7 @@ export class CdkObserveContent implements AfterContentInit, OnDestroy {

private _subscribe() {
this._unsubscribe();
const stream = this._contentObserver.observe(this._elementRef.nativeElement);
const stream = this._contentObserver.observe(this._elementRef);

// TODO(mmalerba): We shouldn't be emitting on this @Output() outside the zone.
// Consider brining it back inside the zone next time we're making breaking changes.
Expand Down