bpmn-js 14.0.0 → 14.1.0

package/lib/features/popup-menu/ReplaceMenuProvider.js

@@ -15,19 +15,19 @@ import {
 import {
   forEach,
   filter,
-  isArray,
-  isUndefined
+  isArray
 } from 'min-dash';
 
 import * as replaceOptions from '../replace/ReplaceOptions';
 
 /**
- * @typedef {import('../features/BpmnFactory').default} BpmnFactory
+ * @typedef {import('../modeling/BpmnFactory').default} BpmnFactory
  * @typedef {import('diagram-js/lib/features/popup-menu/PopupMenu').default} PopupMenu
- * @typedef {import('../features/Modeling').default} Modeling
- * @typedef {import('../features/BpmnReplace').default} BpmnReplace
+ * @typedef {import('../modeling/Modeling').default} Modeling
+ * @typedef {import('../replace/BpmnReplace').default} BpmnReplace
  * @typedef {import('diagram-js/lib/features/Rules').default} Rules
  * @typedef {import('diagram-js/lib/i18n/translate/translate').default} Translate
+ * @typedef {import('../copy-paste/ModdleCopy').default} ModdleCopy
  *
  * @typedef {import('../../model/Types').Element} Element
  * @typedef {import('../../model/Types').Moddle} Moddle
@@ -54,10 +54,11 @@ import * as replaceOptions from '../replace/ReplaceOptions';
  * @param {BpmnReplace} bpmnReplace
  * @param {Rules} rules
  * @param {Translate} translate
+ * @param {ModdleCopy} moddleCopy
  */
 export default function ReplaceMenuProvider(
     bpmnFactory, popupMenu, modeling, moddle,
-    bpmnReplace, rules, translate) {
+    bpmnReplace, rules, translate, moddleCopy) {
 
   this._bpmnFactory = bpmnFactory;
   this._popupMenu = popupMenu;
@@ -66,6 +67,7 @@ export default function ReplaceMenuProvider(
   this._bpmnReplace = bpmnReplace;
   this._rules = rules;
   this._translate = translate;
+  this._moddleCopy = moddleCopy;
 
   this._register();
 }
@@ -77,7 +79,8 @@ ReplaceMenuProvider.$inject = [
   'moddle',
   'bpmnReplace',
   'rules',
-  'translate'
+  'translate',
+  'moddleCopy'
 ];
 
 ReplaceMenuProvider.prototype._register = function() {
@@ -461,18 +464,24 @@ ReplaceMenuProvider.prototype._getLoopCharacteristicsHeaderEntries = function(ta
   var translate = this._translate;
 
   function toggleLoopEntry(event, entry) {
-    var newLoopCharacteristics = getBusinessObject(target).loopCharacteristics;
 
+    // remove
     if (entry.active) {
-      newLoopCharacteristics = undefined;
-    } else {
-      if (isUndefined(entry.options.isSequential) || !newLoopCharacteristics
-      || !is(newLoopCharacteristics, entry.options.loopCharacteristics)) {
-        newLoopCharacteristics = self._moddle.create(entry.options.loopCharacteristics);
-      }
+      self._modeling.updateProperties(target, { loopCharacteristics: undefined });
+      return;
+    }
+
+    const currentLoopCharacteristics = target.businessObject.get('loopCharacteristics'),
+          newLoopCharacteristics = self._moddle.create(entry.options.loopCharacteristics);
 
-      newLoopCharacteristics.isSequential = entry.options.isSequential;
+    // copy old properties
+    if (currentLoopCharacteristics) {
+      self._moddleCopy.copyElement(currentLoopCharacteristics, newLoopCharacteristics);
     }
+
+    // update `isSequential` property
+    newLoopCharacteristics.set('isSequential', entry.options.isSequential);
+
     self._modeling.updateProperties(target, { loopCharacteristics: newLoopCharacteristics });
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bpmn-js",
-  "version": "14.0.0",
+  "version": "14.1.0",
   "description": "A bpmn 2.0 toolkit and web modeler",
   "main": "index.js",
   "files": [
@@ -73,7 +73,7 @@
     "camunda-bpmn-moddle": "^4.0.1",
     "chai": "4.1.2",
     "chai-match": "^1.1.1",
-    "cpx": "^1.5.0",
+    "cpy": "^10.1.0",
     "cross-env": "^7.0.3",
     "del": "^6.0.0",
     "del-cli": "^5.0.0",
@@ -100,7 +100,7 @@
     "remark-preset-bpmn-io": "^0.2.1",
     "rollup": "^3.19.1",
     "rollup-plugin-license": "^3.0.0",
-    "sinon": "^15.0.0",
+    "sinon": "^16.0.0",
     "sinon-chai": "^3.7.0",
     "ts-expect": "^1.3.0",
     "typescript": "^5.0.0",
@@ -108,7 +108,7 @@
   },
   "dependencies": {
     "bpmn-moddle": "^8.0.1",
-    "diagram-js": "^12.3.0",
+    "diagram-js": "^12.4.0",
     "diagram-js-direct-editing": "^2.0.0",
     "ids": "^1.0.3",
     "inherits-browser": "^0.1.0",

package/lib/icons/dist/append.svg

@@ -1 +0,0 @@
-data:image/svg+xml,data%3Aimage%2Fsvg%2Bxml%2C%253Csvg%2520xmlns%253D%2522http%253A%252F%252Fwww.w3.org%252F2000%252Fsvg%2522%2520width%253D%252222%2522%2520height%253D%252222%2522%2520viewBox%253D%25220%25200%25205.82%25205.82%2522%253E%253Cpath%2520d%253D%2522M1.3%25203.4c.3%25200%2520.5-.2.5-.5s-.2-.4-.5-.4c-.2%25200-.4.1-.4.4%25200%2520.3.2.5.4.5zm1.7%25200c.2%25200%2520.4-.2.4-.5s-.2-.4-.4-.4c-.3%25200-.5.1-.5.4%25200%2520.3.2.5.5.5zm1.6%25200c.2%25200%2520.4-.2.4-.5s-.2-.4-.4-.4c-.3%25200-.5.1-.5.4%25200%2520.3.2.5.5.5z%2522%252F%253E%253C%252Fsvg%253E

package/lib/icons/dist/connect-context-pad.svg

@@ -1 +0,0 @@
-data:image/svg+xml,data%3Aimage%2Fsvg%2Bxml%2C%253Csvg%2520xmlns%253D%2522http%253A%252F%252Fwww.w3.org%252F2000%252Fsvg%2522%2520viewBox%253D%25220%25200%25202048%25202048%2522%253E%253Cpath%2520d%253D%2522M2013.823%2520158.247%2520995.866%2520525.177l143.206%2520181.698L34.177%25201595.041l136.637%2520158.712%25201104.89-888.123%2520140.894%2520182.578Z%2522%252F%253E%253C%252Fsvg%253E

package/lib/icons/dist/connect-palette.svg

@@ -1 +0,0 @@
-data:image/svg+xml,data%3Aimage%2Fsvg%2Bxml%2C%253Csvg%2520xmlns%253D%2522http%253A%252F%252Fwww.w3.org%252F2000%252Fsvg%2522%2520viewBox%253D%25220%25200%25202048%25202048%2522%253E%253Cpath%2520d%253D%2522M2013.823%2520158.247%2520995.866%2520525.177l143.206%2520181.698L34.177%25201595.041l136.637%2520158.712%25201104.89-888.123%2520140.894%2520182.578Z%2522%252F%253E%253C%252Fsvg%253E

package/lib/icons/dist/create.svg

@@ -1 +0,0 @@
-data:image/svg+xml,data%3Aimage%2Fsvg%2Bxml%2C%253Csvg%2520xmlns%253D%2522http%253A%252F%252Fwww.w3.org%252F2000%252Fsvg%2522%2520width%253D%252246%2522%2520height%253D%252246%2522%2520viewBox%253D%2522-2%2520-2%25209.82%25209.82%2522%253E%253Cpath%2520d%253D%2522M1.3%25203.4c.3%25200%2520.5-.2.5-.5s-.2-.4-.5-.4c-.2%25200-.4.1-.4.4%25200%2520.3.2.5.4.5zm1.7%25200c.2%25200%2520.4-.2.4-.5s-.2-.4-.4-.4c-.3%25200-.5.1-.5.4%25200%2520.3.2.5.5.5zm1.6%25200c.2%25200%2520.4-.2.4-.5s-.2-.4-.4-.4c-.3%25200-.5.1-.5.4%25200%2520.3.2.5.5.5z%2522%252F%253E%253C%252Fsvg%253E