fix(keyboard): expose keyboard event to listeners as { keyEvent }

Multiple times we call the argument passed to listeners event. In this case, extracting the event from the event is super confusing: eventBus.on('keyboard.keydown', function(event) { var actualEvent = event.event; ... });
bpmn-io · Oct 29, 2018 · 94b5e26 · 94b5e26
1 parent b4cb648
commit 94b5e26
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/lib/features/keyboard-move-selection/KeyboardMoveSelection.js b/lib/features/keyboard-move-selection/KeyboardMoveSelection.js
@@ -77,7 +77,7 @@ export default function KeyboardMoveSelection(
 
   keyboard.addListener(HIGHER_PRIORITY, function(event) {
 
-    var keyEvent = event.event;
+    var keyEvent = event.keyEvent;
 
     var direction = KEY_TO_DIRECTION[keyEvent.key];
 

diff --git a/lib/features/keyboard/Keyboard.js b/lib/features/keyboard/Keyboard.js
@@ -88,7 +88,7 @@ Keyboard.prototype._keyHandler = function(event) {
   }
 
   var context = {
-    event: event
+    keyEvent: event
   };
 
   eventBusResult = this._eventBus.fire(KEYDOWN_EVENT, context);

diff --git a/lib/features/keyboard/KeyboardBindings.js b/lib/features/keyboard/KeyboardBindings.js
@@ -61,7 +61,7 @@ KeyboardBindings.prototype.registerBindings = function(keyboard, editorActions)
   // (CTRL|CMD) + Z
   addListener('undo', function(context) {
 
-    var event = context.event;
+    var event = context.keyEvent;
 
     if (isCmd(event) && !isShift(event) && isKey(['z', 'Z'], event)) {
       editorActions.trigger('undo');
@@ -75,7 +75,7 @@ KeyboardBindings.prototype.registerBindings = function(keyboard, editorActions)
   // CMD + SHIFT + Z
   addListener('redo', function(context) {
 
-    var event = context.event;
+    var event = context.keyEvent;
 
     if (isCmd(event) && (isKey(['y', 'Y'], event) || (isKey(['z', 'Z'], event) && isShift(event)))) {
       editorActions.trigger('redo');
@@ -88,7 +88,7 @@ KeyboardBindings.prototype.registerBindings = function(keyboard, editorActions)
   // CTRL/CMD + C
   addListener('copy', function(context) {
 
-    var event = context.event;
+    var event = context.keyEvent;
 
     if (isCmd(event) && isKey(['c', 'C'], event)) {
       editorActions.trigger('copy');
@@ -101,7 +101,7 @@ KeyboardBindings.prototype.registerBindings = function(keyboard, editorActions)
   // CTRL/CMD + V
   addListener('paste', function(context) {
 
-    var event = context.event;
+    var event = context.keyEvent;
 
     if (isCmd(event) && isKey(['v', 'V'], event)) {
       editorActions.trigger('paste');
@@ -114,7 +114,7 @@ KeyboardBindings.prototype.registerBindings = function(keyboard, editorActions)
   // CTRL/CMD + +
   addListener('stepZoom', function(context) {
 
-    var event = context.event;
+    var event = context.keyEvent;
 
     if (isKey([ '+', 'Add' ], event) && isCmd(event)) {
       editorActions.trigger('stepZoom', { value: 1 });
@@ -127,7 +127,7 @@ KeyboardBindings.prototype.registerBindings = function(keyboard, editorActions)
   // CTRL + -
   addListener('stepZoom', function(context) {
 
-    var event = context.event;
+    var event = context.keyEvent;
 
     if (isKey([ '-', 'Subtract' ], event) && isCmd(event)) {
       editorActions.trigger('stepZoom', { value: -1 });
@@ -140,7 +140,7 @@ KeyboardBindings.prototype.registerBindings = function(keyboard, editorActions)
   // CTRL + 0
   addListener('zoom', function(context) {
 
-    var event = context.event;
+    var event = context.keyEvent;
 
     if (isKey('0', event) && isCmd(event)) {
       editorActions.trigger('zoom', { value: 1 });
@@ -153,7 +153,7 @@ KeyboardBindings.prototype.registerBindings = function(keyboard, editorActions)
   // DEL
   addListener('removeSelection', function(context) {
 
-    var event = context.event;
+    var event = context.keyEvent;
 
     if (isKey('Delete', event)) {
       editorActions.trigger('removeSelection');

diff --git a/lib/navigation/keyboard-move/KeyboardMove.js b/lib/navigation/keyboard-move/KeyboardMove.js
@@ -31,7 +31,7 @@ export default function KeyboardMove(
 
   function arrowsListener(context) {
 
-    var event = context.event,
+    var event = context.keyEvent,
         config = self._config;
 
     if (!keyboard.isCmd(event)) {