bpmn-js 15.2.2 → 16.1.0

package/lib/draw/BpmnRenderer.js

@@ -10,6 +10,7 @@ import BaseRenderer from 'diagram-js/lib/draw/BaseRenderer';
 
 import {
   isExpanded,
+  isHorizontal,
   isEventSubProcess
 } from '../util/DiUtil';
 
@@ -1063,10 +1064,12 @@ export default function BpmnRenderer(
   }
 
   function renderLaneLabel(parentGfx, text, element, attrs = {}) {
+    var isHorizontalLane = isHorizontal(element);
+
     var textBox = renderLabel(parentGfx, text, {
       box: {
         height: 30,
-        width: getHeight(element, attrs),
+        width: isHorizontalLane ? getHeight(element, attrs) : getWidth(element, attrs),
       },
       align: 'center-middle',
       style: {
@@ -1074,9 +1077,10 @@ export default function BpmnRenderer(
       }
     });
 
-    var top = -1 * getHeight(element, attrs);
-
-    transform(textBox, 0, -top, 270);
+    if (isHorizontalLane) {
+      var top = -1 * getHeight(element, attrs);
+      transform(textBox, 0, -top, 270);
+    }
   }
 
   function renderActivity(parentGfx, element, attrs = {}) {
@@ -1794,12 +1798,13 @@ export default function BpmnRenderer(
       var participant = renderLane(parentGfx, element, attrs);
 
       var expandedParticipant = isExpanded(element);
+      var horizontalParticipant = isHorizontal(element);
 
       var semantic = getSemantic(element),
           name = semantic.get('name');
 
       if (expandedParticipant) {
-        drawLine(parentGfx, [
+        var waypoints = horizontalParticipant ? [
           {
             x: 30,
             y: 0
@@ -1808,20 +1813,43 @@ export default function BpmnRenderer(
             x: 30,
             y: getHeight(element, attrs)
           }
-        ], {
+        ] : [
+          {
+            x: 0,
+            y: 30
+          },
+          {
+            x: getWidth(element, attrs),
+            y: 30
+          }
+        ];
+
+        drawLine(parentGfx, waypoints, {
           stroke: getStrokeColor(element, defaultStrokeColor, attrs.stroke),
           strokeWidth: PARTICIPANT_STROKE_WIDTH
         });
 
         renderLaneLabel(parentGfx, name, element, attrs);
       } else {
-        renderLabel(parentGfx, name, {
-          box: getBounds(element, attrs),
+        var bounds = getBounds(element, attrs);
+
+        if (!horizontalParticipant) {
+          bounds.height = getWidth(element, attrs);
+          bounds.width = getHeight(element, attrs);
+        }
+
+        var textBox = renderLabel(parentGfx, name, {
+          box: bounds,
           align: 'center-middle',
           style: {
             fill: getLabelColor(element, defaultLabelColor, defaultStrokeColor, attrs.stroke)
           }
         });
+
+        if (!horizontalParticipant) {
+          var top = -1 * getHeight(element, attrs);
+          transform(textBox, 0, -top, 270);
+        }
       }
 
       if (semantic.get('participantMultiplicity')) {

package/lib/features/context-pad/ContextPadProvider.js

@@ -229,18 +229,13 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
    *
    * @param {string} type
    * @param {string} className
-   * @param {string} [title]
+   * @param {string} title
    * @param {Object} [options]
    *
    * @return {ContextPadEntry}
    */
   function appendAction(type, className, title, options) {
 
-    if (typeof title !== 'string') {
-      options = title;
-      title = translate('Append {type}', { type: type.replace(/^bpmn:/, '') });
-    }
-
     function appendStart(event, element) {
 
       var shape = elementFactory.createShape(assign({ type: type }, options));
@@ -306,7 +301,7 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
       'lane-insert-above': {
         group: 'lane-insert-above',
         className: 'bpmn-icon-lane-insert-above',
-        title: translate('Add Lane above'),
+        title: translate('Add lane above'),
         action: {
           click: function(event, element) {
             modeling.addLane(element, 'top');
@@ -322,7 +317,7 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
           'lane-divide-two': {
             group: 'lane-divide',
             className: 'bpmn-icon-lane-divide-two',
-            title: translate('Divide into two Lanes'),
+            title: translate('Divide into two lanes'),
             action: {
               click: splitLaneHandler(2)
             }
@@ -335,7 +330,7 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
           'lane-divide-three': {
             group: 'lane-divide',
             className: 'bpmn-icon-lane-divide-three',
-            title: translate('Divide into three Lanes'),
+            title: translate('Divide into three lanes'),
             action: {
               click: splitLaneHandler(3)
             }
@@ -348,7 +343,7 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
       'lane-insert-below': {
         group: 'lane-insert-below',
         className: 'bpmn-icon-lane-insert-below',
-        title: translate('Add Lane below'),
+        title: translate('Add lane below'),
         action: {
           click: function(event, element) {
             modeling.addLane(element, 'bottom');
@@ -367,30 +362,30 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
         'append.receive-task': appendAction(
           'bpmn:ReceiveTask',
           'bpmn-icon-receive-task',
-          translate('Append ReceiveTask')
+          translate('Append receive task')
         ),
         'append.message-intermediate-event': appendAction(
           'bpmn:IntermediateCatchEvent',
           'bpmn-icon-intermediate-event-catch-message',
-          translate('Append MessageIntermediateCatchEvent'),
+          translate('Append message intermediate catch event'),
           { eventDefinitionType: 'bpmn:MessageEventDefinition' }
         ),
         'append.timer-intermediate-event': appendAction(
           'bpmn:IntermediateCatchEvent',
           'bpmn-icon-intermediate-event-catch-timer',
-          translate('Append TimerIntermediateCatchEvent'),
+          translate('Append timer intermediate catch event'),
           { eventDefinitionType: 'bpmn:TimerEventDefinition' }
         ),
         'append.condition-intermediate-event': appendAction(
           'bpmn:IntermediateCatchEvent',
           'bpmn-icon-intermediate-event-catch-condition',
-          translate('Append ConditionIntermediateCatchEvent'),
+          translate('Append conditional intermediate catch event'),
           { eventDefinitionType: 'bpmn:ConditionalEventDefinition' }
         ),
         'append.signal-intermediate-event': appendAction(
           'bpmn:IntermediateCatchEvent',
           'bpmn-icon-intermediate-event-catch-signal',
-          translate('Append SignalIntermediateCatchEvent'),
+          translate('Append signal intermediate catch event'),
           { eventDefinitionType: 'bpmn:SignalEventDefinition' }
         )
       });
@@ -420,22 +415,22 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
         'append.end-event': appendAction(
           'bpmn:EndEvent',
           'bpmn-icon-end-event-none',
-          translate('Append EndEvent')
+          translate('Append end event')
         ),
         'append.gateway': appendAction(
           'bpmn:ExclusiveGateway',
           'bpmn-icon-gateway-none',
-          translate('Append Gateway')
+          translate('Append gateway')
         ),
         'append.append-task': appendAction(
           'bpmn:Task',
           'bpmn-icon-task',
-          translate('Append Task')
+          translate('Append task')
         ),
         'append.intermediate-event': appendAction(
           'bpmn:IntermediateThrowEvent',
           'bpmn-icon-intermediate-event-none',
-          translate('Append Intermediate/Boundary Event')
+          translate('Append intermediate/boundary event')
         )
       });
     }
@@ -472,7 +467,7 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
       'append.text-annotation': appendAction(
         'bpmn:TextAnnotation',
         'bpmn-icon-text-annotation',
-        translate('Append TextAnnotation')
+        translate('Append text annotation')
       )
     });
   }
@@ -489,7 +484,7 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
       'append.text-annotation': appendAction(
         'bpmn:TextAnnotation',
         'bpmn-icon-text-annotation',
-        translate('Append TextAnnotation')
+        translate('Append text annotation')
       ),
 
       'connect': {
@@ -499,8 +494,8 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
           'Connect using ' +
             (businessObject.isForCompensation
               ? ''
-              : 'Sequence/MessageFlow or ') +
-            'Association'
+              : 'sequence/message flow or ') +
+            'association'
         ),
         action: {
           click: startConnect,
@@ -515,7 +510,7 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
       'connect': {
         group: 'connect',
         className: 'bpmn-icon-connection-multi',
-        title: translate('Connect using Association'),
+        title: translate('Connect using association'),
         action: {
           click: startConnect,
           dragstart: startConnect,
@@ -529,7 +524,7 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
       'connect': {
         group: 'connect',
         className: 'bpmn-icon-connection-multi',
-        title: translate('Connect using DataInputAssociation'),
+        title: translate('Connect using data input association'),
         action: {
           click: startConnect,
           dragstart: startConnect
@@ -543,7 +538,7 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
       'append.text-annotation': appendAction(
         'bpmn:TextAnnotation',
         'bpmn-icon-text-annotation',
-        translate('Append TextAnnotation')
+        translate('Append text annotation')
       )
     });
   }

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

@@ -11,7 +11,11 @@ import {
 } from '../../util/ModelUtil';
 
 import { isAny } from '../modeling/util/ModelingUtil';
-import { isExpanded } from '../../util/DiUtil';
+
+import {
+  isExpanded,
+  isHorizontal
+} from '../../util/DiUtil';
 
 import {
   getExternalLabelMid,
@@ -277,13 +281,47 @@ LabelEditingProvider.prototype.getEditingBBox = function(element) {
 
   // adjust for expanded pools AND lanes
   if (is(element, 'bpmn:Lane') || isExpandedPool(element)) {
+    var isHorizontalLane = isHorizontal(element);
 
-    assign(bounds, {
+    var laneBounds = isHorizontalLane ? {
       width: bbox.height,
       height: 30 * zoom,
       x: bbox.x - bbox.height / 2 + (15 * zoom),
       y: mid.y - (30 * zoom) / 2
+    } : {
+      width: bbox.width,
+      height: 30 * zoom
+    };
+
+    assign(bounds, laneBounds);
+
+    assign(style, {
+      fontSize: defaultFontSize + 'px',
+      lineHeight: defaultLineHeight,
+      paddingTop: (7 * zoom) + 'px',
+      paddingBottom: (7 * zoom) + 'px',
+      paddingLeft: (5 * zoom) + 'px',
+      paddingRight: (5 * zoom) + 'px',
+      transform: isHorizontalLane ? 'rotate(-90deg)' : null
     });
+  }
+
+
+  // internal labels for collapsed participants
+  if (isCollapsedPool(element)) {
+    var isHorizontalPool = isHorizontal(element);
+
+    var poolBounds = isHorizontalPool ? {
+      width: bbox.width,
+      height: bbox.height
+    } : {
+      width: bbox.height,
+      height: bbox.width,
+      x: mid.x - bbox.height / 2,
+      y: mid.y - bbox.width / 2
+    };
+
+    assign(bounds, poolBounds);
 
     assign(style, {
       fontSize: defaultFontSize + 'px',
@@ -292,15 +330,14 @@ LabelEditingProvider.prototype.getEditingBBox = function(element) {
       paddingBottom: (7 * zoom) + 'px',
       paddingLeft: (5 * zoom) + 'px',
       paddingRight: (5 * zoom) + 'px',
-      transform: 'rotate(-90deg)'
+      transform: isHorizontalPool ? null : 'rotate(-90deg)'
     });
   }
 
 
-  // internal labels for tasks and collapsed call activities,
-  // sub processes and participants
+  // internal labels for tasks and collapsed call activities
+  // and sub processes
   if (isAny(element, [ 'bpmn:Task', 'bpmn:CallActivity' ]) ||
-      isCollapsedPool(element) ||
       isCollapsedSubProcess(element)) {
 
     assign(bounds, {

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

@@ -35,10 +35,15 @@ export default function IsHorizontalFix(eventBus) {
         bo = getBusinessObject(shape),
         di = getDi(shape);
 
-    if (isAny(bo, elementTypesToUpdate) && !di.get('isHorizontal')) {
+    if (isAny(bo, elementTypesToUpdate)) {
+      var isHorizontal = di.get('isHorizontal');
+
+      if (isHorizontal === undefined) {
+        isHorizontal = true;
+      }
 
       // set attribute directly to avoid modeling#updateProperty side effects
-      di.set('isHorizontal', true);
+      di.set('isHorizontal', isHorizontal);
     }
   });
 

package/lib/features/palette/PaletteProvider.js

@@ -84,12 +84,10 @@ PaletteProvider.prototype.getPaletteEntries = function() {
       create.start(event, shape);
     }
 
-    var shortType = type.replace(/^bpmn:/, '');
-
     return {
       group: group,
       className: className,
-      title: title || translate('Create {type}', { type: shortType }),
+      title: title,
       action: {
         dragstart: createListener,
         click: createListener
@@ -127,7 +125,7 @@ PaletteProvider.prototype.getPaletteEntries = function() {
     'hand-tool': {
       group: 'tools',
       className: 'bpmn-icon-hand-tool',
-      title: translate('Activate the hand tool'),
+      title: translate('Activate hand tool'),
       action: {
         click: function(event) {
           handTool.activateHand(event);
@@ -137,7 +135,7 @@ PaletteProvider.prototype.getPaletteEntries = function() {
     'lasso-tool': {
       group: 'tools',
       className: 'bpmn-icon-lasso-tool',
-      title: translate('Activate the lasso tool'),
+      title: translate('Activate lasso tool'),
       action: {
         click: function(event) {
           lassoTool.activateSelection(event);
@@ -147,7 +145,7 @@ PaletteProvider.prototype.getPaletteEntries = function() {
     'space-tool': {
       group: 'tools',
       className: 'bpmn-icon-space-tool',
-      title: translate('Activate the create/remove space tool'),
+      title: translate('Activate create/remove space tool'),
       action: {
         click: function(event) {
           spaceTool.activateSelection(event);
@@ -157,7 +155,7 @@ PaletteProvider.prototype.getPaletteEntries = function() {
     'global-connect-tool': {
       group: 'tools',
       className: 'bpmn-icon-connection-multi',
-      title: translate('Activate the global connect tool'),
+      title: translate('Activate global connect tool'),
       action: {
         click: function(event) {
           globalConnect.start(event);
@@ -170,36 +168,36 @@ PaletteProvider.prototype.getPaletteEntries = function() {
     },
     'create.start-event': createAction(
       'bpmn:StartEvent', 'event', 'bpmn-icon-start-event-none',
-      translate('Create StartEvent')
+      translate('Create start event')
     ),
     'create.intermediate-event': createAction(
       'bpmn:IntermediateThrowEvent', 'event', 'bpmn-icon-intermediate-event-none',
-      translate('Create Intermediate/Boundary Event')
+      translate('Create intermediate/boundary event')
     ),
     'create.end-event': createAction(
       'bpmn:EndEvent', 'event', 'bpmn-icon-end-event-none',
-      translate('Create EndEvent')
+      translate('Create end event')
     ),
     'create.exclusive-gateway': createAction(
       'bpmn:ExclusiveGateway', 'gateway', 'bpmn-icon-gateway-none',
-      translate('Create Gateway')
+      translate('Create gateway')
     ),
     'create.task': createAction(
       'bpmn:Task', 'activity', 'bpmn-icon-task',
-      translate('Create Task')
+      translate('Create task')
     ),
     'create.data-object': createAction(
       'bpmn:DataObjectReference', 'data-object', 'bpmn-icon-data-object',
-      translate('Create DataObjectReference')
+      translate('Create data object reference')
     ),
     'create.data-store': createAction(
       'bpmn:DataStoreReference', 'data-store', 'bpmn-icon-data-store',
-      translate('Create DataStoreReference')
+      translate('Create data store reference')
     ),
     'create.subprocess-expanded': {
       group: 'activity',
       className: 'bpmn-icon-subprocess-expanded',
-      title: translate('Create expanded SubProcess'),
+      title: translate('Create expanded sub-process'),
       action: {
         dragstart: createSubprocess,
         click: createSubprocess
@@ -208,7 +206,7 @@ PaletteProvider.prototype.getPaletteEntries = function() {
     'create.participant-expanded': {
       group: 'collaboration',
       className: 'bpmn-icon-participant',
-      title: translate('Create Pool/Participant'),
+      title: translate('Create pool/participant'),
       action: {
         dragstart: createParticipant,
         click: createParticipant
@@ -216,7 +214,7 @@ PaletteProvider.prototype.getPaletteEntries = function() {
     },
     'create.group': createAction(
       'bpmn:Group', 'artifact', 'bpmn-icon-group',
-      translate('Create Group')
+      translate('Create group')
     ),
   });
 

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

@@ -268,7 +268,7 @@ ReplaceMenuProvider.prototype.getPopupMenuEntries = function(target) {
     // collapsed sub process cannot be replaced with itself
     if (is(businessObject, 'bpmn:SubProcess') && !isExpanded(target)) {
       filteredReplaceOptions = filter(filteredReplaceOptions, function(replaceOption) {
-        return replaceOption.label !== 'Sub Process (collapsed)';
+        return replaceOption.label !== 'Sub-process (collapsed)';
       });
     }
 
@@ -511,7 +511,7 @@ ReplaceMenuProvider.prototype._getLoopCharacteristicsHeaderEntries = function(ta
   return {
     'toggle-parallel-mi' : {
       className: 'bpmn-icon-parallel-mi-marker',
-      title: translate('Parallel Multi Instance'),
+      title: translate('Parallel multi-instance'),
       active: isParallel,
       action: toggleLoopEntry,
       options: {
@@ -521,7 +521,7 @@ ReplaceMenuProvider.prototype._getLoopCharacteristicsHeaderEntries = function(ta
     },
     'toggle-sequential-mi': {
       className: 'bpmn-icon-sequential-mi-marker',
-      title: translate('Sequential Multi Instance'),
+      title: translate('Sequential multi-instance'),
       active: isSequential,
       action: toggleLoopEntry,
       options: {
@@ -609,7 +609,7 @@ ReplaceMenuProvider.prototype._getParticipantMultiplicityHeaderEntries = functio
   return {
     'toggle-participant-multiplicity': {
       className: 'bpmn-icon-parallel-mi-marker',
-      title: translate('Participant Multiplicity'),
+      title: translate('Participant multiplicity'),
       active: !!participantMultiplicity,
       action: toggleParticipantMultiplicity,
     }
@@ -668,7 +668,7 @@ ReplaceMenuProvider.prototype._getNonInterruptingHeaderEntries = function(elemen
   return {
     'toggle-non-interrupting': {
       imageHtml: icon,
-      title: translate('Toggle Non-Interrupting'),
+      title: translate('Toggle non-interrupting'),
       active: isNonInterrupting,
       action: function() {
         self._modeling.updateProperties(element, {