Actually fix element blurring bug (#60)

Was caused by the highlighted choice being un-set.

Author: josephschmitt

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngc-omnibox",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "description": "A modern, flexible, Angular 1.x autocomplete library with limited assumptions.",
   "main": "dist/ngc-omnibox.js",
   "scripts": {

spec/tests/angularComponent/ngcOmniboxControllerSpec.js

@@ -10,7 +10,8 @@ describe('ngcOmnibox.angularComponent.ngcOmniboxController', () => {
     querySelector() {},
     querySelectorAll() {},
     focus() {},
-    blur() {}
+    blur() {},
+    contains() {}
   };
 
   beforeEach(() => {
@@ -534,13 +535,15 @@ describe('ngcOmnibox.angularComponent.ngcOmniboxController', () => {
     });
 
     it('should focus the component when highlighting a choice', () => {
+      omniboxController.doc.activeElement = omniboxController.element;
       spyOn(omniboxController.element, 'focus');
 
       omniboxController.highlightedChoice = 'one';
       expect(omniboxController.element.focus).toHaveBeenCalled();
     });
 
     it('should focus the field when highlighting no choice', () => {
+      omniboxController.doc.activeElement = omniboxController.element;
       spyOn(omniboxController.fieldElement, 'focus');
 
       omniboxController.highlightedChoice = null;

src/angularComponent/ngcOmniboxController.js

@@ -56,20 +56,6 @@ export default class NgcOmniboxController {
           $scope.$apply();
         }
 
-        // Focus/blur events are finicky, especially when the blur event fires when there's no other
-        // focus target (such as hitting the ESC key, manually calling blur(), or on mobile when
-        // hitting "Done" on the keyboard): the field can still be the focused element. This is a
-        // problem since it means if the user then immediately tries to focus the field again, the
-        // focus event won't fire (since technically the field is already focused). To combat this,
-        // we check here to make absolutely certain that the field isn't currently focused and if it
-        // is, we'll focus our main component element which a.) has a tabindex so we know it's
-        // focuseable, and b.) allows us to keep listening for more events if we need to. Also,
-        // since the element that kept focus is a child of our component element, focusing it won't
-        // call the focus event listener again, avoiding an infinite loop.
-        if (this.doc.activeElement === this.fieldElement) {
-          this.element.focus();
-        }
-
         this.onBlur({event});
       }, SUGGESTIONS_BLUR_THRESHOLD);
     }, true);
@@ -149,7 +135,8 @@ export default class NgcOmniboxController {
   set highlightedChoice(choice) {
     this._highlightedChoice = choice;
 
-    if (this._fieldElement) {
+    const focusedEl = this.doc.activeElement;
+    if (this._fieldElement && (focusedEl === this.element || this.element.contains(focusedEl))) {
       if (choice) {
         this.element.focus();
       } else {