Update to ember-keyboard 6.0.0

- refactor to new template helpers

Author: lukemelia

app/components/dropdown.hbs

@@ -2,6 +2,7 @@
   local-class="container"
   ...attributes
   {{on-click-outside (action (mut this.dropdownExpanded) false)}}
+  {{on-key 'Escape' (action (mut this.dropdownExpanded) false)}}
 >
   {{yield (hash
     Trigger=(component "dropdown/trigger" toggle=(action "toggleDropdown"))

app/components/dropdown.js

@@ -1,17 +1,10 @@
 import Component from '@ember/component';
-import { on } from '@ember/object/evented';
 
-import { EKMixin, EKOnInsertMixin, keyDown } from 'ember-keyboard';
-
-export default Component.extend(EKMixin, EKOnInsertMixin, {
+export default Component.extend({
   tagName: '',
 
   dropdownExpanded: false,
 
-  onEscape: on(keyDown('Escape'), function () {
-    this.set('dropdownExpanded', false);
-  }),
-
   actions: {
     toggleDropdown() {
       this.toggleProperty('dropdownExpanded');

app/components/header.hbs

@@ -22,6 +22,8 @@
         data-test-search-input
       >
       <label for="cargo-desktop-search" local-class="search-label">Search</label>
+      {{on-key 's' (focus '#cargo-desktop-search')}}
+      {{on-key 'shift+s' (focus '#cargo-desktop-search')}}
     </form>
 
     <nav local-class='nav'>

app/components/header.js

@@ -1,29 +1,13 @@
 import Component from '@ember/component';
-import { on } from '@ember/object/evented';
 import { inject as service } from '@ember/service';
 
-import { EKMixin, keyDown, keyPress } from 'ember-keyboard';
-
-export default Component.extend(EKMixin, {
+export default Component.extend({
   header: service(),
   router: service(),
   session: service(),
 
   tagName: '',
 
-  keyboardActivated: true,
-
-  focusSearch: on(keyDown('KeyS'), keyPress('KeyS'), keyDown('shift+KeyS'), function (event) {
-    if (event.ctrlKey || event.altKey || event.metaKey) {
-      return;
-    }
-
-    if (document.activeElement === document.body) {
-      event.preventDefault();
-      document.querySelector('#cargo-desktop-search').focus();
-    }
-  }),
-
   actions: {
     search(event) {
       event.preventDefault();

app/helpers/focus.js

@@ -0,0 +1,12 @@
+import { helper } from '@ember/component/helper';
+
+export function focus([selector]) {
+  return function (event) {
+    if (document.activeElement === document.body) {
+      event.preventDefault();
+      document.querySelector(selector).focus();
+    }
+  };
+}
+
+export default helper(focus);

config/environment.js

@@ -30,6 +30,9 @@ module.exports = function (environment) {
     'ember-cli-mirage': {
       discoverEmberDataModels: false,
     },
+    emberKeyboard: {
+      disableInputsInitializer: true,
+    },
   };
 
   if (environment === 'development') {