bpmn-js 0.20.6 → 0.22.1

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

@@ -1,44 +1,44 @@
-'use strict';
-
-var is = require('../../util/ModelUtil').is;
-
-function getLabelAttr(semantic) {
-  if (is(semantic, 'bpmn:FlowElement') ||
-      is(semantic, 'bpmn:Participant') ||
-      is(semantic, 'bpmn:Lane') ||
-      is(semantic, 'bpmn:SequenceFlow') ||
-      is(semantic, 'bpmn:MessageFlow')) {
-
-    return 'name';
-  }
-
-  if (is(semantic, 'bpmn:TextAnnotation')) {
-    return 'text';
-  }
-}
-
-module.exports.getLabel = function(element) {
-  var semantic = element.businessObject,
-      attr = getLabelAttr(semantic);
-
-  if (attr) {
-    return semantic[attr] || '';
-  }
-};
-
-
-module.exports.setLabel = function(element, text, isExternal) {
-  var semantic = element.businessObject,
-      attr = getLabelAttr(semantic);
-
-  if (attr) {
-    semantic[attr] = text;
-  }
-
-  // show external label if not empty
-  if (isExternal) {
-    element.hidden = !text;
-  }
-
-  return element;
+'use strict';
+
+var is = require('../../util/ModelUtil').is;
+
+function getLabelAttr(semantic) {
+  if (is(semantic, 'bpmn:FlowElement') ||
+      is(semantic, 'bpmn:Participant') ||
+      is(semantic, 'bpmn:Lane') ||
+      is(semantic, 'bpmn:SequenceFlow') ||
+      is(semantic, 'bpmn:MessageFlow')) {
+
+    return 'name';
+  }
+
+  if (is(semantic, 'bpmn:TextAnnotation')) {
+    return 'text';
+  }
+}
+
+module.exports.getLabel = function(element) {
+  var semantic = element.businessObject,
+      attr = getLabelAttr(semantic);
+
+  if (attr) {
+    return semantic[attr] || '';
+  }
+};
+
+
+module.exports.setLabel = function(element, text, isExternal) {
+  var semantic = element.businessObject,
+      attr = getLabelAttr(semantic);
+
+  if (attr) {
+    semantic[attr] = text;
+  }
+
+  // show external label if not empty
+  if (isExternal) {
+    element.hidden = !text;
+  }
+
+  return element;
 };

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

@@ -1,113 +1,117 @@
-'use strict';
-
-var LabelUtil = require('../LabelUtil');
-
-var TextUtil = require('diagram-js/lib/util/Text');
-
-var hasExternalLabel = require('../../../util/LabelUtil').hasExternalLabel;
-
-var getBusinessObject = require('../../../util/ModelUtil').getBusinessObject;
-
-var NULL_DIMENSIONS = {
-  width: 0,
-  height: 0
-};
-
-
-/**
- * A handler that updates the text of a BPMN element.
- */
-function UpdateLabelHandler(modeling) {
-
-  var textUtil = new TextUtil();
-
-  /**
-   * Set the label and return the changed elements.
-   *
-   * Element parameter can be label itself or connection (i.e. sequence flow).
-   *
-   * @param {djs.model.Base} element
-   * @param {String} text
-   */
-  function setText(element, text) {
-
-    // external label if present
-    var label = element.label || element;
-
-    var labelTarget = element.labelTarget || element;
-
-    LabelUtil.setLabel(label, text, labelTarget !== label);
-
-    return [ label, labelTarget ];
-  }
-
-  function execute(ctx) {
-    ctx.oldLabel = LabelUtil.getLabel(ctx.element);
-    return setText(ctx.element, ctx.newLabel);
-  }
-
-  function revert(ctx) {
-    return setText(ctx.element, ctx.oldLabel);
-  }
-
-  function postExecute(ctx) {
-    var element = ctx.element,
-        label = element.label || element;
-
-    // ignore internal labels
-    if (!hasExternalLabel(element)) {
-      return;
-    }
-
-    var text = getBusinessObject(label).name;
-
-    if (!text) {
-      return;
-    }
-
-    // get layouted text bounds and resize external
-    // external label accordingly
-    var newBounds = getLayoutedBounds(label, text, textUtil);
-
-    modeling.resizeShape(label, newBounds, NULL_DIMENSIONS);
-  }
-
-  // API
-
-  this.execute = execute;
-  this.revert = revert;
-  this.postExecute = postExecute;
-}
-
-UpdateLabelHandler.$inject = [ 'modeling' ];
-
-module.exports = UpdateLabelHandler;
-
-
-// TODO(nikku): repeating code (search for <getLayoutedBounds>)
-
-var EXTERNAL_LABEL_STYLE = {
-  fontFamily: 'Arial, sans-serif',
-  fontSize: '11px'
-};
-
-function getLayoutedBounds(bounds, text, textUtil) {
-
-  var layoutedLabelDimensions = textUtil.getDimensions(text, {
-    box: {
-      width: 90,
-      height: 30,
-      x: bounds.width / 2 + bounds.x,
-      y: bounds.height / 2 + bounds.y
-    },
-    style: EXTERNAL_LABEL_STYLE
-  });
-
-  // resize label shape to fit label text
-  return {
-    x: Math.round(bounds.x + bounds.width / 2 - layoutedLabelDimensions.width / 2),
-    y: Math.round(bounds.y),
-    width: Math.ceil(layoutedLabelDimensions.width),
-    height: Math.ceil(layoutedLabelDimensions.height)
-  };
+'use strict';
+
+var LabelUtil = require('../LabelUtil');
+
+var TextUtil = require('diagram-js/lib/util/Text');
+
+var hasExternalLabel = require('../../../util/LabelUtil').hasExternalLabel;
+
+var getBusinessObject = require('../../../util/ModelUtil').getBusinessObject,
+    is = require('../../../util/ModelUtil').is;
+
+var NULL_DIMENSIONS = {
+  width: 0,
+  height: 0
+};
+
+
+/**
+ * A handler that updates the text of a BPMN element.
+ */
+function UpdateLabelHandler(modeling) {
+
+  var textUtil = new TextUtil();
+
+  /**
+   * Set the label and return the changed elements.
+   *
+   * Element parameter can be label itself or connection (i.e. sequence flow).
+   *
+   * @param {djs.model.Base} element
+   * @param {String} text
+   */
+  function setText(element, text) {
+
+    // external label if present
+    var label = element.label || element;
+
+    var labelTarget = element.labelTarget || element;
+
+    LabelUtil.setLabel(label, text, labelTarget !== label);
+
+    return [ label, labelTarget ];
+  }
+
+  function execute(ctx) {
+    ctx.oldLabel = LabelUtil.getLabel(ctx.element);
+    return setText(ctx.element, ctx.newLabel);
+  }
+
+  function revert(ctx) {
+    return setText(ctx.element, ctx.oldLabel);
+  }
+
+  function postExecute(ctx) {
+    var element = ctx.element,
+        label = element.label || element,
+        bounds = ctx.bounds;
+
+    // ignore internal labels for elements except text annotations
+    if (!hasExternalLabel(element) && !is(element, 'bpmn:TextAnnotation')) {
+      return;
+    }
+
+    var bo = getBusinessObject(label);
+
+    var text = bo.name || bo.text;
+
+    if (!text) {
+      return;
+    }
+
+    // get layouted text bounds and resize external
+    // external label accordingly
+    var newBounds = is(element, 'bpmn:TextAnnotation') ? bounds : getLayoutedBounds(label, text, textUtil);
+
+    modeling.resizeShape(label, newBounds, NULL_DIMENSIONS);
+  }
+
+  // API
+
+  this.execute = execute;
+  this.revert = revert;
+  this.postExecute = postExecute;
+}
+
+UpdateLabelHandler.$inject = [ 'modeling' ];
+
+module.exports = UpdateLabelHandler;
+
+
+// TODO(nikku): repeating code (search for <getLayoutedBounds>)
+
+var EXTERNAL_LABEL_STYLE = {
+  fontFamily: 'Arial, sans-serif',
+  fontSize: '11px'
+};
+
+function getLayoutedBounds(bounds, text, textUtil) {
+
+  var layoutedLabelDimensions = textUtil.getDimensions(text, {
+    box: {
+      width: 90,
+      height: 30,
+      x: bounds.width / 2 + bounds.x,
+      y: bounds.height / 2 + bounds.y
+    },
+    style: EXTERNAL_LABEL_STYLE
+  });
+
+  // resize label shape to fit label text
+  return {
+    x: Math.round(bounds.x + bounds.width / 2 - layoutedLabelDimensions.width / 2),
+    y: Math.round(bounds.y),
+    width: Math.ceil(layoutedLabelDimensions.width),
+    height: Math.ceil(layoutedLabelDimensions.height)
+  };
 }

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

@@ -1,9 +1,14 @@
-module.exports = {
-  __depends__: [
-    require('diagram-js/lib/command'),
-    require('diagram-js/lib/features/change-support'),
-    require('diagram-js-direct-editing')
-  ],
-  __init__: [ 'labelEditingProvider' ],
-  labelEditingProvider: [ 'type', require('./LabelEditingProvider') ]
-};
+module.exports = {
+  __depends__: [
+    require('diagram-js/lib/command'),
+    require('diagram-js/lib/features/change-support'),
+    require('diagram-js/lib/features/resize'),
+    require('diagram-js-direct-editing')
+  ],
+  __init__: [
+    'labelEditingProvider',
+    'labelEditingPreview'
+  ],
+  labelEditingProvider: [ 'type', require('./LabelEditingProvider') ],
+  labelEditingPreview: [ 'type', require('./LabelEditingPreview') ]
+};

package/lib/features/modeling/BpmnFactory.js

@@ -1,97 +1,97 @@
-'use strict';
-
-var map = require('lodash/collection/map'),
-    assign = require('lodash/object/assign'),
-    pick = require('lodash/object/pick');
-
-
-function BpmnFactory(moddle) {
-  this._model = moddle;
-}
-
-BpmnFactory.$inject = [ 'moddle' ];
-
-
-BpmnFactory.prototype._needsId = function(element) {
-  return element.$instanceOf('bpmn:RootElement') ||
-         element.$instanceOf('bpmn:FlowElement') ||
-         element.$instanceOf('bpmn:MessageFlow') ||
-         element.$instanceOf('bpmn:DataAssociation') ||
-         element.$instanceOf('bpmn:Artifact') ||
-         element.$instanceOf('bpmn:Participant') ||
-         element.$instanceOf('bpmn:Lane') ||
-         element.$instanceOf('bpmn:Process') ||
-         element.$instanceOf('bpmn:Collaboration') ||
-         element.$instanceOf('bpmndi:BPMNShape') ||
-         element.$instanceOf('bpmndi:BPMNEdge') ||
-         element.$instanceOf('bpmndi:BPMNDiagram') ||
-         element.$instanceOf('bpmndi:BPMNPlane') ||
-         element.$instanceOf('bpmn:Property');
-};
-
-BpmnFactory.prototype._ensureId = function(element) {
-
-  // generate semantic ids for elements
-  // bpmn:SequenceFlow -> SequenceFlow_ID
-  var prefix = (element.$type || '').replace(/^[^:]*:/g, '') + '_';
-
-  if (!element.id && this._needsId(element)) {
-    element.id = this._model.ids.nextPrefixed(prefix, element);
-  }
-};
-
-
-BpmnFactory.prototype.create = function(type, attrs) {
-  var element = this._model.create(type, attrs || {});
-
-  this._ensureId(element);
-
-  return element;
-};
-
-
-BpmnFactory.prototype.createDiLabel = function() {
-  return this.create('bpmndi:BPMNLabel', {
-    bounds: this.createDiBounds()
-  });
-};
-
-
-BpmnFactory.prototype.createDiShape = function(semantic, bounds, attrs) {
-
-  return this.create('bpmndi:BPMNShape', assign({
-    bpmnElement: semantic,
-    bounds: this.createDiBounds(bounds)
-  }, attrs));
-};
-
-
-BpmnFactory.prototype.createDiBounds = function(bounds) {
-  return this.create('dc:Bounds', bounds);
-};
-
-
-BpmnFactory.prototype.createDiWaypoints = function(waypoints) {
-  return map(waypoints, function(pos) {
-    return this.createDiWaypoint(pos);
-  }, this);
-};
-
-BpmnFactory.prototype.createDiWaypoint = function(point) {
-  return this.create('dc:Point', pick(point, [ 'x', 'y' ]));
-};
-
-
-BpmnFactory.prototype.createDiEdge = function(semantic, waypoints, attrs) {
-  return this.create('bpmndi:BPMNEdge', assign({
-    bpmnElement: semantic
-  }, attrs));
-};
-
-BpmnFactory.prototype.createDiPlane = function(semantic) {
-  return this.create('bpmndi:BPMNPlane', {
-    bpmnElement: semantic
-  });
-};
-
-module.exports = BpmnFactory;
+'use strict';
+
+var map = require('lodash/collection/map'),
+    assign = require('lodash/object/assign'),
+    pick = require('lodash/object/pick');
+
+
+function BpmnFactory(moddle) {
+  this._model = moddle;
+}
+
+BpmnFactory.$inject = [ 'moddle' ];
+
+
+BpmnFactory.prototype._needsId = function(element) {
+  return element.$instanceOf('bpmn:RootElement') ||
+         element.$instanceOf('bpmn:FlowElement') ||
+         element.$instanceOf('bpmn:MessageFlow') ||
+         element.$instanceOf('bpmn:DataAssociation') ||
+         element.$instanceOf('bpmn:Artifact') ||
+         element.$instanceOf('bpmn:Participant') ||
+         element.$instanceOf('bpmn:Lane') ||
+         element.$instanceOf('bpmn:Process') ||
+         element.$instanceOf('bpmn:Collaboration') ||
+         element.$instanceOf('bpmndi:BPMNShape') ||
+         element.$instanceOf('bpmndi:BPMNEdge') ||
+         element.$instanceOf('bpmndi:BPMNDiagram') ||
+         element.$instanceOf('bpmndi:BPMNPlane') ||
+         element.$instanceOf('bpmn:Property');
+};
+
+BpmnFactory.prototype._ensureId = function(element) {
+
+  // generate semantic ids for elements
+  // bpmn:SequenceFlow -> SequenceFlow_ID
+  var prefix = (element.$type || '').replace(/^[^:]*:/g, '') + '_';
+
+  if (!element.id && this._needsId(element)) {
+    element.id = this._model.ids.nextPrefixed(prefix, element);
+  }
+};
+
+
+BpmnFactory.prototype.create = function(type, attrs) {
+  var element = this._model.create(type, attrs || {});
+
+  this._ensureId(element);
+
+  return element;
+};
+
+
+BpmnFactory.prototype.createDiLabel = function() {
+  return this.create('bpmndi:BPMNLabel', {
+    bounds: this.createDiBounds()
+  });
+};
+
+
+BpmnFactory.prototype.createDiShape = function(semantic, bounds, attrs) {
+
+  return this.create('bpmndi:BPMNShape', assign({
+    bpmnElement: semantic,
+    bounds: this.createDiBounds(bounds)
+  }, attrs));
+};
+
+
+BpmnFactory.prototype.createDiBounds = function(bounds) {
+  return this.create('dc:Bounds', bounds);
+};
+
+
+BpmnFactory.prototype.createDiWaypoints = function(waypoints) {
+  return map(waypoints, function(pos) {
+    return this.createDiWaypoint(pos);
+  }, this);
+};
+
+BpmnFactory.prototype.createDiWaypoint = function(point) {
+  return this.create('dc:Point', pick(point, [ 'x', 'y' ]));
+};
+
+
+BpmnFactory.prototype.createDiEdge = function(semantic, waypoints, attrs) {
+  return this.create('bpmndi:BPMNEdge', assign({
+    bpmnElement: semantic
+  }, attrs));
+};
+
+BpmnFactory.prototype.createDiPlane = function(semantic) {
+  return this.create('bpmndi:BPMNPlane', {
+    bpmnElement: semantic
+  });
+};
+
+module.exports = BpmnFactory;