fix(client): disable editor actions if direct editing

* properly disable editor actions when direct editing is active * remove hacks Closes #790
camunda · Jun 18, 2018 · b7d59cb · b7d59cb
1 parent bc90f73
commit b7d59cb
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 21 deletions.
diff --git a/app/lib/menu/menu-builder.js b/app/lib/menu/menu-builder.js
@@ -355,7 +355,7 @@ MenuBuilder.prototype.appendBpmnActions = function() {
   this.menu.append(new MenuItem({
     label: 'Edit Label',
     accelerator: 'E',
-    enabled: this.opts.state.elementsSelected,
+    enabled: this.opts.state.elementsSelected && this.opts.state.inactiveInput,
     click: function() {
       app.emit('menu:action', 'directEditing');
     }
@@ -365,7 +365,7 @@ MenuBuilder.prototype.appendBpmnActions = function() {
 
   this.menu.append(new MenuItem({
     label: 'Align Elements',
-    enabled: this.opts.state.elementsSelected,
+    enabled: this.opts.state.elementsSelected && this.opts.inactiveInput,
     submenu: Menu.buildFromTemplate([
       {
         label: 'Align Left',
@@ -415,7 +415,7 @@ MenuBuilder.prototype.appendBpmnActions = function() {
 
   this.menu.append(new MenuItem({
     label: 'Distribute Elements',
-    enabled: this.opts.state.elementsSelected,
+    enabled: this.opts.state.elementsSelected && this.opts.inactiveInput,
     submenu: Menu.buildFromTemplate([
       {
         label: 'Distribute Horizontally',
@@ -439,6 +439,7 @@ MenuBuilder.prototype.appendBpmnActions = function() {
   this.menu.append(new MenuItem({
     label: 'Find',
     accelerator: 'CommandOrControl + F',
+    enabled: this.opts.state.inactiveInput,
     click: function() {
       app.emit('menu:action', 'find');
     }
@@ -449,13 +450,15 @@ MenuBuilder.prototype.appendBpmnActions = function() {
   this.menu.append(new MenuItem({
     label: 'Move Elements to Origin',
     accelerator: 'CommandOrControl+Shift+0',
+    enabled: this.opts.state.inactiveInput,
     click: function() {
       app.emit('menu:action', 'moveToOrigin');
     }
   }));
 
   this.menu.append(new MenuItem({
     label: 'Move Canvas',
+    enabled: this.opts.state.inactiveInput,
     submenu: Menu.buildFromTemplate([{
       label: 'Move Up',
       accelerator: 'Up',
@@ -539,7 +542,7 @@ MenuBuilder.prototype.appendCmmnActions = function() {
   this.menu.append(new MenuItem({
     label: 'Edit Label',
     accelerator: 'E',
-    enabled: this.opts.state.elementsSelected,
+    enabled: this.opts.state.elementsSelected && this.opts.state.inactiveInput,
     click: function() {
       app.emit('menu:action', 'directEditing');
     }
@@ -550,6 +553,7 @@ MenuBuilder.prototype.appendCmmnActions = function() {
   this.menu.append(new MenuItem({
     label: 'Find',
     accelerator: 'CommandOrControl + F',
+    enabled: this.opts.state.inactiveInput,
     click: function() {
       app.emit('menu:action', 'find');
     }
@@ -559,6 +563,7 @@ MenuBuilder.prototype.appendCmmnActions = function() {
 
   this.menu.append(new MenuItem({
     label: 'Move Canvas',
+    enabled: this.opts.state.inactiveInput,
     submenu: Menu.buildFromTemplate([{
       label: 'Move Up',
       accelerator: 'Up',
@@ -650,7 +655,7 @@ MenuBuilder.prototype.appendDmnActions = function() {
     this.menu.append(new MenuItem({
       label: 'Edit Label',
       accelerator: 'E',
-      enabled: this.opts.state.elementsSelected,
+      enabled: this.opts.state.elementsSelected && this.opts.state.inactiveInput,
       click: function() {
         app.emit('menu:action', 'directEditing');
       }

diff --git a/client/lib/app/editor/bpmn-editor.js b/client/lib/app/editor/bpmn-editor.js
@@ -214,12 +214,6 @@ BpmnEditor.prototype.triggerEditorActions = function(action, options) {
     };
   }
 
-  // ignore all editor actions (besides the following three)
-  // if there's a current active input or textarea
-  if ([ 'removeSelection', 'stepZoom', 'zoom', 'find' ].indexOf(action) === -1 && isInputActive()) {
-    return;
-  }
-
   debug('editor-actions', action, opts);
 
   // forward other actions to editor actions
@@ -273,7 +267,7 @@ BpmnEditor.prototype.updateState = function() {
     stateContext = assign(stateContext, {
       undo: commandStack.canUndo(),
       redo: commandStack.canRedo(),
-      elementsSelected: elementsSelected && !inputActive,
+      elementsSelected: elementsSelected,
       dirty: dirty,
       zoom: true,
       editable: true,

diff --git a/client/lib/app/editor/cmmn-editor.js b/client/lib/app/editor/cmmn-editor.js
@@ -151,12 +151,6 @@ CmmnEditor.prototype.triggerEditorActions = function(action, options) {
     }, options);
   }
 
-  // ignore all editor actions (besides the following three)
-  // if there's a current active input or textarea
-  if ([ 'removeSelection', 'stepZoom', 'zoom' ].indexOf(action) === -1 && isInputActive()) {
-    return;
-  }
-
   debug('editor-actions', action, opts);
 
   // forward other actions to editor actions
@@ -213,7 +207,7 @@ CmmnEditor.prototype.updateState = function() {
     stateContext = assign(stateContext, {
       undo: commandStack.canUndo(),
       redo: commandStack.canRedo(),
-      elementsSelected: elementsSelected && !inputActive,
+      elementsSelected: elementsSelected,
       dirty: dirty,
       zoom: true,
       editable: true,

diff --git a/client/lib/app/editor/dmn-editor.js b/client/lib/app/editor/dmn-editor.js
@@ -137,8 +137,6 @@ DmnEditor.prototype.updateState = function(options = {}) {
 
       stateContext.elementsSelected = !!selection.get().length;
 
-      // TODO(philippfromme): fix, this always returns false
-      // when wrapping this with setTimeout it works as expected
       var inputActive = isInputActive();
 
       stateContext.inactiveInput = !inputActive;