bpmn-js 18.1.2 → 18.2.0

package/lib/features/ordering/BpmnOrderingProvider.js

@@ -1,192 +1,192 @@
-import inherits from 'inherits-browser';
-
-import OrderingProvider from 'diagram-js/lib/features/ordering/OrderingProvider';
-
-import {
-  is,
-  isAny
-} from '../modeling/util/ModelingUtil';
-
-import {
-  findIndex,
-  find
-} from 'min-dash';
-
-/**
- * @typedef {import('diagram-js/lib/core/Canvas').default} Canvas
- * @typedef {import('diagram-js/lib/core/EventBus').default} EventBus
- */
-
-/**
- * A BPMN-specific ordering provider.
- *
- * @param {EventBus} eventBus
- * @param {Canvas} canvas
- */
-export default function BpmnOrderingProvider(eventBus, canvas) {
-
-  OrderingProvider.call(this, eventBus);
-
-  var orders = [
-    { type: 'bpmn:SubProcess', order: { level: 6 } },
-
-    // handle SequenceFlow(s) like message flows and render them always on top
-    {
-      type: 'bpmn:SequenceFlow',
-      order: {
-        level: 9,
-        containers: [
-          'bpmn:Participant',
-          'bpmn:FlowElementsContainer'
-        ]
-      }
-    },
-
-    // handle DataAssociation(s) like message flows and render them always on top
-    {
-      type: 'bpmn:DataAssociation',
-      order: {
-        level: 9,
-        containers: [
-          'bpmn:Collaboration',
-          'bpmn:FlowElementsContainer'
-        ]
-      }
-    },
-    {
-      type: 'bpmn:TextAnnotation',
-      order: {
-        level: 9
-      }
-    },
-    {
-      type: 'bpmn:MessageFlow', order: {
-        level: 9,
-        containers: [ 'bpmn:Collaboration' ]
-      }
-    },
-    {
-      type: 'bpmn:Association',
-      order: {
-        level: 6,
-        containers: [
-          'bpmn:Participant',
-          'bpmn:FlowElementsContainer',
-          'bpmn:Collaboration'
-        ]
-      }
-    },
-    { type: 'bpmn:BoundaryEvent', order: { level: 8 } },
-    {
-      type: 'bpmn:Group',
-      order: {
-        level: 10,
-        containers: [
-          'bpmn:Collaboration',
-          'bpmn:FlowElementsContainer'
-        ]
-      }
-    },
-    { type: 'bpmn:FlowElement', order: { level: 5 } },
-    { type: 'bpmn:Participant', order: { level: -2 } },
-    { type: 'bpmn:Lane', order: { level: -1 } }
-  ];
-
-  function computeOrder(element) {
-    if (element.labelTarget) {
-      return { level: 10 };
-    }
-
-    var entry = find(orders, function(o) {
-      return isAny(element, [ o.type ]);
-    });
-
-    return entry && entry.order || { level: 1 };
-  }
-
-  function getOrder(element) {
-
-    var order = element.order;
-
-    if (!order) {
-      element.order = order = computeOrder(element);
-    }
-
-    if (!order) {
-      throw new Error(`no order for <${ element.id }>`);
-    }
-
-    return order;
-  }
-
-  function findActualParent(element, newParent, containers) {
-
-    var actualParent = newParent;
-
-    while (actualParent) {
-
-      if (isAny(actualParent, containers)) {
-        break;
-      }
-
-      actualParent = actualParent.parent;
-    }
-
-    if (!actualParent) {
-      throw new Error(`no parent for <${ element.id }> in <${ newParent && newParent.id }>`);
-    }
-
-    return actualParent;
-  }
-
-  this.getOrdering = function(element, newParent) {
-
-    // render labels and text annotations always on top
-    if (element.labelTarget || is(element, 'bpmn:TextAnnotation')) {
-      return {
-        parent: canvas.findRoot(newParent) || canvas.getRootElement(),
-        index: -1
-      };
-    }
-
-    var elementOrder = getOrder(element);
-
-    if (elementOrder.containers) {
-      newParent = findActualParent(element, newParent, elementOrder.containers);
-    }
-
-    var currentIndex = newParent.children.indexOf(element);
-
-    var insertIndex = findIndex(newParent.children, function(child) {
-
-      // do not compare with labels, they are created
-      // in the wrong order (right after elements) during import and
-      // mess up the positioning.
-      if (!element.labelTarget && child.labelTarget) {
-        return false;
-      }
-
-      return elementOrder.level < getOrder(child).level;
-    });
-
-
-    // if the element is already in the child list at
-    // a smaller index, we need to adjust the insert index.
-    // this takes into account that the element is being removed
-    // before being re-inserted
-    if (insertIndex !== -1) {
-      if (currentIndex !== -1 && currentIndex < insertIndex) {
-        insertIndex -= 1;
-      }
-    }
-
-    return {
-      index: insertIndex,
-      parent: newParent
-    };
-  };
-}
-
-BpmnOrderingProvider.$inject = [ 'eventBus', 'canvas' ];
-
+import inherits from 'inherits-browser';
+
+import OrderingProvider from 'diagram-js/lib/features/ordering/OrderingProvider';
+
+import {
+  is,
+  isAny
+} from '../modeling/util/ModelingUtil';
+
+import {
+  findIndex,
+  find
+} from 'min-dash';
+
+/**
+ * @typedef {import('diagram-js/lib/core/Canvas').default} Canvas
+ * @typedef {import('diagram-js/lib/core/EventBus').default} EventBus
+ */
+
+/**
+ * A BPMN-specific ordering provider.
+ *
+ * @param {EventBus} eventBus
+ * @param {Canvas} canvas
+ */
+export default function BpmnOrderingProvider(eventBus, canvas) {
+
+  OrderingProvider.call(this, eventBus);
+
+  var orders = [
+    { type: 'bpmn:SubProcess', order: { level: 6 } },
+
+    // handle SequenceFlow(s) like message flows and render them always on top
+    {
+      type: 'bpmn:SequenceFlow',
+      order: {
+        level: 9,
+        containers: [
+          'bpmn:Participant',
+          'bpmn:FlowElementsContainer'
+        ]
+      }
+    },
+
+    // handle DataAssociation(s) like message flows and render them always on top
+    {
+      type: 'bpmn:DataAssociation',
+      order: {
+        level: 9,
+        containers: [
+          'bpmn:Collaboration',
+          'bpmn:FlowElementsContainer'
+        ]
+      }
+    },
+    {
+      type: 'bpmn:TextAnnotation',
+      order: {
+        level: 9
+      }
+    },
+    {
+      type: 'bpmn:MessageFlow', order: {
+        level: 9,
+        containers: [ 'bpmn:Collaboration' ]
+      }
+    },
+    {
+      type: 'bpmn:Association',
+      order: {
+        level: 6,
+        containers: [
+          'bpmn:Participant',
+          'bpmn:FlowElementsContainer',
+          'bpmn:Collaboration'
+        ]
+      }
+    },
+    { type: 'bpmn:BoundaryEvent', order: { level: 8 } },
+    {
+      type: 'bpmn:Group',
+      order: {
+        level: 10,
+        containers: [
+          'bpmn:Collaboration',
+          'bpmn:FlowElementsContainer'
+        ]
+      }
+    },
+    { type: 'bpmn:FlowElement', order: { level: 5 } },
+    { type: 'bpmn:Participant', order: { level: -2 } },
+    { type: 'bpmn:Lane', order: { level: -1 } }
+  ];
+
+  function computeOrder(element) {
+    if (element.labelTarget) {
+      return { level: 10 };
+    }
+
+    var entry = find(orders, function(o) {
+      return isAny(element, [ o.type ]);
+    });
+
+    return entry && entry.order || { level: 1 };
+  }
+
+  function getOrder(element) {
+
+    var order = element.order;
+
+    if (!order) {
+      element.order = order = computeOrder(element);
+    }
+
+    if (!order) {
+      throw new Error(`no order for <${ element.id }>`);
+    }
+
+    return order;
+  }
+
+  function findActualParent(element, newParent, containers) {
+
+    var actualParent = newParent;
+
+    while (actualParent) {
+
+      if (isAny(actualParent, containers)) {
+        break;
+      }
+
+      actualParent = actualParent.parent;
+    }
+
+    if (!actualParent) {
+      throw new Error(`no parent for <${ element.id }> in <${ newParent && newParent.id }>`);
+    }
+
+    return actualParent;
+  }
+
+  this.getOrdering = function(element, newParent) {
+
+    // render labels and text annotations always on top
+    if (element.labelTarget || is(element, 'bpmn:TextAnnotation')) {
+      return {
+        parent: canvas.findRoot(newParent) || canvas.getRootElement(),
+        index: -1
+      };
+    }
+
+    var elementOrder = getOrder(element);
+
+    if (elementOrder.containers) {
+      newParent = findActualParent(element, newParent, elementOrder.containers);
+    }
+
+    var currentIndex = newParent.children.indexOf(element);
+
+    var insertIndex = findIndex(newParent.children, function(child) {
+
+      // do not compare with labels, they are created
+      // in the wrong order (right after elements) during import and
+      // mess up the positioning.
+      if (!element.labelTarget && child.labelTarget) {
+        return false;
+      }
+
+      return elementOrder.level < getOrder(child).level;
+    });
+
+
+    // if the element is already in the child list at
+    // a smaller index, we need to adjust the insert index.
+    // this takes into account that the element is being removed
+    // before being re-inserted
+    if (insertIndex !== -1) {
+      if (currentIndex !== -1 && currentIndex < insertIndex) {
+        insertIndex -= 1;
+      }
+    }
+
+    return {
+      index: insertIndex,
+      parent: newParent
+    };
+  };
+}
+
+BpmnOrderingProvider.$inject = [ 'eventBus', 'canvas' ];
+
 inherits(BpmnOrderingProvider, OrderingProvider);

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

