bpmn-js 10.2.0 → 10.2.1

package/dist/bpmn-modeler.development.js

@@ -1,5 +1,5 @@
 /*!
- * bpmn-js - bpmn-modeler v10.2.0
+ * bpmn-js - bpmn-modeler v10.2.1
  *
  * Copyright (c) 2014-present, camunda Services GmbH
  *
@@ -8,7 +8,7 @@
  *
  * Source Code: https://github.com/bpmn-io/bpmn-js
  *
- * Date: 2022-10-02
+ * Date: 2022-10-17
  */
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
@@ -43218,62 +43218,75 @@
     CommandInterceptor.call(this, eventBus);
 
     /**
-     * Remove existing sequence flows of event-based target before connecting
-     * from event-based gateway.
+     * Remove incoming sequence flows of event-based target when creating
+     * sequence flow.
+     *
+     * 1. If source is event-based gateway remove all incoming sequence flows
+     * 2. If source is not event-based gateway remove all incoming sequence flows
+     * whose source is event-based gateway
      */
     this.preExecuted('connection.create', function(event) {
-
       var context = event.context,
+          connection = context.connection,
           source = context.source,
           target = context.target,
-          existingIncomingConnections = target.incoming.slice();
+          hints = context.hints;
 
-      if (context.hints && context.hints.createElementsBehavior === false) {
+      if (hints && hints.createElementsBehavior === false) {
         return;
       }
 
-      if (
-        is$1(source, 'bpmn:EventBasedGateway') &&
-        target.incoming.length
-      ) {
+      if (!isSequenceFlow(connection)) {
+        return;
+      }
 
-        existingIncomingConnections.filter(isSequenceFlow)
-          .forEach(function(sequenceFlow) {
-            modeling.removeConnection(sequenceFlow);
-          });
+      var sequenceFlows = [];
+
+      if (is$1(source, 'bpmn:EventBasedGateway')) {
+        sequenceFlows = target.incoming.filter(isSequenceFlow);
+      } else {
+        sequenceFlows = target.incoming.filter(function(connection) {
+          return isSequenceFlow(connection)
+            && is$1(connection.source, 'bpmn:EventBasedGateway');
+        });
       }
+
+      sequenceFlows.forEach(function(sequenceFlow) {
+        modeling.removeConnection(sequenceFlow);
+      });
     });
 
     /**
-     *  After replacing shape with event-based gateway, remove incoming sequence
-     *  flows of event-based targets which do not belong to event-based gateway
-     *  source.
+     * Remove incoming sequence flows of event-based targets when replacing source
+     * with event-based gateway.
      */
     this.preExecuted('shape.replace', function(event) {
-
-      var newShape = event.context.newShape,
-          newShapeTargets,
-          newShapeTargetsIncomingSequenceFlows;
+      var context = event.context,
+          newShape = context.newShape;
 
       if (!is$1(newShape, 'bpmn:EventBasedGateway')) {
         return;
       }
 
-      newShapeTargets = newShape.outgoing.filter(isSequenceFlow)
-        .map(function(sequenceFlow) {
-          return sequenceFlow.target;
-        });
+      var targets = newShape.outgoing.filter(isSequenceFlow)
+        .reduce(function(targets, sequenceFlow) {
+          if (!targets.includes(sequenceFlow.target)) {
+            return targets.concat(sequenceFlow.target);
+          }
 
-      newShapeTargetsIncomingSequenceFlows = newShapeTargets.reduce(function(sequenceFlows, target) {
-        var incomingSequenceFlows = target.incoming.filter(isSequenceFlow);
+          return targets;
+        }, []);
 
-        return sequenceFlows.concat(incomingSequenceFlows);
-      }, []);
+      targets.forEach(function(target) {
+        target.incoming.filter(isSequenceFlow).forEach(function(sequenceFlow) {
+          const sequenceFlowsFromNewShape = target.incoming.filter(isSequenceFlow).filter(function(sequenceFlow) {
+            return sequenceFlow.source === newShape;
+          });
 
-      newShapeTargetsIncomingSequenceFlows.forEach(function(sequenceFlow) {
-        if (sequenceFlow.source !== newShape) {
-          modeling.removeConnection(sequenceFlow);
-        }
+          if (sequenceFlow.source !== newShape || sequenceFlowsFromNewShape.length > 1) {
+            modeling.removeConnection(sequenceFlow);
+          }
+        });
       });
     });
   }
@@ -43285,9 +43298,7 @@
 
   e(EventBasedGatewayBehavior, CommandInterceptor);
 
-
-
-  // helpers //////////////////////
+  // helpers //////////
 
   function isSequenceFlow(connection) {
     return is$1(connection, 'bpmn:SequenceFlow');
@@ -48088,16 +48099,6 @@
   }
 
   function canConnectSequenceFlow(source, target) {
-
-    if (
-      isEventBasedTarget(target) &&
-      target.incoming.length > 0 &&
-      areOutgoingEventBasedGatewayConnections(target.incoming) &&
-      !is$1(source, 'bpmn:EventBasedGateway')
-    ) {
-      return false;
-    }
-
     return isSequenceFlowSource(source) &&
            isSequenceFlowTarget(target) &&
            isSameScope(source, target) &&
@@ -48169,19 +48170,6 @@
     return true;
   }
 
-  function isOutgoingEventBasedGatewayConnection(connection) {
-
-    if (connection && connection.source) {
-      return is$1(connection.source, 'bpmn:EventBasedGateway');
-    }
-  }
-
-  function areOutgoingEventBasedGatewayConnections(connections) {
-    connections = connections || [];
-
-    return connections.some(isOutgoingEventBasedGatewayConnection);
-  }
-
   function getRootElement(element) {
     return getParent(element, 'bpmn:Process') || getParent(element, 'bpmn:Collaboration');
   }