From a9841310c563b6762e1249a49b7d064ce6a4c21b Mon Sep 17 00:00:00 2001 From: Marc Laval Date: Thu, 14 Mar 2019 10:21:57 +0100 Subject: [PATCH] refactor(focus-monitor): adapt demo examples for Ivy --- .../focus-monitor-focus-via-example.ts | 6 +++--- .../focus-monitor-overview-example.ts | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/material-examples/focus-monitor-focus-via/focus-monitor-focus-via-example.ts b/src/material-examples/focus-monitor-focus-via/focus-monitor-focus-via-example.ts index 3e08e0418965..7277de6ff052 100644 --- a/src/material-examples/focus-monitor-focus-via/focus-monitor-focus-via-example.ts +++ b/src/material-examples/focus-monitor-focus-via/focus-monitor-focus-via-example.ts @@ -1,11 +1,11 @@ import {FocusMonitor, FocusOrigin} from '@angular/cdk/a11y'; import { + AfterViewInit, ChangeDetectorRef, Component, ElementRef, NgZone, OnDestroy, - OnInit, ViewChild } from '@angular/core'; @@ -15,7 +15,7 @@ import { templateUrl: 'focus-monitor-focus-via-example.html', styleUrls: ['focus-monitor-focus-via-example.css'] }) -export class FocusMonitorFocusViaExample implements OnDestroy, OnInit { +export class FocusMonitorFocusViaExample implements OnDestroy, AfterViewInit { @ViewChild('monitored') monitoredEl: ElementRef; origin = this.formatOrigin(null); @@ -24,7 +24,7 @@ export class FocusMonitorFocusViaExample implements OnDestroy, OnInit { private cdr: ChangeDetectorRef, private ngZone: NgZone) {} - ngOnInit() { + ngAfterViewInit() { this.focusMonitor.monitor(this.monitoredEl) .subscribe(origin => this.ngZone.run(() => { this.origin = this.formatOrigin(origin); diff --git a/src/material-examples/focus-monitor-overview/focus-monitor-overview-example.ts b/src/material-examples/focus-monitor-overview/focus-monitor-overview-example.ts index ed319e277b68..77495db67505 100644 --- a/src/material-examples/focus-monitor-overview/focus-monitor-overview-example.ts +++ b/src/material-examples/focus-monitor-overview/focus-monitor-overview-example.ts @@ -1,11 +1,11 @@ import {FocusMonitor, FocusOrigin} from '@angular/cdk/a11y'; import { + AfterViewInit, ChangeDetectorRef, Component, ElementRef, NgZone, OnDestroy, - OnInit, ViewChild } from '@angular/core'; @@ -15,7 +15,7 @@ import { templateUrl: 'focus-monitor-overview-example.html', styleUrls: ['focus-monitor-overview-example.css'] }) -export class FocusMonitorOverviewExample implements OnDestroy, OnInit { +export class FocusMonitorOverviewExample implements OnDestroy, AfterViewInit { @ViewChild('element') element: ElementRef; @ViewChild('subtree') subtree: ElementRef; @@ -26,7 +26,7 @@ export class FocusMonitorOverviewExample implements OnDestroy, OnInit { private cdr: ChangeDetectorRef, private ngZone: NgZone) {} - ngOnInit() { + ngAfterViewInit() { this.focusMonitor.monitor(this.element) .subscribe(origin => this.ngZone.run(() => { this.elementOrigin = this.formatOrigin(origin);