Added support for nested subgraphs in grammar, part 1 of issue #161

mermaid-js · May 9, 2015 · ae6bb57 · ae6bb57
1 parent 594e69d
commit ae6bb57
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 11 deletions.
diff --git a/src/diagrams/flowchart/graphDb.js b/src/diagrams/flowchart/graphDb.js
@@ -29,7 +29,7 @@ exports.addVertex = function (id, text, type, style) {
         vertices[id] = {id: id, styles: [], classes:[]};
     }
     if (typeof text !== 'undefined') {
-        vertices[id].text = text;
+        vertices[id].text = text.trim();
     }
     if (typeof type !== 'undefined') {
         vertices[id].type = type;
@@ -59,7 +59,7 @@ exports.addLink = function (start, end, type, linktext) {
     linktext = type.text;
 
     if (typeof linktext !== 'undefined') {
-        edge.text = linktext;
+        edge.text = linktext.trim();
     }
 
     if (typeof type !== 'undefined') {

diff --git a/src/diagrams/flowchart/parser/flow.jison b/src/diagrams/flowchart/parser/flow.jison
@@ -17,7 +17,7 @@
 "click"               return 'CLICK';
 "graph"               return 'GRAPH';
 "subgraph"            return 'subgraph';
-"end"                 return 'end';
+"end"\s*              return 'end';
 "LR"                  return 'DIR';
 "RL"                  return 'DIR';
 "TB"                  return 'DIR';
@@ -216,9 +216,9 @@ statement
     {$$=[];}
     | clickStatement separator
     {$$=[];}
-    | subgraph  text separator document end separator
+    | subgraph  text separator document end
     {yy.addSubGraph($4,$2);}
-    | subgraph separator document end separator
+    | subgraph separator document end
     {yy.addSubGraph($3,undefined);}
     ;
 

diff --git a/src/diagrams/flowchart/parser/flow.js b/src/diagrams/flowchart/parser/flow.js
diff --git a/src/diagrams/flowchart/parser/flow.spec.js b/src/diagrams/flowchart/parser/flow.spec.js
@@ -357,6 +357,17 @@ describe('when parsing ',function(){
         expect(edges[0].type).toBe('arrow');
     });
 
+    it('should handle nested subgraphs',function(){
+        var str = 'graph TD\n' +
+            'A-->B\n' +
+            'subgraph myTitle\n\n' +
+            ' c-->d \n\n' +
+            ' subgraph inner\n\n   e-->f \n end \n\n' +
+            'end\n';
+        var res = flow.parser.parse(str);
+
+    });
+
     it('should handle subgraphs',function(){
         var res = flow.parser.parse('graph TD\nA-->B\nsubgraph myTitle\nc-->d\nend;');
 

diff --git a/src/diagrams/gantt/ganttRenderer.js b/src/diagrams/gantt/ganttRenderer.js
@@ -38,6 +38,7 @@ module.exports.draw = function (text, id) {
     var h = taskArray.length * (conf.barHeight + conf.barGap) + 2 * conf.topPadding;
 
     elem.style.height = h + 'px';
+    elem.height = h;
     var svg = d3.select('#' + id);
 
 // http://codepen.io/anon/pen/azLvWR