review stuff

Author: kseamon

src/cdk-experimental/popover-edit/edit-event-dispatcher.ts

@@ -32,7 +32,10 @@ export class EditEventDispatcher {
   readonly mouseMove = new Subject<Element|null>();
 
   /** The EditRef for the currently active edit lens (if any). */
-  editRef: EditRef<any> | null = null;
+  get editRef(): EditRef<any>|null {
+    return this._editRef;
+  }
+  private _editRef: EditRef<any>|null = null;
 
   /** The table cell that has an active edit lens (or null). */
   private _currentlyEditing: Element|null = null;
@@ -71,6 +74,20 @@ export class EditEventDispatcher {
     }
   }
 
+  /** Sets the currently active EditRef. */
+  setActiveEditRef(ref: EditRef<any>) {
+    this._editRef = ref;
+  }
+
+  /** Unsets the currently active EditRef, if the specified editRef is active. */
+  unsetActiveEditRef(ref: EditRef<any>) {
+    if (this._editRef !== ref) {
+      return;
+    }
+
+    this._editRef = null;
+  }
+
   /**
    * Gets an Observable that emits true when the specified element's row
    * is being hovered over and false when not. Hovering is defined as when

src/cdk-experimental/popover-edit/edit-ref.ts

@@ -42,7 +42,7 @@ export class EditRef<FormValue> implements OnDestroy {
   constructor(
       @Self() private readonly _form: ControlContainer,
       private readonly _editEventDispatcher: EditEventDispatcher) {
-    this._editEventDispatcher.editRef = this;
+    this._editEventDispatcher.setActiveEditRef(this);
   }
 
   /**
@@ -63,7 +63,7 @@ export class EditRef<FormValue> implements OnDestroy {
   }
 
   ngOnDestroy(): void {
-    this._editEventDispatcher.editRef = null;
+    this._editEventDispatcher.unsetActiveEditRef(this);
     this._finalValueSubject.next(this._form.value);
     this._finalValueSubject.complete();
   }

src/cdk-experimental/popover-edit/focus-escape-notifier.ts

@@ -31,6 +31,8 @@ export class FocusEscapeNotifier extends FocusTrap {
       document: Document) {
     super(element, checker, ngZone, document, true /* deferAnchors */);
 
+    // The focus trap adds "anchors" at the beginning and end of a trapped region that redirect
+    // focus. We override that redirect behavior here with simply emitting on a stream.
     this.startAnchorListener = () => {
       this._escapeSubject.next(FocusEscapeNotifierDirection.START);
       return true;