@@ -1,6 +1,6 @@
-declare namespace _default {
-    let __init__: string[];
-    let bpmnOrderingProvider: (string | typeof BpmnOrderingProvider)[];
-}
-export default _default;
-import BpmnOrderingProvider from './BpmnOrderingProvider';
+declare namespace _default {
+    let __init__: string[];
+    let bpmnOrderingProvider: (string | typeof BpmnOrderingProvider)[];
+}
+export default _default;
+import BpmnOrderingProvider from './BpmnOrderingProvider';

package/lib/features/ordering/index.js

@@ -1,6 +1,6 @@
-import BpmnOrderingProvider from './BpmnOrderingProvider';
-
-export default {
-  __init__: [ 'bpmnOrderingProvider' ],
-  bpmnOrderingProvider: [ 'type', BpmnOrderingProvider ]
+import BpmnOrderingProvider from './BpmnOrderingProvider';
+
+export default {
+  __init__: [ 'bpmnOrderingProvider' ],
+  bpmnOrderingProvider: [ 'type', BpmnOrderingProvider ]
 };

package/lib/features/outline/OutlineProvider.d.ts

@@ -1,39 +1,39 @@
-/**
- * BPMN-specific outline provider.
- *
- * @implements {BaseOutlineProvider}
- *
- */
-export default class OutlineProvider implements BaseOutlineProvider {
-  static $inject: string[];
-
-  /**
-   * @param outline
-   * @param styles
-   */
-  constructor(outline: Outline, styles: Styles);
-
-  /**
-   * Returns outline for a given element.
-   *
-   * @param element
-   *
-   * @return
-   */
-  getOutline(element: Element): Outline;
-
-  /**
-   * Updates the outline for a given element.
-   * Returns true if the update for the given element was handled by this provider.
-   *
-   * @param element
-   * @param outline
-   * @returns
-   */
-  updateOutline(element: Element, outline: Outline): boolean;
-}
-
-type BaseOutlineProvider = import("diagram-js/lib/features/outline/OutlineProvider").default;
-type Outline = import("diagram-js/lib/features/outline/OutlineProvider").Outline;
-type Styles = import("diagram-js/lib/draw/Styles").default;
-type Element = import("diagram-js/lib/model/Types").Element;
+/**
+ * BPMN-specific outline provider.
+ *
+ * @implements {BaseOutlineProvider}
+ *
+ */
+export default class OutlineProvider implements BaseOutlineProvider {
+  static $inject: string[];
+
+  /**
+   * @param outline
+   * @param styles
+   */
+  constructor(outline: Outline, styles: Styles);
+
+  /**
+   * Returns outline for a given element.
+   *
+   * @param element
+   *
+   * @return
+   */
+  getOutline(element: Element): Outline;
+
+  /**
+   * Updates the outline for a given element.
+   * Returns true if the update for the given element was handled by this provider.
+   *
+   * @param element
+   * @param outline
+   * @returns
+   */
+  updateOutline(element: Element, outline: Outline): boolean;
+}
+
+type BaseOutlineProvider = import("diagram-js/lib/features/outline/OutlineProvider").default;
+type Outline = import("diagram-js/lib/features/outline/OutlineProvider").Outline;
+type Styles = import("diagram-js/lib/draw/Styles").default;
+type Element = import("diagram-js/lib/model/Types").Element;