feat(layout): allow moving of source point on straight layouting

Related to bpmn-io/bpmn-js#574
bpmn-io · Jun 21, 2016 · 1a95fcd · nikku · Jun 22, 2016 · ricardomatias
1 parent 8468695
commit 1a95fcd
Show file tree

Hide file tree

Showing 2 changed files with 62 additions and 0 deletions.
diff --git a/lib/layout/ManhattanLayout.js b/lib/layout/ManhattanLayout.js
@@ -291,6 +291,30 @@ module.exports.layoutStraight = function(source, target, start, end, hints) {
     primaryAxis = 'y';
   }
 
+  if (hints.moveSource) {
+
+    if (!isInRange(primaryAxis, end, source)) {
+      return null;
+    }
+
+    axis[primaryAxis] = end[primaryAxis];
+
+    return [
+      {
+        x: axis.x !== undefined ? axis.x : start.x,
+        y: axis.y !== undefined ? axis.y : start.y,
+        original: {
+          x: axis.x !== undefined ? axis.x : start.x,
+          y: axis.y !== undefined ? axis.y : start.y
+        }
+      },
+      {
+        x: end.x,
+        y: end.y
+      }
+    ];
+  }
+
   if (!isInRange(primaryAxis, start, target)) {
     return null;
   }

diff --git a/test/spec/layout/ManhattanLayoutSpec.js b/test/spec/layout/ManhattanLayoutSpec.js
@@ -402,6 +402,25 @@ describe('layout/ManhattanLayout', function() {
       });
 
 
+      it('should layout straight line (horizontal) by moving source point', function() {
+
+        // given
+        var start = rect(100, 100, 100, 100),
+            end = rect(300, 50, 100, 300);
+
+        var waypoints = [];
+
+        // when
+        var repaired = repair(start, end, waypoints, { preferredLayouts: [ 'straight' ], moveSource: true });
+
+        // then
+        expect(repaired).to.eql([
+          { x: 150, y: 200, original: { x: 150, y: 200 } },
+          { x: 350, y: 200 }
+        ]);
+      });
+
+
       it('should layout straight line (vertical)', function() {
 
         // given
@@ -420,6 +439,25 @@ describe('layout/ManhattanLayout', function() {
         ]);
       });
 
+
+      it('should layout straight line (vertical) by moving source point', function() {
+
+        // given
+        var start = rect(100, 100, 100, 100),
+            end = rect(50, 300, 200, 100);
+
+        var waypoints = [];
+
+        // when
+        var repaired = repair(start, end, waypoints, { preferredLayouts: [ 'straight' ], moveSource: true });
+
+        // then
+        expect(repaired).to.eql([
+          { x: 150, y: 150, original: { x: 150, y: 150 } },
+          { x: 150, y: 350 }
+        ]);
+      });
+
     });