linkStyle now supports list of indexes with a few tests

For example: linkStyle 0,1,2 interpolate basis stroke:#00f,stroke-width:2px; Other variants of linkStyle syntax are also included
mermaid-js · Feb 21, 2019 · 752a12b · 752a12b
1 parent 7d3578b
commit 752a12b
Show file tree

Hide file tree

Showing 4 changed files with 137 additions and 73 deletions.
diff --git a/src/diagrams/flowchart/flowDb.js b/src/diagrams/flowchart/flowDb.js
@@ -87,28 +87,32 @@ export const addLink = function (start, end, type, linktext) {
  * @param pos
  * @param interpolate
  */
-export const updateLinkInterpolate = function (pos, interp) {
-  if (pos === 'default') {
-    edges.defaultInterpolate = interp
-  } else {
-    edges[pos].interpolate = interp
-  }
+export const updateLinkInterpolate = function (positions, interp) {
+  positions.forEach(function (pos) {
+    if (pos === 'default') {
+      edges.defaultInterpolate = interp
+    } else {
+      edges[pos].interpolate = interp
+    }
+  })
 }
 
 /**
  * Updates a link with a style
  * @param pos
  * @param style
  */
-export const updateLink = function (pos, style) {
-  if (pos === 'default') {
-    edges.defaultStyle = style
-  } else {
-    if (utils.isSubstringInArray('fill', style) === -1) {
-      style.push('fill:none')
+export const updateLink = function (positions, style) {
+  positions.forEach(function (pos) {
+    if (pos === 'default') {
+      edges.defaultStyle = style
+    } else {
+      if (utils.isSubstringInArray('fill', style) === -1) {
+        style.push('fill:none')
+      }
+      edges[pos].style = style
     }
-    edges[pos].style = style
-  }
+  })
 }
 
 export const addClass = function (id, style) {

diff --git a/src/diagrams/flowchart/parser/flow.jison b/src/diagrams/flowchart/parser/flow.jison
@@ -410,21 +410,27 @@ styleStatement:STYLE SPACE alphaNum SPACE stylesOpt
 
 linkStyleStatement
     : LINKSTYLE SPACE DEFAULT SPACE stylesOpt
-          {$$ = $1;yy.updateLink($3,$5);}
-    | LINKSTYLE SPACE NUM SPACE stylesOpt
+          {$$ = $1;yy.updateLink([$3],$5);}
+    | LINKSTYLE SPACE numList SPACE stylesOpt
           {$$ = $1;yy.updateLink($3,$5);}
     | LINKSTYLE SPACE DEFAULT SPACE INTERPOLATE SPACE alphaNum SPACE stylesOpt
-          {$$ = $1;yy.updateLinkInterpolate($3,$7);yy.updateLink($3,$9);}
-    | LINKSTYLE SPACE NUM SPACE INTERPOLATE SPACE alphaNum SPACE stylesOpt
+          {$$ = $1;yy.updateLinkInterpolate([$3],$7);yy.updateLink([$3],$9);}
+    | LINKSTYLE SPACE numList SPACE INTERPOLATE SPACE alphaNum SPACE stylesOpt
           {$$ = $1;yy.updateLinkInterpolate($3,$7);yy.updateLink($3,$9);}
     | LINKSTYLE SPACE DEFAULT SPACE INTERPOLATE SPACE alphaNum
-          {$$ = $1;yy.updateLinkInterpolate($3,$7);}
-    | LINKSTYLE SPACE NUM SPACE INTERPOLATE SPACE alphaNum
+          {$$ = $1;yy.updateLinkInterpolate([$3],$7);}
+    | LINKSTYLE SPACE numList SPACE INTERPOLATE SPACE alphaNum
           {$$ = $1;yy.updateLinkInterpolate($3,$7);}
     ;
 
 commentStatement: PCT PCT commentText;
 
+numList: NUM
+        {$$ = [$1]}
+    | numList COMMA NUM
+        {$1.push($3);$$ = $1;}
+    ;
+
 stylesOpt: style
         {$$ = [$1]}
     | stylesOpt COMMA style