From 120811e68731b3bd626dfb87c5bf229474a73491 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Fri, 28 Jul 2023 01:13:29 -0700 Subject: [PATCH 1/4] add dagre_disconnected_edge test --- e2etests/regression_test.go | 1 + .../testdata/files/dagre_disconnected_edge.d2 | 13 ++ .../dagre/board.exp.json | 202 ++++++++++++++++++ .../dagre/sketch.exp.svg | 96 +++++++++ .../elk/board.exp.json | 193 +++++++++++++++++ .../elk/sketch.exp.svg | 96 +++++++++ 6 files changed, 601 insertions(+) create mode 100644 e2etests/testdata/files/dagre_disconnected_edge.d2 create mode 100644 e2etests/testdata/regression/dagre_disconnected_edge/dagre/board.exp.json create mode 100644 e2etests/testdata/regression/dagre_disconnected_edge/dagre/sketch.exp.svg create mode 100644 e2etests/testdata/regression/dagre_disconnected_edge/elk/board.exp.json create mode 100644 e2etests/testdata/regression/dagre_disconnected_edge/elk/sketch.exp.svg diff --git a/e2etests/regression_test.go b/e2etests/regression_test.go index e66d250edd..55bc62b145 100644 --- a/e2etests/regression_test.go +++ b/e2etests/regression_test.go @@ -1038,6 +1038,7 @@ cf many required: { loadFromFile(t, "cylinder_grid_label"), loadFromFile(t, "grid_with_latex"), loadFromFile(t, "icons_on_top"), + loadFromFile(t, "dagre_disconnected_edge"), } runa(t, tcs) diff --git a/e2etests/testdata/files/dagre_disconnected_edge.d2 b/e2etests/testdata/files/dagre_disconnected_edge.d2 new file mode 100644 index 0000000000..a51b8241cf --- /dev/null +++ b/e2etests/testdata/files/dagre_disconnected_edge.d2 @@ -0,0 +1,13 @@ +x -> y + +x: program { + label.near: top-center + icon: https://icons.terrastruct.com/essentials%2F005-programmer.svg + icon.near: outside-top-right +} + +y: profits { + label.near: bottom-right + icon: https://icons.terrastruct.com/essentials%2Fprofits.svg + icon.near: outside-left-center +} diff --git a/e2etests/testdata/regression/dagre_disconnected_edge/dagre/board.exp.json b/e2etests/testdata/regression/dagre_disconnected_edge/dagre/board.exp.json new file mode 100644 index 0000000000..0c668d3c94 --- /dev/null +++ b/e2etests/testdata/regression/dagre_disconnected_edge/dagre/board.exp.json @@ -0,0 +1,202 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "x", + "type": "rectangle", + "pos": { + "x": 0, + "y": 0 + }, + "width": 131, + "height": 92, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/essentials/005-programmer.svg", + "RawPath": "/essentials%2F005-programmer.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "OUTSIDE_TOP_RIGHT", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "program", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 60, + "labelHeight": 21, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "y", + "type": "rectangle", + "pos": { + "x": 81, + "y": 192 + }, + "width": 118, + "height": 92, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/essentials/profits.svg", + "RawPath": "/essentials%2Fprofits.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "OUTSIDE_LEFT_MIDDLE", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "profits", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 47, + "labelHeight": 21, + "labelPosition": "INSIDE_BOTTOM_RIGHT", + "zIndex": 0, + "level": 1 + } + ], + "connections": [ + { + "id": "(x -> y)[0]", + "src": "x", + "srcArrow": "none", + "dst": "y", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 139.5, + "y": 92 + }, + { + "x": 139.5, + "y": 132 + }, + { + "x": 139.5, + "y": 152 + }, + { + "x": 139.5, + "y": 192 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + } + ], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/regression/dagre_disconnected_edge/dagre/sketch.exp.svg b/e2etests/testdata/regression/dagre_disconnected_edge/dagre/sketch.exp.svg new file mode 100644 index 0000000000..af5c010ef6 --- /dev/null +++ b/e2etests/testdata/regression/dagre_disconnected_edge/dagre/sketch.exp.svg @@ -0,0 +1,96 @@ +programprofits + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/dagre_disconnected_edge/elk/board.exp.json b/e2etests/testdata/regression/dagre_disconnected_edge/elk/board.exp.json new file mode 100644 index 0000000000..4630de7187 --- /dev/null +++ b/e2etests/testdata/regression/dagre_disconnected_edge/elk/board.exp.json @@ -0,0 +1,193 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "x", + "type": "rectangle", + "pos": { + "x": 40, + "y": 12 + }, + "width": 131, + "height": 118, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/essentials/005-programmer.svg", + "RawPath": "/essentials%2F005-programmer.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "OUTSIDE_TOP_RIGHT", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "program", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 60, + "labelHeight": 21, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "y", + "type": "rectangle", + "pos": { + "x": 81, + "y": 200 + }, + "width": 118, + "height": 118, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/essentials/profits.svg", + "RawPath": "/essentials%2Fprofits.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "OUTSIDE_LEFT_MIDDLE", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "profits", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 47, + "labelHeight": 21, + "labelPosition": "INSIDE_BOTTOM_RIGHT", + "zIndex": 0, + "level": 1 + } + ], + "connections": [ + { + "id": "(x -> y)[0]", + "src": "x", + "srcArrow": "none", + "dst": "y", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 105.5, + "y": 130 + }, + { + "x": 105.5, + "y": 200 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + } + ], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/regression/dagre_disconnected_edge/elk/sketch.exp.svg b/e2etests/testdata/regression/dagre_disconnected_edge/elk/sketch.exp.svg new file mode 100644 index 0000000000..37e784f9ab --- /dev/null +++ b/e2etests/testdata/regression/dagre_disconnected_edge/elk/sketch.exp.svg @@ -0,0 +1,96 @@ +programprofits + + + + \ No newline at end of file From 189edf552aa1762eaf3a28664e3bab3a3fb0cec6 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Fri, 28 Jul 2023 02:10:27 -0700 Subject: [PATCH 2/4] add check for nodes that need to move with edges even if they start behind the original node --- d2layouts/d2dagrelayout/layout.go | 65 +++++++++++++++++++++++-------- 1 file changed, 48 insertions(+), 17 deletions(-) diff --git a/d2layouts/d2dagrelayout/layout.go b/d2layouts/d2dagrelayout/layout.go index ebab1e73e3..6d004e25f5 100644 --- a/d2layouts/d2dagrelayout/layout.go +++ b/d2layouts/d2dagrelayout/layout.go @@ -856,6 +856,7 @@ func shiftUp(g *d2graph.Graph, start, distance float64, isHorizontal bool) { func shiftReachableDown(g *d2graph.Graph, obj *d2graph.Object, start, distance float64, isHorizontal, isMargin bool) map[*d2graph.Object]struct{} { q := []*d2graph.Object{obj} + needsMove := make(map[*d2graph.Object]struct{}) seen := make(map[*d2graph.Object]struct{}) shifted := make(map[*d2graph.Object]struct{}) shiftedEdges := make(map[*d2graph.Edge]struct{}) @@ -915,23 +916,27 @@ func shiftReachableDown(g *d2graph.Graph, obj *d2graph.Object, start, distance f } // skip other objects behind start if curr != obj { - if isHorizontal { - if curr.TopLeft.X < start { - continue - } - } else { - if curr.TopLeft.Y < start { - continue + if _, in := needsMove[curr]; !in { + if isHorizontal { + if curr.TopLeft.X < start { + continue + } + } else { + if curr.TopLeft.Y < start { + continue + } } } } if isHorizontal { - shift := false - if !isMargin { - shift = start < curr.TopLeft.X - } else { - shift = start <= curr.TopLeft.X + _, shift := needsMove[curr] + if !shift { + if !isMargin { + shift = start < curr.TopLeft.X + } else { + shift = start <= curr.TopLeft.X + } } if shift { @@ -939,11 +944,13 @@ func shiftReachableDown(g *d2graph.Graph, obj *d2graph.Object, start, distance f shifted[curr] = struct{}{} } } else { - shift := false - if !isMargin { - shift = start < curr.TopLeft.Y - } else { - shift = start <= curr.TopLeft.Y + _, shift := needsMove[curr] + if !shift { + if !isMargin { + shift = start < curr.TopLeft.Y + } else { + shift = start <= curr.TopLeft.Y + } } if shift { curr.TopLeft.Y += distance @@ -977,6 +984,18 @@ func shiftReachableDown(g *d2graph.Graph, obj *d2graph.Object, start, distance f shiftedEdges[e] = struct{}{} continue } else if e.Src == curr { + last := e.Route[len(e.Route)-1] + if isHorizontal { + if start <= last.X && + e.Dst.TopLeft.X+e.Dst.Width < last.X+distance { + needsMove[e.Dst] = struct{}{} + } + } else { + if start <= last.Y && + e.Dst.TopLeft.Y+e.Dst.Height < last.Y+distance { + needsMove[e.Dst] = struct{}{} + } + } queue(e.Dst) if isHorizontal { for _, p := range e.Route { @@ -993,6 +1012,18 @@ func shiftReachableDown(g *d2graph.Graph, obj *d2graph.Object, start, distance f } shiftedEdges[e] = struct{}{} } else if e.Dst == curr { + first := e.Route[0] + if isHorizontal { + if start <= first.X && + e.Src.TopLeft.X+e.Src.Width < first.X+distance { + needsMove[e.Src] = struct{}{} + } + } else { + if start <= first.Y && + e.Src.TopLeft.Y+e.Src.Height < first.Y+distance { + needsMove[e.Src] = struct{}{} + } + } queue(e.Src) if isHorizontal { for _, p := range e.Route { From adcc52388fcb00621b71363ea554cb210703031f Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Fri, 28 Jul 2023 02:11:41 -0700 Subject: [PATCH 3/4] update test --- .../dagre/board.exp.json | 2 +- .../dagre/sketch.exp.svg | 156 +++++++++--------- 2 files changed, 79 insertions(+), 79 deletions(-) diff --git a/e2etests/testdata/regression/dagre_disconnected_edge/dagre/board.exp.json b/e2etests/testdata/regression/dagre_disconnected_edge/dagre/board.exp.json index 0c668d3c94..f74f94ee7f 100644 --- a/e2etests/testdata/regression/dagre_disconnected_edge/dagre/board.exp.json +++ b/e2etests/testdata/regression/dagre_disconnected_edge/dagre/board.exp.json @@ -7,7 +7,7 @@ "id": "x", "type": "rectangle", "pos": { - "x": 0, + "x": 74, "y": 0 }, "width": 131, diff --git a/e2etests/testdata/regression/dagre_disconnected_edge/dagre/sketch.exp.svg b/e2etests/testdata/regression/dagre_disconnected_edge/dagre/sketch.exp.svg index af5c010ef6..3e81e4970d 100644 --- a/e2etests/testdata/regression/dagre_disconnected_edge/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/dagre_disconnected_edge/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -programprofits - - + .d2-2262832694 .fill-N1{fill:#0A0F25;} + .d2-2262832694 .fill-N2{fill:#676C7E;} + .d2-2262832694 .fill-N3{fill:#9499AB;} + .d2-2262832694 .fill-N4{fill:#CFD2DD;} + .d2-2262832694 .fill-N5{fill:#DEE1EB;} + .d2-2262832694 .fill-N6{fill:#EEF1F8;} + .d2-2262832694 .fill-N7{fill:#FFFFFF;} + .d2-2262832694 .fill-B1{fill:#0D32B2;} + .d2-2262832694 .fill-B2{fill:#0D32B2;} + .d2-2262832694 .fill-B3{fill:#E3E9FD;} + .d2-2262832694 .fill-B4{fill:#E3E9FD;} + .d2-2262832694 .fill-B5{fill:#EDF0FD;} + .d2-2262832694 .fill-B6{fill:#F7F8FE;} + .d2-2262832694 .fill-AA2{fill:#4A6FF3;} + .d2-2262832694 .fill-AA4{fill:#EDF0FD;} + .d2-2262832694 .fill-AA5{fill:#F7F8FE;} + .d2-2262832694 .fill-AB4{fill:#EDF0FD;} + .d2-2262832694 .fill-AB5{fill:#F7F8FE;} + .d2-2262832694 .stroke-N1{stroke:#0A0F25;} + .d2-2262832694 .stroke-N2{stroke:#676C7E;} + .d2-2262832694 .stroke-N3{stroke:#9499AB;} + .d2-2262832694 .stroke-N4{stroke:#CFD2DD;} + .d2-2262832694 .stroke-N5{stroke:#DEE1EB;} + .d2-2262832694 .stroke-N6{stroke:#EEF1F8;} + .d2-2262832694 .stroke-N7{stroke:#FFFFFF;} + .d2-2262832694 .stroke-B1{stroke:#0D32B2;} + .d2-2262832694 .stroke-B2{stroke:#0D32B2;} + .d2-2262832694 .stroke-B3{stroke:#E3E9FD;} + .d2-2262832694 .stroke-B4{stroke:#E3E9FD;} + .d2-2262832694 .stroke-B5{stroke:#EDF0FD;} + .d2-2262832694 .stroke-B6{stroke:#F7F8FE;} + .d2-2262832694 .stroke-AA2{stroke:#4A6FF3;} + .d2-2262832694 .stroke-AA4{stroke:#EDF0FD;} + .d2-2262832694 .stroke-AA5{stroke:#F7F8FE;} + .d2-2262832694 .stroke-AB4{stroke:#EDF0FD;} + .d2-2262832694 .stroke-AB5{stroke:#F7F8FE;} + .d2-2262832694 .background-color-N1{background-color:#0A0F25;} + .d2-2262832694 .background-color-N2{background-color:#676C7E;} + .d2-2262832694 .background-color-N3{background-color:#9499AB;} + .d2-2262832694 .background-color-N4{background-color:#CFD2DD;} + .d2-2262832694 .background-color-N5{background-color:#DEE1EB;} + .d2-2262832694 .background-color-N6{background-color:#EEF1F8;} + .d2-2262832694 .background-color-N7{background-color:#FFFFFF;} + .d2-2262832694 .background-color-B1{background-color:#0D32B2;} + .d2-2262832694 .background-color-B2{background-color:#0D32B2;} + .d2-2262832694 .background-color-B3{background-color:#E3E9FD;} + .d2-2262832694 .background-color-B4{background-color:#E3E9FD;} + .d2-2262832694 .background-color-B5{background-color:#EDF0FD;} + .d2-2262832694 .background-color-B6{background-color:#F7F8FE;} + .d2-2262832694 .background-color-AA2{background-color:#4A6FF3;} + .d2-2262832694 .background-color-AA4{background-color:#EDF0FD;} + .d2-2262832694 .background-color-AA5{background-color:#F7F8FE;} + .d2-2262832694 .background-color-AB4{background-color:#EDF0FD;} + .d2-2262832694 .background-color-AB5{background-color:#F7F8FE;} + .d2-2262832694 .color-N1{color:#0A0F25;} + .d2-2262832694 .color-N2{color:#676C7E;} + .d2-2262832694 .color-N3{color:#9499AB;} + .d2-2262832694 .color-N4{color:#CFD2DD;} + .d2-2262832694 .color-N5{color:#DEE1EB;} + .d2-2262832694 .color-N6{color:#EEF1F8;} + .d2-2262832694 .color-N7{color:#FFFFFF;} + .d2-2262832694 .color-B1{color:#0D32B2;} + .d2-2262832694 .color-B2{color:#0D32B2;} + .d2-2262832694 .color-B3{color:#E3E9FD;} + .d2-2262832694 .color-B4{color:#E3E9FD;} + .d2-2262832694 .color-B5{color:#EDF0FD;} + .d2-2262832694 .color-B6{color:#F7F8FE;} + .d2-2262832694 .color-AA2{color:#4A6FF3;} + .d2-2262832694 .color-AA4{color:#EDF0FD;} + .d2-2262832694 .color-AA5{color:#F7F8FE;} + .d2-2262832694 .color-AB4{color:#EDF0FD;} + .d2-2262832694 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>programprofits + + \ No newline at end of file From 92af7a73c9619ffe653b0f0a371edd0470c05a90 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Fri, 28 Jul 2023 09:44:45 -0700 Subject: [PATCH 4/4] tests --- .../regression/dagre_disconnected_edge/dagre/sketch.exp.svg | 2 +- .../regression/dagre_disconnected_edge/elk/sketch.exp.svg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/e2etests/testdata/regression/dagre_disconnected_edge/dagre/sketch.exp.svg b/e2etests/testdata/regression/dagre_disconnected_edge/dagre/sketch.exp.svg index 3e81e4970d..7fcca0eb3c 100644 --- a/e2etests/testdata/regression/dagre_disconnected_edge/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/dagre_disconnected_edge/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -