refactor: use FocusOriginMonitor to restore focus

Author: crisbeto

src/lib/sidenav/index.ts

@@ -8,14 +8,14 @@
 
 import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
-import {MdCommonModule} from '../core';
+import {MdCommonModule, StyleModule} from '../core';
 import {A11yModule} from '../core/a11y/index';
 import {OverlayModule} from '../core/overlay/index';
 import {MdSidenav, MdSidenavContainer} from './sidenav';
 
 
 @NgModule({
-  imports: [CommonModule, MdCommonModule, A11yModule, OverlayModule],
+  imports: [CommonModule, MdCommonModule, A11yModule, OverlayModule, StyleModule],
   exports: [MdSidenavContainer, MdSidenav, MdCommonModule],
   declarations: [MdSidenavContainer, MdSidenav],
 })

src/lib/sidenav/sidenav.ts

@@ -24,7 +24,7 @@ import {
   Inject,
   ChangeDetectorRef,
 } from '@angular/core';
-import {Directionality, coerceBooleanProperty} from '../core';
+import {Directionality, coerceBooleanProperty, FocusOriginMonitor} from '../core';
 import {FocusTrapFactory, FocusTrap} from '../core/a11y/focus-trap';
 import {ESCAPE} from '../core/keyboard/keycodes';
 import {first} from '../core/rxjs/index';
@@ -139,6 +139,7 @@ export class MdSidenav implements AfterContentInit, OnDestroy {
    */
   constructor(private _elementRef: ElementRef,
               private _focusTrapFactory: FocusTrapFactory,
+              private _focusOriginMonitor: FocusOriginMonitor,
               @Optional() @Inject(DOCUMENT) private _doc: any) {
     this.onOpen.subscribe(() => {
       if (this._doc) {
@@ -161,7 +162,7 @@ export class MdSidenav implements AfterContentInit, OnDestroy {
     let activeEl = this._doc && this._doc.activeElement;
     if (activeEl && this._elementRef.nativeElement.contains(activeEl)) {
       if (this._elementFocusedBeforeSidenavWasOpened instanceof HTMLElement) {
-        this._elementFocusedBeforeSidenavWasOpened.focus();
+        this._focusOriginMonitor.focusVia(this._elementFocusedBeforeSidenavWasOpened, 'program');
       } else {
         this._elementRef.nativeElement.blur();
       }