diff --git a/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf b/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf index df7fa6513..1548b2a0b 100644 Binary files a/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf and b/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf differ diff --git a/e2etests/testdata/regression/empty_class_height/dagre/board.exp.json b/e2etests/testdata/regression/empty_class_height/dagre/board.exp.json index 87e22dff9..d04a989ef 100644 --- a/e2etests/testdata/regression/empty_class_height/dagre/board.exp.json +++ b/e2etests/testdata/regression/empty_class_height/dagre/board.exp.json @@ -4,20 +4,74 @@ "fontFamily": "SourceSansPro", "shapes": [ { - "id": "A", - "type": "rectangle", + "id": "class1", + "type": "class", "pos": { "x": 0, "y": 0 }, - "width": 55, - "height": 66, + "width": 319, + "height": 184, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "B6", - "stroke": "B1", + "fill": "N1", + "stroke": "N7", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": [ + { + "name": "num", + "type": "int", + "visibility": "private" + }, + { + "name": "timeout", + "type": "int", + "visibility": "private" + } + ], + "methods": null, + "columns": null, + "label": "class with rows", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 214, + "labelHeight": 31, + "zIndex": 0, + "level": 1, + "primaryAccentColor": "B2", + "secondaryAccentColor": "AA2", + "neutralAccentColor": "N2" + }, + { + "id": "class2", + "type": "class", + "pos": { + "x": 379, + "y": 46 + }, + "width": 362, + "height": 92, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N1", + "stroke": "N7", "shadow": false, "3d": false, "multiple": false, @@ -30,19 +84,21 @@ "fields": null, "methods": null, "columns": null, - "label": "A", - "fontSize": 16, - "fontFamily": "mono", + "label": "class without rows", + "fontSize": 20, + "fontFamily": "DEFAULT", "language": "", "color": "N1", "italic": false, - "bold": true, + "bold": false, "underline": false, - "labelWidth": 10, - "labelHeight": 21, - "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelWidth": 257, + "labelHeight": 31, "zIndex": 0, - "level": 1 + "level": 1, + "primaryAccentColor": "B2", + "secondaryAccentColor": "AA2", + "neutralAccentColor": "N2" } ], "connections": [], diff --git a/e2etests/testdata/regression/empty_class_height/dagre/sketch.exp.svg b/e2etests/testdata/regression/empty_class_height/dagre/sketch.exp.svg index a8d390578..3a62eda85 100644 --- a/e2etests/testdata/regression/empty_class_height/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/empty_class_height/dagre/sketch.exp.svg @@ -1,10 +1,10 @@ -A - + .d2-3149201134 .fill-N1{fill:#0A0F25;} + .d2-3149201134 .fill-N2{fill:#676C7E;} + .d2-3149201134 .fill-N3{fill:#9499AB;} + .d2-3149201134 .fill-N4{fill:#CFD2DD;} + .d2-3149201134 .fill-N5{fill:#DEE1EB;} + .d2-3149201134 .fill-N6{fill:#EEF1F8;} + .d2-3149201134 .fill-N7{fill:#FFFFFF;} + .d2-3149201134 .fill-B1{fill:#0D32B2;} + .d2-3149201134 .fill-B2{fill:#0D32B2;} + .d2-3149201134 .fill-B3{fill:#E3E9FD;} + .d2-3149201134 .fill-B4{fill:#E3E9FD;} + .d2-3149201134 .fill-B5{fill:#EDF0FD;} + .d2-3149201134 .fill-B6{fill:#F7F8FE;} + .d2-3149201134 .fill-AA2{fill:#4A6FF3;} + .d2-3149201134 .fill-AA4{fill:#EDF0FD;} + .d2-3149201134 .fill-AA5{fill:#F7F8FE;} + .d2-3149201134 .fill-AB4{fill:#EDF0FD;} + .d2-3149201134 .fill-AB5{fill:#F7F8FE;} + .d2-3149201134 .stroke-N1{stroke:#0A0F25;} + .d2-3149201134 .stroke-N2{stroke:#676C7E;} + .d2-3149201134 .stroke-N3{stroke:#9499AB;} + .d2-3149201134 .stroke-N4{stroke:#CFD2DD;} + .d2-3149201134 .stroke-N5{stroke:#DEE1EB;} + .d2-3149201134 .stroke-N6{stroke:#EEF1F8;} + .d2-3149201134 .stroke-N7{stroke:#FFFFFF;} + .d2-3149201134 .stroke-B1{stroke:#0D32B2;} + .d2-3149201134 .stroke-B2{stroke:#0D32B2;} + .d2-3149201134 .stroke-B3{stroke:#E3E9FD;} + .d2-3149201134 .stroke-B4{stroke:#E3E9FD;} + .d2-3149201134 .stroke-B5{stroke:#EDF0FD;} + .d2-3149201134 .stroke-B6{stroke:#F7F8FE;} + .d2-3149201134 .stroke-AA2{stroke:#4A6FF3;} + .d2-3149201134 .stroke-AA4{stroke:#EDF0FD;} + .d2-3149201134 .stroke-AA5{stroke:#F7F8FE;} + .d2-3149201134 .stroke-AB4{stroke:#EDF0FD;} + .d2-3149201134 .stroke-AB5{stroke:#F7F8FE;} + .d2-3149201134 .background-color-N1{background-color:#0A0F25;} + .d2-3149201134 .background-color-N2{background-color:#676C7E;} + .d2-3149201134 .background-color-N3{background-color:#9499AB;} + .d2-3149201134 .background-color-N4{background-color:#CFD2DD;} + .d2-3149201134 .background-color-N5{background-color:#DEE1EB;} + .d2-3149201134 .background-color-N6{background-color:#EEF1F8;} + .d2-3149201134 .background-color-N7{background-color:#FFFFFF;} + .d2-3149201134 .background-color-B1{background-color:#0D32B2;} + .d2-3149201134 .background-color-B2{background-color:#0D32B2;} + .d2-3149201134 .background-color-B3{background-color:#E3E9FD;} + .d2-3149201134 .background-color-B4{background-color:#E3E9FD;} + .d2-3149201134 .background-color-B5{background-color:#EDF0FD;} + .d2-3149201134 .background-color-B6{background-color:#F7F8FE;} + .d2-3149201134 .background-color-AA2{background-color:#4A6FF3;} + .d2-3149201134 .background-color-AA4{background-color:#EDF0FD;} + .d2-3149201134 .background-color-AA5{background-color:#F7F8FE;} + .d2-3149201134 .background-color-AB4{background-color:#EDF0FD;} + .d2-3149201134 .background-color-AB5{background-color:#F7F8FE;} + .d2-3149201134 .color-N1{color:#0A0F25;} + .d2-3149201134 .color-N2{color:#676C7E;} + .d2-3149201134 .color-N3{color:#9499AB;} + .d2-3149201134 .color-N4{color:#CFD2DD;} + .d2-3149201134 .color-N5{color:#DEE1EB;} + .d2-3149201134 .color-N6{color:#EEF1F8;} + .d2-3149201134 .color-N7{color:#FFFFFF;} + .d2-3149201134 .color-B1{color:#0D32B2;} + .d2-3149201134 .color-B2{color:#0D32B2;} + .d2-3149201134 .color-B3{color:#E3E9FD;} + .d2-3149201134 .color-B4{color:#E3E9FD;} + .d2-3149201134 .color-B5{color:#EDF0FD;} + .d2-3149201134 .color-B6{color:#F7F8FE;} + .d2-3149201134 .color-AA2{color:#4A6FF3;} + .d2-3149201134 .color-AA4{color:#EDF0FD;} + .d2-3149201134 .color-AA5{color:#F7F8FE;} + .d2-3149201134 .color-AB4{color:#EDF0FD;} + .d2-3149201134 .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}]]>class with rows-numint-timeoutintclass without rows + \ No newline at end of file diff --git a/e2etests/testdata/regression/empty_class_height/elk/board.exp.json b/e2etests/testdata/regression/empty_class_height/elk/board.exp.json index e17604137..5ada06396 100644 --- a/e2etests/testdata/regression/empty_class_height/elk/board.exp.json +++ b/e2etests/testdata/regression/empty_class_height/elk/board.exp.json @@ -4,20 +4,74 @@ "fontFamily": "SourceSansPro", "shapes": [ { - "id": "A", - "type": "rectangle", + "id": "class1", + "type": "class", "pos": { "x": 12, "y": 12 }, - "width": 55, - "height": 66, + "width": 319, + "height": 184, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "B6", - "stroke": "B1", + "fill": "N1", + "stroke": "N7", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": [ + { + "name": "num", + "type": "int", + "visibility": "private" + }, + { + "name": "timeout", + "type": "int", + "visibility": "private" + } + ], + "methods": null, + "columns": null, + "label": "class with rows", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 214, + "labelHeight": 31, + "zIndex": 0, + "level": 1, + "primaryAccentColor": "B2", + "secondaryAccentColor": "AA2", + "neutralAccentColor": "N2" + }, + { + "id": "class2", + "type": "class", + "pos": { + "x": 351, + "y": 58 + }, + "width": 362, + "height": 92, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N1", + "stroke": "N7", "shadow": false, "3d": false, "multiple": false, @@ -30,19 +84,21 @@ "fields": null, "methods": null, "columns": null, - "label": "A", - "fontSize": 16, - "fontFamily": "mono", + "label": "class without rows", + "fontSize": 20, + "fontFamily": "DEFAULT", "language": "", "color": "N1", "italic": false, - "bold": true, + "bold": false, "underline": false, - "labelWidth": 10, - "labelHeight": 21, - "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelWidth": 257, + "labelHeight": 31, "zIndex": 0, - "level": 1 + "level": 1, + "primaryAccentColor": "B2", + "secondaryAccentColor": "AA2", + "neutralAccentColor": "N2" } ], "connections": [], diff --git a/e2etests/testdata/regression/empty_class_height/elk/sketch.exp.svg b/e2etests/testdata/regression/empty_class_height/elk/sketch.exp.svg index 9e978e96a..e640bcf2c 100644 --- a/e2etests/testdata/regression/empty_class_height/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/empty_class_height/elk/sketch.exp.svg @@ -1,10 +1,10 @@ -A - + .d2-2428178623 .fill-N1{fill:#0A0F25;} + .d2-2428178623 .fill-N2{fill:#676C7E;} + .d2-2428178623 .fill-N3{fill:#9499AB;} + .d2-2428178623 .fill-N4{fill:#CFD2DD;} + .d2-2428178623 .fill-N5{fill:#DEE1EB;} + .d2-2428178623 .fill-N6{fill:#EEF1F8;} + .d2-2428178623 .fill-N7{fill:#FFFFFF;} + .d2-2428178623 .fill-B1{fill:#0D32B2;} + .d2-2428178623 .fill-B2{fill:#0D32B2;} + .d2-2428178623 .fill-B3{fill:#E3E9FD;} + .d2-2428178623 .fill-B4{fill:#E3E9FD;} + .d2-2428178623 .fill-B5{fill:#EDF0FD;} + .d2-2428178623 .fill-B6{fill:#F7F8FE;} + .d2-2428178623 .fill-AA2{fill:#4A6FF3;} + .d2-2428178623 .fill-AA4{fill:#EDF0FD;} + .d2-2428178623 .fill-AA5{fill:#F7F8FE;} + .d2-2428178623 .fill-AB4{fill:#EDF0FD;} + .d2-2428178623 .fill-AB5{fill:#F7F8FE;} + .d2-2428178623 .stroke-N1{stroke:#0A0F25;} + .d2-2428178623 .stroke-N2{stroke:#676C7E;} + .d2-2428178623 .stroke-N3{stroke:#9499AB;} + .d2-2428178623 .stroke-N4{stroke:#CFD2DD;} + .d2-2428178623 .stroke-N5{stroke:#DEE1EB;} + .d2-2428178623 .stroke-N6{stroke:#EEF1F8;} + .d2-2428178623 .stroke-N7{stroke:#FFFFFF;} + .d2-2428178623 .stroke-B1{stroke:#0D32B2;} + .d2-2428178623 .stroke-B2{stroke:#0D32B2;} + .d2-2428178623 .stroke-B3{stroke:#E3E9FD;} + .d2-2428178623 .stroke-B4{stroke:#E3E9FD;} + .d2-2428178623 .stroke-B5{stroke:#EDF0FD;} + .d2-2428178623 .stroke-B6{stroke:#F7F8FE;} + .d2-2428178623 .stroke-AA2{stroke:#4A6FF3;} + .d2-2428178623 .stroke-AA4{stroke:#EDF0FD;} + .d2-2428178623 .stroke-AA5{stroke:#F7F8FE;} + .d2-2428178623 .stroke-AB4{stroke:#EDF0FD;} + .d2-2428178623 .stroke-AB5{stroke:#F7F8FE;} + .d2-2428178623 .background-color-N1{background-color:#0A0F25;} + .d2-2428178623 .background-color-N2{background-color:#676C7E;} + .d2-2428178623 .background-color-N3{background-color:#9499AB;} + .d2-2428178623 .background-color-N4{background-color:#CFD2DD;} + .d2-2428178623 .background-color-N5{background-color:#DEE1EB;} + .d2-2428178623 .background-color-N6{background-color:#EEF1F8;} + .d2-2428178623 .background-color-N7{background-color:#FFFFFF;} + .d2-2428178623 .background-color-B1{background-color:#0D32B2;} + .d2-2428178623 .background-color-B2{background-color:#0D32B2;} + .d2-2428178623 .background-color-B3{background-color:#E3E9FD;} + .d2-2428178623 .background-color-B4{background-color:#E3E9FD;} + .d2-2428178623 .background-color-B5{background-color:#EDF0FD;} + .d2-2428178623 .background-color-B6{background-color:#F7F8FE;} + .d2-2428178623 .background-color-AA2{background-color:#4A6FF3;} + .d2-2428178623 .background-color-AA4{background-color:#EDF0FD;} + .d2-2428178623 .background-color-AA5{background-color:#F7F8FE;} + .d2-2428178623 .background-color-AB4{background-color:#EDF0FD;} + .d2-2428178623 .background-color-AB5{background-color:#F7F8FE;} + .d2-2428178623 .color-N1{color:#0A0F25;} + .d2-2428178623 .color-N2{color:#676C7E;} + .d2-2428178623 .color-N3{color:#9499AB;} + .d2-2428178623 .color-N4{color:#CFD2DD;} + .d2-2428178623 .color-N5{color:#DEE1EB;} + .d2-2428178623 .color-N6{color:#EEF1F8;} + .d2-2428178623 .color-N7{color:#FFFFFF;} + .d2-2428178623 .color-B1{color:#0D32B2;} + .d2-2428178623 .color-B2{color:#0D32B2;} + .d2-2428178623 .color-B3{color:#E3E9FD;} + .d2-2428178623 .color-B4{color:#E3E9FD;} + .d2-2428178623 .color-B5{color:#EDF0FD;} + .d2-2428178623 .color-B6{color:#F7F8FE;} + .d2-2428178623 .color-AA2{color:#4A6FF3;} + .d2-2428178623 .color-AA4{color:#EDF0FD;} + .d2-2428178623 .color-AA5{color:#F7F8FE;} + .d2-2428178623 .color-AB4{color:#EDF0FD;} + .d2-2428178623 .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}]]>class with rows-numint-timeoutintclass without rows + \ No newline at end of file