From 211d6f4005f2d723667b83a32adb47c3c56e7da1 Mon Sep 17 00:00:00 2001
From: Knut Sveidqvist <knut@sveido.com>
Date: Tue, 21 Jul 2020 11:15:42 +0200
Subject: [PATCH]

---
 cypress/platform/bundle-test.js               | 20 +++++++++++++++++--
 .../intersect/intersect-polygon.js            | 13 ++++++++----
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/cypress/platform/bundle-test.js b/cypress/platform/bundle-test.js
index a484f627d..30084e6f9 100644
--- a/cypress/platform/bundle-test.js
+++ b/cypress/platform/bundle-test.js
@@ -1,13 +1,29 @@
 import mermaid from '../../dist/mermaid.core';
 
-const code = `graph LR
+let code = `flowchart LR
 Power_Supply --> Transmitter_A
 Power_Supply --> Transmitter_B
 Transmitter_A --> D
 Transmitter_B --> D`;
 
+let code2 = `gantt
+  dateFormat  YYYY-MM-DD
+  title Adding GANTT diagram functionality to mermaid
+  section A section
+  Completed task      :done,    des1, 2014-01-06,2014-01-08
+  Active task         :active,  des2, 2014-01-09, 3d
+  Future task         :   des3, after des2, 5d
+  Future task2         :   des4, after des3, 5d
+  section Critical tasks
+  Completed task in the critical line :crit, done, 2014-01-06,24h
+  Implement parser and jison    :crit, done, after des1, 2d
+  Create tests for parser       :crit, active, 3d
+  Future task in critical line  :crit, 5d
+  Create tests for renderer     :2d
+  Add to mermaid                :1d`;
+
 mermaid.initialize({
-  theme: 'forest',
+  theme: 'default',
   fontFamily: '"Lucida Console", Monaco, monospace',
   startOnLoad: false,
   flowchart: {
diff --git a/src/dagre-wrapper/intersect/intersect-polygon.js b/src/dagre-wrapper/intersect/intersect-polygon.js
index 35dc48a6d..b40536d38 100644
--- a/src/dagre-wrapper/intersect/intersect-polygon.js
+++ b/src/dagre-wrapper/intersect/intersect-polygon.js
@@ -16,10 +16,15 @@ function intersectPolygon(node, polyPoints, point) {
 
   var minX = Number.POSITIVE_INFINITY;
   var minY = Number.POSITIVE_INFINITY;
-  polyPoints.forEach(function(entry) {
-    minX = Math.min(minX, entry.x);
-    minY = Math.min(minY, entry.y);
-  });
+  if (typeof polyPoints.forEach === 'function') {
+    polyPoints.forEach(function(entry) {
+      minX = Math.min(minX, entry.x);
+      minY = Math.min(minY, entry.y);
+    });
+  } else {
+    minX = Math.min(minX, polyPoints.x);
+    minY = Math.min(minY, polyPoints.y);
+  }
 
   var left = x1 - node.width / 2 - minX;
   var top = y1 - node.height / 2 - minY;