camunda-bpmn-js 3.10.1 → 3.10.2

package/dist/camunda-cloud-modeler.development.js

@@ -32860,7 +32860,7 @@
    * @typedef {import('../../core/EventBus').default} EventBus
    */
 
-  var HIGH_PRIORITY$q = 1500;
+  var HIGH_PRIORITY$r = 1500;
 
 
   /**
@@ -32928,7 +32928,7 @@
        */
       eventBus.on('drag.start', function(event) {
 
-        eventBus.once('drag.move', HIGH_PRIORITY$q, function(event) {
+        eventBus.once('drag.move', HIGH_PRIORITY$r, function(event) {
 
           ensureHover(event);
 
@@ -32959,7 +32959,7 @@
         hover = event.element;
       });
 
-      eventBus.on('element.hover', HIGH_PRIORITY$q, function(event) {
+      eventBus.on('element.hover', HIGH_PRIORITY$r, function(event) {
 
         // (3) am I on an element still?
         if (hover) {
@@ -34911,7 +34911,7 @@
       MARKER_CONNECT_UPDATING$1 = 'djs-updating',
       MARKER_DRAGGER = 'djs-dragging';
 
-  var HIGH_PRIORITY$p = 1100;
+  var HIGH_PRIORITY$q = 1100;
 
   /**
    * Preview connection while moving bendpoints.
@@ -34979,7 +34979,7 @@
     eventBus.on([
       'bendpoint.move.out',
       'bendpoint.move.cleanup'
-    ], HIGH_PRIORITY$p, function(event) {
+    ], HIGH_PRIORITY$q, function(event) {
       var context = event.context,
           hover = context.hover,
           target = context.target;
@@ -35065,7 +35065,7 @@
     eventBus.on([
       'bendpoint.move.end',
       'bendpoint.move.cancel'
-    ], HIGH_PRIORITY$p, function(event) {
+    ], HIGH_PRIORITY$q, function(event) {
       var context = event.context,
           connection = context.connection,
           draggerGfx = context.draggerGfx,
@@ -36081,7 +36081,7 @@
    * @typedef {import('../../core/EventBus').default} EventBus
    */
 
-  var HIGH_PRIORITY$o = 1100,
+  var HIGH_PRIORITY$p = 1100,
       LOW_PRIORITY$m = 900;
 
   var MARKER_OK$3 = 'connect-ok',
@@ -36142,7 +36142,7 @@
     eventBus.on([
       'connect.out',
       'connect.cleanup'
-    ], HIGH_PRIORITY$o, function(event) {
+    ], HIGH_PRIORITY$p, function(event) {
       var hover = event.hover;
 
       if (hover) {
@@ -37468,7 +37468,7 @@
 
   var PARTICIPANT_BORDER_WIDTH = 30;
 
-  var HIGH_PRIORITY$n = 2000;
+  var HIGH_PRIORITY$o = 2000;
 
 
   /**
@@ -37485,7 +37485,7 @@
     eventBus.on([
       'create.start',
       'shape.move.start'
-    ], HIGH_PRIORITY$n, function(event) {
+    ], HIGH_PRIORITY$o, function(event) {
       var context = event.context,
           shape = context.shape,
           rootElement = canvas.getRootElement();
@@ -37520,7 +37520,7 @@
     });
 
     // force hovering process when creating first participant
-    eventBus.on('create.start', HIGH_PRIORITY$n, function(event) {
+    eventBus.on('create.start', HIGH_PRIORITY$o, function(event) {
       var context = event.context,
           shape = context.shape,
           rootElement = canvas.getRootElement(),
@@ -37532,7 +37532,7 @@
       }
 
       if (is$6(shape, 'bpmn:Participant') && is$6(rootElement, 'bpmn:Process')) {
-        eventBus.on('element.hover', HIGH_PRIORITY$n, ensureHoveringProcess);
+        eventBus.on('element.hover', HIGH_PRIORITY$o, ensureHoveringProcess);
 
         eventBus.once('create.cleanup', function() {
           eventBus.off('element.hover', ensureHoveringProcess);
@@ -37553,7 +37553,7 @@
 
     // when creating mutliple elements through `elements.create` parent must be set to collaboration
     // and passed to `shape.create` as hint
-    this.preExecute('elements.create', HIGH_PRIORITY$n, function(context) {
+    this.preExecute('elements.create', HIGH_PRIORITY$o, function(context) {
       var elements = context.elements,
           parent = context.parent,
           participant = findParticipant(elements),
@@ -38975,7 +38975,7 @@
    * @typedef {import('diagram-js/lib/core/Canvas').default} Canvas
    */
 
-  var HIGH_PRIORITY$m = 1500;
+  var HIGH_PRIORITY$n = 1500;
   var HIGHEST_PRIORITY = 2000;
 
 
@@ -38997,7 +38997,7 @@
       'shape.move.move',
       'shape.move.out',
       'shape.move.end'
-    ], HIGH_PRIORITY$m, function(event) {
+    ], HIGH_PRIORITY$n, function(event) {
       var context = event.context,
           shape = context.shape || event.shape,
           hover = event.hover;
@@ -39028,7 +39028,7 @@
       'global-connect.out',
       'global-connect.end',
       'global-connect.cleanup'
-    ], HIGH_PRIORITY$m, function(event) {
+    ], HIGH_PRIORITY$n, function(event) {
       var hover = event.hover;
 
       // ensure connections start/end on bpmn:Participant,
@@ -39042,7 +39042,7 @@
 
     eventBus.on([
       'bendpoint.move.hover'
-    ], HIGH_PRIORITY$m, function(event) {
+    ], HIGH_PRIORITY$n, function(event) {
       var context = event.context,
           hover = event.hover,
           type = context.type;
@@ -39058,7 +39058,7 @@
 
     eventBus.on([
       'connect.start'
-    ], HIGH_PRIORITY$m, function(event) {
+    ], HIGH_PRIORITY$n, function(event) {
       var context = event.context,
           start = context.start;
 
@@ -41508,7 +41508,7 @@
     'selection'
   ];
 
-  var HIGH_PRIORITY$l = 1500;
+  var HIGH_PRIORITY$m = 1500;
 
   /**
    * @typedef {import('diagram-js/lib/core/EventBus').default} EventBus
@@ -41551,7 +41551,7 @@
    * @param {EventBus} eventBus
    */
   function ResizeBehavior$1(eventBus) {
-    eventBus.on('resize.start', HIGH_PRIORITY$l, function(event) {
+    eventBus.on('resize.start', HIGH_PRIORITY$m, function(event) {
       var context = event.context,
           shape = context.shape,
           direction = context.direction,
@@ -42094,7 +42094,7 @@
    */
 
   var LOW_PRIORITY$h = 400;
-  var HIGH_PRIORITY$k = 600;
+  var HIGH_PRIORITY$l = 600;
 
   var DEFAULT_POSITION = {
     x: 180,
@@ -42381,7 +42381,7 @@
     }, true);
 
     // move elements between planes
-    this.postExecuted('shape.toggleCollapse', HIGH_PRIORITY$k, function(context) {
+    this.postExecuted('shape.toggleCollapse', HIGH_PRIORITY$l, function(context) {
       var shape = context.shape;
 
       if (!is$6(shape, 'bpmn:SubProcess')) {
@@ -43029,7 +43029,7 @@
    */
 
   var LOW_PRIORITY$f = 500,
-      HIGH_PRIORITY$j = 5000;
+      HIGH_PRIORITY$k = 5000;
 
 
   /**
@@ -43103,7 +43103,7 @@
 
     // listen to a lot of stuff to group lane updates
 
-    this.preExecute(laneRefUpdateEvents, HIGH_PRIORITY$j, function(event) {
+    this.preExecute(laneRefUpdateEvents, HIGH_PRIORITY$k, function(event) {
       initContext();
     });
 
@@ -44431,7 +44431,7 @@
    * @typedef {import('diagram-js/lib/core/Canvas').default} Canvas
    */
 
-  var HIGH_PRIORITY$i = 2000;
+  var HIGH_PRIORITY$j = 2000;
 
   /**
    * @param {EventBus} eventBus
@@ -44439,7 +44439,7 @@
    */
   function BpmnDiOrdering(eventBus, canvas) {
 
-    eventBus.on('saveXML.start', HIGH_PRIORITY$i, orderDi);
+    eventBus.on('saveXML.start', HIGH_PRIORITY$j, orderDi);
 
     function orderDi() {
       var rootElements = canvas.getRootElements();
@@ -44806,7 +44806,7 @@
 
   var PREFIX = 'create';
 
-  var HIGH_PRIORITY$h = 2000;
+  var HIGH_PRIORITY$i = 2000;
 
 
   /**
@@ -45034,7 +45034,7 @@
     eventBus.on('create.init', function() {
       eventBus.on('elements.changed', cancel);
 
-      eventBus.once([ 'create.cancel', 'create.end' ], HIGH_PRIORITY$h, function() {
+      eventBus.once([ 'create.cancel', 'create.end' ], HIGH_PRIORITY$i, function() {
         eventBus.off('elements.changed', cancel);
       });
     });
@@ -47174,7 +47174,7 @@
     e: 'right'
   };
 
-  var HIGH_PRIORITY$g = 1500;
+  var HIGH_PRIORITY$h = 1500;
 
   var DIRECTION_TO_OPPOSITE = {
     n: 's',
@@ -47223,7 +47223,7 @@
       });
     });
 
-    eventBus.on('spaceTool.move', HIGH_PRIORITY$g , function(event) {
+    eventBus.on('spaceTool.move', HIGH_PRIORITY$h , function(event) {
       var context = event.context,
           initialized = context.initialized;
 
@@ -48712,7 +48712,7 @@
   }
 
   var LOW_PRIORITY$a = 250,
-      HIGH_PRIORITY$f = 1400;
+      HIGH_PRIORITY$g = 1400;
 
   /**
    * @typedef {import('../../model/Types').Element} Element
@@ -48739,7 +48739,7 @@
 
     // remove labels from the collection that are being
     // moved with other elements anyway
-    eventBus.on('shape.move.start', HIGH_PRIORITY$f, function(e) {
+    eventBus.on('shape.move.start', HIGH_PRIORITY$g, function(e) {
 
       var context = e.context,
           shapes = context.shapes,
@@ -48778,7 +48778,7 @@
     });
 
     // add all labels to move closure
-    this.preExecuted('elements.move', HIGH_PRIORITY$f, function(e) {
+    this.preExecuted('elements.move', HIGH_PRIORITY$g, function(e) {
       var context = e.context,
           closure = context.closure,
           enclosedElements = closure.enclosedElements;
@@ -48894,7 +48894,7 @@
    */
 
   var LOW_PRIORITY$9 = 251,
-      HIGH_PRIORITY$e = 1401;
+      HIGH_PRIORITY$f = 1401;
 
   var MARKER_ATTACH$1 = 'attach-ok';
 
@@ -48923,7 +48923,7 @@
 
     // remove all the attached elements from the shapes to be validated
     // add all the attached shapes to the overall list of moved shapes
-    eventBus.on('shape.move.start', HIGH_PRIORITY$e, function(e) {
+    eventBus.on('shape.move.start', HIGH_PRIORITY$f, function(e) {
 
       var context = e.context,
           shapes = context.shapes,
@@ -48976,7 +48976,7 @@
     });
 
     // add all attachers to move closure
-    this.preExecuted('elements.move', HIGH_PRIORITY$e, function(e) {
+    this.preExecuted('elements.move', HIGH_PRIORITY$f, function(e) {
       var context = e.context,
           closure = context.closure,
           shapes = context.shapes,
@@ -60624,7 +60624,7 @@
    * @typedef {import('../../grid-snapping/GridSnapping').default} GridSnapping
    */
 
-  var HIGH_PRIORITY$d = 2000;
+  var HIGH_PRIORITY$e = 2000;
 
   /**
    * Integrates space tool with grid snapping.
@@ -60636,7 +60636,7 @@
     eventBus.on([
       'spaceTool.move',
       'spaceTool.end'
-    ], HIGH_PRIORITY$d, function(event) {
+    ], HIGH_PRIORITY$e, function(event) {
       var context = event.context;
 
       if (!context.initialized) {
@@ -60695,14 +60695,14 @@
    * @typedef {import('diagram-js/lib/util/Types').Axis} Axis
    */
 
-  var HIGH_PRIORITY$c = 2000;
+  var HIGH_PRIORITY$d = 2000;
 
   /**
    * @param {EventBus} eventBus
    * @param {GridSnapping} gridSnapping
    */
   function GridSnappingAutoPlaceBehavior(eventBus, gridSnapping) {
-    eventBus.on('autoPlace', HIGH_PRIORITY$c, function(context) {
+    eventBus.on('autoPlace', HIGH_PRIORITY$d, function(context) {
       var source = context.source,
           sourceMid = getMid(source),
           shape = context.shape;
@@ -60811,7 +60811,7 @@
    * @typedef {import('diagram-js/lib/util/Types').Point} Point
    */
 
-  var HIGH_PRIORITY$b = 3000;
+  var HIGH_PRIORITY$c = 3000;
 
 
   /**
@@ -60831,7 +60831,7 @@
     this.postExecuted([
       'connection.create',
       'connection.layout'
-    ], HIGH_PRIORITY$b, function(event) {
+    ], HIGH_PRIORITY$c, function(event) {
       var context = event.context,
           connection = context.connection,
           hints = context.hints || {},
@@ -62060,7 +62060,7 @@
    * } } DirectEditingContext
    */
 
-  var HIGH_PRIORITY$a = 2000;
+  var HIGH_PRIORITY$b = 2000;
 
   /**
    * @param {EventBus} eventBus
@@ -62105,7 +62105,7 @@
     eventBus.on([
       'shape.remove',
       'connection.remove'
-    ], HIGH_PRIORITY$a, function(event) {
+    ], HIGH_PRIORITY$b, function(event) {
 
       if (directEditing.isActive(event.element)) {
         directEditing.cancel();
@@ -63077,7 +63077,7 @@
 
   var LOW_PRIORITY$5 = 500,
       MEDIUM_PRIORITY = 1250,
-      HIGH_PRIORITY$9 = 1500;
+      HIGH_PRIORITY$a = 1500;
 
   var round$2 = Math.round;
 
@@ -63127,7 +63127,7 @@
     // * validatedShapes: a list of shapes that are being checked
     //                    against the rules before and during move
     //
-    eventBus.on('shape.move.start', HIGH_PRIORITY$9, function(event) {
+    eventBus.on('shape.move.start', HIGH_PRIORITY$a, function(event) {
 
       var context = event.context,
           shape = event.shape,
@@ -64556,7 +64556,7 @@
    * @typedef {import('../tool-manager/ToolManager').default} ToolManager
    */
 
-  var HIGH_PRIORITY$8 = 1500;
+  var HIGH_PRIORITY$9 = 1500;
   var HAND_CURSOR = 'grab';
 
   /**
@@ -64582,7 +64582,7 @@
       dragging: 'hand.move'
     });
 
-    eventBus.on('element.mousedown', HIGH_PRIORITY$8, function(event) {
+    eventBus.on('element.mousedown', HIGH_PRIORITY$9, function(event) {
 
       if (!hasPrimaryModifier(event)) {
         return;
@@ -64593,7 +64593,7 @@
       return false;
     });
 
-    keyboard && keyboard.addListener(HIGH_PRIORITY$8, function(e) {
+    keyboard && keyboard.addListener(HIGH_PRIORITY$9, function(e) {
       if (!isSpace$1(e.keyEvent) || self.isActive()) {
         return;
       }
@@ -64603,7 +64603,7 @@
       self.activateMove(mouseEvent, !!mouseEvent);
     }, 'keyboard.keydown');
 
-    keyboard && keyboard.addListener(HIGH_PRIORITY$8, function(e) {
+    keyboard && keyboard.addListener(HIGH_PRIORITY$9, function(e) {
       if (!isSpace$1(e.keyEvent) || !self.isActive()) {
         return;
       }
@@ -65899,7 +65899,7 @@
    * @typedef {import('../../model/Types').Shape} Shape
    */
 
-  var HIGH_PRIORITY$7 = 1500;
+  var HIGH_PRIORITY$8 = 1500;
 
 
   /**
@@ -65912,7 +65912,7 @@
     injector.invoke(CreateMoveSnapping, this);
 
     // creating first participant
-    eventBus.on([ 'create.move', 'create.end' ], HIGH_PRIORITY$7, setSnappedIfConstrained);
+    eventBus.on([ 'create.move', 'create.end' ], HIGH_PRIORITY$8, setSnappedIfConstrained);
 
     // snap boundary events
     eventBus.on([
@@ -65920,7 +65920,7 @@
       'create.end',
       'shape.move.move',
       'shape.move.end'
-    ], HIGH_PRIORITY$7, function(event) {
+    ], HIGH_PRIORITY$8, function(event) {
       var context = event.context,
           canExecute = context.canExecute,
           target = context.target;
@@ -121259,7 +121259,7 @@
     });
   }
 
-  const HIGH_PRIORITY$6 = 5000;
+  const HIGH_PRIORITY$7 = 5000;
 
 
   /**
@@ -121275,7 +121275,7 @@
       /**
        * Remove zeebe:CalledDecision if zeebe:TaskDefinition is about to be added.
        */
-      this.preExecute('element.updateModdleProperties' , HIGH_PRIORITY$6, function(context) {
+      this.preExecute('element.updateModdleProperties' , HIGH_PRIORITY$7, function(context) {
         const {
           element,
           moddleElement,
@@ -121306,7 +121306,7 @@
       /**
        * Remove zeebe:TaskDefinition and zeebe:TaskHeaders if zeebe:CalledDecision is about to be added.
        */
-      this.preExecute('element.updateModdleProperties', HIGH_PRIORITY$6, function(context) {
+      this.preExecute('element.updateModdleProperties', HIGH_PRIORITY$7, function(context) {
         const {
           element,
           moddleElement,
@@ -121900,7 +121900,7 @@
     }
   }
 
-  const HIGH_PRIORITY$5 = 5000;
+  const HIGH_PRIORITY$6 = 5000;
 
 
   /**
@@ -121914,7 +121914,7 @@
        * Add zeebe:CalledElement extension element with zeebe:propagateAllChildVariables attribute = false
        * when creating bpmn:CallActivity.
        */
-      this.postExecuted('shape.create', HIGH_PRIORITY$5, function(context) {
+      this.postExecuted('shape.create', HIGH_PRIORITY$6, function(context) {
         const { shape } = context;
 
         if (!is$6(shape, 'bpmn:CallActivity')) {
@@ -122277,7 +122277,7 @@
       && !properties.values.find(value => is$6(value, type));
   }
 
-  const HIGH_PRIORITY$4 = 5000;
+  const HIGH_PRIORITY$5 = 5000;
 
 
   /**
@@ -122288,7 +122288,7 @@
     constructor(commandStack, eventBus) {
       super(eventBus);
 
-      this.postExecuted('element.updateModdleProperties' , HIGH_PRIORITY$4, function(context) {
+      this.postExecuted('element.updateModdleProperties' , HIGH_PRIORITY$5, function(context) {
         const {
           element,
           moddleElement
@@ -122320,7 +122320,7 @@
     'eventBus'
   ];
 
-  const HIGH_PRIORITY$3 = 5000;
+  const HIGH_PRIORITY$4 = 5000;
 
 
   /**
@@ -122331,7 +122331,7 @@
     constructor(commandStack, eventBus) {
       super(eventBus);
 
-      this.postExecuted('element.updateModdleProperties' , HIGH_PRIORITY$3, function(context) {
+      this.postExecuted('element.updateModdleProperties' , HIGH_PRIORITY$4, function(context) {
         const {
           element,
           moddleElement
@@ -122362,7 +122362,7 @@
     'eventBus'
   ];
 
-  const HIGH_PRIORITY$2 = 5000;
+  const HIGH_PRIORITY$3 = 5000;
 
 
   /**
@@ -122380,7 +122380,7 @@
        * Remove zeebe:Output elements if zeebe:propagateAllChildVariables is set to true.
        * Remove zeebe:IoMapping extension element if empty.
        */
-      this.postExecute('element.updateModdleProperties' , HIGH_PRIORITY$2, function(context) {
+      this.postExecute('element.updateModdleProperties' , HIGH_PRIORITY$3, function(context) {
         const {
           element,
           moddleElement,
@@ -122420,7 +122420,7 @@
        * Set zeebe:propagateAllChildVariables of zeebe:CalledElement to false if
        * zeebe:Output or zeebe:IoMapping with zeebe:Output is added.
        */
-      this.preExecute('element.updateModdleProperties' , HIGH_PRIORITY$2, function(context) {
+      this.preExecute('element.updateModdleProperties' , HIGH_PRIORITY$3, function(context) {
         const {
           element,
           moddleElement,
@@ -123383,11 +123383,11 @@
       }
       businessObject = eventDefinitions[0];
     }
+    if (!businessObject) {
+      return;
+    }
     return businessObject.get('messageRef');
   }
-  function findZeebeSubscription(message) {
-    return findExtension$1(message, 'zeebe:Subscription');
-  }
   function getDefaultValue(property) {
     if (property.value !== undefined) {
       return property.value;
@@ -124009,242 +124009,6 @@
     // should never throw as templates are validated beforehand
     throw unknownBindingError$1(element, property);
   }
-  function unsetProperty(commandStack, element, property) {
-    let businessObject = getBusinessObject$2(element);
-    const {
-      binding
-    } = property;
-    const {
-      type
-    } = binding;
-    let extensionElements;
-    const commands = [];
-    const context = {
-      element,
-      property
-    };
-    if (MESSAGE_BINDING_TYPES.includes(type)) {
-      businessObject = findMessage(businessObject);
-      if (!businessObject) {
-        return;
-      }
-    }
-
-    // property
-    if (PROPERTY_BINDING_TYPES.includes(type)) {
-      const {
-        name
-      } = binding;
-      commands.push({
-        cmd: 'element.updateModdleProperties',
-        context: {
-          ...context,
-          moddleElement: businessObject,
-          properties: {
-            [name]: undefined
-          }
-        }
-      });
-    }
-    if (EXTENSION_BINDING_TYPES$1.includes(type)) {
-      extensionElements = businessObject.get('extensionElements');
-      if (!extensionElements) return;
-    }
-
-    // zeebe:taskDefinition
-    if (TASK_DEFINITION_TYPES.includes(type)) {
-      const oldTaskDefinition = findExtension$1(extensionElements, 'zeebe:TaskDefinition');
-      const propertyName = getTaskDefinitionPropertyName(binding);
-      if (oldTaskDefinition) {
-        if (isOnlyProperty(oldTaskDefinition, propertyName)) {
-          // remove task definition
-          commands.push({
-            cmd: 'element.updateModdleProperties',
-            context: {
-              ...context,
-              moddleElement: extensionElements,
-              properties: {
-                values: without(extensionElements.get('values'), oldTaskDefinition)
-              }
-            }
-          });
-        } else {
-          // remove property
-          commands.push({
-            cmd: 'element.updateModdleProperties',
-            context: {
-              ...context,
-              moddleElement: oldTaskDefinition,
-              properties: {
-                [propertyName]: undefined
-              }
-            }
-          });
-        }
-      }
-    }
-
-    // zeebe:IoMapping
-    if (IO_BINDING_TYPES$1.includes(type)) {
-      let ioMapping = findExtension$1(extensionElements, 'zeebe:IoMapping');
-      if (!ioMapping) return;
-
-      // zeebe:Input
-      if (type === ZEBBE_INPUT_TYPE) {
-        const oldZeebeInputParameter = findInputParameter$1(ioMapping, binding);
-        const values = ioMapping.get('inputParameters').filter(value => value !== oldZeebeInputParameter);
-        if (ioMapping.get('outputParameters').length == 0 && values.length == 0) {
-          commands.push({
-            cmd: 'element.updateModdleProperties',
-            context: {
-              ...context,
-              moddleElement: extensionElements,
-              properties: {
-                values: without(extensionElements.get('values'), ioMapping)
-              }
-            }
-          });
-        } else {
-          commands.push({
-            cmd: 'element.updateModdleProperties',
-            context: {
-              ...context,
-              moddleElement: ioMapping,
-              properties: {
-                inputParameters: [...values]
-              }
-            }
-          });
-        }
-      }
-
-      // zeebe:Output
-      if (type === ZEEBE_OUTPUT_TYPE) {
-        const oldZeebeOutputParameter = findOutputParameter$1(ioMapping, binding);
-        const values = ioMapping.get('outputParameters').filter(value => value !== oldZeebeOutputParameter);
-        if (ioMapping.get('inputParameters').length == 0 && values.length == 0) {
-          commands.push({
-            cmd: 'element.updateModdleProperties',
-            context: {
-              ...context,
-              moddleElement: extensionElements,
-              properties: {
-                values: without(extensionElements.get('values'), ioMapping)
-              }
-            }
-          });
-        }
-        commands.push({
-          cmd: 'element.updateModdleProperties',
-          context: {
-            ...context,
-            moddleElement: ioMapping,
-            properties: {
-              'outputParameters': [...values]
-            }
-          }
-        });
-      }
-    }
-
-    // zeebe:taskHeaders
-    if (type === ZEEBE_TASK_HEADER_TYPE) {
-      let taskHeaders = findExtension$1(extensionElements, 'zeebe:TaskHeaders');
-      if (!taskHeaders) return;
-      const oldTaskHeader = findTaskHeader(taskHeaders, binding);
-      const values = taskHeaders.get('values').filter(value => value !== oldTaskHeader);
-      if (values.length === 0) {
-        commands.push({
-          cmd: 'element.updateModdleProperties',
-          context: {
-            ...context,
-            moddleElement: extensionElements,
-            properties: {
-              values: without(extensionElements.get('values'), taskHeaders)
-            }
-          }
-        });
-      } else {
-        commands.push({
-          cmd: 'element.updateModdleProperties',
-          context: {
-            ...context,
-            moddleElement: taskHeaders,
-            properties: {
-              values: [...values]
-            }
-          }
-        });
-      }
-    }
-
-    // zeebe:Property
-    if (type === ZEEBE_PROPERTY_TYPE) {
-      let zeebeProperties = findExtension$1(extensionElements, 'zeebe:Properties');
-      if (!zeebeProperties) return;
-      const oldZeebeProperty = findZeebeProperty(zeebeProperties, binding);
-      const properties = zeebeProperties.get('properties').filter(property => property !== oldZeebeProperty);
-      if (!properties.length) {
-        commands.push({
-          cmd: 'element.updateModdleProperties',
-          context: {
-            ...context,
-            moddleElement: extensionElements,
-            properties: {
-              values: without(extensionElements.get('values'), zeebeProperties)
-            }
-          }
-        });
-      } else {
-        commands.push({
-          cmd: 'element.updateModdleProperties',
-          context: {
-            ...context,
-            moddleElement: zeebeProperties,
-            properties: {
-              properties: [...properties]
-            }
-          }
-        });
-      }
-    }
-
-    // bpmn:Message#property
-    if (type === MESSAGE_PROPERTY_TYPE) {
-      commands.push({
-        cmd: 'element.updateModdleProperties',
-        context: {
-          ...context,
-          moddleElement: businessObject,
-          properties: {
-            [binding.name]: undefined
-          }
-        }
-      });
-    }
-
-    // bpmn:Message#zeebe:subscription#property
-    if (type === MESSAGE_ZEEBE_SUBSCRIPTION_PROPERTY_TYPE) {
-      const subscription = findZeebeSubscription(businessObject);
-      if (!subscription) {
-        return;
-      }
-      commands.push({
-        cmd: 'element.updateModdleProperties',
-        context: {
-          ...context,
-          moddleElement: subscription,
-          properties: {
-            [binding.name]: undefined
-          }
-        }
-      });
-    }
-    if (commands.length) {
-      commandStack.execute('properties-panel.multi-command-executor', commands);
-      return;
-    }
-  }
   function validateProperty(value, property, translate$1 = translate) {
     const {
       constraints = {},
@@ -124309,14 +124073,6 @@
   function matchesPattern$1(string, pattern) {
     return new RegExp(pattern).test(string);
   }
-  function isOnlyProperty(moddleElement, propertyName) {
-    const descriptor = moddleElement.$descriptor;
-    return descriptor.properties.every(({
-      name
-    }) => {
-      return propertyName === name || moddleElement.get(name) === undefined;
-    });
-  }
 
   /**
    * Based on conditions, remove properties from the template.
@@ -124395,49 +124151,7 @@
     return true;
   }
 
-  function removeRootElement(rootElement, injector) {
-    const modeling = injector.get('modeling'),
-      canvas = injector.get('canvas'),
-      bpmnjs = injector.get('bpmnjs');
-    const element = canvas.getRootElement(),
-      definitions = bpmnjs.getDefinitions(),
-      rootElements = definitions.get('rootElements');
-    const newRootElements = rootElements.filter(e => e !== rootElement);
-
-    // short-circuit to prevent unnecessary updates
-    if (newRootElements.length === rootElements.length) {
-      return;
-    }
-    modeling.updateModdleProperties(element, definitions, {
-      rootElements: newRootElements
-    });
-  }
-
-  /**
-   * Remove message from element and the diagram.
-   *
-   * @param {import('bpmn-js/lib/model/Types').Element} element
-   * @param {import('didi').Injector} injector
-   */
-  function removeMessage(element, injector) {
-    const modeling = injector.get('modeling');
-    const bo = getReferringElement(element);
-    const message = findMessage(bo);
-    if (!message) {
-      return;
-    }
-    modeling.updateModdleProperties(element, bo, {
-      messageRef: undefined
-    });
-    removeRootElement(message, injector);
-  }
-  function getReferringElement(element) {
-    const bo = getBusinessObject$2(element);
-    if (is$6(bo, 'bpmn:Event')) {
-      return bo.get('eventDefinitions')[0];
-    }
-    return bo;
-  }
+  const HIGH_PRIORITY$2 = 2500;
 
   /**
    * Checks the conditions of an element template and sets/resets the
@@ -124453,6 +124167,20 @@
       this._injector = injector;
       this.preExecute(['element.updateProperties', 'element.updateModdleProperties'], this._saveConditionalState, true, this);
       this.postExecute(['element.updateProperties', 'element.updateModdleProperties', 'propertiesPanel.zeebe.changeTemplate', 'element.move'], this._applyConditions, true, this);
+
+      // Apply Conditions before changing properties. This persists the template so we can check if conditions apply
+      // after upgrading the template.
+      this.preExecute(['propertiesPanel.zeebe.changeTemplate'], HIGH_PRIORITY$2, this._handleTemplateUpgrade, true, this);
+    }
+    _handleTemplateUpgrade(context) {
+      const {
+        element,
+        newTemplate
+      } = context;
+      if (!element || !newTemplate) {
+        return;
+      }
+      context.newTemplate = applyConditions(context.element, context.newTemplate);
     }
     _saveConditionalState(context) {
       const {
@@ -124467,29 +124195,52 @@
     _applyConditions(context) {
       const {
         element,
-        oldTemplate
+        hints = {}
       } = context;
+      if (hints.skipConditionUpdate) {
+        return;
+      }
       const template = this._elementTemplates.get(element);
+
+      // New Template is persisted before applying default values,
+      // new conditions might apply after the defaults are present.
+      const oldTemplate = context.oldTemplate || context.newTemplate;
       if (!template || !oldTemplate || template.id !== oldTemplate.id) {
         return;
       }
       const newTemplate = applyConditions(element, template);
-      const propertiesToAdd = getMissingProperties(oldTemplate, newTemplate);
-      const propertiesToRemove = getPropertiesToRemove(newTemplate, oldTemplate);
-      this._updateReferencedElement(element, oldTemplate, newTemplate);
-      propertiesToAdd.forEach(property => setPropertyValue(this._bpmnFactory, this._commandStack, element, property, property.value));
-      propertiesToRemove.forEach(property => unsetProperty(this._commandStack, element, property));
-    }
-    _updateReferencedElement(element, oldTemplate, newTemplate) {
-      if (hasMessageProperties(oldTemplate) && !hasMessageProperties(newTemplate)) {
-        removeMessage(element, this._injector);
+      if (!hasDifferentPropertyBindings(newTemplate, oldTemplate)) {
+        return;
       }
+      const changeContext = {
+        element,
+        newTemplate,
+        oldTemplate,
+        hints: {
+          skipConditionUpdate: true
+        }
+      };
+      this._commandStack.execute('propertiesPanel.zeebe.changeTemplate', changeContext);
     }
   }
   ElementTemplatesConditionChecker.$inject = ['eventBus', 'elementTemplates', 'commandStack', 'bpmnFactory', 'injector'];
 
   // helpers
 
+  function hasDifferentPropertyBindings(sourceTemplate, targetTemplate) {
+    return hasNewProperties(sourceTemplate, targetTemplate) || hasRemovedProperties(sourceTemplate, targetTemplate);
+  }
+  function hasNewProperties(sourceTemplate, targetTemplate) {
+    let properties = targetTemplate.properties;
+    return properties.some(targetProp => !sourceTemplate.properties.find(sourceProp => compareProps(sourceProp, targetProp)));
+  }
+  function hasRemovedProperties(oldTemplate, newTemplate) {
+    const oldProperties = getMissingProperties(newTemplate, oldTemplate);
+
+    // ensure XML properties are mantained for properties with
+    // different conditions but same bindings
+    return oldProperties.some(property => !findPropertyWithBinding(newTemplate, property));
+  }
   function getMissingProperties(sourceTemplate, targetTemplate) {
     let properties = targetTemplate.properties;
     return properties.filter(targetProp => !sourceTemplate.properties.find(sourceProp => compareProps(sourceProp, targetProp)));
@@ -124500,13 +124251,6 @@
   function findPropertyWithBinding(template, prop1) {
     return template.properties.some(prop2 => areBindingsEqual(prop1.binding, prop2.binding));
   }
-  function getPropertiesToRemove(newTemplate, oldTemplate) {
-    const oldProperties = getMissingProperties(newTemplate, oldTemplate);
-
-    // ensure XML properties are mantained for properties with
-    // different conditions but same bindings
-    return oldProperties.filter(property => !findPropertyWithBinding(newTemplate, property));
-  }
   function normalizeReplacer$1(key, value) {
     if (isObject$1(value)) {
       const keys = Object.keys(value).sort();
@@ -124539,9 +124283,6 @@
   function equals(a, b) {
     return JSON.stringify(a, normalizeReplacer$1) === JSON.stringify(b, normalizeReplacer$1);
   }
-  function hasMessageProperties(template) {
-    return template.properties.some(p => MESSAGE_BINDING_TYPES.includes(p.binding.type));
-  }
 
   /**
    * The BPMN 2.0 extension attribute name under
@@ -125321,16 +125062,87 @@
     return !is$6(eventDefinitions[0], eventDefinition);
   }
 
+  function removeRootElement(rootElement, injector) {
+    const modeling = injector.get('modeling'),
+      canvas = injector.get('canvas'),
+      bpmnjs = injector.get('bpmnjs');
+    const element = canvas.getRootElement(),
+      definitions = bpmnjs.getDefinitions(),
+      rootElements = definitions.get('rootElements');
+    const newRootElements = rootElements.filter(e => e !== rootElement);
+
+    // short-circuit to prevent unnecessary updates
+    if (newRootElements.length === rootElements.length) {
+      return;
+    }
+    modeling.updateModdleProperties(element, definitions, {
+      rootElements: newRootElements
+    });
+  }
+
+  /**
+   * Remove message from element and the diagram.
+   *
+   * @param {import('bpmn-js/lib/model/Types').Element} element
+   * @param {import('didi').Injector} injector
+   */
+  function removeMessage(element, injector) {
+    const modeling = injector.get('modeling');
+    const bo = getReferringElement(element);
+
+    // Event does not have an event definition
+    if (!bo) {
+      return;
+    }
+    const message = findMessage(bo);
+    if (!message) {
+      return;
+    }
+    modeling.updateModdleProperties(element, bo, {
+      messageRef: undefined
+    });
+    removeRootElement(message, injector);
+  }
+  function getReferringElement(element) {
+    const bo = getBusinessObject$2(element);
+    if (is$6(bo, 'bpmn:Event')) {
+      return bo.get('eventDefinitions')[0];
+    }
+    return bo;
+  }
+
   /**
    * Applies an element template to an element. Sets `zeebe:modelerTemplate` and
    * `zeebe:modelerTemplateVersion`.
    */
   let ChangeElementTemplateHandler$1 = class ChangeElementTemplateHandler {
-    constructor(bpmnFactory, bpmnReplace, commandStack, modeling) {
+    constructor(bpmnFactory, bpmnReplace, commandStack, injector) {
       this._bpmnFactory = bpmnFactory;
       this._bpmnReplace = bpmnReplace;
-      this._commandStack = commandStack;
-      this._modeling = modeling;
+
+      // Wrap commandStack and modeling to add hints to all commands
+      this._commandStackWrapper = {
+        execute: (event, context, ...rest) => {
+          commandStack.execute(event, {
+            hints: {
+              skipConditionUpdate: true
+            },
+            ...context
+          }, ...rest);
+        }
+      };
+      this._modelingWrapper = {
+        updateModdleProperties: (element, moddleElement, properties) => this._commandStackWrapper.execute('element.updateModdleProperties', {
+          element,
+          moddleElement,
+          properties
+        }),
+        updateProperties: (element, properties) => this._commandStackWrapper.execute('element.updateProperties', {
+          element,
+          properties
+        })
+      };
+      this._injector = injector;
     }
 
     /**
@@ -125355,11 +125167,8 @@
       // update zeebe:modelerTemplateIcon
       this._updateZeebeModelerTemplateIcon(element, newTemplate);
       if (newTemplate) {
-        // do not apply properties that don't meet conditions
-        newTemplate = applyConditions(element, newTemplate);
-
         // update element type
-        element = context.element = this._updateElementType(element, newTemplate);
+        element = context.element = this._updateElementType(element, oldTemplate, newTemplate);
 
         // update properties
         this._updateProperties(element, oldTemplate, newTemplate);
@@ -125375,18 +125184,12 @@
 
         // update zeebe:Property properties
         this._updateZeebePropertyProperties(element, oldTemplate, newTemplate);
-
-        // update bpmn:Message properties
-        this._updateMessageProperties(element, oldTemplate, newTemplate);
-
-        // update bpmn:Message zeebe:subscription properties
-        this._updateMessageZeebeSubscriptionProperties(element, oldTemplate, newTemplate);
-        this._updateZeebeModelerTemplateOnReferencedElement(element, oldTemplate, newTemplate);
+        this._updateMessage(element, oldTemplate, newTemplate);
       }
     }
     _getOrCreateExtensionElements(element, businessObject = getBusinessObject$2(element)) {
       const bpmnFactory = this._bpmnFactory,
-        modeling = this._modeling;
+        modeling = this._modelingWrapper;
       let extensionElements = businessObject.get('extensionElements');
       if (!extensionElements) {
         extensionElements = bpmnFactory.create('bpmn:ExtensionElements', {
@@ -125400,30 +125203,48 @@
       return extensionElements;
     }
     _updateZeebeModelerTemplate(element, newTemplate) {
-      const modeling = this._modeling;
+      const modeling = this._modelingWrapper;
       modeling.updateProperties(element, {
         'zeebe:modelerTemplate': newTemplate && newTemplate.id,
         'zeebe:modelerTemplateVersion': newTemplate && newTemplate.version
       });
     }
     _updateZeebeModelerTemplateIcon(element, newTemplate) {
-      const modeling = this._modeling;
+      const modeling = this._modelingWrapper;
       const icon = newTemplate && newTemplate.icon;
       modeling.updateProperties(element, {
         'zeebe:modelerTemplateIcon': icon && icon.contents
       });
     }
     _updateProperties(element, oldTemplate, newTemplate) {
-      const commandStack = this._commandStack;
+      const commandStack = this._commandStackWrapper;
+      const businessObject = getBusinessObject$2(element);
       const newProperties = newTemplate.properties.filter(newProperty => {
         const newBinding = newProperty.binding,
           newBindingType = newBinding.type;
         return newBindingType === 'property';
       });
+
+      // Remove old Properties if no new Properties specified
+      const propertiesToRemove = oldTemplate && oldTemplate.properties.filter(oldProperty => {
+        const oldBinding = oldProperty.binding,
+          oldBindingType = oldBinding.type;
+        return oldBindingType === 'property' && !newProperties.find(newProperty => newProperty.binding.name === oldProperty.binding.name);
+      }) || [];
+      if (propertiesToRemove.length) {
+        const payload = propertiesToRemove.reduce((properties, property) => {
+          properties[property.binding.name] = undefined;
+          return properties;
+        }, {});
+        commandStack.execute('element.updateModdleProperties', {
+          element,
+          moddleElement: businessObject,
+          properties: payload
+        });
+      }
       if (!newProperties.length) {
         return;
       }
-      const businessObject = getBusinessObject$2(element);
       newProperties.forEach(newProperty => {
         const oldProperty = findOldProperty$1(oldTemplate, newProperty),
           newBinding = newProperty.binding,
@@ -125453,34 +125274,42 @@
      */
     _updateZeebeTaskDefinition(element, oldTemplate, newTemplate) {
       const bpmnFactory = this._bpmnFactory,
-        commandStack = this._commandStack;
+        commandStack = this._commandStackWrapper;
       const newProperties = newTemplate.properties.filter(newProperty => {
         const newBinding = newProperty.binding,
           newBindingType = newBinding.type;
         return TASK_DEFINITION_TYPES.includes(newBindingType);
       });
+      const businessObject = this._getOrCreateExtensionElements(element);
+      let taskDefinition = findExtension$1(businessObject, 'zeebe:TaskDefinition');
+
+      // (1) remove old task definition if no new properties specified
 
-      // (1) do not override old task definition if no new properties specified
       if (!newProperties.length) {
+        commandStack.execute('element.updateModdleProperties', {
+          element,
+          moddleElement: businessObject,
+          properties: {
+            values: without(businessObject.get('values'), taskDefinition)
+          }
+        });
         return;
       }
-      const businessObject = this._getOrCreateExtensionElements(element);
       newProperties.forEach(newProperty => {
         const oldProperty = findOldProperty$1(oldTemplate, newProperty),
-          oldTaskDefinition = findBusinessObject(businessObject, newProperty),
           newPropertyValue = getDefaultValue(newProperty),
           newBinding = newProperty.binding,
           propertyName = getTaskDefinitionPropertyName(newBinding);
 
         // (2) update old task definition
-        if (oldTaskDefinition) {
-          if (!shouldKeepValue(oldTaskDefinition, oldProperty, newProperty)) {
+        if (taskDefinition) {
+          if (!shouldKeepValue(taskDefinition, oldProperty, newProperty)) {
             const properties = {
               [propertyName]: newPropertyValue
             };
             commandStack.execute('element.updateModdleProperties', {
               element,
-              moddleElement: oldTaskDefinition,
+              moddleElement: taskDefinition,
               properties
             });
           }
@@ -125491,17 +125320,34 @@
           const properties = {
             [propertyName]: newPropertyValue
           };
-          const newTaskDefinition = createTaskDefinition(properties, bpmnFactory);
-          newTaskDefinition.$parent = businessObject;
+          taskDefinition = createTaskDefinition(properties, bpmnFactory);
+          taskDefinition.$parent = businessObject;
           commandStack.execute('element.updateModdleProperties', {
             element,
             moddleElement: businessObject,
             properties: {
-              values: [...businessObject.get('values'), newTaskDefinition]
+              values: [...businessObject.get('values'), taskDefinition]
             }
           });
         }
       });
+
+      // (4) remove properties no longer templated
+      const oldProperties = oldTemplate && oldTemplate.properties.filter(oldProperty => {
+        const oldBinding = oldProperty.binding,
+          oldBindingType = oldBinding.type;
+        return TASK_DEFINITION_TYPES.includes(oldBindingType) && !newProperties.find(newProperty => newProperty.binding.property === oldProperty.binding.property);
+      }) || [];
+      oldProperties.forEach(oldProperty => {
+        const properties = {
+          [oldProperty.binding.property]: undefined
+        };
+        commandStack.execute('element.updateModdleProperties', {
+          element,
+          moddleElement: taskDefinition,
+          properties
+        });
+      });
     }
 
     /**
@@ -125514,7 +125360,7 @@
      */
     _updateZeebeInputOutputParameterProperties(element, oldTemplate, newTemplate) {
       const bpmnFactory = this._bpmnFactory,
-        commandStack = this._commandStack;
+        commandStack = this._commandStackWrapper;
       const newProperties = newTemplate.properties.filter(newProperty => {
         const newBinding = newProperty.binding,
           newBindingType = newBinding.type;
@@ -125641,7 +125487,7 @@
      */
     _updateZeebeTaskHeaderProperties(element, oldTemplate, newTemplate) {
       const bpmnFactory = this._bpmnFactory,
-        commandStack = this._commandStack;
+        commandStack = this._commandStackWrapper;
       const newProperties = newTemplate.properties.filter(newProperty => {
         const newBinding = newProperty.binding,
           newBindingType = newBinding.type;
@@ -125731,7 +125577,7 @@
      */
     _updateZeebePropertyProperties(element, oldTemplate, newTemplate) {
       const bpmnFactory = this._bpmnFactory,
-        commandStack = this._commandStack;
+        commandStack = this._commandStackWrapper;
       const newProperties = newTemplate.properties.filter(newProperty => {
         const newBinding = newProperty.binding,
           newBindingType = newBinding.type;
@@ -125812,6 +125658,17 @@
         });
       }
     }
+    _updateMessage(element, oldTemplate, newTemplate) {
+      // update bpmn:Message properties
+      this._updateMessageProperties(element, oldTemplate, newTemplate);
+
+      // update bpmn:Message zeebe:subscription properties
+      this._updateMessageZeebeSubscriptionProperties(element, oldTemplate, newTemplate);
+      this._updateZeebeModelerTemplateOnReferencedElement(element, oldTemplate, newTemplate);
+      if (!hasMessageProperties(newTemplate)) {
+        removeMessage(element, this._injector);
+      }
+    }
 
     /**
      * Update bpmn:Message properties.
@@ -125826,10 +125683,21 @@
           newBindingType = newBinding.type;
         return newBindingType === MESSAGE_PROPERTY_TYPE;
       });
+      const removedProperties = oldTemplate && oldTemplate.properties.filter(oldProperty => {
+        const oldBinding = oldProperty.binding,
+          oldBindingType = oldBinding.type;
+        return oldBindingType === MESSAGE_PROPERTY_TYPE && !newProperties.find(newProperty => newProperty.binding.name === oldProperty.binding.name);
+      }) || [];
+      let message = this._getMessage(element);
+      message && removedProperties.forEach(removedProperty => {
+        this._modelingWrapper.updateModdleProperties(element, message, {
+          [removedProperty.binding.name]: undefined
+        });
+      });
       if (!newProperties.length) {
         return;
       }
-      const message = this._getOrCreateMessage(element, newTemplate);
+      message = this._getOrCreateMessage(element, newTemplate);
       newProperties.forEach(newProperty => {
         const oldProperty = findOldProperty$1(oldTemplate, newProperty),
           newBinding = newProperty.binding,
@@ -125841,7 +125709,7 @@
           return;
         }
         properties[newBindingName] = newPropertyValue;
-        this._modeling.updateModdleProperties(element, changedElement, properties);
+        this._modelingWrapper.updateModdleProperties(element, changedElement, properties);
       });
     }
 
@@ -125858,24 +125726,50 @@
           newBindingType = newBinding.type;
         return newBindingType === MESSAGE_ZEEBE_SUBSCRIPTION_PROPERTY_TYPE;
       });
-      if (!newProperties.length) {
+      const removedProperties = oldTemplate && oldTemplate.properties.filter(oldProperty => {
+        const oldBinding = oldProperty.binding,
+          oldBindingType = oldBinding.type;
+        return oldBindingType === MESSAGE_ZEEBE_SUBSCRIPTION_PROPERTY_TYPE && !newProperties.find(newProperty => newProperty.binding.name === oldProperty.binding.name);
+      }) || [];
+      if (!newProperties.length && !removedProperties.length) {
         return;
       }
       const message = this._getOrCreateMessage(element, newTemplate);
-      const zeebeSubscription = this._getOrCreateExtension(element, message, 'zeebe:Subscription');
-      newProperties.forEach(newProperty => {
+      const messageExtensionElements = this._getOrCreateExtensionElements(element, message);
+      const zeebeSubscription = this._getSubscription(element, message);
+      const propertiesToSet = newProperties.reduce((properties, newProperty) => {
         const oldProperty = findOldProperty$1(oldTemplate, newProperty),
           newBinding = newProperty.binding,
           newBindingName = newBinding.name,
           newPropertyValue = getDefaultValue(newProperty),
           changedElement = zeebeSubscription;
-        let properties = {};
         if (shouldKeepValue(changedElement, oldProperty, newProperty)) {
-          return;
+          return properties;
         }
         properties[newBindingName] = newPropertyValue;
-        this._modeling.updateModdleProperties(element, changedElement, properties);
-      });
+        return properties;
+      }, {});
+
+      // Update zeebe Subscription
+      if (zeebeSubscription) {
+        this._modelingWrapper.updateModdleProperties(element, zeebeSubscription, propertiesToSet);
+      } else {
+        // create new Subscription
+        const newSubscription = createElement$1('zeebe:Subscription', propertiesToSet, message, this._bpmnFactory);
+        this._modelingWrapper.updateModdleProperties(element, messageExtensionElements, {
+          values: [...messageExtensionElements.get('values'), newSubscription]
+        });
+      }
+
+      // Remove old properties
+      if (!oldTemplate || !zeebeSubscription) {
+        return;
+      }
+      const propertiesToRemove = removedProperties.reduce((properties, removedProperty) => {
+        properties[removedProperty.binding.name] = undefined;
+        return properties;
+      }, {});
+      this._modelingWrapper.updateModdleProperties(element, zeebeSubscription, propertiesToRemove);
     }
     _updateZeebeModelerTemplateOnReferencedElement(element, oldTemplate, newTemplate) {
       const businessObject = getBusinessObject$2(element);
@@ -125886,39 +125780,41 @@
       if (getTemplateId$1(message) === newTemplate.id) {
         return;
       }
-      this._modeling.updateModdleProperties(element, message, {
+      this._modelingWrapper.updateModdleProperties(element, message, {
         'zeebe:modelerTemplate': newTemplate.id
       });
     }
-    _getOrCreateExtension(element, bo, type) {
+    _getSubscription(element, bo) {
       const extensionElements = this._getOrCreateExtensionElements(element, bo);
-      const extension = findExtension$1(extensionElements, type);
+      const extension = findExtension$1(extensionElements, 'zeebe:Subscription');
       if (extension) {
         return extension;
       }
-      const newExtension = createElement$1(type, {}, bo, this._bpmnFactory);
-      this._modeling.updateModdleProperties(element, extensionElements, {
-        values: [...extensionElements.get('values'), newExtension]
-      });
-      return newExtension;
     }
     _getOrCreateMessage(element, template) {
+      return this._getMessage(element) || this._createMessage(element, template);
+    }
+    _createMessage(element, template) {
       let bo = getBusinessObject$2(element);
       if (is$6(bo, 'bpmn:Event')) {
         bo = bo.get('eventDefinitions')[0];
       }
-      let message = bo.get('messageRef');
-      if (!message) {
-        message = this._bpmnFactory.create('bpmn:Message', {
-          'zeebe:modelerTemplate': template.id
-        });
-        message.$parent = getRoot(bo);
-        this._modeling.updateModdleProperties(element, bo, {
-          messageRef: message
-        });
-      }
+      const message = this._bpmnFactory.create('bpmn:Message', {
+        'zeebe:modelerTemplate': template.id
+      });
+      message.$parent = getRoot(bo);
+      this._modelingWrapper.updateModdleProperties(element, bo, {
+        messageRef: message
+      });
       return message;
     }
+    _getMessage(element) {
+      let bo = getBusinessObject$2(element);
+      if (is$6(bo, 'bpmn:Event')) {
+        bo = bo.get('eventDefinitions')[0];
+      }
+      return bo && bo.get('messageRef');
+    }
 
     /**
      * Replaces the element with the specified elementType.
@@ -125927,12 +125823,18 @@
      * @param {djs.model.Base} element
      * @param {Object} newTemplate
      */
-    _updateElementType(element, newTemplate) {
+    _updateElementType(element, oldTemplate, newTemplate) {
       // determine new task type
       const newType = newTemplate.elementType;
       if (!newType) {
         return element;
       }
+      const oldType = oldTemplate && oldTemplate.elementType;
+
+      // Do not replace if the element type did not change
+      if (oldType && oldType.value === newType.value && oldType.eventDefinition === newType.eventDefinition) {
+        return element;
+      }
       const replacement = {
         type: newType.value
       };
@@ -125943,7 +125845,7 @@
       return replacedElement;
     }
   };
-  ChangeElementTemplateHandler$1.$inject = ['bpmnFactory', 'bpmnReplace', 'commandStack', 'modeling'];
+  ChangeElementTemplateHandler$1.$inject = ['bpmnFactory', 'bpmnReplace', 'commandStack', 'injector'];
 
   // helpers //////////
 
@@ -126142,6 +126044,9 @@
   }
   function getPropertyValue(element, property) {
     const businessObject = getBusinessObject$2(element);
+    if (!businessObject) {
+      return;
+    }
     const binding = property.binding,
       bindingName = binding.name,
       bindingType = binding.type;
@@ -126178,6 +126083,9 @@
     array.splice(index, 1);
     return array;
   }
+  function hasMessageProperties(template) {
+    return template.properties.some(p => MESSAGE_BINDING_TYPES.includes(p.binding.type));
+  }
 
   class RemoveElementTemplateHandler {
     constructor(modeling, elementFactory, elementRegistry, canvas, bpmnFactory, replace, commandStack) {