@angular/cdk 7.2.0 → 7.2.1

package/esm2015/a11y.js

@@ -11,7 +11,7 @@ import { Subject, Subscription, of } from 'rxjs';
 import { UP_ARROW, DOWN_ARROW, LEFT_ARROW, RIGHT_ARROW, TAB, A, Z, ZERO, NINE, hasModifierKey } from '@angular/cdk/keycodes';
 import { debounceTime, filter, map, tap, take } from 'rxjs/operators';
 import { Platform, normalizePassiveListenerOptions, PlatformModule } from '@angular/cdk/platform';
-import { coerceBooleanProperty } from '@angular/cdk/coercion';
+import { coerceBooleanProperty, coerceElement } from '@angular/cdk/coercion';
 import { ContentObserver, ObserversModule } from '@angular/cdk/observers';
 
 /**
@@ -1076,6 +1076,9 @@ class FocusTrap {
         this._ngZone = _ngZone;
         this._document = _document;
         this._hasAttached = false;
+        // Event listeners for the anchors. Need to be regular functions so that we can unbind them later.
+        this._startAnchorListener = () => this.focusLastTabbableElement();
+        this._endAnchorListener = () => this.focusFirstTabbableElement();
         this._enabled = true;
         if (!deferAnchors) {
             this.attachAnchors();
@@ -1102,11 +1105,21 @@ class FocusTrap {
      * @return {?}
      */
     destroy() {
-        if (this._startAnchor && this._startAnchor.parentNode) {
-            this._startAnchor.parentNode.removeChild(this._startAnchor);
+        /** @type {?} */
+        const startAnchor = this._startAnchor;
+        /** @type {?} */
+        const endAnchor = this._endAnchor;
+        if (startAnchor) {
+            startAnchor.removeEventListener('focus', this._startAnchorListener);
+            if (startAnchor.parentNode) {
+                startAnchor.parentNode.removeChild(startAnchor);
+            }
         }
-        if (this._endAnchor && this._endAnchor.parentNode) {
-            this._endAnchor.parentNode.removeChild(this._endAnchor);
+        if (endAnchor) {
+            endAnchor.removeEventListener('focus', this._endAnchorListener);
+            if (endAnchor.parentNode) {
+                endAnchor.parentNode.removeChild(endAnchor);
+            }
         }
         this._startAnchor = this._endAnchor = null;
     }
@@ -1124,11 +1137,11 @@ class FocusTrap {
         this._ngZone.runOutsideAngular(() => {
             if (!this._startAnchor) {
                 this._startAnchor = this._createAnchor();
-                (/** @type {?} */ (this._startAnchor)).addEventListener('focus', () => this.focusLastTabbableElement());
+                (/** @type {?} */ (this._startAnchor)).addEventListener('focus', this._startAnchorListener);
             }
             if (!this._endAnchor) {
                 this._endAnchor = this._createAnchor();
-                (/** @type {?} */ (this._endAnchor)).addEventListener('focus', () => this.focusFirstTabbableElement());
+                (/** @type {?} */ (this._endAnchor)).addEventListener('focus', this._endAnchorListener);
             }
         });
         if (this._element.parentNode) {
@@ -1805,7 +1818,7 @@ class FocusMonitor {
             return of(null);
         }
         /** @type {?} */
-        const nativeElement = this._getNativeElement(element);
+        const nativeElement = coerceElement(element);
         // Check if we're already monitoring this element.
         if (this._elementInfo.has(nativeElement)) {
             /** @type {?} */
@@ -1844,7 +1857,7 @@ class FocusMonitor {
      */
     stopMonitoring(element) {
         /** @type {?} */
-        const nativeElement = this._getNativeElement(element);
+        const nativeElement = coerceElement(element);
         /** @type {?} */
         const elementInfo = this._elementInfo.get(nativeElement);
         if (elementInfo) {
@@ -1863,7 +1876,7 @@ class FocusMonitor {
      */
     focusVia(element, origin, options) {
         /** @type {?} */
-        const nativeElement = this._getNativeElement(element);
+        const nativeElement = coerceElement(element);
         this._setOriginForCurrentEventQueue(origin);
         // `focus` isn't available on the server
         if (typeof nativeElement.focus === 'function') {
@@ -2061,14 +2074,6 @@ class FocusMonitor {
             clearTimeout(this._originTimeoutId);
         }
     }
-    /**
-     * @private
-     * @param {?} element
-     * @return {?}
-     */
-    _getNativeElement(element) {
-        return element instanceof ElementRef ? element.nativeElement : element;
-    }
 }
 FocusMonitor.decorators = [
     { type: Injectable, args: [{ providedIn: 'root' },] },