luciano/d2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update test

Browse source
This commit is contained in:
Gavin Nishizawa 2023-07-20 11:31:59 -07:00
parent fbda3e8873
commit 10c94c08cd
No known key found for this signature in database
GPG key ID: AE3B177777CE55CD
5 changed files with 458 additions and 218 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
e2etests/testdata/files/overlapping_child_label.d2 vendored
View file

@ -4,30 +4,42 @@ heyy: {
hey.label.near: outside-bottom-right hey.label.near: outside-bottom-right
} }
ayyy: { aaaa: {
label.near: top-right label.near: top-right
icon.near: top-left icon.near: top-left
class: icon class: icon
beee: { bbbb: {
label.near: outside-top-left label.near: outside-top-left
icon.near: outside-top-right icon.near: outside-top-right
class: icon class: icon
} }
} }
ceee: { cccc: {
label.near: top-right label.near: top-right
icon.near: bottom-left icon.near: bottom-left
class: icon class: icon
deee: { dddd: {
label.near: outside-top-right label.near: outside-top-right
icon.near: outside-bottom-left icon.near: outside-bottom-left
class: icon class: icon
} }
} }
eeeeeeeeeeeeeeeeeee: {
label.near: center-right
icon.near: center-left
class: icon
fffffffffff: {
label.near: outside-right-center
icon.near: outside-left-center
class: icon
}
}
classes: { classes: {
icon.icon: https://icons.terrastruct.com/essentials/time.svg icon.icon: https://icons.terrastruct.com/essentials/time.svg
} }

158
e2etests/testdata/stable/overlapping_child_label/dagre/board.exp.json generated vendored
View file

