diff --git a/d2renderers/d2sketch/testdata/root-fill/sketch.exp.svg b/d2renderers/d2sketch/testdata/root-fill/sketch.exp.svg index 477f27ce8..8b87d6a30 100644 --- a/d2renderers/d2sketch/testdata/root-fill/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/root-fill/sketch.exp.svg @@ -1,20 +1,20 @@ - @@ -844,20 +844,20 @@ -OEM FactoryOEM WarehouseDistributor Warehousecompany WarehouseFlow-I (Warehousing, Installation)MasterRegional-1Regional-2Regional-N

company Warehouse

+Flow-I (Warehousing, Installation)OEM FactoryOEM WarehouseDistributor Warehousecompany WarehouseMasterRegional-1Regional-2Regional-N

company Warehouse

  • Asset Tagging
  • Inventory
  • Staging
  • Dispatch to Site
-
 +
 + - diff --git a/e2etests-cli/testdata/TestCLI_E2E/animation.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/animation.exp.svg index f6216f287..4b287519e 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/animation.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/animation.exp.svg @@ -1,16 +1,16 @@ Chicken's plan +}]]>Chicken's plan -Approach roadChicken's plan +Chicken's planApproach road - -Approach roadCross roadChicken's plan + +Chicken's planApproach roadCross road + - -Approach roadCross roadMake you wonder whyChicken's plan +Chicken's planApproach roadCross roadMake you wonder why + - \ No newline at end of file diff --git a/e2etests-cli/testdata/TestCLI_E2E/vars-animation.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/vars-animation.exp.svg index 8ec9e5a88..a38d833e5 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/vars-animation.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/vars-animation.exp.svg @@ -1,16 +1,16 @@ CHICKEN'S PLAN +}]]>CHICKEN'S PLAN -APPROACH ROADCHICKEN'S PLAN +CHICKEN'S PLANAPPROACH ROAD - -APPROACH ROADCROSS ROADCHICKEN'S PLAN + +CHICKEN'S PLANAPPROACH ROADCROSS ROAD + - -APPROACH ROADCROSS ROADMAKE YOU WONDER WHYCHICKEN'S PLAN +CHICKEN'S PLANAPPROACH ROADCROSS ROADMAKE YOU WONDER WHY + - \ No newline at end of file diff --git a/e2etests/testdata/regression/multiple_constant_nears/dagre/board.exp.json b/e2etests/testdata/regression/multiple_constant_nears/dagre/board.exp.json index d20cfdc39..d6231ed4b 100644 --- a/e2etests/testdata/regression/multiple_constant_nears/dagre/board.exp.json +++ b/e2etests/testdata/regression/multiple_constant_nears/dagre/board.exp.json @@ -3,47 +3,6 @@ "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ - { - "id": "c", - "type": "rectangle", - "pos": { - "x": 0, - "y": 0 - }, - "width": 53, - "height": 66, - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "borderRadius": 0, - "fill": "B6", - "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": 16, - "fontFamily": "DEFAULT", - "language": "", - "color": "N1", - "italic": false, - "bold": true, - "underline": false, - "labelWidth": 8, - "labelHeight": 21, - "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 0, - "level": 1 - }, { "id": "a", "type": "rectangle", @@ -85,6 +44,88 @@ "zIndex": 0, "level": 1 }, + { + "id": "b", + "type": "rectangle", + "pos": { + "x": 73, + "y": 318 + }, + "width": 139, + "height": 292, + "opacity": 0.5, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "green", + "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": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 13, + "labelHeight": 36, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "c", + "type": "rectangle", + "pos": { + "x": 0, + "y": 0 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "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": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, { "id": "a.1", "type": "rectangle", @@ -208,47 +249,6 @@ "zIndex": 0, "level": 2 }, - { - "id": "b", - "type": "rectangle", - "pos": { - "x": 73, - "y": 318 - }, - "width": 139, - "height": 292, - "opacity": 0.5, - "strokeDash": 0, - "strokeWidth": 2, - "borderRadius": 0, - "fill": "green", - "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": 28, - "fontFamily": "DEFAULT", - "language": "", - "color": "N1", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 13, - "labelHeight": 36, - "labelPosition": "OUTSIDE_TOP_CENTER", - "zIndex": 0, - "level": 1 - }, { "id": "b.1111", "type": "rectangle", diff --git a/e2etests/testdata/regression/multiple_constant_nears/dagre/sketch.exp.svg b/e2etests/testdata/regression/multiple_constant_nears/dagre/sketch.exp.svg index 310f04aac..59453e7ae 100644 --- a/e2etests/testdata/regression/multiple_constant_nears/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/multiple_constant_nears/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -cab12311112222 + .d2-114303792 .fill-N1{fill:#0A0F25;} + .d2-114303792 .fill-N2{fill:#676C7E;} + .d2-114303792 .fill-N3{fill:#9499AB;} + .d2-114303792 .fill-N4{fill:#CFD2DD;} + .d2-114303792 .fill-N5{fill:#DEE1EB;} + .d2-114303792 .fill-N6{fill:#EEF1F8;} + .d2-114303792 .fill-N7{fill:#FFFFFF;} + .d2-114303792 .fill-B1{fill:#0D32B2;} + .d2-114303792 .fill-B2{fill:#0D32B2;} + .d2-114303792 .fill-B3{fill:#E3E9FD;} + .d2-114303792 .fill-B4{fill:#E3E9FD;} + .d2-114303792 .fill-B5{fill:#EDF0FD;} + .d2-114303792 .fill-B6{fill:#F7F8FE;} + .d2-114303792 .fill-AA2{fill:#4A6FF3;} + .d2-114303792 .fill-AA4{fill:#EDF0FD;} + .d2-114303792 .fill-AA5{fill:#F7F8FE;} + .d2-114303792 .fill-AB4{fill:#EDF0FD;} + .d2-114303792 .fill-AB5{fill:#F7F8FE;} + .d2-114303792 .stroke-N1{stroke:#0A0F25;} + .d2-114303792 .stroke-N2{stroke:#676C7E;} + .d2-114303792 .stroke-N3{stroke:#9499AB;} + .d2-114303792 .stroke-N4{stroke:#CFD2DD;} + .d2-114303792 .stroke-N5{stroke:#DEE1EB;} + .d2-114303792 .stroke-N6{stroke:#EEF1F8;} + .d2-114303792 .stroke-N7{stroke:#FFFFFF;} + .d2-114303792 .stroke-B1{stroke:#0D32B2;} + .d2-114303792 .stroke-B2{stroke:#0D32B2;} + .d2-114303792 .stroke-B3{stroke:#E3E9FD;} + .d2-114303792 .stroke-B4{stroke:#E3E9FD;} + .d2-114303792 .stroke-B5{stroke:#EDF0FD;} + .d2-114303792 .stroke-B6{stroke:#F7F8FE;} + .d2-114303792 .stroke-AA2{stroke:#4A6FF3;} + .d2-114303792 .stroke-AA4{stroke:#EDF0FD;} + .d2-114303792 .stroke-AA5{stroke:#F7F8FE;} + .d2-114303792 .stroke-AB4{stroke:#EDF0FD;} + .d2-114303792 .stroke-AB5{stroke:#F7F8FE;} + .d2-114303792 .background-color-N1{background-color:#0A0F25;} + .d2-114303792 .background-color-N2{background-color:#676C7E;} + .d2-114303792 .background-color-N3{background-color:#9499AB;} + .d2-114303792 .background-color-N4{background-color:#CFD2DD;} + .d2-114303792 .background-color-N5{background-color:#DEE1EB;} + .d2-114303792 .background-color-N6{background-color:#EEF1F8;} + .d2-114303792 .background-color-N7{background-color:#FFFFFF;} + .d2-114303792 .background-color-B1{background-color:#0D32B2;} + .d2-114303792 .background-color-B2{background-color:#0D32B2;} + .d2-114303792 .background-color-B3{background-color:#E3E9FD;} + .d2-114303792 .background-color-B4{background-color:#E3E9FD;} + .d2-114303792 .background-color-B5{background-color:#EDF0FD;} + .d2-114303792 .background-color-B6{background-color:#F7F8FE;} + .d2-114303792 .background-color-AA2{background-color:#4A6FF3;} + .d2-114303792 .background-color-AA4{background-color:#EDF0FD;} + .d2-114303792 .background-color-AA5{background-color:#F7F8FE;} + .d2-114303792 .background-color-AB4{background-color:#EDF0FD;} + .d2-114303792 .background-color-AB5{background-color:#F7F8FE;} + .d2-114303792 .color-N1{color:#0A0F25;} + .d2-114303792 .color-N2{color:#676C7E;} + .d2-114303792 .color-N3{color:#9499AB;} + .d2-114303792 .color-N4{color:#CFD2DD;} + .d2-114303792 .color-N5{color:#DEE1EB;} + .d2-114303792 .color-N6{color:#EEF1F8;} + .d2-114303792 .color-N7{color:#FFFFFF;} + .d2-114303792 .color-B1{color:#0D32B2;} + .d2-114303792 .color-B2{color:#0D32B2;} + .d2-114303792 .color-B3{color:#E3E9FD;} + .d2-114303792 .color-B4{color:#E3E9FD;} + .d2-114303792 .color-B5{color:#EDF0FD;} + .d2-114303792 .color-B6{color:#F7F8FE;} + .d2-114303792 .color-AA2{color:#4A6FF3;} + .d2-114303792 .color-AA4{color:#EDF0FD;} + .d2-114303792 .color-AA5{color:#F7F8FE;} + .d2-114303792 .color-AB4{color:#EDF0FD;} + .d2-114303792 .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}]]>abc12311112222 - + diff --git a/e2etests/testdata/regression/multiple_constant_nears/elk/board.exp.json b/e2etests/testdata/regression/multiple_constant_nears/elk/board.exp.json index d80cd5430..2ce891239 100644 --- a/e2etests/testdata/regression/multiple_constant_nears/elk/board.exp.json +++ b/e2etests/testdata/regression/multiple_constant_nears/elk/board.exp.json @@ -3,47 +3,6 @@ "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ - { - "id": "c", - "type": "rectangle", - "pos": { - "x": 12, - "y": 12 - }, - "width": 53, - "height": 66, - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "borderRadius": 0, - "fill": "B6", - "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": 16, - "fontFamily": "DEFAULT", - "language": "", - "color": "N1", - "italic": false, - "bold": true, - "underline": false, - "labelWidth": 8, - "labelHeight": 21, - "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 0, - "level": 1 - }, { "id": "a", "type": "rectangle", @@ -85,6 +44,88 @@ "zIndex": 0, "level": 1 }, + { + "id": "b", + "type": "rectangle", + "pos": { + "x": 85, + "y": 284 + }, + "width": 179, + "height": 302, + "opacity": 0.5, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "green", + "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": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 13, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "c", + "type": "rectangle", + "pos": { + "x": 12, + "y": 12 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "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": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, { "id": "a.1", "type": "rectangle", @@ -208,47 +249,6 @@ "zIndex": 0, "level": 2 }, - { - "id": "b", - "type": "rectangle", - "pos": { - "x": 85, - "y": 284 - }, - "width": 179, - "height": 302, - "opacity": 0.5, - "strokeDash": 0, - "strokeWidth": 2, - "borderRadius": 0, - "fill": "green", - "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": 28, - "fontFamily": "DEFAULT", - "language": "", - "color": "N1", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 13, - "labelHeight": 36, - "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 0, - "level": 1 - }, { "id": "b.1111", "type": "rectangle", diff --git a/e2etests/testdata/regression/multiple_constant_nears/elk/sketch.exp.svg b/e2etests/testdata/regression/multiple_constant_nears/elk/sketch.exp.svg index fa774803d..9f669ad5d 100644 --- a/e2etests/testdata/regression/multiple_constant_nears/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/multiple_constant_nears/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -cab12311112222 + .d2-1840765879 .fill-N1{fill:#0A0F25;} + .d2-1840765879 .fill-N2{fill:#676C7E;} + .d2-1840765879 .fill-N3{fill:#9499AB;} + .d2-1840765879 .fill-N4{fill:#CFD2DD;} + .d2-1840765879 .fill-N5{fill:#DEE1EB;} + .d2-1840765879 .fill-N6{fill:#EEF1F8;} + .d2-1840765879 .fill-N7{fill:#FFFFFF;} + .d2-1840765879 .fill-B1{fill:#0D32B2;} + .d2-1840765879 .fill-B2{fill:#0D32B2;} + .d2-1840765879 .fill-B3{fill:#E3E9FD;} + .d2-1840765879 .fill-B4{fill:#E3E9FD;} + .d2-1840765879 .fill-B5{fill:#EDF0FD;} + .d2-1840765879 .fill-B6{fill:#F7F8FE;} + .d2-1840765879 .fill-AA2{fill:#4A6FF3;} + .d2-1840765879 .fill-AA4{fill:#EDF0FD;} + .d2-1840765879 .fill-AA5{fill:#F7F8FE;} + .d2-1840765879 .fill-AB4{fill:#EDF0FD;} + .d2-1840765879 .fill-AB5{fill:#F7F8FE;} + .d2-1840765879 .stroke-N1{stroke:#0A0F25;} + .d2-1840765879 .stroke-N2{stroke:#676C7E;} + .d2-1840765879 .stroke-N3{stroke:#9499AB;} + .d2-1840765879 .stroke-N4{stroke:#CFD2DD;} + .d2-1840765879 .stroke-N5{stroke:#DEE1EB;} + .d2-1840765879 .stroke-N6{stroke:#EEF1F8;} + .d2-1840765879 .stroke-N7{stroke:#FFFFFF;} + .d2-1840765879 .stroke-B1{stroke:#0D32B2;} + .d2-1840765879 .stroke-B2{stroke:#0D32B2;} + .d2-1840765879 .stroke-B3{stroke:#E3E9FD;} + .d2-1840765879 .stroke-B4{stroke:#E3E9FD;} + .d2-1840765879 .stroke-B5{stroke:#EDF0FD;} + .d2-1840765879 .stroke-B6{stroke:#F7F8FE;} + .d2-1840765879 .stroke-AA2{stroke:#4A6FF3;} + .d2-1840765879 .stroke-AA4{stroke:#EDF0FD;} + .d2-1840765879 .stroke-AA5{stroke:#F7F8FE;} + .d2-1840765879 .stroke-AB4{stroke:#EDF0FD;} + .d2-1840765879 .stroke-AB5{stroke:#F7F8FE;} + .d2-1840765879 .background-color-N1{background-color:#0A0F25;} + .d2-1840765879 .background-color-N2{background-color:#676C7E;} + .d2-1840765879 .background-color-N3{background-color:#9499AB;} + .d2-1840765879 .background-color-N4{background-color:#CFD2DD;} + .d2-1840765879 .background-color-N5{background-color:#DEE1EB;} + .d2-1840765879 .background-color-N6{background-color:#EEF1F8;} + .d2-1840765879 .background-color-N7{background-color:#FFFFFF;} + .d2-1840765879 .background-color-B1{background-color:#0D32B2;} + .d2-1840765879 .background-color-B2{background-color:#0D32B2;} + .d2-1840765879 .background-color-B3{background-color:#E3E9FD;} + .d2-1840765879 .background-color-B4{background-color:#E3E9FD;} + .d2-1840765879 .background-color-B5{background-color:#EDF0FD;} + .d2-1840765879 .background-color-B6{background-color:#F7F8FE;} + .d2-1840765879 .background-color-AA2{background-color:#4A6FF3;} + .d2-1840765879 .background-color-AA4{background-color:#EDF0FD;} + .d2-1840765879 .background-color-AA5{background-color:#F7F8FE;} + .d2-1840765879 .background-color-AB4{background-color:#EDF0FD;} + .d2-1840765879 .background-color-AB5{background-color:#F7F8FE;} + .d2-1840765879 .color-N1{color:#0A0F25;} + .d2-1840765879 .color-N2{color:#676C7E;} + .d2-1840765879 .color-N3{color:#9499AB;} + .d2-1840765879 .color-N4{color:#CFD2DD;} + .d2-1840765879 .color-N5{color:#DEE1EB;} + .d2-1840765879 .color-N6{color:#EEF1F8;} + .d2-1840765879 .color-N7{color:#FFFFFF;} + .d2-1840765879 .color-B1{color:#0D32B2;} + .d2-1840765879 .color-B2{color:#0D32B2;} + .d2-1840765879 .color-B3{color:#E3E9FD;} + .d2-1840765879 .color-B4{color:#E3E9FD;} + .d2-1840765879 .color-B5{color:#EDF0FD;} + .d2-1840765879 .color-B6{color:#F7F8FE;} + .d2-1840765879 .color-AA2{color:#4A6FF3;} + .d2-1840765879 .color-AA4{color:#EDF0FD;} + .d2-1840765879 .color-AA5{color:#F7F8FE;} + .d2-1840765879 .color-AB4{color:#EDF0FD;} + .d2-1840765879 .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}]]>abc12311112222 - + diff --git a/e2etests/testdata/regression/unconnected/dagre/board.exp.json b/e2etests/testdata/regression/unconnected/dagre/board.exp.json index c247f0d23..1ab1067fa 100644 --- a/e2etests/testdata/regression/unconnected/dagre/board.exp.json +++ b/e2etests/testdata/regression/unconnected/dagre/board.exp.json @@ -3,6 +3,46 @@ "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ + { + "id": "title", + "type": "text", + "pos": { + "x": 438, + "y": -56 + }, + "width": 639, + "height": 51, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "transparent", + "stroke": "N1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Workflow-I (Warehousing, Installation)", + "fontSize": 40, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 639, + "labelHeight": 51, + "zIndex": 0, + "level": 1 + }, { "id": "OEM Factory", "type": "rectangle", @@ -493,46 +533,6 @@ "labelPosition": "INSIDE_MIDDLE_CENTER", "zIndex": 0, "level": 2 - }, - { - "id": "title", - "type": "text", - "pos": { - "x": 438, - "y": -56 - }, - "width": 639, - "height": 51, - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "borderRadius": 0, - "fill": "transparent", - "stroke": "N1", - "shadow": false, - "3d": false, - "multiple": false, - "double-border": false, - "tooltip": "", - "link": "", - "icon": null, - "iconPosition": "", - "blend": false, - "fields": null, - "methods": null, - "columns": null, - "label": "Workflow-I (Warehousing, Installation)", - "fontSize": 40, - "fontFamily": "DEFAULT", - "language": "", - "color": "N1", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 639, - "labelHeight": 51, - "zIndex": 0, - "level": 1 } ], "connections": [ diff --git a/e2etests/testdata/regression/unconnected/dagre/sketch.exp.svg b/e2etests/testdata/regression/unconnected/dagre/sketch.exp.svg index 33754aad7..c861d0812 100644 --- a/e2etests/testdata/regression/unconnected/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/unconnected/dagre/sketch.exp.svg @@ -1,20 +1,20 @@ -OEM FactoryOEM WarehouseDistributor WarehouseGos WarehouseCustomer SiteWorkflow-I (Warehousing, Installation)MasterRegional-1Regional-2Regional-N
    +Workflow-I (Warehousing, Installation)OEM FactoryOEM WarehouseDistributor WarehouseGos WarehouseCustomer SiteMasterRegional-1Regional-2Regional-N
    • Asset Tagging
    • Inventory
    • Staging
    • Dispatch to Site
    -
    InstallationSupport +
InstallationSupport + - diff --git a/e2etests/testdata/regression/unconnected/elk/board.exp.json b/e2etests/testdata/regression/unconnected/elk/board.exp.json index a30837f37..d45f7a548 100644 --- a/e2etests/testdata/regression/unconnected/elk/board.exp.json +++ b/e2etests/testdata/regression/unconnected/elk/board.exp.json @@ -3,6 +3,46 @@ "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ + { + "id": "title", + "type": "text", + "pos": { + "x": 482, + "y": -59 + }, + "width": 639, + "height": 51, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "transparent", + "stroke": "N1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Workflow-I (Warehousing, Installation)", + "fontSize": 40, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 639, + "labelHeight": 51, + "zIndex": 0, + "level": 1 + }, { "id": "OEM Factory", "type": "rectangle", @@ -493,46 +533,6 @@ "labelPosition": "INSIDE_MIDDLE_CENTER", "zIndex": 0, "level": 2 - }, - { - "id": "title", - "type": "text", - "pos": { - "x": 482, - "y": -59 - }, - "width": 639, - "height": 51, - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "borderRadius": 0, - "fill": "transparent", - "stroke": "N1", - "shadow": false, - "3d": false, - "multiple": false, - "double-border": false, - "tooltip": "", - "link": "", - "icon": null, - "iconPosition": "", - "blend": false, - "fields": null, - "methods": null, - "columns": null, - "label": "Workflow-I (Warehousing, Installation)", - "fontSize": 40, - "fontFamily": "DEFAULT", - "language": "", - "color": "N1", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 639, - "labelHeight": 51, - "zIndex": 0, - "level": 1 } ], "connections": [ diff --git a/e2etests/testdata/regression/unconnected/elk/sketch.exp.svg b/e2etests/testdata/regression/unconnected/elk/sketch.exp.svg index 17ae95cfa..a1101fced 100644 --- a/e2etests/testdata/regression/unconnected/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/unconnected/elk/sketch.exp.svg @@ -1,20 +1,20 @@ -OEM FactoryOEM WarehouseDistributor WarehouseGos WarehouseCustomer SiteWorkflow-I (Warehousing, Installation)MasterRegional-1Regional-2Regional-N
    +Workflow-I (Warehousing, Installation)OEM FactoryOEM WarehouseDistributor WarehouseGos WarehouseCustomer SiteMasterRegional-1Regional-2Regional-N
    • Asset Tagging
    • Inventory
    • Staging
    • Dispatch to Site
    -
    InstallationSupport +
InstallationSupport + - diff --git a/e2etests/testdata/stable/constant_near_stress/dagre/board.exp.json b/e2etests/testdata/stable/constant_near_stress/dagre/board.exp.json index b81735f0e..b550af1dd 100644 --- a/e2etests/testdata/stable/constant_near_stress/dagre/board.exp.json +++ b/e2etests/testdata/stable/constant_near_stress/dagre/board.exp.json @@ -125,46 +125,6 @@ "zIndex": 0, "level": 1 }, - { - "id": "bottom", - "type": "text", - "pos": { - "x": -431, - "y": 252 - }, - "width": 917, - "height": 131, - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "borderRadius": 0, - "fill": "transparent", - "stroke": "N1", - "shadow": false, - "3d": false, - "multiple": false, - "double-border": false, - "tooltip": "", - "link": "", - "icon": null, - "iconPosition": "", - "blend": false, - "fields": null, - "methods": null, - "columns": null, - "label": "# Cats, no less liquid than their shadows, offer no angles to the wind.\n\nIf we can't fix it, it ain't broke.\n\nDieters live life in the fasting lane.", - "fontSize": 16, - "fontFamily": "DEFAULT", - "language": "markdown", - "color": "N1", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 917, - "labelHeight": 131, - "zIndex": 0, - "level": 1 - }, { "id": "Joe", "type": "person", @@ -247,6 +207,46 @@ "zIndex": 0, "level": 1 }, + { + "id": "bottom", + "type": "text", + "pos": { + "x": -431, + "y": 252 + }, + "width": 917, + "height": 131, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "transparent", + "stroke": "N1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "# Cats, no less liquid than their shadows, offer no angles to the wind.\n\nIf we can't fix it, it ain't broke.\n\nDieters live life in the fasting lane.", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 917, + "labelHeight": 131, + "zIndex": 0, + "level": 1 + }, { "id": "i am top left", "type": "text", diff --git a/e2etests/testdata/stable/constant_near_stress/dagre/sketch.exp.svg b/e2etests/testdata/stable/constant_near_stress/dagre/sketch.exp.svg index 78134855a..b7b35a9ba 100644 --- a/e2etests/testdata/stable/constant_near_stress/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/constant_near_stress/dagre/sketch.exp.svg @@ -1,20 +1,20 @@ -xyThe top of the mountain

Cats, no less liquid than their shadows, offer no angles to the wind.

+xyThe top of the mountainJoeDonald

Cats, no less liquid than their shadows, offer no angles to the wind.

If we can't fix it, it ain't broke.

Dieters live life in the fasting lane.

-
JoeDonaldi am top lefti am top righti am bottom lefti am bottom right +
i am top lefti am top righti am bottom lefti am bottom right - + diff --git a/e2etests/testdata/stable/constant_near_stress/elk/board.exp.json b/e2etests/testdata/stable/constant_near_stress/elk/board.exp.json index d393d9216..603b35fc4 100644 --- a/e2etests/testdata/stable/constant_near_stress/elk/board.exp.json +++ b/e2etests/testdata/stable/constant_near_stress/elk/board.exp.json @@ -125,46 +125,6 @@ "zIndex": 0, "level": 1 }, - { - "id": "bottom", - "type": "text", - "pos": { - "x": -419, - "y": 234 - }, - "width": 917, - "height": 131, - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "borderRadius": 0, - "fill": "transparent", - "stroke": "N1", - "shadow": false, - "3d": false, - "multiple": false, - "double-border": false, - "tooltip": "", - "link": "", - "icon": null, - "iconPosition": "", - "blend": false, - "fields": null, - "methods": null, - "columns": null, - "label": "# Cats, no less liquid than their shadows, offer no angles to the wind.\n\nIf we can't fix it, it ain't broke.\n\nDieters live life in the fasting lane.", - "fontSize": 16, - "fontFamily": "DEFAULT", - "language": "markdown", - "color": "N1", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 917, - "labelHeight": 131, - "zIndex": 0, - "level": 1 - }, { "id": "Joe", "type": "person", @@ -247,6 +207,46 @@ "zIndex": 0, "level": 1 }, + { + "id": "bottom", + "type": "text", + "pos": { + "x": -419, + "y": 234 + }, + "width": 917, + "height": 131, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "transparent", + "stroke": "N1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "# Cats, no less liquid than their shadows, offer no angles to the wind.\n\nIf we can't fix it, it ain't broke.\n\nDieters live life in the fasting lane.", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 917, + "labelHeight": 131, + "zIndex": 0, + "level": 1 + }, { "id": "i am top left", "type": "text", diff --git a/e2etests/testdata/stable/constant_near_stress/elk/sketch.exp.svg b/e2etests/testdata/stable/constant_near_stress/elk/sketch.exp.svg index d85bffe5b..40fe40ab2 100644 --- a/e2etests/testdata/stable/constant_near_stress/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/constant_near_stress/elk/sketch.exp.svg @@ -1,20 +1,20 @@ -xyThe top of the mountain

Cats, no less liquid than their shadows, offer no angles to the wind.

+xyThe top of the mountainJoeDonald

Cats, no less liquid than their shadows, offer no angles to the wind.

If we can't fix it, it ain't broke.

Dieters live life in the fasting lane.

-
JoeDonaldi am top lefti am top righti am bottom lefti am bottom right +
i am top lefti am top righti am bottom lefti am bottom right - + diff --git a/e2etests/testdata/stable/constant_near_title/dagre/board.exp.json b/e2etests/testdata/stable/constant_near_title/dagre/board.exp.json index ac0d6e0df..62e89f006 100644 --- a/e2etests/testdata/stable/constant_near_title/dagre/board.exp.json +++ b/e2etests/testdata/stable/constant_near_title/dagre/board.exp.json @@ -3,6 +3,46 @@ "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ + { + "id": "title", + "type": "text", + "pos": { + "x": 37, + "y": -71 + }, + "width": 257, + "height": 51, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "transparent", + "stroke": "N1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "# A winning strategy", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 257, + "labelHeight": 51, + "zIndex": 0, + "level": 1 + }, { "id": "poll the people", "type": "rectangle", @@ -207,46 +247,6 @@ "labelPosition": "INSIDE_MIDDLE_CENTER", "zIndex": 0, "level": 1 - }, - { - "id": "title", - "type": "text", - "pos": { - "x": 37, - "y": -71 - }, - "width": 257, - "height": 51, - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "borderRadius": 0, - "fill": "transparent", - "stroke": "N1", - "shadow": false, - "3d": false, - "multiple": false, - "double-border": false, - "tooltip": "", - "link": "", - "icon": null, - "iconPosition": "", - "blend": false, - "fields": null, - "methods": null, - "columns": null, - "label": "# A winning strategy", - "fontSize": 16, - "fontFamily": "DEFAULT", - "language": "markdown", - "color": "N1", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 257, - "labelHeight": 51, - "zIndex": 0, - "level": 1 } ], "connections": [ diff --git a/e2etests/testdata/stable/constant_near_title/dagre/sketch.exp.svg b/e2etests/testdata/stable/constant_near_title/dagre/sketch.exp.svg index 91cd0cab6..b3955e1c1 100644 --- a/e2etests/testdata/stable/constant_near_title/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/constant_near_title/dagre/sketch.exp.svg @@ -1,20 +1,20 @@ -poll the peopleresultsunfavorablefavorablewill of the people

A winning strategy

-
 +

A winning strategy

+
poll the peopleresultsunfavorablefavorablewill of the people + - \ No newline at end of file diff --git a/e2etests/testdata/stable/constant_near_title/elk/board.exp.json b/e2etests/testdata/stable/constant_near_title/elk/board.exp.json index 56d22f7ee..1eb62f0b7 100644 --- a/e2etests/testdata/stable/constant_near_title/elk/board.exp.json +++ b/e2etests/testdata/stable/constant_near_title/elk/board.exp.json @@ -3,6 +3,46 @@ "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ + { + "id": "title", + "type": "text", + "pos": { + "x": 29, + "y": -59 + }, + "width": 257, + "height": 51, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "transparent", + "stroke": "N1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "# A winning strategy", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 257, + "labelHeight": 51, + "zIndex": 0, + "level": 1 + }, { "id": "poll the people", "type": "rectangle", @@ -207,46 +247,6 @@ "labelPosition": "INSIDE_MIDDLE_CENTER", "zIndex": 0, "level": 1 - }, - { - "id": "title", - "type": "text", - "pos": { - "x": 29, - "y": -59 - }, - "width": 257, - "height": 51, - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "borderRadius": 0, - "fill": "transparent", - "stroke": "N1", - "shadow": false, - "3d": false, - "multiple": false, - "double-border": false, - "tooltip": "", - "link": "", - "icon": null, - "iconPosition": "", - "blend": false, - "fields": null, - "methods": null, - "columns": null, - "label": "# A winning strategy", - "fontSize": 16, - "fontFamily": "DEFAULT", - "language": "markdown", - "color": "N1", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 257, - "labelHeight": 51, - "zIndex": 0, - "level": 1 } ], "connections": [ diff --git a/e2etests/testdata/stable/constant_near_title/elk/sketch.exp.svg b/e2etests/testdata/stable/constant_near_title/elk/sketch.exp.svg index 8d6e6ec78..275c532b1 100644 --- a/e2etests/testdata/stable/constant_near_title/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/constant_near_title/elk/sketch.exp.svg @@ -1,20 +1,20 @@ -poll the peopleresultsunfavorablefavorablewill of the people

A winning strategy

-
 +

A winning strategy

+
poll the peopleresultsunfavorablefavorablewill of the people + - \ No newline at end of file diff --git a/e2etests/testdata/stable/near_keys_for_container#01/dagre/board.exp.json b/e2etests/testdata/stable/near_keys_for_container#01/dagre/board.exp.json index 0b3b174cd..f0d9f8c63 100644 --- a/e2etests/testdata/stable/near_keys_for_container#01/dagre/board.exp.json +++ b/e2etests/testdata/stable/near_keys_for_container#01/dagre/board.exp.json @@ -3,334 +3,6 @@ "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ - { - "id": "z", - "type": "rectangle", - "pos": { - "x": -113, - "y": 56 - }, - "width": 227, - "height": 292, - "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": "z", - "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": "z.a", - "type": "rectangle", - "pos": { - "x": -83, - "y": 86 - }, - "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": "a", - "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": "z.b", - "type": "rectangle", - "pos": { - "x": -83, - "y": 252 - }, - "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": "z.c", - "type": "rectangle", - "pos": { - "x": 30, - "y": 86 - }, - "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": "c", - "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": "z.d", - "type": "rectangle", - "pos": { - "x": 29, - "y": 252 - }, - "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": "a", - "type": "rectangle", - "pos": { - "x": -86, - "y": -217 - }, - "width": 173, - "height": 197, - "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": -56, - "y": -176 - }, - "width": 113, - "height": 126, - "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": 24, - "fontFamily": "DEFAULT", - "language": "", - "color": "N1", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 12, - "labelHeight": 31, - "labelPosition": "OUTSIDE_TOP_CENTER", - "zIndex": 0, - "level": 2 - }, - { - "id": "a.b.c", - "type": "rectangle", - "pos": { - "x": -26, - "y": -146 - }, - "width": 53, - "height": 66, - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "borderRadius": 0, - "fill": "B6", - "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": 16, - "fontFamily": "DEFAULT", - "language": "", - "color": "N1", - "italic": false, - "bold": true, - "underline": false, - "labelWidth": 8, - "labelHeight": 21, - "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 0, - "level": 3 - }, { "id": "x", "type": "rectangle", @@ -741,6 +413,334 @@ "zIndex": 0, "level": 2 }, + { + "id": "z", + "type": "rectangle", + "pos": { + "x": -113, + "y": 56 + }, + "width": 227, + "height": 292, + "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": "z", + "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": "z.a", + "type": "rectangle", + "pos": { + "x": -83, + "y": 86 + }, + "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": "a", + "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": "z.b", + "type": "rectangle", + "pos": { + "x": -83, + "y": 252 + }, + "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": "z.c", + "type": "rectangle", + "pos": { + "x": 30, + "y": 86 + }, + "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": "c", + "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": "z.d", + "type": "rectangle", + "pos": { + "x": 29, + "y": 252 + }, + "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": "a", + "type": "rectangle", + "pos": { + "x": -86, + "y": -217 + }, + "width": 173, + "height": 197, + "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": -56, + "y": -176 + }, + "width": 113, + "height": 126, + "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": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 12, + "labelHeight": 31, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "a.b.c", + "type": "rectangle", + "pos": { + "x": -26, + "y": -146 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "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": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, { "id": "b", "type": "rectangle", @@ -907,100 +907,6 @@ } ], "connections": [ - { - "id": "z.(a -> b)[0]", - "src": "z.a", - "srcArrow": "none", - "dst": "z.b", - "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": -57, - "y": 152 - }, - { - "x": -57, - "y": 192 - }, - { - "x": -57, - "y": 212 - }, - { - "x": -57, - "y": 252 - } - ], - "isCurve": true, - "animated": false, - "tooltip": "", - "icon": null, - "zIndex": 0 - }, - { - "id": "z.(c -> d)[0]", - "src": "z.c", - "srcArrow": "none", - "dst": "z.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": 56.5, - "y": 152 - }, - { - "x": 56.5, - "y": 192 - }, - { - "x": 56.5, - "y": 212 - }, - { - "x": 56.5, - "y": 252 - } - ], - "isCurve": true, - "animated": false, - "tooltip": "", - "icon": null, - "zIndex": 0 - }, { "id": "x.(a -> b)[0]", "src": "x.a", @@ -1188,6 +1094,100 @@ "tooltip": "", "icon": null, "zIndex": 0 + }, + { + "id": "z.(a -> b)[0]", + "src": "z.a", + "srcArrow": "none", + "dst": "z.b", + "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": -57, + "y": 152 + }, + { + "x": -57, + "y": 192 + }, + { + "x": -57, + "y": 212 + }, + { + "x": -57, + "y": 252 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "z.(c -> d)[0]", + "src": "z.c", + "srcArrow": "none", + "dst": "z.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": 56.5, + "y": 152 + }, + { + "x": 56.5, + "y": 192 + }, + { + "x": 56.5, + "y": 212 + }, + { + "x": 56.5, + "y": 252 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 } ], "root": { diff --git a/e2etests/testdata/stable/near_keys_for_container#01/dagre/sketch.exp.svg b/e2etests/testdata/stable/near_keys_for_container#01/dagre/sketch.exp.svg index 006077180..332b06d69 100644 --- a/e2etests/testdata/stable/near_keys_for_container#01/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/near_keys_for_container#01/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -zaxybabcdbabcdabcdaccd + .d2-4283156917 .fill-N1{fill:#0A0F25;} + .d2-4283156917 .fill-N2{fill:#676C7E;} + .d2-4283156917 .fill-N3{fill:#9499AB;} + .d2-4283156917 .fill-N4{fill:#CFD2DD;} + .d2-4283156917 .fill-N5{fill:#DEE1EB;} + .d2-4283156917 .fill-N6{fill:#EEF1F8;} + .d2-4283156917 .fill-N7{fill:#FFFFFF;} + .d2-4283156917 .fill-B1{fill:#0D32B2;} + .d2-4283156917 .fill-B2{fill:#0D32B2;} + .d2-4283156917 .fill-B3{fill:#E3E9FD;} + .d2-4283156917 .fill-B4{fill:#E3E9FD;} + .d2-4283156917 .fill-B5{fill:#EDF0FD;} + .d2-4283156917 .fill-B6{fill:#F7F8FE;} + .d2-4283156917 .fill-AA2{fill:#4A6FF3;} + .d2-4283156917 .fill-AA4{fill:#EDF0FD;} + .d2-4283156917 .fill-AA5{fill:#F7F8FE;} + .d2-4283156917 .fill-AB4{fill:#EDF0FD;} + .d2-4283156917 .fill-AB5{fill:#F7F8FE;} + .d2-4283156917 .stroke-N1{stroke:#0A0F25;} + .d2-4283156917 .stroke-N2{stroke:#676C7E;} + .d2-4283156917 .stroke-N3{stroke:#9499AB;} + .d2-4283156917 .stroke-N4{stroke:#CFD2DD;} + .d2-4283156917 .stroke-N5{stroke:#DEE1EB;} + .d2-4283156917 .stroke-N6{stroke:#EEF1F8;} + .d2-4283156917 .stroke-N7{stroke:#FFFFFF;} + .d2-4283156917 .stroke-B1{stroke:#0D32B2;} + .d2-4283156917 .stroke-B2{stroke:#0D32B2;} + .d2-4283156917 .stroke-B3{stroke:#E3E9FD;} + .d2-4283156917 .stroke-B4{stroke:#E3E9FD;} + .d2-4283156917 .stroke-B5{stroke:#EDF0FD;} + .d2-4283156917 .stroke-B6{stroke:#F7F8FE;} + .d2-4283156917 .stroke-AA2{stroke:#4A6FF3;} + .d2-4283156917 .stroke-AA4{stroke:#EDF0FD;} + .d2-4283156917 .stroke-AA5{stroke:#F7F8FE;} + .d2-4283156917 .stroke-AB4{stroke:#EDF0FD;} + .d2-4283156917 .stroke-AB5{stroke:#F7F8FE;} + .d2-4283156917 .background-color-N1{background-color:#0A0F25;} + .d2-4283156917 .background-color-N2{background-color:#676C7E;} + .d2-4283156917 .background-color-N3{background-color:#9499AB;} + .d2-4283156917 .background-color-N4{background-color:#CFD2DD;} + .d2-4283156917 .background-color-N5{background-color:#DEE1EB;} + .d2-4283156917 .background-color-N6{background-color:#EEF1F8;} + .d2-4283156917 .background-color-N7{background-color:#FFFFFF;} + .d2-4283156917 .background-color-B1{background-color:#0D32B2;} + .d2-4283156917 .background-color-B2{background-color:#0D32B2;} + .d2-4283156917 .background-color-B3{background-color:#E3E9FD;} + .d2-4283156917 .background-color-B4{background-color:#E3E9FD;} + .d2-4283156917 .background-color-B5{background-color:#EDF0FD;} + .d2-4283156917 .background-color-B6{background-color:#F7F8FE;} + .d2-4283156917 .background-color-AA2{background-color:#4A6FF3;} + .d2-4283156917 .background-color-AA4{background-color:#EDF0FD;} + .d2-4283156917 .background-color-AA5{background-color:#F7F8FE;} + .d2-4283156917 .background-color-AB4{background-color:#EDF0FD;} + .d2-4283156917 .background-color-AB5{background-color:#F7F8FE;} + .d2-4283156917 .color-N1{color:#0A0F25;} + .d2-4283156917 .color-N2{color:#676C7E;} + .d2-4283156917 .color-N3{color:#9499AB;} + .d2-4283156917 .color-N4{color:#CFD2DD;} + .d2-4283156917 .color-N5{color:#DEE1EB;} + .d2-4283156917 .color-N6{color:#EEF1F8;} + .d2-4283156917 .color-N7{color:#FFFFFF;} + .d2-4283156917 .color-B1{color:#0D32B2;} + .d2-4283156917 .color-B2{color:#0D32B2;} + .d2-4283156917 .color-B3{color:#E3E9FD;} + .d2-4283156917 .color-B4{color:#E3E9FD;} + .d2-4283156917 .color-B5{color:#EDF0FD;} + .d2-4283156917 .color-B6{color:#F7F8FE;} + .d2-4283156917 .color-AA2{color:#4A6FF3;} + .d2-4283156917 .color-AA4{color:#EDF0FD;} + .d2-4283156917 .color-AA5{color:#F7F8FE;} + .d2-4283156917 .color-AB4{color:#EDF0FD;} + .d2-4283156917 .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}]]>xyzababcdabcdabcdbaccd - - + + - - - - - @@ -116,6 +111,11 @@ + + + + + diff --git a/e2etests/testdata/stable/near_keys_for_container#01/elk/board.exp.json b/e2etests/testdata/stable/near_keys_for_container#01/elk/board.exp.json index c216a61ab..461bd39c7 100644 --- a/e2etests/testdata/stable/near_keys_for_container#01/elk/board.exp.json +++ b/e2etests/testdata/stable/near_keys_for_container#01/elk/board.exp.json @@ -3,334 +3,6 @@ "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ - { - "id": "z", - "type": "rectangle", - "pos": { - "x": -113, - "y": 20 - }, - "width": 227, - "height": 302, - "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": "z", - "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": "z.a", - "type": "rectangle", - "pos": { - "x": -63, - "y": 70 - }, - "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": "a", - "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": "z.b", - "type": "rectangle", - "pos": { - "x": -63, - "y": 206 - }, - "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": "z.c", - "type": "rectangle", - "pos": { - "x": 10, - "y": 70 - }, - "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": "c", - "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": "z.d", - "type": "rectangle", - "pos": { - "x": 9, - "y": 206 - }, - "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": "a", - "type": "rectangle", - "pos": { - "x": -126, - "y": -286 - }, - "width": 253, - "height": 266, - "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": -76, - "y": -236 - }, - "width": 153, - "height": 166, - "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": 24, - "fontFamily": "DEFAULT", - "language": "", - "color": "N1", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 12, - "labelHeight": 31, - "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 0, - "level": 2 - }, - { - "id": "a.b.c", - "type": "rectangle", - "pos": { - "x": -26, - "y": -186 - }, - "width": 53, - "height": 66, - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "borderRadius": 0, - "fill": "B6", - "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": 16, - "fontFamily": "DEFAULT", - "language": "", - "color": "N1", - "italic": false, - "bold": true, - "underline": false, - "labelWidth": 8, - "labelHeight": 21, - "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 0, - "level": 3 - }, { "id": "x", "type": "rectangle", @@ -741,6 +413,334 @@ "zIndex": 0, "level": 2 }, + { + "id": "z", + "type": "rectangle", + "pos": { + "x": -113, + "y": 20 + }, + "width": 227, + "height": 302, + "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": "z", + "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": "z.a", + "type": "rectangle", + "pos": { + "x": -63, + "y": 70 + }, + "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": "a", + "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": "z.b", + "type": "rectangle", + "pos": { + "x": -63, + "y": 206 + }, + "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": "z.c", + "type": "rectangle", + "pos": { + "x": 10, + "y": 70 + }, + "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": "c", + "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": "z.d", + "type": "rectangle", + "pos": { + "x": 9, + "y": 206 + }, + "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": "a", + "type": "rectangle", + "pos": { + "x": -126, + "y": -286 + }, + "width": 253, + "height": 266, + "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": -76, + "y": -236 + }, + "width": 153, + "height": 166, + "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": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 12, + "labelHeight": 31, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "a.b.c", + "type": "rectangle", + "pos": { + "x": -26, + "y": -186 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "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": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, { "id": "b", "type": "rectangle", @@ -907,82 +907,6 @@ } ], "connections": [ - { - "id": "z.(a -> b)[0]", - "src": "z.a", - "srcArrow": "none", - "dst": "z.b", - "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": -37, - "y": 136 - }, - { - "x": -37, - "y": 206 - } - ], - "animated": false, - "tooltip": "", - "icon": null, - "zIndex": 0 - }, - { - "id": "z.(c -> d)[0]", - "src": "z.c", - "srcArrow": "none", - "dst": "z.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": 36.5, - "y": 136 - }, - { - "x": 36.5, - "y": 206 - } - ], - "animated": false, - "tooltip": "", - "icon": null, - "zIndex": 0 - }, { "id": "x.(a -> b)[0]", "src": "x.a", @@ -1134,6 +1058,82 @@ "tooltip": "", "icon": null, "zIndex": 0 + }, + { + "id": "z.(a -> b)[0]", + "src": "z.a", + "srcArrow": "none", + "dst": "z.b", + "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": -37, + "y": 136 + }, + { + "x": -37, + "y": 206 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "z.(c -> d)[0]", + "src": "z.c", + "srcArrow": "none", + "dst": "z.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": 36.5, + "y": 136 + }, + { + "x": 36.5, + "y": 206 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 } ], "root": { diff --git a/e2etests/testdata/stable/near_keys_for_container#01/elk/sketch.exp.svg b/e2etests/testdata/stable/near_keys_for_container#01/elk/sketch.exp.svg index 535aecf9d..d7853b97f 100644 --- a/e2etests/testdata/stable/near_keys_for_container#01/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/near_keys_for_container#01/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -zaxybabcdbabcdabcdaccd + .d2-355368884 .fill-N1{fill:#0A0F25;} + .d2-355368884 .fill-N2{fill:#676C7E;} + .d2-355368884 .fill-N3{fill:#9499AB;} + .d2-355368884 .fill-N4{fill:#CFD2DD;} + .d2-355368884 .fill-N5{fill:#DEE1EB;} + .d2-355368884 .fill-N6{fill:#EEF1F8;} + .d2-355368884 .fill-N7{fill:#FFFFFF;} + .d2-355368884 .fill-B1{fill:#0D32B2;} + .d2-355368884 .fill-B2{fill:#0D32B2;} + .d2-355368884 .fill-B3{fill:#E3E9FD;} + .d2-355368884 .fill-B4{fill:#E3E9FD;} + .d2-355368884 .fill-B5{fill:#EDF0FD;} + .d2-355368884 .fill-B6{fill:#F7F8FE;} + .d2-355368884 .fill-AA2{fill:#4A6FF3;} + .d2-355368884 .fill-AA4{fill:#EDF0FD;} + .d2-355368884 .fill-AA5{fill:#F7F8FE;} + .d2-355368884 .fill-AB4{fill:#EDF0FD;} + .d2-355368884 .fill-AB5{fill:#F7F8FE;} + .d2-355368884 .stroke-N1{stroke:#0A0F25;} + .d2-355368884 .stroke-N2{stroke:#676C7E;} + .d2-355368884 .stroke-N3{stroke:#9499AB;} + .d2-355368884 .stroke-N4{stroke:#CFD2DD;} + .d2-355368884 .stroke-N5{stroke:#DEE1EB;} + .d2-355368884 .stroke-N6{stroke:#EEF1F8;} + .d2-355368884 .stroke-N7{stroke:#FFFFFF;} + .d2-355368884 .stroke-B1{stroke:#0D32B2;} + .d2-355368884 .stroke-B2{stroke:#0D32B2;} + .d2-355368884 .stroke-B3{stroke:#E3E9FD;} + .d2-355368884 .stroke-B4{stroke:#E3E9FD;} + .d2-355368884 .stroke-B5{stroke:#EDF0FD;} + .d2-355368884 .stroke-B6{stroke:#F7F8FE;} + .d2-355368884 .stroke-AA2{stroke:#4A6FF3;} + .d2-355368884 .stroke-AA4{stroke:#EDF0FD;} + .d2-355368884 .stroke-AA5{stroke:#F7F8FE;} + .d2-355368884 .stroke-AB4{stroke:#EDF0FD;} + .d2-355368884 .stroke-AB5{stroke:#F7F8FE;} + .d2-355368884 .background-color-N1{background-color:#0A0F25;} + .d2-355368884 .background-color-N2{background-color:#676C7E;} + .d2-355368884 .background-color-N3{background-color:#9499AB;} + .d2-355368884 .background-color-N4{background-color:#CFD2DD;} + .d2-355368884 .background-color-N5{background-color:#DEE1EB;} + .d2-355368884 .background-color-N6{background-color:#EEF1F8;} + .d2-355368884 .background-color-N7{background-color:#FFFFFF;} + .d2-355368884 .background-color-B1{background-color:#0D32B2;} + .d2-355368884 .background-color-B2{background-color:#0D32B2;} + .d2-355368884 .background-color-B3{background-color:#E3E9FD;} + .d2-355368884 .background-color-B4{background-color:#E3E9FD;} + .d2-355368884 .background-color-B5{background-color:#EDF0FD;} + .d2-355368884 .background-color-B6{background-color:#F7F8FE;} + .d2-355368884 .background-color-AA2{background-color:#4A6FF3;} + .d2-355368884 .background-color-AA4{background-color:#EDF0FD;} + .d2-355368884 .background-color-AA5{background-color:#F7F8FE;} + .d2-355368884 .background-color-AB4{background-color:#EDF0FD;} + .d2-355368884 .background-color-AB5{background-color:#F7F8FE;} + .d2-355368884 .color-N1{color:#0A0F25;} + .d2-355368884 .color-N2{color:#676C7E;} + .d2-355368884 .color-N3{color:#9499AB;} + .d2-355368884 .color-N4{color:#CFD2DD;} + .d2-355368884 .color-N5{color:#DEE1EB;} + .d2-355368884 .color-N6{color:#EEF1F8;} + .d2-355368884 .color-N7{color:#FFFFFF;} + .d2-355368884 .color-B1{color:#0D32B2;} + .d2-355368884 .color-B2{color:#0D32B2;} + .d2-355368884 .color-B3{color:#E3E9FD;} + .d2-355368884 .color-B4{color:#E3E9FD;} + .d2-355368884 .color-B5{color:#EDF0FD;} + .d2-355368884 .color-B6{color:#F7F8FE;} + .d2-355368884 .color-AA2{color:#4A6FF3;} + .d2-355368884 .color-AA4{color:#EDF0FD;} + .d2-355368884 .color-AA5{color:#F7F8FE;} + .d2-355368884 .color-AB4{color:#EDF0FD;} + .d2-355368884 .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}]]>xyzababcdabcdabcdbaccd - - + + - - - - - @@ -116,6 +111,11 @@ + + + + +