Viewer and Modeler modules

lib/Viewer.js

@@ -4,6 +4,7 @@ import CoreModule from './core';
 import TranslateModule from 'diagram-js/lib/i18n/translate';
 import SelectionModule from 'diagram-js/lib/features/selection';
 import OverlaysModule from 'diagram-js/lib/features/overlays';
+import CollapsedSubprocessNavigationModule from './features/collapsed-subprocesses-navigation';
 
 import BaseViewer from './BaseViewer';
 
@@ -66,7 +67,8 @@ Viewer.prototype._modules = [
   CoreModule,
   TranslateModule,
   SelectionModule,
-  OverlaysModule
+  OverlaysModule,
+  CollapsedSubprocessNavigationModule
 ];
 
 // default moddle extensions the viewer is composed of

lib/features/collapsed-subprocesses-navigation/CollapsedSubprocessNavigation.js

@@ -7,7 +7,7 @@ import { getBusinessObject, is } from '../../util/ModelUtil';
 
 
 import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor';
-import { selfAndAllChildren } from '../../../../diagram-js/lib/util/Elements';
+import { selfAndAllChildren } from 'diagram-js/lib/util/Elements';
 
 
 var ARROW_DOWN_SVG = '<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M4.81801948,3.50735931 L10.4996894,9.1896894 L10.5,4 L12,4 L12,12 L4,12 L4,10.5 L9.6896894,10.4996894 L3.75735931,4.56801948 C3.46446609,4.27512627 3.46446609,3.80025253 3.75735931,3.50735931 C4.05025253,3.21446609 4.52512627,3.21446609 4.81801948,3.50735931 Z"/></svg>';

lib/features/collapsed-subprocesses-navigation/index.js

@@ -0,0 +1,7 @@
+import CollapsedSubprocessNavigation from './CollapsedSubprocessNavigation';
+
+export default {
+  __depends__: [ ],
+  __init__: [ 'collapsedSubprocessNavigation' ],
+  collapsedSubprocessNavigation: [ 'type', CollapsedSubprocessNavigation ],
+};

lib/features/collapsed-subprocesses/ToggleCollapseBehaviour.js

@@ -54,10 +54,10 @@ export default function ExpandBehaviour(commandStack, injector, canvas, bpmnImpo
 
       // Collapse
       var bo = getBusinessObject(shape);
-      newDiagram = createDiagram(bo);
+      newDiagram = createDiagram(shape);
       diagrams.push(newDiagram);
-
-      var newShape = bpmnImporter.add({ element: bo, di: newDiagram.plane });
+      console.log(shape, bo, newDiagram.plane);
+      var newShape = bpmnImporter.add(bo, newDiagram.plane);
       var planeElements = newDiagram.plane.get('planeElement');
 
       oldDiagram = findRootDiagram(getDi(shape));
@@ -113,14 +113,16 @@ export default function ExpandBehaviour(commandStack, injector, canvas, bpmnImpo
     });
   };
 
-  var createDiagram = function(rootElement) {
-    var plane = bpmnFactory.createDiPlane(rootElement);
+  var createDiagram = function(shape) {
+    var bo = getBusinessObject(shape);
+    var plane = bpmnFactory.createDiPlane(bo);
     var diagram = bpmnFactory.create('bpmndi:BPMNDiagram', {
       plane: plane
     });
-    rootElement.di = plane;
+
+    // shape.di = plane;
     plane.$parent = diagram;
-    plane.bpmnElement = rootElement;
+    plane.bpmnElement = bo;
     diagram.$parent = bpmnjs.getDefinitions();
     return diagram;
   };

lib/features/collapsed-subprocesses/index.js

@@ -1,28 +1,12 @@
-import NavigationBehaviour from './NavigationBehaviour';
 import ExpandBehaviour from './ToggleCollapseBehaviour';
-
 import RemoveDiagramBehavior from './DeleteBehaviour';
 
-// import DiagramUtil from './diagramUtil';
-
-
-// import UndoBehaviour from './UndoBehaviour';
-
 export default {
   __depends__: [ ],
-  __init__: [ 'navigationBehaviour',
-
-    // 'diagramUtil',
+  __init__: [
     'removeDiagramBehavior',
-
-    //   // 'undoBehaviour',
     'expandBehaviour'
   ],
-  navigationBehaviour: [ 'type', NavigationBehaviour ],
-
-  // diagramUtil: [ 'type', DiagramUtil ],
   removeDiagramBehavior: ['type', RemoveDiagramBehavior],
-
-  // // undoBehaviour: ['type', UndoBehaviour],
   expandBehaviour: ['type', ExpandBehaviour]
 };