@ -11,7 +11,7 @@
"y": 33 "y": 33
}, },
"width": 131, "width": 131,
"height": 490, "height": 500,
"opacity": 1, "opacity": 1,
"strokeDash": 0, "strokeDash": 0,
"strokeWidth": 2, "strokeWidth": 2,
@ -127,17 +127,17 @@
"level": 2 "level": 2
}, },
{ {
"id": "ayyy", "id": "aaaa",
"type": "rectangle", "type": "rectangle",
"classes": [ "classes": [
"icon" "icon"
], ],
"pos": { "pos": {
"x": 181, "x": 181,
"y": -60 "y": -70
}, },
"width": 164, "width": 167,
"height": 232, "height": 242,
"opacity": 1, "opacity": 1,
"strokeDash": 0, "strokeDash": 0,
"strokeWidth": 2, "strokeWidth": 2,
@ -168,7 +168,7 @@
"fields": null, "fields": null,
"methods": null, "methods": null,
"columns": null, "columns": null,
"label": "ayyy", "label": "aaaa",
"fontSize": 28, "fontSize": 28,
"fontFamily": "DEFAULT", "fontFamily": "DEFAULT",
"language": "", "language": "",
@ -176,14 +176,14 @@
"italic": false, "italic": false,
"bold": false, "bold": false,
"underline": false, "underline": false,
"labelWidth": 53, "labelWidth": 55,
"labelHeight": 36, "labelHeight": 36,
"labelPosition": "INSIDE_TOP_RIGHT", "labelPosition": "INSIDE_TOP_RIGHT",
"zIndex": 0, "zIndex": 0,
"level": 1 "level": 1
}, },
{ {
"id": "ayyy.beee", "id": "aaaa.bbbb",
"type": "rectangle", "type": "rectangle",
"classes": [ "classes": [
"icon" "icon"
@ -192,7 +192,7 @@
"x": 211, "x": 211,
"y": 50 "y": 50
}, },
"width": 104, "width": 107,
"height": 92, "height": 92,
"opacity": 1, "opacity": 1,
"strokeDash": 0, "strokeDash": 0,
@ -224,7 +224,7 @@
"fields": null, "fields": null,
"methods": null, "methods": null,
"columns": null, "columns": null,
"label": "beee", "label": "bbbb",
"fontSize": 16, "fontSize": 16,
"fontFamily": "DEFAULT", "fontFamily": "DEFAULT",
"language": "", "language": "",
@ -232,24 +232,24 @@
"italic": false, "italic": false,
"bold": true, "bold": true,
"underline": false, "underline": false,
"labelWidth": 33, "labelWidth": 36,
"labelHeight": 21, "labelHeight": 21,
"labelPosition": "OUTSIDE_TOP_LEFT", "labelPosition": "OUTSIDE_TOP_LEFT",
"zIndex": 0, "zIndex": 0,
"level": 2 "level": 2
}, },
{ {
"id": "ceee", "id": "cccc",
"type": "rectangle", "type": "rectangle",
"classes": [ "classes": [
"icon" "icon"
], ],
"pos": { "pos": {
"x": 385, "x": 388,
"y": -17 "y": -27
}, },
"width": 165, "width": 168,
"height": 297, "height": 317,
"opacity": 1, "opacity": 1,
"strokeDash": 0, "strokeDash": 0,
"strokeWidth": 2, "strokeWidth": 2,
@ -280,7 +280,7 @@
"fields": null, "fields": null,
"methods": null, "methods": null,
"columns": null, "columns": null,
"label": "ceee", "label": "cccc",
"fontSize": 28, "fontSize": 28,
"fontFamily": "DEFAULT", "fontFamily": "DEFAULT",
"language": "", "language": "",
@ -288,23 +288,23 @@
"italic": false, "italic": false,
"bold": false, "bold": false,
"underline": false, "underline": false,
"labelWidth": 53, "labelWidth": 51,
"labelHeight": 36, "labelHeight": 36,
"labelPosition": "INSIDE_TOP_RIGHT", "labelPosition": "INSIDE_TOP_RIGHT",
"zIndex": 0, "zIndex": 0,
"level": 1 "level": 1
}, },
{ {
"id": "ceee.deee", "id": "cccc.dddd",
"type": "rectangle", "type": "rectangle",
"classes": [ "classes": [
"icon" "icon"
], ],
"pos": { "pos": {
"x": 415, "x": 418,
"y": 50 "y": 50
}, },
"width": 105, "width": 108,
"height": 92, "height": 92,
"opacity": 1, "opacity": 1,
"strokeDash": 0, "strokeDash": 0,
@ -336,7 +336,7 @@
"fields": null, "fields": null,
"methods": null, "methods": null,
"columns": null, "columns": null,
"label": "deee", "label": "dddd",
"fontSize": 16, "fontSize": 16,
"fontFamily": "DEFAULT", "fontFamily": "DEFAULT",
"language": "", "language": "",
@ -344,11 +344,123 @@
"italic": false, "italic": false,
"bold": true, "bold": true,
"underline": false, "underline": false,
"labelWidth": 34, "labelWidth": 37,
"labelHeight": 21, "labelHeight": 21,
"labelPosition": "OUTSIDE_TOP_RIGHT", "labelPosition": "OUTSIDE_TOP_RIGHT",
"zIndex": 0, "zIndex": 0,
"level": 2 "level": 2
},
{
"id": "eeeeeeeeeeeeeeeeeee",
"type": "rectangle",
"classes": [
"icon"
],
"pos": {
"x": 626,
"y": 20
},
"width": 624,
"height": 152,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
"borderRadius": 0,
"fill": "B4",
"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/time.svg",
"RawPath": "",
"OmitHost": false,
"ForceQuery": false,
"RawQuery": "",
"Fragment": "",
"RawFragment": ""
},
"iconPosition": "INSIDE_MIDDLE_LEFT",
"blend": false,
"fields": null,
"methods": null,
"columns": null,
"label": "eeeeeeeeeeeeeeeeeee",
"fontSize": 28,
"fontFamily": "DEFAULT",
"language": "",
"color": "N1",
"italic": false,
"bold": false,
"underline": false,
"labelWidth": 263,
"labelHeight": 36,
"labelPosition": "INSIDE_MIDDLE_RIGHT",
"zIndex": 0,
"level": 1
},
{
"id": "eeeeeeeeeeeeeeeeeee.fffffffffff",
"type": "rectangle",
"classes": [
"icon"
],
"pos": {
"x": 774,
"y": 50
},
"width": 132,
"height": 92,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
"borderRadius": 0,
"fill": "B5",
"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/time.svg",
"RawPath": "",
"OmitHost": false,
"ForceQuery": false,
"RawQuery": "",
"Fragment": "",
"RawFragment": ""
},
"iconPosition": "OUTSIDE_LEFT_MIDDLE",
"blend": false,
"fields": null,
"methods": null,
"columns": null,
"label": "fffffffffff",
"fontSize": 16,
"fontFamily": "DEFAULT",
"language": "",
"color": "N1",
"italic": false,
"bold": true,
"underline": false,
"labelWidth": 61,
"labelHeight": 21,
"labelPosition": "OUTSIDE_RIGHT_MIDDLE",
"zIndex": 0,
"level": 2
} }
], ],
"connections": [ "connections": [

176
e2etests/testdata/stable/overlapping_child_label/dagre/sketch.exp.svg vendored
View file

File diff suppressed because one or more lines are too long
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 17 KiB

148
e2etests/testdata/stable/overlapping_child_label/elk/board.exp.json generated vendored
View file

@ -127,7 +127,7 @@
"level": 2 "level": 2
}, },
{ {
"id": "ayyy", "id": "aaaa",
"type": "rectangle", "type": "rectangle",
"classes": [ "classes": [
"icon" "icon"
@ -136,7 +136,7 @@
"x": 203, "x": 203,
"y": 42 "y": 42
}, },
"width": 204, "width": 207,
"height": 242, "height": 242,
"opacity": 1, "opacity": 1,
"strokeDash": 0, "strokeDash": 0,
@ -168,7 +168,7 @@
"fields": null, "fields": null,
"methods": null, "methods": null,
"columns": null, "columns": null,
"label": "ayyy", "label": "aaaa",
"fontSize": 28, "fontSize": 28,
"fontFamily": "DEFAULT", "fontFamily": "DEFAULT",
"language": "", "language": "",
@ -176,14 +176,14 @@
"italic": false, "italic": false,
"bold": false, "bold": false,
"underline": false, "underline": false,
"labelWidth": 53, "labelWidth": 55,
"labelHeight": 36, "labelHeight": 36,
"labelPosition": "INSIDE_TOP_RIGHT", "labelPosition": "INSIDE_TOP_RIGHT",
"zIndex": 0, "zIndex": 0,
"level": 1 "level": 1
}, },
{ {
"id": "ayyy.beee", "id": "aaaa.bbbb",
"type": "rectangle", "type": "rectangle",
"classes": [ "classes": [
"icon" "icon"
@ -192,7 +192,7 @@
"x": 253, "x": 253,
"y": 116 "y": 116
}, },
"width": 104, "width": 107,
"height": 118, "height": 118,
"opacity": 1, "opacity": 1,
"strokeDash": 0, "strokeDash": 0,
@ -224,7 +224,7 @@
"fields": null, "fields": null,
"methods": null, "methods": null,
"columns": null, "columns": null,
"label": "beee", "label": "bbbb",
"fontSize": 16, "fontSize": 16,
"fontFamily": "DEFAULT", "fontFamily": "DEFAULT",
"language": "", "language": "",
@ -232,23 +232,23 @@
"italic": false, "italic": false,
"bold": true, "bold": true,
"underline": false, "underline": false,
"labelWidth": 33, "labelWidth": 36,
"labelHeight": 21, "labelHeight": 21,
"labelPosition": "OUTSIDE_TOP_LEFT", "labelPosition": "OUTSIDE_TOP_LEFT",
"zIndex": 0, "zIndex": 0,
"level": 2 "level": 2
}, },
{ {
"id": "ceee", "id": "cccc",
"type": "rectangle", "type": "rectangle",
"classes": [ "classes": [
"icon" "icon"
], ],
"pos": { "pos": {
"x": 427, "x": 430,
"y": 42 "y": 42
}, },
"width": 205, "width": 208,
"height": 242, "height": 242,
"opacity": 1, "opacity": 1,
"strokeDash": 0, "strokeDash": 0,
@ -280,7 +280,7 @@
"fields": null, "fields": null,
"methods": null, "methods": null,
"columns": null, "columns": null,
"label": "ceee", "label": "cccc",
"fontSize": 28, "fontSize": 28,
"fontFamily": "DEFAULT", "fontFamily": "DEFAULT",
"language": "", "language": "",
@ -288,23 +288,23 @@
"italic": false, "italic": false,
"bold": false, "bold": false,
"underline": false, "underline": false,
"labelWidth": 53, "labelWidth": 51,
"labelHeight": 36, "labelHeight": 36,
"labelPosition": "INSIDE_TOP_RIGHT", "labelPosition": "INSIDE_TOP_RIGHT",
"zIndex": 0, "zIndex": 0,
"level": 1 "level": 1
}, },
{ {
"id": "ceee.deee", "id": "cccc.dddd",
"type": "rectangle", "type": "rectangle",
"classes": [ "classes": [
"icon" "icon"
], ],
"pos": { "pos": {
"x": 477, "x": 480,
"y": 92 "y": 92
}, },
"width": 105, "width": 108,
"height": 118, "height": 118,
"opacity": 1, "opacity": 1,
"strokeDash": 0, "strokeDash": 0,
@ -336,7 +336,7 @@
"fields": null, "fields": null,
"methods": null, "methods": null,
"columns": null, "columns": null,
"label": "deee", "label": "dddd",
"fontSize": 16, "fontSize": 16,
"fontFamily": "DEFAULT", "fontFamily": "DEFAULT",
"language": "", "language": "",
@ -344,11 +344,123 @@
"italic": false, "italic": false,
"bold": true, "bold": true,
"underline": false, "underline": false,
"labelWidth": 34, "labelWidth": 37,
"labelHeight": 21, "labelHeight": 21,
"labelPosition": "OUTSIDE_TOP_RIGHT", "labelPosition": "OUTSIDE_TOP_RIGHT",
"zIndex": 0, "zIndex": 0,
"level": 2 "level": 2
},
{
"id": "eeeeeeeeeeeeeeeeeee",
"type": "rectangle",
"classes": [
"icon"
],
"pos": {
"x": 658,
"y": 54
},
"width": 614,
"height": 218,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
"borderRadius": 0,
"fill": "B4",
"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/time.svg",
"RawPath": "",
"OmitHost": false,
"ForceQuery": false,
"RawQuery": "",
"Fragment": "",
"RawFragment": ""
},
"iconPosition": "INSIDE_MIDDLE_LEFT",
"blend": false,
"fields": null,
"methods": null,
"columns": null,
"label": "eeeeeeeeeeeeeeeeeee",
"fontSize": 28,
"fontFamily": "DEFAULT",
"language": "",
"color": "N1",
"italic": false,
"bold": false,
"underline": false,
"labelWidth": 263,
"labelHeight": 36,
"labelPosition": "INSIDE_MIDDLE_RIGHT",
"zIndex": 0,
"level": 1
},
{
"id": "eeeeeeeeeeeeeeeeeee.fffffffffff",
"type": "rectangle",
"classes": [
"icon"
],
"pos": {
"x": 801,
"y": 104
},
"width": 132,
"height": 118,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
"borderRadius": 0,
"fill": "B5",
"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/time.svg",
"RawPath": "",
"OmitHost": false,
"ForceQuery": false,
"RawQuery": "",
"Fragment": "",
"RawFragment": ""
},
"iconPosition": "OUTSIDE_LEFT_MIDDLE",
"blend": false,
"fields": null,
"methods": null,
"columns": null,
"label": "fffffffffff",
"fontSize": 16,
"fontFamily": "DEFAULT",
"language": "",
"color": "N1",
"italic": false,
"bold": true,
"underline": false,
"labelWidth": 61,
"labelHeight": 21,
"labelPosition": "OUTSIDE_RIGHT_MIDDLE",
"zIndex": 0,
"level": 2
} }
], ],
"connections": [ "connections": [

174
e2etests/testdata/stable/overlapping_child_label/elk/sketch.exp.svg vendored
View file

File diff suppressed because one or more lines are too long
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 17 KiB