From e2fd264a6d79c810b5a030e2cf2a0a7de5e81bec Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Wed, 13 Dec 2023 11:04:22 -0800 Subject: [PATCH 1/4] add disconnect_direction_right test --- e2etests/regression_test.go | 1 + .../files/disconnect_direction_right.d2 | 16 + .../dagre/board.exp.json | 413 ++++++++++++++++++ .../dagre/sketch.exp.svg | 107 +++++ .../elk/board.exp.json | 387 ++++++++++++++++ .../elk/sketch.exp.svg | 107 +++++ 6 files changed, 1031 insertions(+) create mode 100644 e2etests/testdata/files/disconnect_direction_right.d2 create mode 100644 e2etests/testdata/regression/disconnect_direction_right/dagre/board.exp.json create mode 100644 e2etests/testdata/regression/disconnect_direction_right/dagre/sketch.exp.svg create mode 100644 e2etests/testdata/regression/disconnect_direction_right/elk/board.exp.json create mode 100644 e2etests/testdata/regression/disconnect_direction_right/elk/sketch.exp.svg diff --git a/e2etests/regression_test.go b/e2etests/regression_test.go index 10a96e263..c8cdd44db 100644 --- a/e2etests/regression_test.go +++ b/e2etests/regression_test.go @@ -1053,6 +1053,7 @@ cf many required: { loadFromFile(t, "shaped_grid_positioning"), loadFromFile(t, "cloud_shaped_grid"), loadFromFileWithOptions(t, "nested_layout_bug", testCase{testSerialization: true}), + loadFromFile(t, "disconnect_direction_right"), } runa(t, tcs) diff --git a/e2etests/testdata/files/disconnect_direction_right.d2 b/e2etests/testdata/files/disconnect_direction_right.d2 new file mode 100644 index 000000000..53657bb2d --- /dev/null +++ b/e2etests/testdata/files/disconnect_direction_right.d2 @@ -0,0 +1,16 @@ +direction: right + +a: { + b +} + +c: { + d +} + +e: { + f +} + +a.b -> c.d +a.b -> e.f diff --git a/e2etests/testdata/regression/disconnect_direction_right/dagre/board.exp.json b/e2etests/testdata/regression/disconnect_direction_right/dagre/board.exp.json new file mode 100644 index 000000000..b04293bd9 --- /dev/null +++ b/e2etests/testdata/regression/disconnect_direction_right/dagre/board.exp.json @@ -0,0 +1,413 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "a", + "type": "rectangle", + "pos": { + "x": 20, + "y": 185 + }, + "width": 113, + "height": 126, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "a", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 12, + "labelHeight": 36, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "a.b", + "type": "rectangle", + "pos": { + "x": 50, + "y": 215 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "b", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "c", + "type": "rectangle", + "pos": { + "x": 273, + "y": 56 + }, + "width": 114, + "height": 126, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "c", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 12, + "labelHeight": 36, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "c.d", + "type": "rectangle", + "pos": { + "x": 303, + "y": 86 + }, + "width": 54, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "d", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "e", + "type": "rectangle", + "pos": { + "x": 275, + "y": 268 + }, + "width": 111, + "height": 126, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "e", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 12, + "labelHeight": 36, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "e.f", + "type": "rectangle", + "pos": { + "x": 305, + "y": 298 + }, + "width": 51, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "f", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 6, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + } + ], + "connections": [ + { + "id": "(a.b -> c.d)[0]", + "src": "a.b", + "srcArrow": "none", + "dst": "c.d", + "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": 103, + "y": 173.2480010986328 + }, + { + "x": 143, + "y": 129.8489990234375 + }, + { + "x": 163, + "y": 119 + }, + { + "x": 178, + "y": 119 + }, + { + "x": 193, + "y": 119 + }, + { + "x": 263, + "y": 119 + }, + { + "x": 303, + "y": 119 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(a.b -> e.f)[0]", + "src": "a.b", + "srcArrow": "none", + "dst": "e.f", + "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": 103, + "y": 277 + }, + { + "x": 143, + "y": 320.20001220703125 + }, + { + "x": 163, + "y": 331 + }, + { + "x": 178, + "y": 331 + }, + { + "x": 193, + "y": 331 + }, + { + "x": 263.29998779296875, + "y": 331 + }, + { + "x": 304.5, + "y": 331 + } + ], + "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/disconnect_direction_right/dagre/sketch.exp.svg b/e2etests/testdata/regression/disconnect_direction_right/dagre/sketch.exp.svg new file mode 100644 index 000000000..c75f9b3e7 --- /dev/null +++ b/e2etests/testdata/regression/disconnect_direction_right/dagre/sketch.exp.svg @@ -0,0 +1,107 @@ +acebdf + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/disconnect_direction_right/elk/board.exp.json b/e2etests/testdata/regression/disconnect_direction_right/elk/board.exp.json new file mode 100644 index 000000000..52dd59166 --- /dev/null +++ b/e2etests/testdata/regression/disconnect_direction_right/elk/board.exp.json @@ -0,0 +1,387 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "a", + "type": "rectangle", + "pos": { + "x": 12, + "y": 98 + }, + "width": 153, + "height": 180, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "a", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 12, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "a.b", + "type": "rectangle", + "pos": { + "x": 62, + "y": 148 + }, + "width": 53, + "height": 80, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "b", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "c", + "type": "rectangle", + "pos": { + "x": 255, + "y": 12 + }, + "width": 154, + "height": 166, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "c", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 12, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "c.d", + "type": "rectangle", + "pos": { + "x": 305, + "y": 62 + }, + "width": 54, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "d", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "e", + "type": "rectangle", + "pos": { + "x": 255, + "y": 198 + }, + "width": 151, + "height": 166, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "e", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 12, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "e.f", + "type": "rectangle", + "pos": { + "x": 305, + "y": 248 + }, + "width": 51, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "f", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 6, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + } + ], + "connections": [ + { + "id": "(a.b -> c.d)[0]", + "src": "a.b", + "srcArrow": "none", + "dst": "c.d", + "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": 115, + "y": 174.66600036621094 + }, + { + "x": 210, + "y": 174.66600036621094 + }, + { + "x": 210, + "y": 95 + }, + { + "x": 305, + "y": 95 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(a.b -> e.f)[0]", + "src": "a.b", + "srcArrow": "none", + "dst": "e.f", + "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": 115, + "y": 201.33299255371094 + }, + { + "x": 210, + "y": 201.33299255371094 + }, + { + "x": 210, + "y": 281 + }, + { + "x": 305, + "y": 281 + } + ], + "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/disconnect_direction_right/elk/sketch.exp.svg b/e2etests/testdata/regression/disconnect_direction_right/elk/sketch.exp.svg new file mode 100644 index 000000000..c6404d159 --- /dev/null +++ b/e2etests/testdata/regression/disconnect_direction_right/elk/sketch.exp.svg @@ -0,0 +1,107 @@ +acebdf + + + + + + + + \ No newline at end of file From 6ec931191f6f77ef22b08c31c9cc13147319beda Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Wed, 13 Dec 2023 14:08:55 -0800 Subject: [PATCH 2/4] shift edges endpoints that would become disconnected --- d2layouts/d2dagrelayout/layout.go | 34 +++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/d2layouts/d2dagrelayout/layout.go b/d2layouts/d2dagrelayout/layout.go index fbf618ed7..b367e404c 100644 --- a/d2layouts/d2dagrelayout/layout.go +++ b/d2layouts/d2dagrelayout/layout.go @@ -902,14 +902,27 @@ func shiftReachableDown(g *d2graph.Graph, obj *d2graph.Object, start, distance f } } queue(e.Dst) + first := e.Route[0] + startIndex := 0 + _, wasShifted := shifted[curr] if isHorizontal { - for _, p := range e.Route { + if wasShifted && first.X < curr.TopLeft.X && first.X < start { + first.X += distance + startIndex++ + } + for i := startIndex; i < len(e.Route); i++ { + p := e.Route[i] if start <= p.X { p.X += distance } } } else { - for _, p := range e.Route { + if wasShifted && first.Y < curr.TopLeft.Y && first.Y < start { + first.Y += distance + startIndex++ + } + for i := startIndex; i < len(e.Route); i++ { + p := e.Route[i] if start <= p.Y { p.Y += distance } @@ -930,14 +943,27 @@ func shiftReachableDown(g *d2graph.Graph, obj *d2graph.Object, start, distance f } } queue(e.Src) + last := e.Route[len(e.Route)-1] + endIndex := len(e.Route) + _, wasShifted := shifted[curr] if isHorizontal { - for _, p := range e.Route { + if wasShifted && last.X < curr.TopLeft.X && last.X < start { + last.X += distance + endIndex-- + } + for i := 0; i < endIndex; i++ { + p := e.Route[i] if start <= p.X { p.X += distance } } } else { - for _, p := range e.Route { + if wasShifted && last.Y < curr.TopLeft.Y && last.Y < start { + last.Y += distance + endIndex-- + } + for i := 0; i < endIndex; i++ { + p := e.Route[i] if start <= p.Y { p.Y += distance } From cfb0dd74fb7cca94698268ee29a43c81466e1e25 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Wed, 13 Dec 2023 14:09:45 -0800 Subject: [PATCH 3/4] update test --- .../dagre/board.exp.json | 4 +- .../dagre/sketch.exp.svg | 158 +++++++++--------- 2 files changed, 81 insertions(+), 81 deletions(-) diff --git a/e2etests/testdata/regression/disconnect_direction_right/dagre/board.exp.json b/e2etests/testdata/regression/disconnect_direction_right/dagre/board.exp.json index b04293bd9..0702d7c9e 100644 --- a/e2etests/testdata/regression/disconnect_direction_right/dagre/board.exp.json +++ b/e2etests/testdata/regression/disconnect_direction_right/dagre/board.exp.json @@ -277,11 +277,11 @@ "route": [ { "x": 103, - "y": 173.2480010986328 + "y": 219 }, { "x": 143, - "y": 129.8489990234375 + "y": 139 }, { "x": 163, diff --git a/e2etests/testdata/regression/disconnect_direction_right/dagre/sketch.exp.svg b/e2etests/testdata/regression/disconnect_direction_right/dagre/sketch.exp.svg index c75f9b3e7..44c07ff73 100644 --- a/e2etests/testdata/regression/disconnect_direction_right/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/disconnect_direction_right/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -acebdf + .d2-881173092 .fill-N1{fill:#0A0F25;} + .d2-881173092 .fill-N2{fill:#676C7E;} + .d2-881173092 .fill-N3{fill:#9499AB;} + .d2-881173092 .fill-N4{fill:#CFD2DD;} + .d2-881173092 .fill-N5{fill:#DEE1EB;} + .d2-881173092 .fill-N6{fill:#EEF1F8;} + .d2-881173092 .fill-N7{fill:#FFFFFF;} + .d2-881173092 .fill-B1{fill:#0D32B2;} + .d2-881173092 .fill-B2{fill:#0D32B2;} + .d2-881173092 .fill-B3{fill:#E3E9FD;} + .d2-881173092 .fill-B4{fill:#E3E9FD;} + .d2-881173092 .fill-B5{fill:#EDF0FD;} + .d2-881173092 .fill-B6{fill:#F7F8FE;} + .d2-881173092 .fill-AA2{fill:#4A6FF3;} + .d2-881173092 .fill-AA4{fill:#EDF0FD;} + .d2-881173092 .fill-AA5{fill:#F7F8FE;} + .d2-881173092 .fill-AB4{fill:#EDF0FD;} + .d2-881173092 .fill-AB5{fill:#F7F8FE;} + .d2-881173092 .stroke-N1{stroke:#0A0F25;} + .d2-881173092 .stroke-N2{stroke:#676C7E;} + .d2-881173092 .stroke-N3{stroke:#9499AB;} + .d2-881173092 .stroke-N4{stroke:#CFD2DD;} + .d2-881173092 .stroke-N5{stroke:#DEE1EB;} + .d2-881173092 .stroke-N6{stroke:#EEF1F8;} + .d2-881173092 .stroke-N7{stroke:#FFFFFF;} + .d2-881173092 .stroke-B1{stroke:#0D32B2;} + .d2-881173092 .stroke-B2{stroke:#0D32B2;} + .d2-881173092 .stroke-B3{stroke:#E3E9FD;} + .d2-881173092 .stroke-B4{stroke:#E3E9FD;} + .d2-881173092 .stroke-B5{stroke:#EDF0FD;} + .d2-881173092 .stroke-B6{stroke:#F7F8FE;} + .d2-881173092 .stroke-AA2{stroke:#4A6FF3;} + .d2-881173092 .stroke-AA4{stroke:#EDF0FD;} + .d2-881173092 .stroke-AA5{stroke:#F7F8FE;} + .d2-881173092 .stroke-AB4{stroke:#EDF0FD;} + .d2-881173092 .stroke-AB5{stroke:#F7F8FE;} + .d2-881173092 .background-color-N1{background-color:#0A0F25;} + .d2-881173092 .background-color-N2{background-color:#676C7E;} + .d2-881173092 .background-color-N3{background-color:#9499AB;} + .d2-881173092 .background-color-N4{background-color:#CFD2DD;} + .d2-881173092 .background-color-N5{background-color:#DEE1EB;} + .d2-881173092 .background-color-N6{background-color:#EEF1F8;} + .d2-881173092 .background-color-N7{background-color:#FFFFFF;} + .d2-881173092 .background-color-B1{background-color:#0D32B2;} + .d2-881173092 .background-color-B2{background-color:#0D32B2;} + .d2-881173092 .background-color-B3{background-color:#E3E9FD;} + .d2-881173092 .background-color-B4{background-color:#E3E9FD;} + .d2-881173092 .background-color-B5{background-color:#EDF0FD;} + .d2-881173092 .background-color-B6{background-color:#F7F8FE;} + .d2-881173092 .background-color-AA2{background-color:#4A6FF3;} + .d2-881173092 .background-color-AA4{background-color:#EDF0FD;} + .d2-881173092 .background-color-AA5{background-color:#F7F8FE;} + .d2-881173092 .background-color-AB4{background-color:#EDF0FD;} + .d2-881173092 .background-color-AB5{background-color:#F7F8FE;} + .d2-881173092 .color-N1{color:#0A0F25;} + .d2-881173092 .color-N2{color:#676C7E;} + .d2-881173092 .color-N3{color:#9499AB;} + .d2-881173092 .color-N4{color:#CFD2DD;} + .d2-881173092 .color-N5{color:#DEE1EB;} + .d2-881173092 .color-N6{color:#EEF1F8;} + .d2-881173092 .color-N7{color:#FFFFFF;} + .d2-881173092 .color-B1{color:#0D32B2;} + .d2-881173092 .color-B2{color:#0D32B2;} + .d2-881173092 .color-B3{color:#E3E9FD;} + .d2-881173092 .color-B4{color:#E3E9FD;} + .d2-881173092 .color-B5{color:#EDF0FD;} + .d2-881173092 .color-B6{color:#F7F8FE;} + .d2-881173092 .color-AA2{color:#4A6FF3;} + .d2-881173092 .color-AA4{color:#EDF0FD;} + .d2-881173092 .color-AA5{color:#F7F8FE;} + .d2-881173092 .color-AB4{color:#EDF0FD;} + .d2-881173092 .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}]]>acebdf From b67764d34ee62e22a05eb88fc96fb9839abf9184 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Wed, 13 Dec 2023 14:15:11 -0800 Subject: [PATCH 4/4] changelog --- ci/release/changelogs/next.md | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md index 60e1ebc6f..a61c9436f 100644 --- a/ci/release/changelogs/next.md +++ b/ci/release/changelogs/next.md @@ -10,3 +10,4 @@ - Fixes missing unfilled triangle arrowheads when sketch flag is on. [#1763](https://github.com/terrastruct/d2/pull/1763) - Fixes a bug where the render target could be incorrect if the target path contains "index". [#1764](https://github.com/terrastruct/d2/pull/1764) - Fixes ELK layout with outside labels/icons. [#1776](https://github.com/terrastruct/d2/pull/1776) +- Fixes a bug where an edge could become disconnected with dagre layout and direction right. [#1778](https://github.com/terrastruct/d2/pull/1778)