bpmn-js 17.3.0 → 17.5.0

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

@@ -202,6 +202,13 @@ LabelEditingProvider.prototype.activate = function(element) {
   assign(context, bounds);
 
   var options = {};
+  var style = context.style || {};
+
+  // Remove background and border
+  assign(style, {
+    backgroundColor: null,
+    border: null
+  });
 
   // tasks
   if (
@@ -223,6 +230,12 @@ LabelEditingProvider.prototype.activate = function(element) {
     assign(options, {
       autoResize: true
     });
+
+    // keep background and border for external labels
+    assign(style, {
+      backgroundColor: '#ffffff',
+      border: '1px solid #ccc'
+    });
   }
 
   // text annotations
@@ -231,10 +244,17 @@ LabelEditingProvider.prototype.activate = function(element) {
       resizable: true,
       autoResize: true
     });
+
+    // keep background and border for text annotations
+    assign(style, {
+      backgroundColor: '#ffffff',
+      border: '1px solid #ccc'
+    });
   }
 
   assign(context, {
-    options: options
+    options: options,
+    style: style
   });
 
   return context;

package/lib/features/modeling/BpmnUpdater.d.ts

@@ -8,9 +8,8 @@ export default class BpmnUpdater extends CommandInterceptor {
    * @param eventBus
    * @param bpmnFactory
    * @param connectionDocking
-   * @param translate
    */
-  constructor(eventBus: EventBus, bpmnFactory: BpmnFactory, connectionDocking: CroppingConnectionDocking, translate: Translate);
+  constructor(eventBus: EventBus, bpmnFactory: BpmnFactory, connectionDocking: CroppingConnectionDocking);
 
   /**
    * @param context
@@ -83,7 +82,6 @@ export default class BpmnUpdater extends CommandInterceptor {
 type EventBus = import('diagram-js/lib/core/EventBus').default;
 type BpmnFactory = import('./BpmnFactory').default;
 type CroppingConnectionDocking = import('diagram-js/lib/layout/CroppingConnectionDocking').default;
-export type Translate = typeof import("diagram-js/lib/i18n/translate/translate").default;
 type Connection = import('../../model/Types').Connection;
 type Element = import('../../model/Types').Element;
 type Shape = import('../../model/Types').Shape;

package/lib/features/modeling/BpmnUpdater.js

@@ -34,7 +34,6 @@ import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor';
  * @typedef {import('diagram-js/lib/core/EventBus').default} EventBus
  * @typedef {import('./BpmnFactory').default} BpmnFactory
  * @typedef {import('diagram-js/lib/layout/CroppingConnectionDocking').default} CroppingConnectionDocking
- * @typedef {import('diagram-js/lib/i18n/translate/translate').default} Translate
  *
  * @typedef {import('../../model/Types').Connection} Connection
  * @typedef {import('../../model/Types').Element} Element
@@ -50,24 +49,20 @@ import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor';
  * @param {EventBus} eventBus
  * @param {BpmnFactory} bpmnFactory
  * @param {CroppingConnectionDocking} connectionDocking
- * @param {Translate} translate
  */
 export default function BpmnUpdater(
     eventBus,
     bpmnFactory,
-    connectionDocking,
-    translate
+    connectionDocking
 ) {
 
   CommandInterceptor.call(this, eventBus);
 
   this._bpmnFactory = bpmnFactory;
-  this._translate = translate;
 
   var self = this;
 
 
-
   // connection cropping //////////////////////
 
   // crop connection ends during create/update
@@ -322,8 +317,7 @@ inherits(BpmnUpdater, CommandInterceptor);
 BpmnUpdater.$inject = [
   'eventBus',
   'bpmnFactory',
-  'connectionDocking',
-  'translate'
+  'connectionDocking'
 ];
 
 
@@ -562,8 +556,7 @@ BpmnUpdater.prototype.getLaneSet = function(container) {
  */
 BpmnUpdater.prototype.updateSemanticParent = function(businessObject, newParent, visualParent) {
 
-  var containment,
-      translate = this._translate;
+  var containment;
 
   if (businessObject.$parent === newParent) {
     return;
@@ -668,13 +661,7 @@ BpmnUpdater.prototype.updateSemanticParent = function(businessObject, newParent,
   }
 
   if (!containment) {
-    throw new Error(translate(
-      'no parent for {element} in {parent}',
-      {
-        element: businessObject.id,
-        parent: newParent.id
-      }
-    ));
+    throw new Error(`no parent for <${ businessObject.id }> in <${ newParent.id }>`);
   }
 
   var children;

package/lib/features/modeling/ElementFactory.d.ts

@@ -11,9 +11,8 @@ export default class ElementFactory<T extends import("../../model/Types").Connec
   /**
    * @param bpmnFactory
    * @param moddle
-   * @param translate
    */
-  constructor(bpmnFactory: BpmnFactory, moddle: Moddle, translate: Translate);
+  constructor(bpmnFactory: BpmnFactory, moddle: Moddle);
 
   /**
    * Create a label.
@@ -105,7 +104,6 @@ export default class ElementFactory<T extends import("../../model/Types").Connec
   createParticipantShape(attrs?: boolean | (Partial<Shape> & Partial<BpmnAttributes>)): W;
 }
 
-export type Translate = typeof import("diagram-js/lib/i18n/translate/translate").default;
 type Dimensions = import('diagram-js/lib/util/Types').Dimensions;
 type BpmnFactory = import('./BpmnFactory').default;
 type BpmnAttributes = import('../../model/Types').BpmnAttributes;

package/lib/features/modeling/ElementFactory.js

@@ -34,8 +34,6 @@ import {
 } from '../../util/CompatibilityUtil';
 
 /**
- * @typedef {import('diagram-js/lib/i18n/translate/translate').default} Translate
- *
  * @typedef {import('diagram-js/lib/util/Types').Dimensions} Dimensions
  *
  * @typedef {import('./BpmnFactory').default} BpmnFactory
@@ -62,22 +60,19 @@ import {
  *
  * @param {BpmnFactory} bpmnFactory
  * @param {Moddle} moddle
- * @param {Translate} translate
  */
-export default function ElementFactory(bpmnFactory, moddle, translate) {
+export default function ElementFactory(bpmnFactory, moddle) {
   BaseElementFactory.call(this);
 
   this._bpmnFactory = bpmnFactory;
   this._moddle = moddle;
-  this._translate = translate;
 }
 
 inherits(ElementFactory, BaseElementFactory);
 
 ElementFactory.$inject = [
   'bpmnFactory',
-  'moddle',
-  'translate'
+  'moddle'
 ];
 
 ElementFactory.prototype._baseCreate = BaseElementFactory.prototype.create;
@@ -155,17 +150,17 @@ ElementFactory.prototype.create = function(elementType, attrs) {
  * @return {T}
  */
 ElementFactory.prototype.createElement = function(elementType, attrs) {
-  var size,
-      translate = this._translate;
 
   attrs = assign({}, attrs || {});
 
+  var size;
+
   var businessObject = attrs.businessObject,
       di = attrs.di;
 
   if (!businessObject) {
     if (!attrs.type) {
-      throw new Error(translate('no shape type specified'));
+      throw new Error('no shape type specified');
     }
 
     businessObject = this._bpmnFactory.create(attrs.type);

package/lib/features/modeling/behavior/UpdateFlowNodeRefsBehavior.d.ts

@@ -6,12 +6,10 @@ export default class UpdateFlowNodeRefsBehavior extends CommandInterceptor {
     /**
      * @param eventBus
      * @param modeling
-     * @param translate
      */
-    constructor(eventBus: EventBus, modeling: Modeling, translate: Translate);
+    constructor(eventBus: EventBus, modeling: Modeling);
 }
 
 type EventBus = import('diagram-js/lib/core/EventBus').default;
 type Modeling = import('../Modeling').default;
-export type Translate = typeof import("diagram-js/lib/i18n/translate/translate").default;
 import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor';

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

@@ -9,7 +9,6 @@ import {
 /**
  * @typedef {import('diagram-js/lib/core/EventBus').default} EventBus
  * @typedef {import('../Modeling').default} Modeling
- * @typedef {import('diagram-js/lib/i18n/translate/translate').default} Translate
  */
 
 var LOW_PRIORITY = 500,
@@ -21,9 +20,8 @@ var LOW_PRIORITY = 500,
  *
  * @param {EventBus} eventBus
  * @param {Modeling} modeling
- * @param {Translate} translate
  */
-export default function UpdateFlowNodeRefsBehavior(eventBus, modeling, translate) {
+export default function UpdateFlowNodeRefsBehavior(eventBus, modeling) {
 
   CommandInterceptor.call(this, eventBus);
 
@@ -46,7 +44,7 @@ export default function UpdateFlowNodeRefsBehavior(eventBus, modeling, translate
 
   function getContext() {
     if (!context) {
-      throw new Error(translate('out of bounds release'));
+      throw new Error('out of bounds release');
     }
 
     return context;
@@ -55,7 +53,7 @@ export default function UpdateFlowNodeRefsBehavior(eventBus, modeling, translate
   function releaseContext() {
 
     if (!context) {
-      throw new Error(translate('out of bounds release'));
+      throw new Error('out of bounds release');
     }
 
     var triggerUpdate = context.leave();
@@ -127,8 +125,7 @@ export default function UpdateFlowNodeRefsBehavior(eventBus, modeling, translate
 
 UpdateFlowNodeRefsBehavior.$inject = [
   'eventBus',
-  'modeling' ,
-  'translate'
+  'modeling'
 ];
 
 inherits(UpdateFlowNodeRefsBehavior, CommandInterceptor);

package/lib/features/modeling/cmd/SplitLaneHandler.d.ts

@@ -10,13 +10,11 @@ export default class SplitLaneHandler implements CommandHandler {
 
   /**
    * @param modeling
-   * @param translate
    */
-  constructor(modeling: Modeling, translate: Translate);
+  constructor(modeling: Modeling);
 
   preExecute(context: any): void;
 }
 
 type CommandHandler = import('diagram-js/lib/command/CommandHandler').default;
 type Modeling = import('../Modeling').default;
-export type Translate = typeof import("diagram-js/lib/i18n/translate/translate").default;

package/lib/features/modeling/cmd/SplitLaneHandler.js

@@ -11,7 +11,6 @@ import {
  * @typedef {import('diagram-js/lib/command/CommandHandler').default} CommandHandler
  *
  * @typedef {import('../Modeling').default} Modeling
- * @typedef {import('diagram-js/lib/i18n/translate/translate').default} Translate
  */
 
 /**
@@ -21,23 +20,19 @@ import {
  * @implements {CommandHandler}
  *
  * @param {Modeling} modeling
- * @param {Translate} translate
  */
-export default function SplitLaneHandler(modeling, translate) {
+export default function SplitLaneHandler(modeling) {
   this._modeling = modeling;
-  this._translate = translate;
 }
 
 SplitLaneHandler.$inject = [
-  'modeling',
-  'translate'
+  'modeling'
 ];
 
 
 SplitLaneHandler.prototype.preExecute = function(context) {
 
-  var modeling = this._modeling,
-      translate = this._translate;
+  var modeling = this._modeling;
 
   var shape = context.shape,
       newLanesCount = context.count;
@@ -46,7 +41,7 @@ SplitLaneHandler.prototype.preExecute = function(context) {
       existingLanesCount = childLanes.length;
 
   if (existingLanesCount > newLanesCount) {
-    throw new Error(translate('more than {count} child lanes', { count: newLanesCount }));
+    throw new Error(`more than <${newLanesCount}> child lanes`);
   }
 
   var isHorizontalLane = isHorizontal(shape);

package/lib/features/modeling/cmd/UpdatePropertiesHandler.d.ts

@@ -16,11 +16,10 @@ export default class UpdatePropertiesHandler implements CommandHandler {
   /**
    * @param elementRegistry
    * @param moddle
-   * @param translate
    * @param modeling
    * @param textRenderer
    */
-  constructor(elementRegistry: ElementRegistry, moddle: Moddle, translate: Translate, modeling: Modeling, textRenderer: TextRenderer);
+  constructor(elementRegistry: ElementRegistry, moddle: Moddle, modeling: Modeling, textRenderer: TextRenderer);
 
   /**
    * Update a BPMN element's properties.
@@ -54,7 +53,6 @@ type CommandHandler = import('diagram-js/lib/command/CommandHandler').default;
 type CommandContext = import('diagram-js/lib/command/CommandStack').CommandContext;
 type ElementRegistry = import('diagram-js/lib/core/ElementRegistry').default;
 type Moddle = import('../../../model/Types').Moddle;
-export type Translate = typeof import("diagram-js/lib/i18n/translate/translate").default;
 type Modeling = import('../Modeling').default;
 type TextRenderer = import('../../../draw/TextRenderer').default;
 type Element = import('../../../model/Types').Element;

package/lib/features/modeling/cmd/UpdatePropertiesHandler.js

@@ -16,7 +16,6 @@ import {
  *
  * @typedef {import('diagram-js/lib/core/ElementRegistry').default} ElementRegistry
  * @typedef {import('../../../model/Types').Moddle} Moddle
- * @typedef {import('diagram-js/lib/i18n/translate/translate').default} Translate
  * @typedef {import('../Modeling').default} Modeling
  * @typedef {import('../../../draw/TextRenderer').default} TextRenderer
  *
@@ -45,17 +44,15 @@ var NULL_DIMENSIONS = {
  *
  * @param {ElementRegistry} elementRegistry
  * @param {Moddle} moddle
- * @param {Translate} translate
  * @param {Modeling} modeling
  * @param {TextRenderer} textRenderer
  */
 export default function UpdatePropertiesHandler(
-    elementRegistry, moddle, translate,
+    elementRegistry, moddle,
     modeling, textRenderer) {
 
   this._elementRegistry = elementRegistry;
   this._moddle = moddle;
-  this._translate = translate;
   this._modeling = modeling;
   this._textRenderer = textRenderer;
 }
@@ -63,7 +60,6 @@ export default function UpdatePropertiesHandler(
 UpdatePropertiesHandler.$inject = [
   'elementRegistry',
   'moddle',
-  'translate',
   'modeling',
   'textRenderer'
 ];
@@ -84,11 +80,10 @@ UpdatePropertiesHandler.$inject = [
 UpdatePropertiesHandler.prototype.execute = function(context) {
 
   var element = context.element,
-      changed = [ element ],
-      translate = this._translate;
+      changed = [ element ];
 
   if (!element) {
-    throw new Error(translate('element required'));
+    throw new Error('element required');
   }
 
   var elementRegistry = this._elementRegistry,

package/lib/features/ordering/BpmnOrderingProvider.d.ts

@@ -6,9 +6,8 @@ export default class BpmnOrderingProvider extends OrderingProvider {
     /**
      * @param eventBus
      * @param canvas
-     * @param translate
      */
-    constructor(eventBus: EventBus, canvas: Canvas, translate: any);
+    constructor(eventBus: EventBus, canvas: Canvas);
     getOrdering: (element: any, newParent: any) => {
         index: number;
         parent: any;
@@ -17,5 +16,4 @@ export default class BpmnOrderingProvider extends OrderingProvider {
 
 type Canvas = import('diagram-js/lib/core/Canvas').default;
 type EventBus = import('diagram-js/lib/core/EventBus').default;
-export type Translate = any;
 import OrderingProvider from 'diagram-js/lib/features/ordering/OrderingProvider';

package/lib/features/ordering/BpmnOrderingProvider.js

@@ -15,7 +15,6 @@ import {
 /**
  * @typedef {import('diagram-js/lib/core/Canvas').default} Canvas
  * @typedef {import('diagram-js/lib/core/EventBus').default} EventBus
- * @typedef {import('diagram-js/i18n/translate/translate').default} Translate
  */
 
 /**
@@ -23,9 +22,8 @@ import {
  *
  * @param {EventBus} eventBus
  * @param {Canvas} canvas
- * @param {Translate} translate
  */
-export default function BpmnOrderingProvider(eventBus, canvas, translate) {
+export default function BpmnOrderingProvider(eventBus, canvas) {
 
   OrderingProvider.call(this, eventBus);
 
@@ -189,6 +187,6 @@ export default function BpmnOrderingProvider(eventBus, canvas, translate) {
   };
 }
 
-BpmnOrderingProvider.$inject = [ 'eventBus', 'canvas', 'translate' ];
+BpmnOrderingProvider.$inject = [ 'eventBus', 'canvas' ];
 
 inherits(BpmnOrderingProvider, OrderingProvider);

package/lib/features/ordering/index.d.ts

@@ -1,5 +1,4 @@
 declare namespace _default {
-    const __depends__: import("didi").ModuleDeclaration[];
     const __init__: string[];
     const bpmnOrderingProvider: (string | typeof BpmnOrderingProvider)[];
 }

package/lib/features/ordering/index.js

@@ -1,11 +1,6 @@
-import translate from 'diagram-js/lib/i18n/translate';
-
 import BpmnOrderingProvider from './BpmnOrderingProvider';
 
 export default {
-  __depends__: [
-    translate
-  ],
   __init__: [ 'bpmnOrderingProvider' ],
   bpmnOrderingProvider: [ 'type', BpmnOrderingProvider ]
 };

package/lib/import/BpmnImporter.d.ts

@@ -10,10 +10,9 @@ export default class BpmnImporter {
    * @param canvas
    * @param elementFactory
    * @param elementRegistry
-   * @param translate
    * @param textRenderer
    */
-  constructor(eventBus: EventBus, canvas: Canvas, elementFactory: ElementFactory, elementRegistry: ElementRegistry, translate: Function, textRenderer: TextRenderer);
+  constructor(eventBus: EventBus, canvas: Canvas, elementFactory: ElementFactory, elementRegistry: ElementRegistry, textRenderer: TextRenderer);
 
   /**
    * Add a BPMN element (semantic) to the canvas making it a child of the
@@ -42,7 +41,6 @@ export default class BpmnImporter {
 type Canvas = import('diagram-js/lib/core/Canvas').default;
 type ElementRegistry = import('diagram-js/lib/core/ElementRegistry').default;
 type EventBus = import('diagram-js/lib/core/EventBus').default;
-export type Translate = typeof import("diagram-js/lib/i18n/translate/translate").default;
 type ElementFactory = import('../features/modeling/ElementFactory').default;
 type TextRenderer = import('../draw/TextRenderer').default;
 type Element = import('../model/Types').Element;

package/lib/import/BpmnImporter.js

@@ -26,7 +26,6 @@ import {
  * @typedef {import('diagram-js/lib/core/Canvas').default} Canvas
  * @typedef {import('diagram-js/lib/core/ElementRegistry').default} ElementRegistry
  * @typedef {import('diagram-js/lib/core/EventBus').default} EventBus
- * @typedef {import('diagram-js/lib/i18n/translate/translate').default} Translate
  *
  * @typedef {import('../features/modeling/ElementFactory').default} ElementFactory
  * @typedef {import('../draw/TextRenderer').default} TextRenderer
@@ -68,12 +67,10 @@ function getWaypoints(di, source, target) {
   });
 }
 
-function notYetDrawn(translate, semantic, refSemantic, property) {
-  return new Error(translate('element {element} referenced by {referenced}#{property} not yet drawn', {
-    element: elementToString(refSemantic),
-    referenced: elementToString(semantic),
-    property: property
-  }));
+function notYetDrawn(semantic, refSemantic, property) {
+  return new Error(
+    `element ${ elementToString(refSemantic) } referenced by ${ elementToString(semantic) }#${ property } not yet drawn`
+  );
 }
 
 
@@ -84,18 +81,16 @@ function notYetDrawn(translate, semantic, refSemantic, property) {
  * @param {Canvas} canvas
  * @param {ElementFactory} elementFactory
  * @param {ElementRegistry} elementRegistry
- * @param {Function} translate
  * @param {TextRenderer} textRenderer
  */
 export default function BpmnImporter(
     eventBus, canvas, elementFactory,
-    elementRegistry, translate, textRenderer) {
+    elementRegistry, textRenderer) {
 
   this._eventBus = eventBus;
   this._canvas = canvas;
   this._elementFactory = elementFactory;
   this._elementRegistry = elementRegistry;
-  this._translate = translate;
   this._textRenderer = textRenderer;
 }
 
@@ -104,7 +99,6 @@ BpmnImporter.$inject = [
   'canvas',
   'elementFactory',
   'elementRegistry',
-  'translate',
   'textRenderer'
 ];
 
@@ -121,7 +115,6 @@ BpmnImporter.$inject = [
  */
 BpmnImporter.prototype.add = function(semantic, di, parentElement) {
   var element,
-      translate = this._translate,
       hidden;
 
   var parentIndex;
@@ -207,10 +200,9 @@ BpmnImporter.prototype.add = function(semantic, di, parentElement) {
 
     this._canvas.addConnection(element, parentElement, parentIndex);
   } else {
-    throw new Error(translate('unknown di {di} for element {semantic}', {
-      di: elementToString(di),
-      semantic: elementToString(semantic)
-    }));
+    throw new Error(
+      `unknown di ${ elementToString(di) } for element ${ elementToString(semantic) }`
+    );
   }
 
   // (optional) LABEL
@@ -218,7 +210,6 @@ BpmnImporter.prototype.add = function(semantic, di, parentElement) {
     this.addLabel(semantic, di, element);
   }
 
-
   this._eventBus.fire('bpmnElement.added', { element: element });
 
   return element;
@@ -232,20 +223,19 @@ BpmnImporter.prototype.add = function(semantic, di, parentElement) {
  * @param {Shape} boundaryElement
  */
 BpmnImporter.prototype._attachBoundary = function(boundarySemantic, boundaryElement) {
-  var translate = this._translate;
   var hostSemantic = boundarySemantic.attachedToRef;
 
   if (!hostSemantic) {
-    throw new Error(translate('missing {semantic}#attachedToRef', {
-      semantic: elementToString(boundarySemantic)
-    }));
+    throw new Error(
+      `missing ${ elementToString(boundarySemantic) }#attachedToRef`
+    );
   }
 
   var host = this._elementRegistry.get(hostSemantic.id),
       attachers = host && host.attachers;
 
   if (!host) {
-    throw notYetDrawn(translate, boundarySemantic, hostSemantic, 'attachedToRef');
+    throw notYetDrawn(boundarySemantic, hostSemantic, 'attachedToRef');
   }
 
   // wire element.host <> host.attachers
@@ -311,8 +301,7 @@ BpmnImporter.prototype._getConnectedElement = function(semantic, side) {
 
   var element,
       refSemantic,
-      type = semantic.$type,
-      translate = this._translate;
+      type = semantic.$type;
 
   refSemantic = semantic[side + 'Ref'];
 
@@ -335,12 +324,11 @@ BpmnImporter.prototype._getConnectedElement = function(semantic, side) {
   }
 
   if (refSemantic) {
-    throw notYetDrawn(translate, semantic, refSemantic, side + 'Ref');
+    throw notYetDrawn(semantic, refSemantic, side + 'Ref');
   } else {
-    throw new Error(translate('{semantic}#{side} Ref not specified', {
-      semantic: elementToString(semantic),
-      side: side
-    }));
+    throw new Error(
+      `${ elementToString(semantic) }#${ side } Ref not specified`
+    );
   }
 };
 

package/lib/import/BpmnTreeWalker.d.ts

@@ -1,9 +1,8 @@
 export default class BpmnTreeWalker {
     /**
      * @param handler
-     * @param translate
      */
-    constructor(handler: Record<'element' | 'root' | 'error', Function>, translate: Translate);
+    constructor(handler: Record<'element' | 'root' | 'error', Function>);
     registerDi: (di: any) => void;
     /**
      * Handle definitions and return the rendered diagram (if any).
@@ -18,5 +17,4 @@ export default class BpmnTreeWalker {
     handleSubProcess: (subProcess: any, context: any) => void;
 }
 
-export type Translate = typeof import("diagram-js/lib/i18n/translate/translate").default;
 type ModdleElement = import('../model/Types').ModdleElement;