chore(hand-tool): make keyboard optional

bpmn-io · Jun 13, 2019 · 93e7a3e · 93e7a3e
1 parent e7217b9
commit 93e7a3e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/lib/features/hand-tool/HandTool.js b/lib/features/hand-tool/HandTool.js
@@ -6,10 +6,11 @@ var HIGH_PRIORITY = 1500;
 var HAND_CURSOR = 'grab';
 
 
-export default function HandTool(eventBus, canvas, dragging, keyboard, toolManager) {
+export default function HandTool(eventBus, canvas, dragging, injector, toolManager) {
   this._dragging = dragging;
 
-  var self = this;
+  var self = this,
+      keyboard = injector.get('keyboard', false);
 
   toolManager.registerTool('hand', {
     tool: 'hand',
@@ -24,7 +25,7 @@ export default function HandTool(eventBus, canvas, dragging, keyboard, toolManag
     }
   }, this);
 
-  keyboard.addListener(HIGH_PRIORITY, function(e) {
+  keyboard && keyboard.addListener(HIGH_PRIORITY, function(e) {
     if (!isSpace(e.keyEvent)) {
       return;
     }
@@ -103,7 +104,7 @@ HandTool.$inject = [
   'eventBus',
   'canvas',
   'dragging',
-  'keyboard',
+  'injector',
   'toolManager'
 ];
 

diff --git a/lib/features/hand-tool/index.js b/lib/features/hand-tool/index.js
@@ -1,11 +1,9 @@
-import KeyboardModule from '../keyboard';
 import ToolManagerModule from '../tool-manager';
 
 import HandTool from './HandTool';
 
 export default {
   __depends__: [
-    KeyboardModule,
     ToolManagerModule
   ],
   __init__: [ 'handTool' ],

diff --git a/test/spec/features/hand-tool/HandToolSpec.js b/test/spec/features/hand-tool/HandToolSpec.js
@@ -9,6 +9,7 @@ import { createCanvasEvent as canvasEvent } from '../../../util/MockEvents';
 
 import handToolModule from 'lib/features/hand-tool';
 import draggingModule from 'lib/features/dragging';
+import keyboardModule from 'lib/features/keyboard';
 
 import { createKeyEvent } from 'test/util/KeyEvents';
 
@@ -17,7 +18,13 @@ var spy = sinon.spy;
 
 describe('features/hand-tool', function() {
 
-  beforeEach(bootstrapDiagram({ modules: [ handToolModule, draggingModule ] }));
+  beforeEach(bootstrapDiagram({
+    modules: [
+      handToolModule,
+      draggingModule,
+      keyboardModule
+    ]
+  }));
 
   var rootShape, childShape;