fix(dot): brings colors on transitions back

sverweij · Dec 20, 2024 · 3d1b67a · 3d1b67a
1 parent 0915a11
commit 3d1b67a
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/dist/render/dot/dot.template.cjs b/dist/render/dot/dot.template.cjs
diff --git a/src/render/dot/dot.template.cjs b/src/render/dot/dot.template.cjs
diff --git a/src/render/dot/dot.template.hbs b/src/render/dot/dot.template.hbs
@@ -11,16 +11,16 @@ digraph "state transitions" {
     "{{{from}}}" -> "{{{to}}}" [label="{{^label}} {{/label}}{{{label}}}"
                             {{~#fromComposite}} ltail="cluster_{{{from}}}"{{/fromComposite}}
                             {{~#toComposite}} lhead="cluster_{{{to}}}"{{/toComposite}}
-                            {{~#if color}} color="{{{../color}}}" fontcolor="{{{../color}}}"{{else}} color="black" fontcolor="black"{{/if}}
+                            {{~#if color}} color="{{{color}}}" fontcolor="{{{color}}}"{{else}} color="black" fontcolor="black"{{/if}}
                             {{~#width}} penwidth="{{{.}}}"{{/width}} class="{{{class}}}"]
     {{/isCompositeSelf}}
     {{#isCompositeSelf}}
       "{{{from}}}" -> "self_{{{name}}}" [label="{{^label}} {{/label}}{{{label}}}" arrowhead=none 
                             {{~#tailportflags}} {{{.}}}{{/tailportflags}} ltail="cluster_{{{from}}}"
-                            {{~#if color}} color="{{{../color}}}" fontcolor="{{{../color}}}"{{else}} color="black" fontcolor="black"{{/if}} class="{{{class}}}"]
+                            {{~#if color}} color="{{{color}}}" fontcolor="{{{color}}}"{{else}} color="black" fontcolor="black"{{/if}} class="{{{class}}}"]
       "self_{{{name}}}" -> "{{{from}}}" [lhead="cluster_{{{from}}}" 
                             {{~#headportflags}} {{{.}}}{{/headportflags}}
-                            {{~#if color}} color="{{{../color}}}"{{else}} color="black"{{/if}}
+                            {{~#if color}} color="{{{color}}}"{{else}} color="black"{{/if}}
                             {{~#width}} penwidth="{{{.}}}"{{/width}} class="{{{class}}}"]
     {{/isCompositeSelf}}
   {{/noteName}}

diff --git a/test/render/fixtures/519-hierarchical-nested-self-transition.dot b/test/render/fixtures/519-hierarchical-nested-self-transition.dot
@@ -37,7 +37,7 @@ digraph "state transitions" {
       "outer" -> "self_tr_outer_outer_9" [label="outer => outer   \l(sorta ok)   \l" arrowhead=none tailport="e" headport="e" ltail="cluster_outer" color="black" fontcolor="black" class="transition"]
       "self_tr_outer_outer_9" -> "outer" [lhead="cluster_outer" tailport="w" color="black" class="transition"]
     "inner.one" -> "inner.one" [label="inner.one => inner.one   \l(sorta ok)   \l" color="black" fontcolor="black" class="transition"]
-      "inner.two" -> "self_tr_inner.two_inner.two_8" [label="inner.two => inner.two   \l(slightly better)   \l" arrowhead=none tailport="e" headport="e" ltail="cluster_inner.two" color="" fontcolor="" class="transition"]
-      "self_tr_inner.two_inner.two_8" -> "inner.two" [lhead="cluster_inner.two" tailport="w" color="" class="transition"]
+      "inner.two" -> "self_tr_inner.two_inner.two_8" [label="inner.two => inner.two   \l(slightly better)   \l" arrowhead=none tailport="e" headport="e" ltail="cluster_inner.two" color="darkgreen" fontcolor="darkgreen" class="transition"]
+      "self_tr_inner.two_inner.two_8" -> "inner.two" [lhead="cluster_inner.two" tailport="w" color="darkgreen" class="transition"]
     "innerst" -> "innerst" [label="innerst => innerst   \l(sorta ok)   \l" color="black" fontcolor="black" class="transition"]
 }
diff --git a/test/render/fixtures/805-colors-toverbal.dot b/test/render/fixtures/805-colors-toverbal.dot
@@ -36,12 +36,12 @@ digraph "state transitions" {
 
     }
 
-    "initial" -> "off" [label="regular transition   \l" color="" fontcolor="" class="transition"]
-    "off" -> "yellow" [label="transition into a nested state   \l" color="" fontcolor="" class="transition"]
-      "on" -> "self_tr_on_on_9" [label="composite state self transition   \l" arrowhead=none tailport="e" headport="e" ltail="cluster_on" color="" fontcolor="" class="transition"]
-      "self_tr_on_on_9" -> "on" [lhead="cluster_on" tailport="w" color="" class="transition"]
-    "on" -> "off" [label="from a composite   \lto a regular state   \l" ltail="cluster_on" color="" fontcolor="" class="transition"]
-    "red" -> "green" [label="[t > 2min]: transition    \lfrom a nested state   \lto a nested state   \l" color="" fontcolor="" class="transition"]
+    "initial" -> "off" [label="regular transition   \l" color="pink" fontcolor="pink" class="transition"]
+    "off" -> "yellow" [label="transition into a nested state   \l" color="green" fontcolor="green" class="transition"]
+      "on" -> "self_tr_on_on_9" [label="composite state self transition   \l" arrowhead=none tailport="e" headport="e" ltail="cluster_on" color="blue" fontcolor="blue" class="transition"]
+      "self_tr_on_on_9" -> "on" [lhead="cluster_on" tailport="w" color="blue" class="transition"]
+    "on" -> "off" [label="from a composite   \lto a regular state   \l" ltail="cluster_on" color="red" fontcolor="red" class="transition"]
+    "red" -> "green" [label="[t > 2min]: transition    \lfrom a nested state   \lto a nested state   \l" color="purple" fontcolor="purple" class="transition"]
     "green" -> "yellow" [label="[t > 2min]   \l" color="black" fontcolor="black" class="transition"]
     "yellow" -> "red" [label="[t > 10s]   \l" color="black" fontcolor="black" class="transition"]
 }