From aa8680ca6429c7ec2481f2c0a5f40f1f45342e5f Mon Sep 17 00:00:00 2001
From: Niklas Kiefer <niklas.kiefer@camunda.com>
Date: Mon, 9 Mar 2020 11:04:17 +0100
Subject: [PATCH] feat(drd): activate direct editing after text annotation
 create

Closes #185
---
 .../label-editing/LabelEditingProvider.js     | 10 +-
 .../label-editing/LabelEditingProviderSpec.js | 94 ++++++++++++++++++-
 2 files changed, 98 insertions(+), 6 deletions(-)

diff --git a/packages/dmn-js-drd/src/features/label-editing/LabelEditingProvider.js b/packages/dmn-js-drd/src/features/label-editing/LabelEditingProvider.js
index e46dffbae..ddc388aa9 100644
--- a/packages/dmn-js-drd/src/features/label-editing/LabelEditingProvider.js
+++ b/packages/dmn-js-drd/src/features/label-editing/LabelEditingProvider.js
@@ -43,9 +43,13 @@ export default function LabelEditingProvider(
 
     var element = e.shape;
 
-    if (is(element, 'dmn:Decision') || is(element, 'dmn:InputData') ||
-        is(element, 'dmn:BusinessKnowledgeModel') || is(element, 'dmn:KnowledgeSource')) {
-
+    if (
+      is(element, 'dmn:Decision') ||
+      is(element, 'dmn:InputData') ||
+      is(element, 'dmn:BusinessKnowledgeModel') ||
+      is(element, 'dmn:KnowledgeSource') ||
+      is(element, 'dmn:TextAnnotation')
+    ) {
       directEditing.activate(element);
     }
   });
diff --git a/packages/dmn-js-drd/test/spec/features/label-editing/LabelEditingProviderSpec.js b/packages/dmn-js-drd/test/spec/features/label-editing/LabelEditingProviderSpec.js
index e092d7362..fc733752c 100644
--- a/packages/dmn-js-drd/test/spec/features/label-editing/LabelEditingProviderSpec.js
+++ b/packages/dmn-js-drd/test/spec/features/label-editing/LabelEditingProviderSpec.js
@@ -1,17 +1,22 @@
 import {
-  bootstrapViewer,
+  bootstrapModeler,
   inject
 } from 'test/TestHelper';
 
 import labelEditingModule from 'src/features/label-editing';
 import modelingModule from 'src/features/modeling';
 import coreModule from 'src/core';
+import createModule from 'diagram-js/lib/features/create';
 import draggingModule from 'diagram-js/lib/features/dragging';
 
 import {
   getLabel
 } from 'src/features/label-editing/LabelUtil';
 
+import {
+  createCanvasEvent as canvasEvent
+} from 'test/util/MockEvents';
+
 
 function triggerKeyEvent(element, event, code) {
   var e = document.createEvent('Events');
@@ -30,9 +35,15 @@ describe('features - label-editing', function() {
 
   var diagramXML = require('../../../fixtures/dmn/di.dmn');
 
-  var testModules = [ labelEditingModule, coreModule, draggingModule, modelingModule ];
+  var testModules = [
+    modelingModule,
+    labelEditingModule,
+    coreModule,
+    createModule,
+    draggingModule
+  ];
 
-  beforeEach(bootstrapViewer(diagramXML, { modules: testModules }));
+  beforeEach(bootstrapModeler(diagramXML, { modules: testModules }));
 
   var setText;
 
@@ -223,4 +234,81 @@ describe('features - label-editing', function() {
 
   });
 
+  describe('after create', function() {
+
+    var createElement;
+
+    beforeEach(inject(
+      function(canvas, create, dragging, elementFactory, elementRegistry) {
+
+        createElement = function(type) {
+
+          var shape = elementFactory.create('shape', { type: type }),
+              parent = canvas.getRootElement(),
+              parentGfx = elementRegistry.getGraphics(parent);
+
+          create.start(canvasEvent({ x: 0, y: 0 }), shape);
+
+          dragging.hover({
+            element: parent,
+            gfx: parentGfx
+          });
+
+          dragging.move(canvasEvent({ x: 400, y: 250 }));
+          dragging.end();
+        };
+      }
+    ));
+
+    it('should activate on Decision', inject(function(directEditing) {
+
+      // when
+      createElement('dmn:Decision');
+
+      // then
+      expect(directEditing.isActive()).to.be.true;
+    }));
+
+
+    it('should activate on InputData', inject(function(directEditing) {
+
+      // when
+      createElement('dmn:InputData');
+
+      // then
+      expect(directEditing.isActive()).to.be.true;
+    }));
+
+
+    it('should activate on BusinessKnowledgeModel', inject(function(directEditing) {
+
+      // when
+      createElement('dmn:BusinessKnowledgeModel');
+
+      // then
+      expect(directEditing.isActive()).to.be.true;
+    }));
+
+
+    it('should activate on KnowledgeSource', inject(function(directEditing) {
+
+      // when
+      createElement('dmn:KnowledgeSource');
+
+      // then
+      expect(directEditing.isActive()).to.be.true;
+    }));
+
+
+    it('should activate on TextAnnotation', inject(function(directEditing) {
+
+      // when
+      createElement('dmn:TextAnnotation');
+
+      // then
+      expect(directEditing.isActive()).to.be.true;
+    }));
+
+  });
+
 });