bpmn-js 13.0.2 → 13.0.3

package/lib/draw/BpmnRenderer.js

@@ -15,7 +15,7 @@ import {
 
 import {
   getLabel
-} from '../features/label-editing/LabelUtil';
+} from '../util/LabelUtil';
 
 import { is } from '../util/ModelUtil';
 

package/lib/features/label-editing/LabelEditingProvider.js

@@ -4,7 +4,7 @@ import {
 
 import {
   getLabel
-} from './LabelUtil';
+} from '../../util/LabelUtil';
 
 import {
   is

package/lib/features/label-editing/LabelUtil.d.ts

@@ -1,14 +1 @@
-/**
- * @param element
- *
- * @return label
- */
-export function getLabel(element: any): string;
-/**
- * @param element
- * @param text
- *
- * @return element
- */
-export function setLabel(element: any, text: string): any;
-export type DiagramElement = any;
+export { getLabel, setLabel } from "../../util/LabelUtil";

package/lib/features/label-editing/LabelUtil.js

@@ -1,82 +1,4 @@
-import { is } from '../../util/ModelUtil';
-
-/**
- * @typedef { import('../../model').DiagramElement } DiagramElement
- */
-
-function getLabelAttr(semantic) {
-  if (
-    is(semantic, 'bpmn:FlowElement') ||
-    is(semantic, 'bpmn:Participant') ||
-    is(semantic, 'bpmn:Lane') ||
-    is(semantic, 'bpmn:SequenceFlow') ||
-    is(semantic, 'bpmn:MessageFlow') ||
-    is(semantic, 'bpmn:DataInput') ||
-    is(semantic, 'bpmn:DataOutput')
-  ) {
-    return 'name';
-  }
-
-  if (is(semantic, 'bpmn:TextAnnotation')) {
-    return 'text';
-  }
-
-  if (is(semantic, 'bpmn:Group')) {
-    return 'categoryValueRef';
-  }
-}
-
-function getCategoryValue(semantic) {
-  var categoryValueRef = semantic['categoryValueRef'];
-
-  if (!categoryValueRef) {
-    return '';
-  }
-
-
-  return categoryValueRef.value || '';
-}
-
-/**
- * @param {DiagramElement} element
- *
- * @return {string} label
- */
-export function getLabel(element) {
-  var semantic = element.businessObject,
-      attr = getLabelAttr(semantic);
-
-  if (attr) {
-
-    if (attr === 'categoryValueRef') {
-
-      return getCategoryValue(semantic);
-    }
-
-    return semantic[attr] || '';
-  }
-}
-
-
-/**
- * @param {DiagramElement} element
- * @param {string} text
- *
- * @return {DiagramElement} element
- */
-export function setLabel(element, text) {
-  var semantic = element.businessObject,
-      attr = getLabelAttr(semantic);
-
-  if (attr) {
-
-    if (attr === 'categoryValueRef') {
-      semantic['categoryValueRef'].value = text;
-    } else {
-      semantic[attr] = text;
-    }
-
-  }
-
-  return element;
-}
+export {
+  getLabel,
+  setLabel
+} from '../../util/LabelUtil';

package/lib/features/label-editing/cmd/UpdateLabelHandler.js

@@ -1,7 +1,7 @@
 import {
   setLabel,
   getLabel
-} from '../LabelUtil';
+} from '../../../util/LabelUtil';
 
 import {
   getExternalLabelMid,
@@ -11,7 +11,6 @@ import {
 } from '../../../util/LabelUtil';
 
 import {
-  getDi,
   is
 } from '../../../util/ModelUtil';
 
@@ -37,29 +36,6 @@ var NULL_DIMENSIONS = {
  */
 export default function UpdateLabelHandler(modeling, textRenderer, bpmnFactory) {
 
-  /**
-   * Creates an empty `diLabel` attribute for embedded labels.
-   *
-   * @param {Element} element
-   * @param {string} text
-   */
-  function ensureInternalLabelDi(element, text) {
-    if (isLabelExternal(element)) {
-      return;
-    }
-
-    var di = getDi(element);
-
-    if (text && !di.label) {
-      di.label = bpmnFactory.create('bpmndi:BPMNLabel');
-    }
-
-    if (!text && di.label) {
-      delete di.label;
-    }
-  }
-
-
   /**
    * Set the label and return the changed elements.
    *
@@ -77,8 +53,6 @@ export default function UpdateLabelHandler(modeling, textRenderer, bpmnFactory)
 
     setLabel(label, text, labelTarget !== label);
 
-    ensureInternalLabelDi(element, text);
-
     return [ label, labelTarget ];
   }
 
@@ -140,7 +114,7 @@ export default function UpdateLabelHandler(modeling, textRenderer, bpmnFactory)
       return;
     }
 
-    var text = getLabel(label);
+    var text = getLabel(element);
 
     // resize element based on label _or_ pre-defined bounds
     if (typeof newBounds === 'undefined') {

package/lib/features/modeling/BpmnUpdater.js

@@ -18,7 +18,11 @@ import {
 
 import { isAny } from './util/ModelingUtil';
 
-import { isLabel } from '../../util/LabelUtil';
+import {
+  getLabel,
+  isLabel,
+  isLabelExternal
+} from '../../util/LabelUtil';
 
 import { delta } from 'diagram-js/lib/util/PositionUtil';
 
@@ -287,6 +291,28 @@ export default function BpmnUpdater(
 
   this.executed([ 'element.updateAttachment' ], ifBpmn(updateAttachment));
   this.reverted([ 'element.updateAttachment' ], ifBpmn(updateAttachment));
+
+
+  // update BPMNLabel
+  this.executed('element.updateLabel', ifBpmn(updateBPMNLabel));
+  this.reverted('element.updateLabel', ifBpmn(updateBPMNLabel));
+
+  function updateBPMNLabel(event) {
+    const { element } = event.context,
+          label = getLabel(element);
+    const di = getDi(element),
+          diLabel = di && di.get('label');
+
+    if (isLabelExternal(element)) {
+      return;
+    }
+
+    if (label && !diLabel) {
+      di.set('label', bpmnFactory.create('bpmndi:BPMNLabel'));
+    } else if (!label && diLabel) {
+      di.set('label', undefined);
+    }
+  }
 }
 
 inherits(BpmnUpdater, CommandInterceptor);
@@ -787,7 +813,7 @@ function ifBpmn(fn) {
   return function(event) {
 
     var context = event.context,
-        element = context.shape || context.connection;
+        element = context.shape || context.connection || context.element;
 
     if (is(element, 'bpmn:BaseElement')) {
       fn(event);

package/lib/features/modeling/behavior/LabelBehavior.js

@@ -6,21 +6,16 @@ import inherits from 'inherits-browser';
 
 import {
   is,
-  getBusinessObject,
-  getDi
+  getBusinessObject
 } from '../../../util/ModelUtil';
 
 import {
   isLabelExternal,
-  getExternalLabelMid,
+  getLabel,
   hasExternalLabel,
   isLabel
 } from '../../../util/LabelUtil';
 
-import {
-  getLabel
-} from '../../label-editing/LabelUtil';
-
 import {
   getLabelAdjustment
 } from './util/LabelLayoutUtil';
@@ -49,11 +44,6 @@ import {
   perpendicularFoot
 } from './util/GeometricUtil';
 
-var DEFAULT_LABEL_DIMENSIONS = {
-  width: 90,
-  height: 20
-};
-
 var NAME_PROPERTY = 'name';
 var TEXT_PROPERTY = 'text';
 
@@ -86,7 +76,16 @@ export default function LabelBehavior(
   CommandInterceptor.call(this, eventBus);
 
   // update label if name property was updated
-  this.postExecute('element.updateProperties', function(e) {
+  this.postExecute('element.updateProperties', onPropertyUpdate);
+  this.postExecute('element.updateModdleProperties', e => {
+    const elementBo = getBusinessObject(e.context.element);
+
+    if (elementBo === e.context.moddleElement) {
+      onPropertyUpdate(e);
+    }
+  });
+
+  function onPropertyUpdate(e) {
     var context = e.context,
         element = context.element,
         properties = context.properties;
@@ -110,7 +109,7 @@ export default function LabelBehavior(
 
       modeling.updateLabel(element, properties.text, newBounds);
     }
-  });
+  }
 
   // create label shape after shape/connection was created
   this.postExecute([ 'shape.create', 'connection.create' ], function(e) {
@@ -121,8 +120,7 @@ export default function LabelBehavior(
       return;
     }
 
-    var element = context.shape || context.connection,
-        businessObject = element.businessObject;
+    var element = context.shape || context.connection;
 
     if (isLabel(element) || !isLabelExternal(element)) {
       return;
@@ -133,20 +131,7 @@ export default function LabelBehavior(
       return;
     }
 
-    var labelCenter = getExternalLabelMid(element);
-
-    // we don't care about x and y
-    var labelDimensions = textRenderer.getExternalLabelBounds(
-      DEFAULT_LABEL_DIMENSIONS,
-      getLabel(element)
-    );
-
-    modeling.createLabel(element, labelCenter, {
-      id: businessObject.id + '_label',
-      businessObject: businessObject,
-      width: labelDimensions.width,
-      height: labelDimensions.height
-    });
+    modeling.updateLabel(element, getLabel(element));
   });
 
   // update label after label shape was deleted
@@ -161,42 +146,6 @@ export default function LabelBehavior(
     }
   });
 
-  // update di information on label creation
-  this.postExecute([ 'label.create' ], function(event) {
-
-    var context = event.context,
-        element = context.shape,
-        labelTarget = context.labelTarget,
-        di;
-
-    // we want to trigger on real labels only
-    if (!labelTarget) {
-      return;
-    }
-
-    // we want to trigger on BPMN elements only
-    if (!is(labelTarget, 'bpmn:BaseElement')) {
-      return;
-    }
-
-    di = getDi(labelTarget);
-
-    if (!di.label) {
-      di.label = bpmnFactory.create('bpmndi:BPMNLabel', {
-        bounds: bpmnFactory.create('dc:Bounds')
-      });
-
-      element.di = di;
-    }
-
-    assign(di.label.bounds, {
-      x: element.x,
-      y: element.y,
-      width: element.width,
-      height: element.height
-    });
-  });
-
   function getVisibleLabelAdjustment(event) {
 
     var context = event.context,

package/lib/features/search/BpmnSearchProvider.js

@@ -6,7 +6,7 @@ import {
 
 import {
   getLabel
-} from '../label-editing/LabelUtil';
+} from '../../util/LabelUtil';
 
 /**
  * @typedef {import('diagram-js/lib/core/Canvas').default} Canvas

package/lib/import/BpmnImporter.js

@@ -6,7 +6,8 @@ import { is } from '../util/ModelUtil';
 
 import {
   isLabelExternal,
-  getExternalLabelBounds
+  getExternalLabelBounds,
+  getLabel
 } from '../util/LabelUtil';
 
 import {
@@ -17,10 +18,6 @@ import {
   isExpanded
 } from '../util/DiUtil';
 
-import {
-  getLabel
-} from '../features/label-editing/LabelUtil';
-
 import {
   elementToString
 } from './Util';

package/lib/util/LabelUtil.d.ts

@@ -61,12 +61,28 @@ export function getExternalLabelBounds(di: ModdleElement, element: Element): Rec
  */
 export function isLabel(element: Element): boolean;
 
+/**
+ * @param element
+ *
+ * @return label
+ */
+export function getLabel(element: any): string;
+
+/**
+ * @param element
+ * @param text
+ *
+ * @return element
+ */
+export function setLabel(element: any, text: string): any;
+
 export namespace DEFAULT_LABEL_SIZE {
     const width: number;
     const height: number;
 }
 
 export const FLOW_LABEL_INDENT: number;
+export type DiagramElement = any;
 type Point = import('diagram-js/lib/util/Types').Point;
 type Rect = import('diagram-js/lib/util/Types').Rect;
 type Element = import('../model/Types').Element;

package/lib/util/LabelUtil.js

@@ -178,3 +178,85 @@ export function getExternalLabelBounds(di, element) {
 export function isLabel(element) {
   return element && !!element.labelTarget;
 }
+
+
+/**
+ * @typedef { import('../model').DiagramElement } DiagramElement
+ */
+
+function getLabelAttr(semantic) {
+  if (
+    is(semantic, 'bpmn:FlowElement') ||
+    is(semantic, 'bpmn:Participant') ||
+    is(semantic, 'bpmn:Lane') ||
+    is(semantic, 'bpmn:SequenceFlow') ||
+    is(semantic, 'bpmn:MessageFlow') ||
+    is(semantic, 'bpmn:DataInput') ||
+    is(semantic, 'bpmn:DataOutput')
+  ) {
+    return 'name';
+  }
+
+  if (is(semantic, 'bpmn:TextAnnotation')) {
+    return 'text';
+  }
+
+  if (is(semantic, 'bpmn:Group')) {
+    return 'categoryValueRef';
+  }
+}
+
+function getCategoryValue(semantic) {
+  var categoryValueRef = semantic['categoryValueRef'];
+
+  if (!categoryValueRef) {
+    return '';
+  }
+
+
+  return categoryValueRef.value || '';
+}
+
+/**
+ * @param {DiagramElement} element
+ *
+ * @return {string} label
+ */
+export function getLabel(element) {
+  var semantic = element.businessObject,
+      attr = getLabelAttr(semantic);
+
+  if (attr) {
+
+    if (attr === 'categoryValueRef') {
+
+      return getCategoryValue(semantic);
+    }
+
+    return semantic[attr] || '';
+  }
+}
+
+
+/**
+ * @param {DiagramElement} element
+ * @param {string} text
+ *
+ * @return {DiagramElement} element
+ */
+export function setLabel(element, text) {
+  var semantic = element.businessObject,
+      attr = getLabelAttr(semantic);
+
+  if (attr) {
+
+    if (attr === 'categoryValueRef') {
+      semantic['categoryValueRef'].value = text;
+    } else {
+      semantic[attr] = text;
+    }
+
+  }
+
+  return element;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bpmn-js",
-  "version": "13.0.2",
+  "version": "13.0.3",
   "description": "A bpmn 2.0 toolkit and web modeler",
   "main": "index.js",
   "files": [

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