Merge pull request #5 from ladadeedee/master

Updates to keyboard events
btecu · Dec 12, 2016 · d766028 · d766028
2 parents 2161f7a + 3bfeb19
commit d766028
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/addon/components/select-dropdown.js b/addon/components/select-dropdown.js
@@ -156,9 +156,8 @@ export default Component.extend({
   tabEnterKeys(selected) {
     if (selected && this.get('options').includes(selected)) {
       this.send('select', selected);
-    } else {
-      let token = this.get('freeText') ? this.get('token') : '';
-      this.attrs.select(token);
+    } else if (this.get('freeText')) {
+      this.attrs.select(this.get('token'));
     }
   },
 

diff --git a/addon/components/x-select.js b/addon/components/x-select.js
@@ -194,7 +194,11 @@ export default Component.extend({
 
           break;
         case 27: // ESC
-          this.send('clear');
+          if (this.get('canSearch') && this.get('hasInput')) {
+            this.send('clear');
+          } else {
+            this.set('isOpen', false);
+          }
           break;
         case 38: // Up Arrow
         case 40: // Down Arrow