Skip to content

Commit

Permalink
chore(dialog): switch to OnPush change detection (angular#6287)
Browse files Browse the repository at this point in the history
Switches the dialog to OnPush change detection.
  • Loading branch information
crisbeto authored and andrewseguin committed Aug 16, 2017
1 parent 6b93572 commit 72360e2
Showing 1 changed file with 15 additions and 2 deletions.
17 changes: 15 additions & 2 deletions src/lib/dialog/dialog-container.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import {
ChangeDetectorRef,
ViewChild,
ViewEncapsulation,
ChangeDetectionStrategy,
} from '@angular/core';
import {animate, AnimationEvent, state, style, transition, trigger} from '@angular/animations';
import {DOCUMENT} from '@angular/platform-browser';
Expand Down Expand Up @@ -50,6 +51,7 @@ export function throwMdDialogContentAlreadyAttachedError() {
templateUrl: 'dialog-container.html',
styleUrls: ['dialog.css'],
encapsulation: ViewEncapsulation.None,
changeDetection: ChangeDetectionStrategy.OnPush,
animations: [
trigger('slideDialog', [
// Note: The `enter` animation doesn't transition to something like `translate3d(0, 0, 0)
Expand Down Expand Up @@ -117,7 +119,13 @@ export class MdDialogContainer extends BasePortalHost {
}

this._savePreviouslyFocusedElement();
return this._portalHost.attachComponentPortal(portal);

const componentRef = this._portalHost.attachComponentPortal(portal);

// Ensure that the initial view change are picked up.
componentRef.changeDetectorRef.markForCheck();

return componentRef;
}

/**
Expand All @@ -130,7 +138,12 @@ export class MdDialogContainer extends BasePortalHost {
}

this._savePreviouslyFocusedElement();
return this._portalHost.attachTemplatePortal(portal);

const locals = this._portalHost.attachTemplatePortal(portal);

this._changeDetectorRef.markForCheck();

return locals;
}

/** Moves the focus inside the focus trap. */
Expand Down

0 comments on commit 72360e2

Please sign in to comment.