fix: [activity] strange corner whene condition is inside while (#295)

.changeset/shaggy-readers-scream.md

@@ -0,0 +1,5 @@
+---
+'@pintora/diagrams': patch
+---
+
+fix: [activity] strange corner whene condition is inside while

demo/cypress/e2e/activity/activity.spec.ts

@@ -97,5 +97,20 @@ end`),
         c.get('.activity__edge-label').should('have.lengthOf', 2)
       },
     },
+    {
+      // issue #284
+      description: 'Should draw lines correctly when there is an empty else block inside a while loop',
+      code: stripStartEmptyLines(`
+  activityDiagram
+  partition G {
+    while (test while) is (next)
+      if (test if) then
+        :print error;
+      else (no)
+      endif
+    endwhile (done)
+  }
+        `),
+    },
   ])
 })

packages/pintora-diagrams/src/activity/artist.ts

@@ -548,10 +548,27 @@ class ActivityDraw {
           width: 1,
           height: 1,
         })
+
         this.g.setEdge(id, dummyNode.id, { label })
-        this.g.setEdge(dummyNode.id, endId)
+        this.g.setEdge(dummyNode.id, endId, { label: '' })
         if (stepModel.parentId) {
-          this.g.setParent(dummyNode.id, stepModel.parentId)
+          // set parent to the cloest group
+          const parentStepModel = this.model.stepModelMap.get(stepModel.parentId)
+          let closestGroup = null
+          let p = parentStepModel
+          while (p) {
+            if (p.type === 'group') {
+              closestGroup = p
+              break
+            }
+            if (p.parentId) {
+              p = this.model.stepModelMap.get(p.parentId)
+              if (!p) break
+            }
+          }
+          if (closestGroup) {
+            this.g.setParent(dummyNode.id, closestGroup.id)
+          }
         }
       }
     }