diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md index efd102ef3..f0ba7471d 100644 --- a/ci/release/changelogs/next.md +++ b/ci/release/changelogs/next.md @@ -30,3 +30,4 @@ - Fixes edge case where nested edge globs were creating excess shapes [#1713](https://github.com/terrastruct/d2/pull/1713) - Fixes a panic with a connection to a grid cell that is a container in TALA [#1729](https://github.com/terrastruct/d2/pull/1729) - Fixes incorrect grid cell positioning when the grid has a shape set and fixes content sometimes escaping circle shapes. [#1734](https://github.com/terrastruct/d2/pull/1734) +- Fixes content sometimes escaping cloud shapes. [#1736](https://github.com/terrastruct/d2/pull/1736) diff --git a/d2exporter/export.go b/d2exporter/export.go index bf923c653..7a959ae07 100644 --- a/d2exporter/export.go +++ b/d2exporter/export.go @@ -167,6 +167,10 @@ func toShape(obj *d2graph.Object, theme *d2themes.Theme) d2target.Shape { case d2target.ShapeSQLTable: shape.SQLTable = *obj.SQLTable shape.FontSize -= d2target.HeaderFontAdd + case d2target.ShapeCloud: + if obj.ContentAspectRatio != nil { + shape.ContentAspectRatio = go2.Pointer(*obj.ContentAspectRatio) + } } shape.Label = text.Text shape.LabelWidth = text.Dimensions.Width diff --git a/d2graph/d2graph.go b/d2graph/d2graph.go index 7fb32ad87..3632dea7c 100644 --- a/d2graph/d2graph.go +++ b/d2graph/d2graph.go @@ -107,6 +107,8 @@ type Object struct { LabelPosition *string `json:"labelPosition,omitempty"` IconPosition *string `json:"iconPosition,omitempty"` + ContentAspectRatio *float64 `json:"contentAspectRatio,omitempty"` + Class *d2target.Class `json:"class,omitempty"` SQLTable *d2target.SQLTable `json:"sql_table,omitempty"` @@ -1068,13 +1070,17 @@ func (obj *Object) SizeToContent(contentWidth, contentHeight, paddingX, paddingY obj.Width = sideLength obj.Height = sideLength } else if desiredHeight == 0 || desiredWidth == 0 { - switch s.GetType() { + switch shapeType { case shape.PERSON_TYPE: obj.Width, obj.Height = shape.LimitAR(obj.Width, obj.Height, shape.PERSON_AR_LIMIT) case shape.OVAL_TYPE: obj.Width, obj.Height = shape.LimitAR(obj.Width, obj.Height, shape.OVAL_AR_LIMIT) } } + if shapeType == shape.CLOUD_TYPE { + innerBox := s.GetInnerBoxForContent(contentWidth, contentHeight) + obj.ContentAspectRatio = go2.Pointer(innerBox.Width / innerBox.Height) + } } func (obj *Object) OuterNearContainer() *Object { diff --git a/d2graph/layout.go b/d2graph/layout.go index 473178983..7567dfbdc 100644 --- a/d2graph/layout.go +++ b/d2graph/layout.go @@ -364,7 +364,11 @@ func (obj *Object) ToShape() shape.Shape { dslShape := strings.ToLower(obj.Shape.Value) shapeType := d2target.DSL_SHAPE_TO_SHAPE_TYPE[dslShape] contentBox := geo.NewBox(tl, obj.Width, obj.Height) - return shape.NewShape(shapeType, contentBox) + s := shape.NewShape(shapeType, contentBox) + if shapeType == shape.CLOUD_TYPE && obj.ContentAspectRatio != nil { + s.SetInnerBoxAspectRatio(*obj.ContentAspectRatio) + } + return s } func (obj *Object) GetLabelTopLeft() *geo.Point { diff --git a/d2layouts/d2grid/layout.go b/d2layouts/d2grid/layout.go index 7e106eb0a..d07ddb4de 100644 --- a/d2layouts/d2grid/layout.go +++ b/d2layouts/d2grid/layout.go @@ -125,7 +125,6 @@ func Layout(ctx context.Context, g *d2graph.Graph) error { // depending on the shape innerBox may be larger than totalWidth, totalHeight // if this is the case, we want to center the cells within the larger innerBox innerBox := s.GetInnerBox() - var resizeDx, resizeDy float64 if innerBox.Width > totalWidth { resizeDx = (innerBox.Width - totalWidth) / 2 diff --git a/d2renderers/d2sketch/testdata/all_shapes/sketch.exp.svg b/d2renderers/d2sketch/testdata/all_shapes/sketch.exp.svg index 966f246bb..131dec077 100644 --- a/d2renderers/d2sketch/testdata/all_shapes/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/all_shapes/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-2513870599 .fill-N1{fill:#0A0F25;} + .d2-2513870599 .fill-N2{fill:#676C7E;} + .d2-2513870599 .fill-N3{fill:#9499AB;} + .d2-2513870599 .fill-N4{fill:#CFD2DD;} + .d2-2513870599 .fill-N5{fill:#DEE1EB;} + .d2-2513870599 .fill-N6{fill:#EEF1F8;} + .d2-2513870599 .fill-N7{fill:#FFFFFF;} + .d2-2513870599 .fill-B1{fill:#0D32B2;} + .d2-2513870599 .fill-B2{fill:#0D32B2;} + .d2-2513870599 .fill-B3{fill:#E3E9FD;} + .d2-2513870599 .fill-B4{fill:#E3E9FD;} + .d2-2513870599 .fill-B5{fill:#EDF0FD;} + .d2-2513870599 .fill-B6{fill:#F7F8FE;} + .d2-2513870599 .fill-AA2{fill:#4A6FF3;} + .d2-2513870599 .fill-AA4{fill:#EDF0FD;} + .d2-2513870599 .fill-AA5{fill:#F7F8FE;} + .d2-2513870599 .fill-AB4{fill:#EDF0FD;} + .d2-2513870599 .fill-AB5{fill:#F7F8FE;} + .d2-2513870599 .stroke-N1{stroke:#0A0F25;} + .d2-2513870599 .stroke-N2{stroke:#676C7E;} + .d2-2513870599 .stroke-N3{stroke:#9499AB;} + .d2-2513870599 .stroke-N4{stroke:#CFD2DD;} + .d2-2513870599 .stroke-N5{stroke:#DEE1EB;} + .d2-2513870599 .stroke-N6{stroke:#EEF1F8;} + .d2-2513870599 .stroke-N7{stroke:#FFFFFF;} + .d2-2513870599 .stroke-B1{stroke:#0D32B2;} + .d2-2513870599 .stroke-B2{stroke:#0D32B2;} + .d2-2513870599 .stroke-B3{stroke:#E3E9FD;} + .d2-2513870599 .stroke-B4{stroke:#E3E9FD;} + .d2-2513870599 .stroke-B5{stroke:#EDF0FD;} + .d2-2513870599 .stroke-B6{stroke:#F7F8FE;} + .d2-2513870599 .stroke-AA2{stroke:#4A6FF3;} + .d2-2513870599 .stroke-AA4{stroke:#EDF0FD;} + .d2-2513870599 .stroke-AA5{stroke:#F7F8FE;} + .d2-2513870599 .stroke-AB4{stroke:#EDF0FD;} + .d2-2513870599 .stroke-AB5{stroke:#F7F8FE;} + .d2-2513870599 .background-color-N1{background-color:#0A0F25;} + .d2-2513870599 .background-color-N2{background-color:#676C7E;} + .d2-2513870599 .background-color-N3{background-color:#9499AB;} + .d2-2513870599 .background-color-N4{background-color:#CFD2DD;} + .d2-2513870599 .background-color-N5{background-color:#DEE1EB;} + .d2-2513870599 .background-color-N6{background-color:#EEF1F8;} + .d2-2513870599 .background-color-N7{background-color:#FFFFFF;} + .d2-2513870599 .background-color-B1{background-color:#0D32B2;} + .d2-2513870599 .background-color-B2{background-color:#0D32B2;} + .d2-2513870599 .background-color-B3{background-color:#E3E9FD;} + .d2-2513870599 .background-color-B4{background-color:#E3E9FD;} + .d2-2513870599 .background-color-B5{background-color:#EDF0FD;} + .d2-2513870599 .background-color-B6{background-color:#F7F8FE;} + .d2-2513870599 .background-color-AA2{background-color:#4A6FF3;} + .d2-2513870599 .background-color-AA4{background-color:#EDF0FD;} + .d2-2513870599 .background-color-AA5{background-color:#F7F8FE;} + .d2-2513870599 .background-color-AB4{background-color:#EDF0FD;} + .d2-2513870599 .background-color-AB5{background-color:#F7F8FE;} + .d2-2513870599 .color-N1{color:#0A0F25;} + .d2-2513870599 .color-N2{color:#676C7E;} + .d2-2513870599 .color-N3{color:#9499AB;} + .d2-2513870599 .color-N4{color:#CFD2DD;} + .d2-2513870599 .color-N5{color:#DEE1EB;} + .d2-2513870599 .color-N6{color:#EEF1F8;} + .d2-2513870599 .color-N7{color:#FFFFFF;} + .d2-2513870599 .color-B1{color:#0D32B2;} + .d2-2513870599 .color-B2{color:#0D32B2;} + .d2-2513870599 .color-B3{color:#E3E9FD;} + .d2-2513870599 .color-B4{color:#E3E9FD;} + .d2-2513870599 .color-B5{color:#EDF0FD;} + .d2-2513870599 .color-B6{color:#F7F8FE;} + .d2-2513870599 .color-AA2{color:#4A6FF3;} + .d2-2513870599 .color-AA4{color:#EDF0FD;} + .d2-2513870599 .color-AA5{color:#F7F8FE;} + .d2-2513870599 .color-AB4{color:#EDF0FD;} + .d2-2513870599 .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}]]> @@ -97,7 +97,7 @@ -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud +rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud diff --git a/d2renderers/d2sketch/testdata/all_shapes_dark/sketch.exp.svg b/d2renderers/d2sketch/testdata/all_shapes_dark/sketch.exp.svg index 6c856f099..d0345e78f 100644 --- a/d2renderers/d2sketch/testdata/all_shapes_dark/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/all_shapes_dark/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-2513870599 .fill-N1{fill:#CDD6F4;} + .d2-2513870599 .fill-N2{fill:#BAC2DE;} + .d2-2513870599 .fill-N3{fill:#A6ADC8;} + .d2-2513870599 .fill-N4{fill:#585B70;} + .d2-2513870599 .fill-N5{fill:#45475A;} + .d2-2513870599 .fill-N6{fill:#313244;} + .d2-2513870599 .fill-N7{fill:#1E1E2E;} + .d2-2513870599 .fill-B1{fill:#CBA6f7;} + .d2-2513870599 .fill-B2{fill:#CBA6f7;} + .d2-2513870599 .fill-B3{fill:#6C7086;} + .d2-2513870599 .fill-B4{fill:#585B70;} + .d2-2513870599 .fill-B5{fill:#45475A;} + .d2-2513870599 .fill-B6{fill:#313244;} + .d2-2513870599 .fill-AA2{fill:#f38BA8;} + .d2-2513870599 .fill-AA4{fill:#45475A;} + .d2-2513870599 .fill-AA5{fill:#313244;} + .d2-2513870599 .fill-AB4{fill:#45475A;} + .d2-2513870599 .fill-AB5{fill:#313244;} + .d2-2513870599 .stroke-N1{stroke:#CDD6F4;} + .d2-2513870599 .stroke-N2{stroke:#BAC2DE;} + .d2-2513870599 .stroke-N3{stroke:#A6ADC8;} + .d2-2513870599 .stroke-N4{stroke:#585B70;} + .d2-2513870599 .stroke-N5{stroke:#45475A;} + .d2-2513870599 .stroke-N6{stroke:#313244;} + .d2-2513870599 .stroke-N7{stroke:#1E1E2E;} + .d2-2513870599 .stroke-B1{stroke:#CBA6f7;} + .d2-2513870599 .stroke-B2{stroke:#CBA6f7;} + .d2-2513870599 .stroke-B3{stroke:#6C7086;} + .d2-2513870599 .stroke-B4{stroke:#585B70;} + .d2-2513870599 .stroke-B5{stroke:#45475A;} + .d2-2513870599 .stroke-B6{stroke:#313244;} + .d2-2513870599 .stroke-AA2{stroke:#f38BA8;} + .d2-2513870599 .stroke-AA4{stroke:#45475A;} + .d2-2513870599 .stroke-AA5{stroke:#313244;} + .d2-2513870599 .stroke-AB4{stroke:#45475A;} + .d2-2513870599 .stroke-AB5{stroke:#313244;} + .d2-2513870599 .background-color-N1{background-color:#CDD6F4;} + .d2-2513870599 .background-color-N2{background-color:#BAC2DE;} + .d2-2513870599 .background-color-N3{background-color:#A6ADC8;} + .d2-2513870599 .background-color-N4{background-color:#585B70;} + .d2-2513870599 .background-color-N5{background-color:#45475A;} + .d2-2513870599 .background-color-N6{background-color:#313244;} + .d2-2513870599 .background-color-N7{background-color:#1E1E2E;} + .d2-2513870599 .background-color-B1{background-color:#CBA6f7;} + .d2-2513870599 .background-color-B2{background-color:#CBA6f7;} + .d2-2513870599 .background-color-B3{background-color:#6C7086;} + .d2-2513870599 .background-color-B4{background-color:#585B70;} + .d2-2513870599 .background-color-B5{background-color:#45475A;} + .d2-2513870599 .background-color-B6{background-color:#313244;} + .d2-2513870599 .background-color-AA2{background-color:#f38BA8;} + .d2-2513870599 .background-color-AA4{background-color:#45475A;} + .d2-2513870599 .background-color-AA5{background-color:#313244;} + .d2-2513870599 .background-color-AB4{background-color:#45475A;} + .d2-2513870599 .background-color-AB5{background-color:#313244;} + .d2-2513870599 .color-N1{color:#CDD6F4;} + .d2-2513870599 .color-N2{color:#BAC2DE;} + .d2-2513870599 .color-N3{color:#A6ADC8;} + .d2-2513870599 .color-N4{color:#585B70;} + .d2-2513870599 .color-N5{color:#45475A;} + .d2-2513870599 .color-N6{color:#313244;} + .d2-2513870599 .color-N7{color:#1E1E2E;} + .d2-2513870599 .color-B1{color:#CBA6f7;} + .d2-2513870599 .color-B2{color:#CBA6f7;} + .d2-2513870599 .color-B3{color:#6C7086;} + .d2-2513870599 .color-B4{color:#585B70;} + .d2-2513870599 .color-B5{color:#45475A;} + .d2-2513870599 .color-B6{color:#313244;} + .d2-2513870599 .color-AA2{color:#f38BA8;} + .d2-2513870599 .color-AA4{color:#45475A;} + .d2-2513870599 .color-AA5{color:#313244;} + .d2-2513870599 .color-AB4{color:#45475A;} + .d2-2513870599 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]> -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud +rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud diff --git a/d2renderers/d2sketch/testdata/dots-all/sketch.exp.svg b/d2renderers/d2sketch/testdata/dots-all/sketch.exp.svg index 1529e27c1..22553e2ae 100644 --- a/d2renderers/d2sketch/testdata/dots-all/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/dots-all/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-144203892 .fill-N1{fill:#0A0F25;} + .d2-144203892 .fill-N2{fill:#676C7E;} + .d2-144203892 .fill-N3{fill:#9499AB;} + .d2-144203892 .fill-N4{fill:#CFD2DD;} + .d2-144203892 .fill-N5{fill:#DEE1EB;} + .d2-144203892 .fill-N6{fill:#EEF1F8;} + .d2-144203892 .fill-N7{fill:#FFFFFF;} + .d2-144203892 .fill-B1{fill:#0D32B2;} + .d2-144203892 .fill-B2{fill:#0D32B2;} + .d2-144203892 .fill-B3{fill:#E3E9FD;} + .d2-144203892 .fill-B4{fill:#E3E9FD;} + .d2-144203892 .fill-B5{fill:#EDF0FD;} + .d2-144203892 .fill-B6{fill:#F7F8FE;} + .d2-144203892 .fill-AA2{fill:#4A6FF3;} + .d2-144203892 .fill-AA4{fill:#EDF0FD;} + .d2-144203892 .fill-AA5{fill:#F7F8FE;} + .d2-144203892 .fill-AB4{fill:#EDF0FD;} + .d2-144203892 .fill-AB5{fill:#F7F8FE;} + .d2-144203892 .stroke-N1{stroke:#0A0F25;} + .d2-144203892 .stroke-N2{stroke:#676C7E;} + .d2-144203892 .stroke-N3{stroke:#9499AB;} + .d2-144203892 .stroke-N4{stroke:#CFD2DD;} + .d2-144203892 .stroke-N5{stroke:#DEE1EB;} + .d2-144203892 .stroke-N6{stroke:#EEF1F8;} + .d2-144203892 .stroke-N7{stroke:#FFFFFF;} + .d2-144203892 .stroke-B1{stroke:#0D32B2;} + .d2-144203892 .stroke-B2{stroke:#0D32B2;} + .d2-144203892 .stroke-B3{stroke:#E3E9FD;} + .d2-144203892 .stroke-B4{stroke:#E3E9FD;} + .d2-144203892 .stroke-B5{stroke:#EDF0FD;} + .d2-144203892 .stroke-B6{stroke:#F7F8FE;} + .d2-144203892 .stroke-AA2{stroke:#4A6FF3;} + .d2-144203892 .stroke-AA4{stroke:#EDF0FD;} + .d2-144203892 .stroke-AA5{stroke:#F7F8FE;} + .d2-144203892 .stroke-AB4{stroke:#EDF0FD;} + .d2-144203892 .stroke-AB5{stroke:#F7F8FE;} + .d2-144203892 .background-color-N1{background-color:#0A0F25;} + .d2-144203892 .background-color-N2{background-color:#676C7E;} + .d2-144203892 .background-color-N3{background-color:#9499AB;} + .d2-144203892 .background-color-N4{background-color:#CFD2DD;} + .d2-144203892 .background-color-N5{background-color:#DEE1EB;} + .d2-144203892 .background-color-N6{background-color:#EEF1F8;} + .d2-144203892 .background-color-N7{background-color:#FFFFFF;} + .d2-144203892 .background-color-B1{background-color:#0D32B2;} + .d2-144203892 .background-color-B2{background-color:#0D32B2;} + .d2-144203892 .background-color-B3{background-color:#E3E9FD;} + .d2-144203892 .background-color-B4{background-color:#E3E9FD;} + .d2-144203892 .background-color-B5{background-color:#EDF0FD;} + .d2-144203892 .background-color-B6{background-color:#F7F8FE;} + .d2-144203892 .background-color-AA2{background-color:#4A6FF3;} + .d2-144203892 .background-color-AA4{background-color:#EDF0FD;} + .d2-144203892 .background-color-AA5{background-color:#F7F8FE;} + .d2-144203892 .background-color-AB4{background-color:#EDF0FD;} + .d2-144203892 .background-color-AB5{background-color:#F7F8FE;} + .d2-144203892 .color-N1{color:#0A0F25;} + .d2-144203892 .color-N2{color:#676C7E;} + .d2-144203892 .color-N3{color:#9499AB;} + .d2-144203892 .color-N4{color:#CFD2DD;} + .d2-144203892 .color-N5{color:#DEE1EB;} + .d2-144203892 .color-N6{color:#EEF1F8;} + .d2-144203892 .color-N7{color:#FFFFFF;} + .d2-144203892 .color-B1{color:#0D32B2;} + .d2-144203892 .color-B2{color:#0D32B2;} + .d2-144203892 .color-B3{color:#E3E9FD;} + .d2-144203892 .color-B4{color:#E3E9FD;} + .d2-144203892 .color-B5{color:#EDF0FD;} + .d2-144203892 .color-B6{color:#F7F8FE;} + .d2-144203892 .color-AA2{color:#4A6FF3;} + .d2-144203892 .color-AA4{color:#EDF0FD;} + .d2-144203892 .color-AA5{color:#F7F8FE;} + .d2-144203892 .color-AB4{color:#EDF0FD;} + .d2-144203892 .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}]]> @@ -130,7 +130,7 @@ -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud +rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud diff --git a/d2renderers/d2sketch/testdata/dots-multiple/sketch.exp.svg b/d2renderers/d2sketch/testdata/dots-multiple/sketch.exp.svg index 4c106ea7d..9615abb8a 100644 --- a/d2renderers/d2sketch/testdata/dots-multiple/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/dots-multiple/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-819970511 .fill-N1{fill:#0A0F25;} + .d2-819970511 .fill-N2{fill:#676C7E;} + .d2-819970511 .fill-N3{fill:#9499AB;} + .d2-819970511 .fill-N4{fill:#CFD2DD;} + .d2-819970511 .fill-N5{fill:#DEE1EB;} + .d2-819970511 .fill-N6{fill:#EEF1F8;} + .d2-819970511 .fill-N7{fill:#FFFFFF;} + .d2-819970511 .fill-B1{fill:#0D32B2;} + .d2-819970511 .fill-B2{fill:#0D32B2;} + .d2-819970511 .fill-B3{fill:#E3E9FD;} + .d2-819970511 .fill-B4{fill:#E3E9FD;} + .d2-819970511 .fill-B5{fill:#EDF0FD;} + .d2-819970511 .fill-B6{fill:#F7F8FE;} + .d2-819970511 .fill-AA2{fill:#4A6FF3;} + .d2-819970511 .fill-AA4{fill:#EDF0FD;} + .d2-819970511 .fill-AA5{fill:#F7F8FE;} + .d2-819970511 .fill-AB4{fill:#EDF0FD;} + .d2-819970511 .fill-AB5{fill:#F7F8FE;} + .d2-819970511 .stroke-N1{stroke:#0A0F25;} + .d2-819970511 .stroke-N2{stroke:#676C7E;} + .d2-819970511 .stroke-N3{stroke:#9499AB;} + .d2-819970511 .stroke-N4{stroke:#CFD2DD;} + .d2-819970511 .stroke-N5{stroke:#DEE1EB;} + .d2-819970511 .stroke-N6{stroke:#EEF1F8;} + .d2-819970511 .stroke-N7{stroke:#FFFFFF;} + .d2-819970511 .stroke-B1{stroke:#0D32B2;} + .d2-819970511 .stroke-B2{stroke:#0D32B2;} + .d2-819970511 .stroke-B3{stroke:#E3E9FD;} + .d2-819970511 .stroke-B4{stroke:#E3E9FD;} + .d2-819970511 .stroke-B5{stroke:#EDF0FD;} + .d2-819970511 .stroke-B6{stroke:#F7F8FE;} + .d2-819970511 .stroke-AA2{stroke:#4A6FF3;} + .d2-819970511 .stroke-AA4{stroke:#EDF0FD;} + .d2-819970511 .stroke-AA5{stroke:#F7F8FE;} + .d2-819970511 .stroke-AB4{stroke:#EDF0FD;} + .d2-819970511 .stroke-AB5{stroke:#F7F8FE;} + .d2-819970511 .background-color-N1{background-color:#0A0F25;} + .d2-819970511 .background-color-N2{background-color:#676C7E;} + .d2-819970511 .background-color-N3{background-color:#9499AB;} + .d2-819970511 .background-color-N4{background-color:#CFD2DD;} + .d2-819970511 .background-color-N5{background-color:#DEE1EB;} + .d2-819970511 .background-color-N6{background-color:#EEF1F8;} + .d2-819970511 .background-color-N7{background-color:#FFFFFF;} + .d2-819970511 .background-color-B1{background-color:#0D32B2;} + .d2-819970511 .background-color-B2{background-color:#0D32B2;} + .d2-819970511 .background-color-B3{background-color:#E3E9FD;} + .d2-819970511 .background-color-B4{background-color:#E3E9FD;} + .d2-819970511 .background-color-B5{background-color:#EDF0FD;} + .d2-819970511 .background-color-B6{background-color:#F7F8FE;} + .d2-819970511 .background-color-AA2{background-color:#4A6FF3;} + .d2-819970511 .background-color-AA4{background-color:#EDF0FD;} + .d2-819970511 .background-color-AA5{background-color:#F7F8FE;} + .d2-819970511 .background-color-AB4{background-color:#EDF0FD;} + .d2-819970511 .background-color-AB5{background-color:#F7F8FE;} + .d2-819970511 .color-N1{color:#0A0F25;} + .d2-819970511 .color-N2{color:#676C7E;} + .d2-819970511 .color-N3{color:#9499AB;} + .d2-819970511 .color-N4{color:#CFD2DD;} + .d2-819970511 .color-N5{color:#DEE1EB;} + .d2-819970511 .color-N6{color:#EEF1F8;} + .d2-819970511 .color-N7{color:#FFFFFF;} + .d2-819970511 .color-B1{color:#0D32B2;} + .d2-819970511 .color-B2{color:#0D32B2;} + .d2-819970511 .color-B3{color:#E3E9FD;} + .d2-819970511 .color-B4{color:#E3E9FD;} + .d2-819970511 .color-B5{color:#EDF0FD;} + .d2-819970511 .color-B6{color:#F7F8FE;} + .d2-819970511 .color-AA2{color:#4A6FF3;} + .d2-819970511 .color-AA4{color:#EDF0FD;} + .d2-819970511 .color-AA5{color:#F7F8FE;} + .d2-819970511 .color-AB4{color:#EDF0FD;} + .d2-819970511 .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}]]> @@ -130,7 +130,7 @@ -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud +rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud diff --git a/d2renderers/d2svg/d2svg.go b/d2renderers/d2svg/d2svg.go index 3f1ae7943..6ee011d88 100644 --- a/d2renderers/d2svg/d2svg.go +++ b/d2renderers/d2svg/d2svg.go @@ -932,6 +932,9 @@ func drawShape(writer, appendixWriter io.Writer, diagramHash string, targetShape shapeType := d2target.DSL_SHAPE_TO_SHAPE_TYPE[targetShape.Type] s := shape.NewShape(shapeType, geo.NewBox(tl, width, height)) + if shapeType == shape.CLOUD_TYPE && targetShape.ContentAspectRatio != nil { + s.SetInnerBoxAspectRatio(*targetShape.ContentAspectRatio) + } var shadowAttr string if targetShape.Shadow { diff --git a/d2renderers/d2svg/dark_theme/testdata/all_shapes/dark_theme.exp.svg b/d2renderers/d2svg/dark_theme/testdata/all_shapes/dark_theme.exp.svg index ee24e61d0..05264e5f4 100644 --- a/d2renderers/d2svg/dark_theme/testdata/all_shapes/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/all_shapes/dark_theme.exp.svg @@ -1,9 +1,9 @@ -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud + .d2-2513870599 .fill-N1{fill:#CDD6F4;} + .d2-2513870599 .fill-N2{fill:#BAC2DE;} + .d2-2513870599 .fill-N3{fill:#A6ADC8;} + .d2-2513870599 .fill-N4{fill:#585B70;} + .d2-2513870599 .fill-N5{fill:#45475A;} + .d2-2513870599 .fill-N6{fill:#313244;} + .d2-2513870599 .fill-N7{fill:#1E1E2E;} + .d2-2513870599 .fill-B1{fill:#CBA6f7;} + .d2-2513870599 .fill-B2{fill:#CBA6f7;} + .d2-2513870599 .fill-B3{fill:#6C7086;} + .d2-2513870599 .fill-B4{fill:#585B70;} + .d2-2513870599 .fill-B5{fill:#45475A;} + .d2-2513870599 .fill-B6{fill:#313244;} + .d2-2513870599 .fill-AA2{fill:#f38BA8;} + .d2-2513870599 .fill-AA4{fill:#45475A;} + .d2-2513870599 .fill-AA5{fill:#313244;} + .d2-2513870599 .fill-AB4{fill:#45475A;} + .d2-2513870599 .fill-AB5{fill:#313244;} + .d2-2513870599 .stroke-N1{stroke:#CDD6F4;} + .d2-2513870599 .stroke-N2{stroke:#BAC2DE;} + .d2-2513870599 .stroke-N3{stroke:#A6ADC8;} + .d2-2513870599 .stroke-N4{stroke:#585B70;} + .d2-2513870599 .stroke-N5{stroke:#45475A;} + .d2-2513870599 .stroke-N6{stroke:#313244;} + .d2-2513870599 .stroke-N7{stroke:#1E1E2E;} + .d2-2513870599 .stroke-B1{stroke:#CBA6f7;} + .d2-2513870599 .stroke-B2{stroke:#CBA6f7;} + .d2-2513870599 .stroke-B3{stroke:#6C7086;} + .d2-2513870599 .stroke-B4{stroke:#585B70;} + .d2-2513870599 .stroke-B5{stroke:#45475A;} + .d2-2513870599 .stroke-B6{stroke:#313244;} + .d2-2513870599 .stroke-AA2{stroke:#f38BA8;} + .d2-2513870599 .stroke-AA4{stroke:#45475A;} + .d2-2513870599 .stroke-AA5{stroke:#313244;} + .d2-2513870599 .stroke-AB4{stroke:#45475A;} + .d2-2513870599 .stroke-AB5{stroke:#313244;} + .d2-2513870599 .background-color-N1{background-color:#CDD6F4;} + .d2-2513870599 .background-color-N2{background-color:#BAC2DE;} + .d2-2513870599 .background-color-N3{background-color:#A6ADC8;} + .d2-2513870599 .background-color-N4{background-color:#585B70;} + .d2-2513870599 .background-color-N5{background-color:#45475A;} + .d2-2513870599 .background-color-N6{background-color:#313244;} + .d2-2513870599 .background-color-N7{background-color:#1E1E2E;} + .d2-2513870599 .background-color-B1{background-color:#CBA6f7;} + .d2-2513870599 .background-color-B2{background-color:#CBA6f7;} + .d2-2513870599 .background-color-B3{background-color:#6C7086;} + .d2-2513870599 .background-color-B4{background-color:#585B70;} + .d2-2513870599 .background-color-B5{background-color:#45475A;} + .d2-2513870599 .background-color-B6{background-color:#313244;} + .d2-2513870599 .background-color-AA2{background-color:#f38BA8;} + .d2-2513870599 .background-color-AA4{background-color:#45475A;} + .d2-2513870599 .background-color-AA5{background-color:#313244;} + .d2-2513870599 .background-color-AB4{background-color:#45475A;} + .d2-2513870599 .background-color-AB5{background-color:#313244;} + .d2-2513870599 .color-N1{color:#CDD6F4;} + .d2-2513870599 .color-N2{color:#BAC2DE;} + .d2-2513870599 .color-N3{color:#A6ADC8;} + .d2-2513870599 .color-N4{color:#585B70;} + .d2-2513870599 .color-N5{color:#45475A;} + .d2-2513870599 .color-N6{color:#313244;} + .d2-2513870599 .color-N7{color:#1E1E2E;} + .d2-2513870599 .color-B1{color:#CBA6f7;} + .d2-2513870599 .color-B2{color:#CBA6f7;} + .d2-2513870599 .color-B3{color:#6C7086;} + .d2-2513870599 .color-B4{color:#585B70;} + .d2-2513870599 .color-B5{color:#45475A;} + .d2-2513870599 .color-B6{color:#313244;} + .d2-2513870599 .color-AA2{color:#f38BA8;} + .d2-2513870599 .color-AA4{color:#45475A;} + .d2-2513870599 .color-AA5{color:#313244;} + .d2-2513870599 .color-AB4{color:#45475A;} + .d2-2513870599 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]>rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud diff --git a/d2target/d2target.go b/d2target/d2target.go index 3c468b81d..1efcfd08f 100644 --- a/d2target/d2target.go +++ b/d2target/d2target.go @@ -469,6 +469,8 @@ type Shape struct { Class SQLTable + ContentAspectRatio *float64 `json:"contentAspectRatio,omitempty"` + Text LabelPosition string `json:"labelPosition,omitempty"` diff --git a/e2etests/regression_test.go b/e2etests/regression_test.go index 257c49b9c..093ebbf1c 100644 --- a/e2etests/regression_test.go +++ b/e2etests/regression_test.go @@ -1051,6 +1051,7 @@ cf many required: { loadFromFile(t, "grid_image_label_position"), loadFromFile(t, "glob_dimensions"), loadFromFile(t, "shaped_grid_positioning"), + loadFromFile(t, "cloud_shaped_grid"), } runa(t, tcs) diff --git a/e2etests/testdata/files/cloud_shaped_grid.d2 b/e2etests/testdata/files/cloud_shaped_grid.d2 new file mode 100644 index 000000000..625645e47 --- /dev/null +++ b/e2etests/testdata/files/cloud_shaped_grid.d2 @@ -0,0 +1,27 @@ +vars: { + grid-container: { + label: "" + grid-gap: 10 + grid-rows: 1 + grid-columns: 4 + a + b + c + d + } +} +cloud: { + shape: cloud + ...${grid-container} + width: 395 + height: 395 +} + +circle: { + shape: circle + ...${grid-container} + width: 395 + height: 395 +} + +direction: right diff --git a/e2etests/testdata/patterns/all_shapes/dagre/board.exp.json b/e2etests/testdata/patterns/all_shapes/dagre/board.exp.json index 6de3c8f46..b5911c6dc 100644 --- a/e2etests/testdata/patterns/all_shapes/dagre/board.exp.json +++ b/e2etests/testdata/patterns/all_shapes/dagre/board.exp.json @@ -703,6 +703,7 @@ "fields": null, "methods": null, "columns": null, + "contentAspectRatio": 2.586678832116788, "label": "cloud", "fontSize": 16, "fontFamily": "DEFAULT", diff --git a/e2etests/testdata/patterns/all_shapes/dagre/sketch.exp.svg b/e2etests/testdata/patterns/all_shapes/dagre/sketch.exp.svg index 641bb6e8f..4678e438d 100644 --- a/e2etests/testdata/patterns/all_shapes/dagre/sketch.exp.svg +++ b/e2etests/testdata/patterns/all_shapes/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -aabbccdd + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/cloud_shaped_grid/elk/board.exp.json b/e2etests/testdata/regression/cloud_shaped_grid/elk/board.exp.json new file mode 100644 index 000000000..28a73821d --- /dev/null +++ b/e2etests/testdata/regression/cloud_shaped_grid/elk/board.exp.json @@ -0,0 +1,456 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "cloud.a", + "type": "rectangle", + "pos": { + "x": 86, + "y": 249 + }, + "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": "circle.a", + "type": "rectangle", + "pos": { + "x": 88, + "y": 591 + }, + "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": "cloud.b", + "type": "rectangle", + "pos": { + "x": 149, + "y": 249 + }, + "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": "circle.b", + "type": "rectangle", + "pos": { + "x": 151, + "y": 591 + }, + "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": "cloud.c", + "type": "rectangle", + "pos": { + "x": 212, + "y": 249 + }, + "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": "circle.c", + "type": "rectangle", + "pos": { + "x": 214, + "y": 591 + }, + "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": "cloud.d", + "type": "rectangle", + "pos": { + "x": 275, + "y": 249 + }, + "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": "circle.d", + "type": "rectangle", + "pos": { + "x": 277, + "y": 591 + }, + "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": "cloud", + "type": "cloud", + "pos": { + "x": 12, + "y": 12 + }, + "width": 395, + "height": 395, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "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": "", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 1 + }, + { + "id": "circle", + "type": "oval", + "pos": { + "x": 12, + "y": 427 + }, + "width": 395, + "height": 395, + "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": "", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 1 + } + ], + "connections": [], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/regression/cloud_shaped_grid/elk/sketch.exp.svg b/e2etests/testdata/regression/cloud_shaped_grid/elk/sketch.exp.svg new file mode 100644 index 000000000..2de9f659a --- /dev/null +++ b/e2etests/testdata/regression/cloud_shaped_grid/elk/sketch.exp.svg @@ -0,0 +1,102 @@ +aabbccdd + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/shaped_grid_positioning/dagre/board.exp.json b/e2etests/testdata/regression/shaped_grid_positioning/dagre/board.exp.json index 25474b2f0..78dbbe474 100644 --- a/e2etests/testdata/regression/shaped_grid_positioning/dagre/board.exp.json +++ b/e2etests/testdata/regression/shaped_grid_positioning/dagre/board.exp.json @@ -90,7 +90,7 @@ "type": "rectangle", "pos": { "x": 3477, - "y": 351 + "y": 321 }, "width": 53, "height": 66, @@ -336,7 +336,7 @@ "type": "rectangle", "pos": { "x": 3570, - "y": 351 + "y": 321 }, "width": 54, "height": 66, @@ -582,7 +582,7 @@ "type": "rectangle", "pos": { "x": 3477, - "y": 457 + "y": 427 }, "width": 53, "height": 66, @@ -951,7 +951,7 @@ "type": "rectangle", "pos": { "x": 3570, - "y": 457 + "y": 427 }, "width": 54, "height": 66, @@ -1219,6 +1219,7 @@ "fields": null, "methods": null, "columns": null, + "contentAspectRatio": 15.747196012106103, "label": "aaaaaaaaaaaaaaa aaaaaaaaaaaaaaa", "fontSize": 28, "fontFamily": "DEFAULT", diff --git a/e2etests/testdata/regression/shaped_grid_positioning/dagre/sketch.exp.svg b/e2etests/testdata/regression/shaped_grid_positioning/dagre/sketch.exp.svg index 25b6d7dea..81672350e 100644 --- a/e2etests/testdata/regression/shaped_grid_positioning/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/shaped_grid_positioning/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -aaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaabbbbbbccccccdddddd + .d2-2112819859 .fill-N1{fill:#0A0F25;} + .d2-2112819859 .fill-N2{fill:#676C7E;} + .d2-2112819859 .fill-N3{fill:#9499AB;} + .d2-2112819859 .fill-N4{fill:#CFD2DD;} + .d2-2112819859 .fill-N5{fill:#DEE1EB;} + .d2-2112819859 .fill-N6{fill:#EEF1F8;} + .d2-2112819859 .fill-N7{fill:#FFFFFF;} + .d2-2112819859 .fill-B1{fill:#0D32B2;} + .d2-2112819859 .fill-B2{fill:#0D32B2;} + .d2-2112819859 .fill-B3{fill:#E3E9FD;} + .d2-2112819859 .fill-B4{fill:#E3E9FD;} + .d2-2112819859 .fill-B5{fill:#EDF0FD;} + .d2-2112819859 .fill-B6{fill:#F7F8FE;} + .d2-2112819859 .fill-AA2{fill:#4A6FF3;} + .d2-2112819859 .fill-AA4{fill:#EDF0FD;} + .d2-2112819859 .fill-AA5{fill:#F7F8FE;} + .d2-2112819859 .fill-AB4{fill:#EDF0FD;} + .d2-2112819859 .fill-AB5{fill:#F7F8FE;} + .d2-2112819859 .stroke-N1{stroke:#0A0F25;} + .d2-2112819859 .stroke-N2{stroke:#676C7E;} + .d2-2112819859 .stroke-N3{stroke:#9499AB;} + .d2-2112819859 .stroke-N4{stroke:#CFD2DD;} + .d2-2112819859 .stroke-N5{stroke:#DEE1EB;} + .d2-2112819859 .stroke-N6{stroke:#EEF1F8;} + .d2-2112819859 .stroke-N7{stroke:#FFFFFF;} + .d2-2112819859 .stroke-B1{stroke:#0D32B2;} + .d2-2112819859 .stroke-B2{stroke:#0D32B2;} + .d2-2112819859 .stroke-B3{stroke:#E3E9FD;} + .d2-2112819859 .stroke-B4{stroke:#E3E9FD;} + .d2-2112819859 .stroke-B5{stroke:#EDF0FD;} + .d2-2112819859 .stroke-B6{stroke:#F7F8FE;} + .d2-2112819859 .stroke-AA2{stroke:#4A6FF3;} + .d2-2112819859 .stroke-AA4{stroke:#EDF0FD;} + .d2-2112819859 .stroke-AA5{stroke:#F7F8FE;} + .d2-2112819859 .stroke-AB4{stroke:#EDF0FD;} + .d2-2112819859 .stroke-AB5{stroke:#F7F8FE;} + .d2-2112819859 .background-color-N1{background-color:#0A0F25;} + .d2-2112819859 .background-color-N2{background-color:#676C7E;} + .d2-2112819859 .background-color-N3{background-color:#9499AB;} + .d2-2112819859 .background-color-N4{background-color:#CFD2DD;} + .d2-2112819859 .background-color-N5{background-color:#DEE1EB;} + .d2-2112819859 .background-color-N6{background-color:#EEF1F8;} + .d2-2112819859 .background-color-N7{background-color:#FFFFFF;} + .d2-2112819859 .background-color-B1{background-color:#0D32B2;} + .d2-2112819859 .background-color-B2{background-color:#0D32B2;} + .d2-2112819859 .background-color-B3{background-color:#E3E9FD;} + .d2-2112819859 .background-color-B4{background-color:#E3E9FD;} + .d2-2112819859 .background-color-B5{background-color:#EDF0FD;} + .d2-2112819859 .background-color-B6{background-color:#F7F8FE;} + .d2-2112819859 .background-color-AA2{background-color:#4A6FF3;} + .d2-2112819859 .background-color-AA4{background-color:#EDF0FD;} + .d2-2112819859 .background-color-AA5{background-color:#F7F8FE;} + .d2-2112819859 .background-color-AB4{background-color:#EDF0FD;} + .d2-2112819859 .background-color-AB5{background-color:#F7F8FE;} + .d2-2112819859 .color-N1{color:#0A0F25;} + .d2-2112819859 .color-N2{color:#676C7E;} + .d2-2112819859 .color-N3{color:#9499AB;} + .d2-2112819859 .color-N4{color:#CFD2DD;} + .d2-2112819859 .color-N5{color:#DEE1EB;} + .d2-2112819859 .color-N6{color:#EEF1F8;} + .d2-2112819859 .color-N7{color:#FFFFFF;} + .d2-2112819859 .color-B1{color:#0D32B2;} + .d2-2112819859 .color-B2{color:#0D32B2;} + .d2-2112819859 .color-B3{color:#E3E9FD;} + .d2-2112819859 .color-B4{color:#E3E9FD;} + .d2-2112819859 .color-B5{color:#EDF0FD;} + .d2-2112819859 .color-B6{color:#F7F8FE;} + .d2-2112819859 .color-AA2{color:#4A6FF3;} + .d2-2112819859 .color-AA4{color:#EDF0FD;} + .d2-2112819859 .color-AA5{color:#F7F8FE;} + .d2-2112819859 .color-AB4{color:#EDF0FD;} + .d2-2112819859 .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}]]>aaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaabbbbbbccccccdddddd - + - + - + - + @@ -127,5 +127,5 @@ - + \ No newline at end of file diff --git a/e2etests/testdata/regression/shaped_grid_positioning/elk/board.exp.json b/e2etests/testdata/regression/shaped_grid_positioning/elk/board.exp.json index b9c4c2ac8..e21003fcf 100644 --- a/e2etests/testdata/regression/shaped_grid_positioning/elk/board.exp.json +++ b/e2etests/testdata/regression/shaped_grid_positioning/elk/board.exp.json @@ -90,7 +90,7 @@ "type": "rectangle", "pos": { "x": 3289, - "y": 363 + "y": 333 }, "width": 53, "height": 66, @@ -336,7 +336,7 @@ "type": "rectangle", "pos": { "x": 3382, - "y": 363 + "y": 333 }, "width": 54, "height": 66, @@ -582,7 +582,7 @@ "type": "rectangle", "pos": { "x": 3289, - "y": 469 + "y": 439 }, "width": 53, "height": 66, @@ -951,7 +951,7 @@ "type": "rectangle", "pos": { "x": 3382, - "y": 469 + "y": 439 }, "width": 54, "height": 66, @@ -1219,6 +1219,7 @@ "fields": null, "methods": null, "columns": null, + "contentAspectRatio": 15.747196012106103, "label": "aaaaaaaaaaaaaaa aaaaaaaaaaaaaaa", "fontSize": 28, "fontFamily": "DEFAULT", diff --git a/e2etests/testdata/regression/shaped_grid_positioning/elk/sketch.exp.svg b/e2etests/testdata/regression/shaped_grid_positioning/elk/sketch.exp.svg index 017b74544..6858bdaf3 100644 --- a/e2etests/testdata/regression/shaped_grid_positioning/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/shaped_grid_positioning/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -aaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaabbbbbbccccccdddddd + .d2-3977469694 .fill-N1{fill:#0A0F25;} + .d2-3977469694 .fill-N2{fill:#676C7E;} + .d2-3977469694 .fill-N3{fill:#9499AB;} + .d2-3977469694 .fill-N4{fill:#CFD2DD;} + .d2-3977469694 .fill-N5{fill:#DEE1EB;} + .d2-3977469694 .fill-N6{fill:#EEF1F8;} + .d2-3977469694 .fill-N7{fill:#FFFFFF;} + .d2-3977469694 .fill-B1{fill:#0D32B2;} + .d2-3977469694 .fill-B2{fill:#0D32B2;} + .d2-3977469694 .fill-B3{fill:#E3E9FD;} + .d2-3977469694 .fill-B4{fill:#E3E9FD;} + .d2-3977469694 .fill-B5{fill:#EDF0FD;} + .d2-3977469694 .fill-B6{fill:#F7F8FE;} + .d2-3977469694 .fill-AA2{fill:#4A6FF3;} + .d2-3977469694 .fill-AA4{fill:#EDF0FD;} + .d2-3977469694 .fill-AA5{fill:#F7F8FE;} + .d2-3977469694 .fill-AB4{fill:#EDF0FD;} + .d2-3977469694 .fill-AB5{fill:#F7F8FE;} + .d2-3977469694 .stroke-N1{stroke:#0A0F25;} + .d2-3977469694 .stroke-N2{stroke:#676C7E;} + .d2-3977469694 .stroke-N3{stroke:#9499AB;} + .d2-3977469694 .stroke-N4{stroke:#CFD2DD;} + .d2-3977469694 .stroke-N5{stroke:#DEE1EB;} + .d2-3977469694 .stroke-N6{stroke:#EEF1F8;} + .d2-3977469694 .stroke-N7{stroke:#FFFFFF;} + .d2-3977469694 .stroke-B1{stroke:#0D32B2;} + .d2-3977469694 .stroke-B2{stroke:#0D32B2;} + .d2-3977469694 .stroke-B3{stroke:#E3E9FD;} + .d2-3977469694 .stroke-B4{stroke:#E3E9FD;} + .d2-3977469694 .stroke-B5{stroke:#EDF0FD;} + .d2-3977469694 .stroke-B6{stroke:#F7F8FE;} + .d2-3977469694 .stroke-AA2{stroke:#4A6FF3;} + .d2-3977469694 .stroke-AA4{stroke:#EDF0FD;} + .d2-3977469694 .stroke-AA5{stroke:#F7F8FE;} + .d2-3977469694 .stroke-AB4{stroke:#EDF0FD;} + .d2-3977469694 .stroke-AB5{stroke:#F7F8FE;} + .d2-3977469694 .background-color-N1{background-color:#0A0F25;} + .d2-3977469694 .background-color-N2{background-color:#676C7E;} + .d2-3977469694 .background-color-N3{background-color:#9499AB;} + .d2-3977469694 .background-color-N4{background-color:#CFD2DD;} + .d2-3977469694 .background-color-N5{background-color:#DEE1EB;} + .d2-3977469694 .background-color-N6{background-color:#EEF1F8;} + .d2-3977469694 .background-color-N7{background-color:#FFFFFF;} + .d2-3977469694 .background-color-B1{background-color:#0D32B2;} + .d2-3977469694 .background-color-B2{background-color:#0D32B2;} + .d2-3977469694 .background-color-B3{background-color:#E3E9FD;} + .d2-3977469694 .background-color-B4{background-color:#E3E9FD;} + .d2-3977469694 .background-color-B5{background-color:#EDF0FD;} + .d2-3977469694 .background-color-B6{background-color:#F7F8FE;} + .d2-3977469694 .background-color-AA2{background-color:#4A6FF3;} + .d2-3977469694 .background-color-AA4{background-color:#EDF0FD;} + .d2-3977469694 .background-color-AA5{background-color:#F7F8FE;} + .d2-3977469694 .background-color-AB4{background-color:#EDF0FD;} + .d2-3977469694 .background-color-AB5{background-color:#F7F8FE;} + .d2-3977469694 .color-N1{color:#0A0F25;} + .d2-3977469694 .color-N2{color:#676C7E;} + .d2-3977469694 .color-N3{color:#9499AB;} + .d2-3977469694 .color-N4{color:#CFD2DD;} + .d2-3977469694 .color-N5{color:#DEE1EB;} + .d2-3977469694 .color-N6{color:#EEF1F8;} + .d2-3977469694 .color-N7{color:#FFFFFF;} + .d2-3977469694 .color-B1{color:#0D32B2;} + .d2-3977469694 .color-B2{color:#0D32B2;} + .d2-3977469694 .color-B3{color:#E3E9FD;} + .d2-3977469694 .color-B4{color:#E3E9FD;} + .d2-3977469694 .color-B5{color:#EDF0FD;} + .d2-3977469694 .color-B6{color:#F7F8FE;} + .d2-3977469694 .color-AA2{color:#4A6FF3;} + .d2-3977469694 .color-AA4{color:#EDF0FD;} + .d2-3977469694 .color-AA5{color:#F7F8FE;} + .d2-3977469694 .color-AB4{color:#EDF0FD;} + .d2-3977469694 .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}]]>aaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaabbbbbbccccccdddddd - + - + - + - + @@ -127,5 +127,5 @@ - + \ No newline at end of file diff --git a/e2etests/testdata/stable/all_shapes/dagre/board.exp.json b/e2etests/testdata/stable/all_shapes/dagre/board.exp.json index 076fa97a4..27bd77abe 100644 --- a/e2etests/testdata/stable/all_shapes/dagre/board.exp.json +++ b/e2etests/testdata/stable/all_shapes/dagre/board.exp.json @@ -686,6 +686,7 @@ "fields": null, "methods": null, "columns": null, + "contentAspectRatio": 2.586678832116788, "label": "cloud", "fontSize": 16, "fontFamily": "DEFAULT", diff --git a/e2etests/testdata/stable/all_shapes/dagre/sketch.exp.svg b/e2etests/testdata/stable/all_shapes/dagre/sketch.exp.svg index e98c7d878..978666787 100644 --- a/e2etests/testdata/stable/all_shapes/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud + .d2-70658636 .fill-N1{fill:#0A0F25;} + .d2-70658636 .fill-N2{fill:#676C7E;} + .d2-70658636 .fill-N3{fill:#9499AB;} + .d2-70658636 .fill-N4{fill:#CFD2DD;} + .d2-70658636 .fill-N5{fill:#DEE1EB;} + .d2-70658636 .fill-N6{fill:#EEF1F8;} + .d2-70658636 .fill-N7{fill:#FFFFFF;} + .d2-70658636 .fill-B1{fill:#0D32B2;} + .d2-70658636 .fill-B2{fill:#0D32B2;} + .d2-70658636 .fill-B3{fill:#E3E9FD;} + .d2-70658636 .fill-B4{fill:#E3E9FD;} + .d2-70658636 .fill-B5{fill:#EDF0FD;} + .d2-70658636 .fill-B6{fill:#F7F8FE;} + .d2-70658636 .fill-AA2{fill:#4A6FF3;} + .d2-70658636 .fill-AA4{fill:#EDF0FD;} + .d2-70658636 .fill-AA5{fill:#F7F8FE;} + .d2-70658636 .fill-AB4{fill:#EDF0FD;} + .d2-70658636 .fill-AB5{fill:#F7F8FE;} + .d2-70658636 .stroke-N1{stroke:#0A0F25;} + .d2-70658636 .stroke-N2{stroke:#676C7E;} + .d2-70658636 .stroke-N3{stroke:#9499AB;} + .d2-70658636 .stroke-N4{stroke:#CFD2DD;} + .d2-70658636 .stroke-N5{stroke:#DEE1EB;} + .d2-70658636 .stroke-N6{stroke:#EEF1F8;} + .d2-70658636 .stroke-N7{stroke:#FFFFFF;} + .d2-70658636 .stroke-B1{stroke:#0D32B2;} + .d2-70658636 .stroke-B2{stroke:#0D32B2;} + .d2-70658636 .stroke-B3{stroke:#E3E9FD;} + .d2-70658636 .stroke-B4{stroke:#E3E9FD;} + .d2-70658636 .stroke-B5{stroke:#EDF0FD;} + .d2-70658636 .stroke-B6{stroke:#F7F8FE;} + .d2-70658636 .stroke-AA2{stroke:#4A6FF3;} + .d2-70658636 .stroke-AA4{stroke:#EDF0FD;} + .d2-70658636 .stroke-AA5{stroke:#F7F8FE;} + .d2-70658636 .stroke-AB4{stroke:#EDF0FD;} + .d2-70658636 .stroke-AB5{stroke:#F7F8FE;} + .d2-70658636 .background-color-N1{background-color:#0A0F25;} + .d2-70658636 .background-color-N2{background-color:#676C7E;} + .d2-70658636 .background-color-N3{background-color:#9499AB;} + .d2-70658636 .background-color-N4{background-color:#CFD2DD;} + .d2-70658636 .background-color-N5{background-color:#DEE1EB;} + .d2-70658636 .background-color-N6{background-color:#EEF1F8;} + .d2-70658636 .background-color-N7{background-color:#FFFFFF;} + .d2-70658636 .background-color-B1{background-color:#0D32B2;} + .d2-70658636 .background-color-B2{background-color:#0D32B2;} + .d2-70658636 .background-color-B3{background-color:#E3E9FD;} + .d2-70658636 .background-color-B4{background-color:#E3E9FD;} + .d2-70658636 .background-color-B5{background-color:#EDF0FD;} + .d2-70658636 .background-color-B6{background-color:#F7F8FE;} + .d2-70658636 .background-color-AA2{background-color:#4A6FF3;} + .d2-70658636 .background-color-AA4{background-color:#EDF0FD;} + .d2-70658636 .background-color-AA5{background-color:#F7F8FE;} + .d2-70658636 .background-color-AB4{background-color:#EDF0FD;} + .d2-70658636 .background-color-AB5{background-color:#F7F8FE;} + .d2-70658636 .color-N1{color:#0A0F25;} + .d2-70658636 .color-N2{color:#676C7E;} + .d2-70658636 .color-N3{color:#9499AB;} + .d2-70658636 .color-N4{color:#CFD2DD;} + .d2-70658636 .color-N5{color:#DEE1EB;} + .d2-70658636 .color-N6{color:#EEF1F8;} + .d2-70658636 .color-N7{color:#FFFFFF;} + .d2-70658636 .color-B1{color:#0D32B2;} + .d2-70658636 .color-B2{color:#0D32B2;} + .d2-70658636 .color-B3{color:#E3E9FD;} + .d2-70658636 .color-B4{color:#E3E9FD;} + .d2-70658636 .color-B5{color:#EDF0FD;} + .d2-70658636 .color-B6{color:#F7F8FE;} + .d2-70658636 .color-AA2{color:#4A6FF3;} + .d2-70658636 .color-AA4{color:#EDF0FD;} + .d2-70658636 .color-AA5{color:#F7F8FE;} + .d2-70658636 .color-AB4{color:#EDF0FD;} + .d2-70658636 .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}]]>rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud @@ -107,5 +107,5 @@ - + \ No newline at end of file diff --git a/e2etests/testdata/stable/all_shapes/elk/board.exp.json b/e2etests/testdata/stable/all_shapes/elk/board.exp.json index d976388f1..023fcf234 100644 --- a/e2etests/testdata/stable/all_shapes/elk/board.exp.json +++ b/e2etests/testdata/stable/all_shapes/elk/board.exp.json @@ -686,6 +686,7 @@ "fields": null, "methods": null, "columns": null, + "contentAspectRatio": 2.586678832116788, "label": "cloud", "fontSize": 16, "fontFamily": "DEFAULT", diff --git a/e2etests/testdata/stable/all_shapes/elk/sketch.exp.svg b/e2etests/testdata/stable/all_shapes/elk/sketch.exp.svg index 9a9819f76..5182fe669 100644 --- a/e2etests/testdata/stable/all_shapes/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud + .d2-3736938434 .fill-N1{fill:#0A0F25;} + .d2-3736938434 .fill-N2{fill:#676C7E;} + .d2-3736938434 .fill-N3{fill:#9499AB;} + .d2-3736938434 .fill-N4{fill:#CFD2DD;} + .d2-3736938434 .fill-N5{fill:#DEE1EB;} + .d2-3736938434 .fill-N6{fill:#EEF1F8;} + .d2-3736938434 .fill-N7{fill:#FFFFFF;} + .d2-3736938434 .fill-B1{fill:#0D32B2;} + .d2-3736938434 .fill-B2{fill:#0D32B2;} + .d2-3736938434 .fill-B3{fill:#E3E9FD;} + .d2-3736938434 .fill-B4{fill:#E3E9FD;} + .d2-3736938434 .fill-B5{fill:#EDF0FD;} + .d2-3736938434 .fill-B6{fill:#F7F8FE;} + .d2-3736938434 .fill-AA2{fill:#4A6FF3;} + .d2-3736938434 .fill-AA4{fill:#EDF0FD;} + .d2-3736938434 .fill-AA5{fill:#F7F8FE;} + .d2-3736938434 .fill-AB4{fill:#EDF0FD;} + .d2-3736938434 .fill-AB5{fill:#F7F8FE;} + .d2-3736938434 .stroke-N1{stroke:#0A0F25;} + .d2-3736938434 .stroke-N2{stroke:#676C7E;} + .d2-3736938434 .stroke-N3{stroke:#9499AB;} + .d2-3736938434 .stroke-N4{stroke:#CFD2DD;} + .d2-3736938434 .stroke-N5{stroke:#DEE1EB;} + .d2-3736938434 .stroke-N6{stroke:#EEF1F8;} + .d2-3736938434 .stroke-N7{stroke:#FFFFFF;} + .d2-3736938434 .stroke-B1{stroke:#0D32B2;} + .d2-3736938434 .stroke-B2{stroke:#0D32B2;} + .d2-3736938434 .stroke-B3{stroke:#E3E9FD;} + .d2-3736938434 .stroke-B4{stroke:#E3E9FD;} + .d2-3736938434 .stroke-B5{stroke:#EDF0FD;} + .d2-3736938434 .stroke-B6{stroke:#F7F8FE;} + .d2-3736938434 .stroke-AA2{stroke:#4A6FF3;} + .d2-3736938434 .stroke-AA4{stroke:#EDF0FD;} + .d2-3736938434 .stroke-AA5{stroke:#F7F8FE;} + .d2-3736938434 .stroke-AB4{stroke:#EDF0FD;} + .d2-3736938434 .stroke-AB5{stroke:#F7F8FE;} + .d2-3736938434 .background-color-N1{background-color:#0A0F25;} + .d2-3736938434 .background-color-N2{background-color:#676C7E;} + .d2-3736938434 .background-color-N3{background-color:#9499AB;} + .d2-3736938434 .background-color-N4{background-color:#CFD2DD;} + .d2-3736938434 .background-color-N5{background-color:#DEE1EB;} + .d2-3736938434 .background-color-N6{background-color:#EEF1F8;} + .d2-3736938434 .background-color-N7{background-color:#FFFFFF;} + .d2-3736938434 .background-color-B1{background-color:#0D32B2;} + .d2-3736938434 .background-color-B2{background-color:#0D32B2;} + .d2-3736938434 .background-color-B3{background-color:#E3E9FD;} + .d2-3736938434 .background-color-B4{background-color:#E3E9FD;} + .d2-3736938434 .background-color-B5{background-color:#EDF0FD;} + .d2-3736938434 .background-color-B6{background-color:#F7F8FE;} + .d2-3736938434 .background-color-AA2{background-color:#4A6FF3;} + .d2-3736938434 .background-color-AA4{background-color:#EDF0FD;} + .d2-3736938434 .background-color-AA5{background-color:#F7F8FE;} + .d2-3736938434 .background-color-AB4{background-color:#EDF0FD;} + .d2-3736938434 .background-color-AB5{background-color:#F7F8FE;} + .d2-3736938434 .color-N1{color:#0A0F25;} + .d2-3736938434 .color-N2{color:#676C7E;} + .d2-3736938434 .color-N3{color:#9499AB;} + .d2-3736938434 .color-N4{color:#CFD2DD;} + .d2-3736938434 .color-N5{color:#DEE1EB;} + .d2-3736938434 .color-N6{color:#EEF1F8;} + .d2-3736938434 .color-N7{color:#FFFFFF;} + .d2-3736938434 .color-B1{color:#0D32B2;} + .d2-3736938434 .color-B2{color:#0D32B2;} + .d2-3736938434 .color-B3{color:#E3E9FD;} + .d2-3736938434 .color-B4{color:#E3E9FD;} + .d2-3736938434 .color-B5{color:#EDF0FD;} + .d2-3736938434 .color-B6{color:#F7F8FE;} + .d2-3736938434 .color-AA2{color:#4A6FF3;} + .d2-3736938434 .color-AA4{color:#EDF0FD;} + .d2-3736938434 .color-AA5{color:#F7F8FE;} + .d2-3736938434 .color-AB4{color:#EDF0FD;} + .d2-3736938434 .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}]]>rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud @@ -107,5 +107,5 @@ - + \ No newline at end of file diff --git a/e2etests/testdata/stable/all_shapes_link/dagre/board.exp.json b/e2etests/testdata/stable/all_shapes_link/dagre/board.exp.json index e324cab44..a2a2af0f4 100644 --- a/e2etests/testdata/stable/all_shapes_link/dagre/board.exp.json +++ b/e2etests/testdata/stable/all_shapes_link/dagre/board.exp.json @@ -778,6 +778,7 @@ "fields": null, "methods": null, "columns": null, + "contentAspectRatio": 2.586678832116788, "label": "cloud", "fontSize": 16, "fontFamily": "DEFAULT", @@ -1567,6 +1568,7 @@ "fields": null, "methods": null, "columns": null, + "contentAspectRatio": 2.586678832116788, "label": "cloud", "fontSize": 16, "fontFamily": "DEFAULT", @@ -2373,6 +2375,7 @@ "fields": null, "methods": null, "columns": null, + "contentAspectRatio": 2.586678832116788, "label": "cloud", "fontSize": 16, "fontFamily": "DEFAULT", diff --git a/e2etests/testdata/stable/all_shapes_link/dagre/sketch.exp.svg b/e2etests/testdata/stable/all_shapes_link/dagre/sketch.exp.svg index 719f3205d..55925ba42 100644 --- a/e2etests/testdata/stable/all_shapes_link/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes_link/dagre/sketch.exp.svg @@ -1,19 +1,19 @@ -linkedtooltippedbothrectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrectangleexamplesquareexamplepageexampleparallelogramexampledocumentexamplecylinderexamplequeueexamplepackageexamplestepexamplecalloutexamplestored_dataexamplepersonexamplediamondexampleovalexamplecircleexamplehexagonexamplecloudexamplerectangleexamplesquareexamplepageexampleparallelogramexampledocumentexamplecylinderexamplequeueexamplepackageexamplestepexamplecalloutexamplestored_dataexamplepersonexamplediamondexampleovalexamplecircleexamplehexagonexamplecloudexample + .d2-1300387434 .fill-N1{fill:#0A0F25;} + .d2-1300387434 .fill-N2{fill:#676C7E;} + .d2-1300387434 .fill-N3{fill:#9499AB;} + .d2-1300387434 .fill-N4{fill:#CFD2DD;} + .d2-1300387434 .fill-N5{fill:#DEE1EB;} + .d2-1300387434 .fill-N6{fill:#EEF1F8;} + .d2-1300387434 .fill-N7{fill:#FFFFFF;} + .d2-1300387434 .fill-B1{fill:#0D32B2;} + .d2-1300387434 .fill-B2{fill:#0D32B2;} + .d2-1300387434 .fill-B3{fill:#E3E9FD;} + .d2-1300387434 .fill-B4{fill:#E3E9FD;} + .d2-1300387434 .fill-B5{fill:#EDF0FD;} + .d2-1300387434 .fill-B6{fill:#F7F8FE;} + .d2-1300387434 .fill-AA2{fill:#4A6FF3;} + .d2-1300387434 .fill-AA4{fill:#EDF0FD;} + .d2-1300387434 .fill-AA5{fill:#F7F8FE;} + .d2-1300387434 .fill-AB4{fill:#EDF0FD;} + .d2-1300387434 .fill-AB5{fill:#F7F8FE;} + .d2-1300387434 .stroke-N1{stroke:#0A0F25;} + .d2-1300387434 .stroke-N2{stroke:#676C7E;} + .d2-1300387434 .stroke-N3{stroke:#9499AB;} + .d2-1300387434 .stroke-N4{stroke:#CFD2DD;} + .d2-1300387434 .stroke-N5{stroke:#DEE1EB;} + .d2-1300387434 .stroke-N6{stroke:#EEF1F8;} + .d2-1300387434 .stroke-N7{stroke:#FFFFFF;} + .d2-1300387434 .stroke-B1{stroke:#0D32B2;} + .d2-1300387434 .stroke-B2{stroke:#0D32B2;} + .d2-1300387434 .stroke-B3{stroke:#E3E9FD;} + .d2-1300387434 .stroke-B4{stroke:#E3E9FD;} + .d2-1300387434 .stroke-B5{stroke:#EDF0FD;} + .d2-1300387434 .stroke-B6{stroke:#F7F8FE;} + .d2-1300387434 .stroke-AA2{stroke:#4A6FF3;} + .d2-1300387434 .stroke-AA4{stroke:#EDF0FD;} + .d2-1300387434 .stroke-AA5{stroke:#F7F8FE;} + .d2-1300387434 .stroke-AB4{stroke:#EDF0FD;} + .d2-1300387434 .stroke-AB5{stroke:#F7F8FE;} + .d2-1300387434 .background-color-N1{background-color:#0A0F25;} + .d2-1300387434 .background-color-N2{background-color:#676C7E;} + .d2-1300387434 .background-color-N3{background-color:#9499AB;} + .d2-1300387434 .background-color-N4{background-color:#CFD2DD;} + .d2-1300387434 .background-color-N5{background-color:#DEE1EB;} + .d2-1300387434 .background-color-N6{background-color:#EEF1F8;} + .d2-1300387434 .background-color-N7{background-color:#FFFFFF;} + .d2-1300387434 .background-color-B1{background-color:#0D32B2;} + .d2-1300387434 .background-color-B2{background-color:#0D32B2;} + .d2-1300387434 .background-color-B3{background-color:#E3E9FD;} + .d2-1300387434 .background-color-B4{background-color:#E3E9FD;} + .d2-1300387434 .background-color-B5{background-color:#EDF0FD;} + .d2-1300387434 .background-color-B6{background-color:#F7F8FE;} + .d2-1300387434 .background-color-AA2{background-color:#4A6FF3;} + .d2-1300387434 .background-color-AA4{background-color:#EDF0FD;} + .d2-1300387434 .background-color-AA5{background-color:#F7F8FE;} + .d2-1300387434 .background-color-AB4{background-color:#EDF0FD;} + .d2-1300387434 .background-color-AB5{background-color:#F7F8FE;} + .d2-1300387434 .color-N1{color:#0A0F25;} + .d2-1300387434 .color-N2{color:#676C7E;} + .d2-1300387434 .color-N3{color:#9499AB;} + .d2-1300387434 .color-N4{color:#CFD2DD;} + .d2-1300387434 .color-N5{color:#DEE1EB;} + .d2-1300387434 .color-N6{color:#EEF1F8;} + .d2-1300387434 .color-N7{color:#FFFFFF;} + .d2-1300387434 .color-B1{color:#0D32B2;} + .d2-1300387434 .color-B2{color:#0D32B2;} + .d2-1300387434 .color-B3{color:#E3E9FD;} + .d2-1300387434 .color-B4{color:#E3E9FD;} + .d2-1300387434 .color-B5{color:#EDF0FD;} + .d2-1300387434 .color-B6{color:#F7F8FE;} + .d2-1300387434 .color-AA2{color:#4A6FF3;} + .d2-1300387434 .color-AA4{color:#EDF0FD;} + .d2-1300387434 .color-AA5{color:#F7F8FE;} + .d2-1300387434 .color-AB4{color:#EDF0FD;} + .d2-1300387434 .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}]]>linkedtooltippedbothrectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrectangleexamplesquareexamplepageexampleparallelogramexampledocumentexamplecylinderexamplequeueexamplepackageexamplestepexamplecalloutexamplestored_dataexamplepersonexamplediamondexampleovalexamplecircleexamplehexagonexamplecloudexamplerectangleexamplesquareexamplepageexampleparallelogramexampledocumentexamplecylinderexamplequeueexamplepackageexamplestepexamplecalloutexamplestored_dataexamplepersonexamplediamondexampleovalexamplecircleexamplehexagonexamplecloudexample @@ -949,7 +949,7 @@ - + diff --git a/e2etests/testdata/stable/all_shapes_link/elk/board.exp.json b/e2etests/testdata/stable/all_shapes_link/elk/board.exp.json index 3811ff4d9..84b06dcc1 100644 --- a/e2etests/testdata/stable/all_shapes_link/elk/board.exp.json +++ b/e2etests/testdata/stable/all_shapes_link/elk/board.exp.json @@ -778,6 +778,7 @@ "fields": null, "methods": null, "columns": null, + "contentAspectRatio": 2.586678832116788, "label": "cloud", "fontSize": 16, "fontFamily": "DEFAULT", @@ -1567,6 +1568,7 @@ "fields": null, "methods": null, "columns": null, + "contentAspectRatio": 2.586678832116788, "label": "cloud", "fontSize": 16, "fontFamily": "DEFAULT", @@ -2373,6 +2375,7 @@ "fields": null, "methods": null, "columns": null, + "contentAspectRatio": 2.586678832116788, "label": "cloud", "fontSize": 16, "fontFamily": "DEFAULT", diff --git a/e2etests/testdata/stable/all_shapes_link/elk/sketch.exp.svg b/e2etests/testdata/stable/all_shapes_link/elk/sketch.exp.svg index e64408305..e63fc9ae7 100644 --- a/e2etests/testdata/stable/all_shapes_link/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes_link/elk/sketch.exp.svg @@ -1,19 +1,19 @@ -linkedtooltippedbothrectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrectangleexamplesquareexamplepageexampleparallelogramexampledocumentexamplecylinderexamplequeueexamplepackageexamplestepexamplecalloutexamplestored_dataexamplepersonexamplediamondexampleovalexamplecircleexamplehexagonexamplecloudexamplerectangleexamplesquareexamplepageexampleparallelogramexampledocumentexamplecylinderexamplequeueexamplepackageexamplestepexamplecalloutexamplestored_dataexamplepersonexamplediamondexampleovalexamplecircleexamplehexagonexamplecloudexample + .d2-4103401959 .fill-N1{fill:#0A0F25;} + .d2-4103401959 .fill-N2{fill:#676C7E;} + .d2-4103401959 .fill-N3{fill:#9499AB;} + .d2-4103401959 .fill-N4{fill:#CFD2DD;} + .d2-4103401959 .fill-N5{fill:#DEE1EB;} + .d2-4103401959 .fill-N6{fill:#EEF1F8;} + .d2-4103401959 .fill-N7{fill:#FFFFFF;} + .d2-4103401959 .fill-B1{fill:#0D32B2;} + .d2-4103401959 .fill-B2{fill:#0D32B2;} + .d2-4103401959 .fill-B3{fill:#E3E9FD;} + .d2-4103401959 .fill-B4{fill:#E3E9FD;} + .d2-4103401959 .fill-B5{fill:#EDF0FD;} + .d2-4103401959 .fill-B6{fill:#F7F8FE;} + .d2-4103401959 .fill-AA2{fill:#4A6FF3;} + .d2-4103401959 .fill-AA4{fill:#EDF0FD;} + .d2-4103401959 .fill-AA5{fill:#F7F8FE;} + .d2-4103401959 .fill-AB4{fill:#EDF0FD;} + .d2-4103401959 .fill-AB5{fill:#F7F8FE;} + .d2-4103401959 .stroke-N1{stroke:#0A0F25;} + .d2-4103401959 .stroke-N2{stroke:#676C7E;} + .d2-4103401959 .stroke-N3{stroke:#9499AB;} + .d2-4103401959 .stroke-N4{stroke:#CFD2DD;} + .d2-4103401959 .stroke-N5{stroke:#DEE1EB;} + .d2-4103401959 .stroke-N6{stroke:#EEF1F8;} + .d2-4103401959 .stroke-N7{stroke:#FFFFFF;} + .d2-4103401959 .stroke-B1{stroke:#0D32B2;} + .d2-4103401959 .stroke-B2{stroke:#0D32B2;} + .d2-4103401959 .stroke-B3{stroke:#E3E9FD;} + .d2-4103401959 .stroke-B4{stroke:#E3E9FD;} + .d2-4103401959 .stroke-B5{stroke:#EDF0FD;} + .d2-4103401959 .stroke-B6{stroke:#F7F8FE;} + .d2-4103401959 .stroke-AA2{stroke:#4A6FF3;} + .d2-4103401959 .stroke-AA4{stroke:#EDF0FD;} + .d2-4103401959 .stroke-AA5{stroke:#F7F8FE;} + .d2-4103401959 .stroke-AB4{stroke:#EDF0FD;} + .d2-4103401959 .stroke-AB5{stroke:#F7F8FE;} + .d2-4103401959 .background-color-N1{background-color:#0A0F25;} + .d2-4103401959 .background-color-N2{background-color:#676C7E;} + .d2-4103401959 .background-color-N3{background-color:#9499AB;} + .d2-4103401959 .background-color-N4{background-color:#CFD2DD;} + .d2-4103401959 .background-color-N5{background-color:#DEE1EB;} + .d2-4103401959 .background-color-N6{background-color:#EEF1F8;} + .d2-4103401959 .background-color-N7{background-color:#FFFFFF;} + .d2-4103401959 .background-color-B1{background-color:#0D32B2;} + .d2-4103401959 .background-color-B2{background-color:#0D32B2;} + .d2-4103401959 .background-color-B3{background-color:#E3E9FD;} + .d2-4103401959 .background-color-B4{background-color:#E3E9FD;} + .d2-4103401959 .background-color-B5{background-color:#EDF0FD;} + .d2-4103401959 .background-color-B6{background-color:#F7F8FE;} + .d2-4103401959 .background-color-AA2{background-color:#4A6FF3;} + .d2-4103401959 .background-color-AA4{background-color:#EDF0FD;} + .d2-4103401959 .background-color-AA5{background-color:#F7F8FE;} + .d2-4103401959 .background-color-AB4{background-color:#EDF0FD;} + .d2-4103401959 .background-color-AB5{background-color:#F7F8FE;} + .d2-4103401959 .color-N1{color:#0A0F25;} + .d2-4103401959 .color-N2{color:#676C7E;} + .d2-4103401959 .color-N3{color:#9499AB;} + .d2-4103401959 .color-N4{color:#CFD2DD;} + .d2-4103401959 .color-N5{color:#DEE1EB;} + .d2-4103401959 .color-N6{color:#EEF1F8;} + .d2-4103401959 .color-N7{color:#FFFFFF;} + .d2-4103401959 .color-B1{color:#0D32B2;} + .d2-4103401959 .color-B2{color:#0D32B2;} + .d2-4103401959 .color-B3{color:#E3E9FD;} + .d2-4103401959 .color-B4{color:#E3E9FD;} + .d2-4103401959 .color-B5{color:#EDF0FD;} + .d2-4103401959 .color-B6{color:#F7F8FE;} + .d2-4103401959 .color-AA2{color:#4A6FF3;} + .d2-4103401959 .color-AA4{color:#EDF0FD;} + .d2-4103401959 .color-AA5{color:#F7F8FE;} + .d2-4103401959 .color-AB4{color:#EDF0FD;} + .d2-4103401959 .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}]]>linkedtooltippedbothrectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrectangleexamplesquareexamplepageexampleparallelogramexampledocumentexamplecylinderexamplequeueexamplepackageexamplestepexamplecalloutexamplestored_dataexamplepersonexamplediamondexampleovalexamplecircleexamplehexagonexamplecloudexamplerectangleexamplesquareexamplepageexampleparallelogramexampledocumentexamplecylinderexamplequeueexamplepackageexamplestepexamplecalloutexamplestored_dataexamplepersonexamplediamondexampleovalexamplecircleexamplehexagonexamplecloudexample @@ -949,7 +949,7 @@ - + diff --git a/e2etests/testdata/stable/all_shapes_multiple/dagre/board.exp.json b/e2etests/testdata/stable/all_shapes_multiple/dagre/board.exp.json index a72669e54..4a2594f54 100644 --- a/e2etests/testdata/stable/all_shapes_multiple/dagre/board.exp.json +++ b/e2etests/testdata/stable/all_shapes_multiple/dagre/board.exp.json @@ -686,6 +686,7 @@ "fields": null, "methods": null, "columns": null, + "contentAspectRatio": 2.586678832116788, "label": "cloud", "fontSize": 16, "fontFamily": "DEFAULT", diff --git a/e2etests/testdata/stable/all_shapes_multiple/dagre/sketch.exp.svg b/e2etests/testdata/stable/all_shapes_multiple/dagre/sketch.exp.svg index 14f70b125..2ed307ef4 100644 --- a/e2etests/testdata/stable/all_shapes_multiple/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes_multiple/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud + .d2-330319047 .fill-N1{fill:#0A0F25;} + .d2-330319047 .fill-N2{fill:#676C7E;} + .d2-330319047 .fill-N3{fill:#9499AB;} + .d2-330319047 .fill-N4{fill:#CFD2DD;} + .d2-330319047 .fill-N5{fill:#DEE1EB;} + .d2-330319047 .fill-N6{fill:#EEF1F8;} + .d2-330319047 .fill-N7{fill:#FFFFFF;} + .d2-330319047 .fill-B1{fill:#0D32B2;} + .d2-330319047 .fill-B2{fill:#0D32B2;} + .d2-330319047 .fill-B3{fill:#E3E9FD;} + .d2-330319047 .fill-B4{fill:#E3E9FD;} + .d2-330319047 .fill-B5{fill:#EDF0FD;} + .d2-330319047 .fill-B6{fill:#F7F8FE;} + .d2-330319047 .fill-AA2{fill:#4A6FF3;} + .d2-330319047 .fill-AA4{fill:#EDF0FD;} + .d2-330319047 .fill-AA5{fill:#F7F8FE;} + .d2-330319047 .fill-AB4{fill:#EDF0FD;} + .d2-330319047 .fill-AB5{fill:#F7F8FE;} + .d2-330319047 .stroke-N1{stroke:#0A0F25;} + .d2-330319047 .stroke-N2{stroke:#676C7E;} + .d2-330319047 .stroke-N3{stroke:#9499AB;} + .d2-330319047 .stroke-N4{stroke:#CFD2DD;} + .d2-330319047 .stroke-N5{stroke:#DEE1EB;} + .d2-330319047 .stroke-N6{stroke:#EEF1F8;} + .d2-330319047 .stroke-N7{stroke:#FFFFFF;} + .d2-330319047 .stroke-B1{stroke:#0D32B2;} + .d2-330319047 .stroke-B2{stroke:#0D32B2;} + .d2-330319047 .stroke-B3{stroke:#E3E9FD;} + .d2-330319047 .stroke-B4{stroke:#E3E9FD;} + .d2-330319047 .stroke-B5{stroke:#EDF0FD;} + .d2-330319047 .stroke-B6{stroke:#F7F8FE;} + .d2-330319047 .stroke-AA2{stroke:#4A6FF3;} + .d2-330319047 .stroke-AA4{stroke:#EDF0FD;} + .d2-330319047 .stroke-AA5{stroke:#F7F8FE;} + .d2-330319047 .stroke-AB4{stroke:#EDF0FD;} + .d2-330319047 .stroke-AB5{stroke:#F7F8FE;} + .d2-330319047 .background-color-N1{background-color:#0A0F25;} + .d2-330319047 .background-color-N2{background-color:#676C7E;} + .d2-330319047 .background-color-N3{background-color:#9499AB;} + .d2-330319047 .background-color-N4{background-color:#CFD2DD;} + .d2-330319047 .background-color-N5{background-color:#DEE1EB;} + .d2-330319047 .background-color-N6{background-color:#EEF1F8;} + .d2-330319047 .background-color-N7{background-color:#FFFFFF;} + .d2-330319047 .background-color-B1{background-color:#0D32B2;} + .d2-330319047 .background-color-B2{background-color:#0D32B2;} + .d2-330319047 .background-color-B3{background-color:#E3E9FD;} + .d2-330319047 .background-color-B4{background-color:#E3E9FD;} + .d2-330319047 .background-color-B5{background-color:#EDF0FD;} + .d2-330319047 .background-color-B6{background-color:#F7F8FE;} + .d2-330319047 .background-color-AA2{background-color:#4A6FF3;} + .d2-330319047 .background-color-AA4{background-color:#EDF0FD;} + .d2-330319047 .background-color-AA5{background-color:#F7F8FE;} + .d2-330319047 .background-color-AB4{background-color:#EDF0FD;} + .d2-330319047 .background-color-AB5{background-color:#F7F8FE;} + .d2-330319047 .color-N1{color:#0A0F25;} + .d2-330319047 .color-N2{color:#676C7E;} + .d2-330319047 .color-N3{color:#9499AB;} + .d2-330319047 .color-N4{color:#CFD2DD;} + .d2-330319047 .color-N5{color:#DEE1EB;} + .d2-330319047 .color-N6{color:#EEF1F8;} + .d2-330319047 .color-N7{color:#FFFFFF;} + .d2-330319047 .color-B1{color:#0D32B2;} + .d2-330319047 .color-B2{color:#0D32B2;} + .d2-330319047 .color-B3{color:#E3E9FD;} + .d2-330319047 .color-B4{color:#E3E9FD;} + .d2-330319047 .color-B5{color:#EDF0FD;} + .d2-330319047 .color-B6{color:#F7F8FE;} + .d2-330319047 .color-AA2{color:#4A6FF3;} + .d2-330319047 .color-AA4{color:#EDF0FD;} + .d2-330319047 .color-AA5{color:#F7F8FE;} + .d2-330319047 .color-AB4{color:#EDF0FD;} + .d2-330319047 .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}]]>rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud @@ -107,5 +107,5 @@ - + \ No newline at end of file diff --git a/e2etests/testdata/stable/all_shapes_multiple/elk/board.exp.json b/e2etests/testdata/stable/all_shapes_multiple/elk/board.exp.json index 00e23b0c7..47c10804b 100644 --- a/e2etests/testdata/stable/all_shapes_multiple/elk/board.exp.json +++ b/e2etests/testdata/stable/all_shapes_multiple/elk/board.exp.json @@ -686,6 +686,7 @@ "fields": null, "methods": null, "columns": null, + "contentAspectRatio": 2.586678832116788, "label": "cloud", "fontSize": 16, "fontFamily": "DEFAULT", diff --git a/e2etests/testdata/stable/all_shapes_multiple/elk/sketch.exp.svg b/e2etests/testdata/stable/all_shapes_multiple/elk/sketch.exp.svg index a471046ea..79e510d07 100644 --- a/e2etests/testdata/stable/all_shapes_multiple/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes_multiple/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud + .d2-611791745 .fill-N1{fill:#0A0F25;} + .d2-611791745 .fill-N2{fill:#676C7E;} + .d2-611791745 .fill-N3{fill:#9499AB;} + .d2-611791745 .fill-N4{fill:#CFD2DD;} + .d2-611791745 .fill-N5{fill:#DEE1EB;} + .d2-611791745 .fill-N6{fill:#EEF1F8;} + .d2-611791745 .fill-N7{fill:#FFFFFF;} + .d2-611791745 .fill-B1{fill:#0D32B2;} + .d2-611791745 .fill-B2{fill:#0D32B2;} + .d2-611791745 .fill-B3{fill:#E3E9FD;} + .d2-611791745 .fill-B4{fill:#E3E9FD;} + .d2-611791745 .fill-B5{fill:#EDF0FD;} + .d2-611791745 .fill-B6{fill:#F7F8FE;} + .d2-611791745 .fill-AA2{fill:#4A6FF3;} + .d2-611791745 .fill-AA4{fill:#EDF0FD;} + .d2-611791745 .fill-AA5{fill:#F7F8FE;} + .d2-611791745 .fill-AB4{fill:#EDF0FD;} + .d2-611791745 .fill-AB5{fill:#F7F8FE;} + .d2-611791745 .stroke-N1{stroke:#0A0F25;} + .d2-611791745 .stroke-N2{stroke:#676C7E;} + .d2-611791745 .stroke-N3{stroke:#9499AB;} + .d2-611791745 .stroke-N4{stroke:#CFD2DD;} + .d2-611791745 .stroke-N5{stroke:#DEE1EB;} + .d2-611791745 .stroke-N6{stroke:#EEF1F8;} + .d2-611791745 .stroke-N7{stroke:#FFFFFF;} + .d2-611791745 .stroke-B1{stroke:#0D32B2;} + .d2-611791745 .stroke-B2{stroke:#0D32B2;} + .d2-611791745 .stroke-B3{stroke:#E3E9FD;} + .d2-611791745 .stroke-B4{stroke:#E3E9FD;} + .d2-611791745 .stroke-B5{stroke:#EDF0FD;} + .d2-611791745 .stroke-B6{stroke:#F7F8FE;} + .d2-611791745 .stroke-AA2{stroke:#4A6FF3;} + .d2-611791745 .stroke-AA4{stroke:#EDF0FD;} + .d2-611791745 .stroke-AA5{stroke:#F7F8FE;} + .d2-611791745 .stroke-AB4{stroke:#EDF0FD;} + .d2-611791745 .stroke-AB5{stroke:#F7F8FE;} + .d2-611791745 .background-color-N1{background-color:#0A0F25;} + .d2-611791745 .background-color-N2{background-color:#676C7E;} + .d2-611791745 .background-color-N3{background-color:#9499AB;} + .d2-611791745 .background-color-N4{background-color:#CFD2DD;} + .d2-611791745 .background-color-N5{background-color:#DEE1EB;} + .d2-611791745 .background-color-N6{background-color:#EEF1F8;} + .d2-611791745 .background-color-N7{background-color:#FFFFFF;} + .d2-611791745 .background-color-B1{background-color:#0D32B2;} + .d2-611791745 .background-color-B2{background-color:#0D32B2;} + .d2-611791745 .background-color-B3{background-color:#E3E9FD;} + .d2-611791745 .background-color-B4{background-color:#E3E9FD;} + .d2-611791745 .background-color-B5{background-color:#EDF0FD;} + .d2-611791745 .background-color-B6{background-color:#F7F8FE;} + .d2-611791745 .background-color-AA2{background-color:#4A6FF3;} + .d2-611791745 .background-color-AA4{background-color:#EDF0FD;} + .d2-611791745 .background-color-AA5{background-color:#F7F8FE;} + .d2-611791745 .background-color-AB4{background-color:#EDF0FD;} + .d2-611791745 .background-color-AB5{background-color:#F7F8FE;} + .d2-611791745 .color-N1{color:#0A0F25;} + .d2-611791745 .color-N2{color:#676C7E;} + .d2-611791745 .color-N3{color:#9499AB;} + .d2-611791745 .color-N4{color:#CFD2DD;} + .d2-611791745 .color-N5{color:#DEE1EB;} + .d2-611791745 .color-N6{color:#EEF1F8;} + .d2-611791745 .color-N7{color:#FFFFFF;} + .d2-611791745 .color-B1{color:#0D32B2;} + .d2-611791745 .color-B2{color:#0D32B2;} + .d2-611791745 .color-B3{color:#E3E9FD;} + .d2-611791745 .color-B4{color:#E3E9FD;} + .d2-611791745 .color-B5{color:#EDF0FD;} + .d2-611791745 .color-B6{color:#F7F8FE;} + .d2-611791745 .color-AA2{color:#4A6FF3;} + .d2-611791745 .color-AA4{color:#EDF0FD;} + .d2-611791745 .color-AA5{color:#F7F8FE;} + .d2-611791745 .color-AB4{color:#EDF0FD;} + .d2-611791745 .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}]]>rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud @@ -107,5 +107,5 @@ - + \ No newline at end of file diff --git a/e2etests/testdata/stable/all_shapes_shadow/dagre/board.exp.json b/e2etests/testdata/stable/all_shapes_shadow/dagre/board.exp.json index 05aed55ea..bfd018b64 100644 --- a/e2etests/testdata/stable/all_shapes_shadow/dagre/board.exp.json +++ b/e2etests/testdata/stable/all_shapes_shadow/dagre/board.exp.json @@ -686,6 +686,7 @@ "fields": null, "methods": null, "columns": null, + "contentAspectRatio": 2.586678832116788, "label": "cloud", "fontSize": 16, "fontFamily": "DEFAULT", diff --git a/e2etests/testdata/stable/all_shapes_shadow/dagre/sketch.exp.svg b/e2etests/testdata/stable/all_shapes_shadow/dagre/sketch.exp.svg index 1bdb08b98..941b0e96b 100644 --- a/e2etests/testdata/stable/all_shapes_shadow/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes_shadow/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-382908709 .fill-N1{fill:#0A0F25;} + .d2-382908709 .fill-N2{fill:#676C7E;} + .d2-382908709 .fill-N3{fill:#9499AB;} + .d2-382908709 .fill-N4{fill:#CFD2DD;} + .d2-382908709 .fill-N5{fill:#DEE1EB;} + .d2-382908709 .fill-N6{fill:#EEF1F8;} + .d2-382908709 .fill-N7{fill:#FFFFFF;} + .d2-382908709 .fill-B1{fill:#0D32B2;} + .d2-382908709 .fill-B2{fill:#0D32B2;} + .d2-382908709 .fill-B3{fill:#E3E9FD;} + .d2-382908709 .fill-B4{fill:#E3E9FD;} + .d2-382908709 .fill-B5{fill:#EDF0FD;} + .d2-382908709 .fill-B6{fill:#F7F8FE;} + .d2-382908709 .fill-AA2{fill:#4A6FF3;} + .d2-382908709 .fill-AA4{fill:#EDF0FD;} + .d2-382908709 .fill-AA5{fill:#F7F8FE;} + .d2-382908709 .fill-AB4{fill:#EDF0FD;} + .d2-382908709 .fill-AB5{fill:#F7F8FE;} + .d2-382908709 .stroke-N1{stroke:#0A0F25;} + .d2-382908709 .stroke-N2{stroke:#676C7E;} + .d2-382908709 .stroke-N3{stroke:#9499AB;} + .d2-382908709 .stroke-N4{stroke:#CFD2DD;} + .d2-382908709 .stroke-N5{stroke:#DEE1EB;} + .d2-382908709 .stroke-N6{stroke:#EEF1F8;} + .d2-382908709 .stroke-N7{stroke:#FFFFFF;} + .d2-382908709 .stroke-B1{stroke:#0D32B2;} + .d2-382908709 .stroke-B2{stroke:#0D32B2;} + .d2-382908709 .stroke-B3{stroke:#E3E9FD;} + .d2-382908709 .stroke-B4{stroke:#E3E9FD;} + .d2-382908709 .stroke-B5{stroke:#EDF0FD;} + .d2-382908709 .stroke-B6{stroke:#F7F8FE;} + .d2-382908709 .stroke-AA2{stroke:#4A6FF3;} + .d2-382908709 .stroke-AA4{stroke:#EDF0FD;} + .d2-382908709 .stroke-AA5{stroke:#F7F8FE;} + .d2-382908709 .stroke-AB4{stroke:#EDF0FD;} + .d2-382908709 .stroke-AB5{stroke:#F7F8FE;} + .d2-382908709 .background-color-N1{background-color:#0A0F25;} + .d2-382908709 .background-color-N2{background-color:#676C7E;} + .d2-382908709 .background-color-N3{background-color:#9499AB;} + .d2-382908709 .background-color-N4{background-color:#CFD2DD;} + .d2-382908709 .background-color-N5{background-color:#DEE1EB;} + .d2-382908709 .background-color-N6{background-color:#EEF1F8;} + .d2-382908709 .background-color-N7{background-color:#FFFFFF;} + .d2-382908709 .background-color-B1{background-color:#0D32B2;} + .d2-382908709 .background-color-B2{background-color:#0D32B2;} + .d2-382908709 .background-color-B3{background-color:#E3E9FD;} + .d2-382908709 .background-color-B4{background-color:#E3E9FD;} + .d2-382908709 .background-color-B5{background-color:#EDF0FD;} + .d2-382908709 .background-color-B6{background-color:#F7F8FE;} + .d2-382908709 .background-color-AA2{background-color:#4A6FF3;} + .d2-382908709 .background-color-AA4{background-color:#EDF0FD;} + .d2-382908709 .background-color-AA5{background-color:#F7F8FE;} + .d2-382908709 .background-color-AB4{background-color:#EDF0FD;} + .d2-382908709 .background-color-AB5{background-color:#F7F8FE;} + .d2-382908709 .color-N1{color:#0A0F25;} + .d2-382908709 .color-N2{color:#676C7E;} + .d2-382908709 .color-N3{color:#9499AB;} + .d2-382908709 .color-N4{color:#CFD2DD;} + .d2-382908709 .color-N5{color:#DEE1EB;} + .d2-382908709 .color-N6{color:#EEF1F8;} + .d2-382908709 .color-N7{color:#FFFFFF;} + .d2-382908709 .color-B1{color:#0D32B2;} + .d2-382908709 .color-B2{color:#0D32B2;} + .d2-382908709 .color-B3{color:#E3E9FD;} + .d2-382908709 .color-B4{color:#E3E9FD;} + .d2-382908709 .color-B5{color:#EDF0FD;} + .d2-382908709 .color-B6{color:#F7F8FE;} + .d2-382908709 .color-AA2{color:#4A6FF3;} + .d2-382908709 .color-AA4{color:#EDF0FD;} + .d2-382908709 .color-AA5{color:#F7F8FE;} + .d2-382908709 .color-AB4{color:#EDF0FD;} + .d2-382908709 .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}]]> @@ -97,7 +97,7 @@ -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud +rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud @@ -115,5 +115,5 @@ - + \ No newline at end of file diff --git a/e2etests/testdata/stable/all_shapes_shadow/elk/board.exp.json b/e2etests/testdata/stable/all_shapes_shadow/elk/board.exp.json index 114123898..16fc33bc8 100644 --- a/e2etests/testdata/stable/all_shapes_shadow/elk/board.exp.json +++ b/e2etests/testdata/stable/all_shapes_shadow/elk/board.exp.json @@ -686,6 +686,7 @@ "fields": null, "methods": null, "columns": null, + "contentAspectRatio": 2.586678832116788, "label": "cloud", "fontSize": 16, "fontFamily": "DEFAULT", diff --git a/e2etests/testdata/stable/all_shapes_shadow/elk/sketch.exp.svg b/e2etests/testdata/stable/all_shapes_shadow/elk/sketch.exp.svg index 76d136e01..cdd8d40cc 100644 --- a/e2etests/testdata/stable/all_shapes_shadow/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes_shadow/elk/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-1463242853 .fill-N1{fill:#0A0F25;} + .d2-1463242853 .fill-N2{fill:#676C7E;} + .d2-1463242853 .fill-N3{fill:#9499AB;} + .d2-1463242853 .fill-N4{fill:#CFD2DD;} + .d2-1463242853 .fill-N5{fill:#DEE1EB;} + .d2-1463242853 .fill-N6{fill:#EEF1F8;} + .d2-1463242853 .fill-N7{fill:#FFFFFF;} + .d2-1463242853 .fill-B1{fill:#0D32B2;} + .d2-1463242853 .fill-B2{fill:#0D32B2;} + .d2-1463242853 .fill-B3{fill:#E3E9FD;} + .d2-1463242853 .fill-B4{fill:#E3E9FD;} + .d2-1463242853 .fill-B5{fill:#EDF0FD;} + .d2-1463242853 .fill-B6{fill:#F7F8FE;} + .d2-1463242853 .fill-AA2{fill:#4A6FF3;} + .d2-1463242853 .fill-AA4{fill:#EDF0FD;} + .d2-1463242853 .fill-AA5{fill:#F7F8FE;} + .d2-1463242853 .fill-AB4{fill:#EDF0FD;} + .d2-1463242853 .fill-AB5{fill:#F7F8FE;} + .d2-1463242853 .stroke-N1{stroke:#0A0F25;} + .d2-1463242853 .stroke-N2{stroke:#676C7E;} + .d2-1463242853 .stroke-N3{stroke:#9499AB;} + .d2-1463242853 .stroke-N4{stroke:#CFD2DD;} + .d2-1463242853 .stroke-N5{stroke:#DEE1EB;} + .d2-1463242853 .stroke-N6{stroke:#EEF1F8;} + .d2-1463242853 .stroke-N7{stroke:#FFFFFF;} + .d2-1463242853 .stroke-B1{stroke:#0D32B2;} + .d2-1463242853 .stroke-B2{stroke:#0D32B2;} + .d2-1463242853 .stroke-B3{stroke:#E3E9FD;} + .d2-1463242853 .stroke-B4{stroke:#E3E9FD;} + .d2-1463242853 .stroke-B5{stroke:#EDF0FD;} + .d2-1463242853 .stroke-B6{stroke:#F7F8FE;} + .d2-1463242853 .stroke-AA2{stroke:#4A6FF3;} + .d2-1463242853 .stroke-AA4{stroke:#EDF0FD;} + .d2-1463242853 .stroke-AA5{stroke:#F7F8FE;} + .d2-1463242853 .stroke-AB4{stroke:#EDF0FD;} + .d2-1463242853 .stroke-AB5{stroke:#F7F8FE;} + .d2-1463242853 .background-color-N1{background-color:#0A0F25;} + .d2-1463242853 .background-color-N2{background-color:#676C7E;} + .d2-1463242853 .background-color-N3{background-color:#9499AB;} + .d2-1463242853 .background-color-N4{background-color:#CFD2DD;} + .d2-1463242853 .background-color-N5{background-color:#DEE1EB;} + .d2-1463242853 .background-color-N6{background-color:#EEF1F8;} + .d2-1463242853 .background-color-N7{background-color:#FFFFFF;} + .d2-1463242853 .background-color-B1{background-color:#0D32B2;} + .d2-1463242853 .background-color-B2{background-color:#0D32B2;} + .d2-1463242853 .background-color-B3{background-color:#E3E9FD;} + .d2-1463242853 .background-color-B4{background-color:#E3E9FD;} + .d2-1463242853 .background-color-B5{background-color:#EDF0FD;} + .d2-1463242853 .background-color-B6{background-color:#F7F8FE;} + .d2-1463242853 .background-color-AA2{background-color:#4A6FF3;} + .d2-1463242853 .background-color-AA4{background-color:#EDF0FD;} + .d2-1463242853 .background-color-AA5{background-color:#F7F8FE;} + .d2-1463242853 .background-color-AB4{background-color:#EDF0FD;} + .d2-1463242853 .background-color-AB5{background-color:#F7F8FE;} + .d2-1463242853 .color-N1{color:#0A0F25;} + .d2-1463242853 .color-N2{color:#676C7E;} + .d2-1463242853 .color-N3{color:#9499AB;} + .d2-1463242853 .color-N4{color:#CFD2DD;} + .d2-1463242853 .color-N5{color:#DEE1EB;} + .d2-1463242853 .color-N6{color:#EEF1F8;} + .d2-1463242853 .color-N7{color:#FFFFFF;} + .d2-1463242853 .color-B1{color:#0D32B2;} + .d2-1463242853 .color-B2{color:#0D32B2;} + .d2-1463242853 .color-B3{color:#E3E9FD;} + .d2-1463242853 .color-B4{color:#E3E9FD;} + .d2-1463242853 .color-B5{color:#EDF0FD;} + .d2-1463242853 .color-B6{color:#F7F8FE;} + .d2-1463242853 .color-AA2{color:#4A6FF3;} + .d2-1463242853 .color-AA4{color:#EDF0FD;} + .d2-1463242853 .color-AA5{color:#F7F8FE;} + .d2-1463242853 .color-AB4{color:#EDF0FD;} + .d2-1463242853 .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}]]> @@ -97,7 +97,7 @@ -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud +rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud @@ -115,5 +115,5 @@ - + \ No newline at end of file diff --git a/e2etests/testdata/stable/nesting_power/dagre/board.exp.json b/e2etests/testdata/stable/nesting_power/dagre/board.exp.json index 5d9d28267..436b2dcfd 100644 --- a/e2etests/testdata/stable/nesting_power/dagre/board.exp.json +++ b/e2etests/testdata/stable/nesting_power/dagre/board.exp.json @@ -2038,6 +2038,7 @@ "fields": null, "methods": null, "columns": null, + "contentAspectRatio": 2.586678832116788, "label": "cloud", "fontSize": 16, "fontFamily": "DEFAULT", diff --git a/e2etests/testdata/stable/nesting_power/dagre/sketch.exp.svg b/e2etests/testdata/stable/nesting_power/dagre/sketch.exp.svg index f6dc7b0c2..2bcf77895 100644 --- a/e2etests/testdata/stable/nesting_power/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/nesting_power/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ - + .d2-4275644664 .fill-N1{fill:#0A0F25;} + .d2-4275644664 .fill-N2{fill:#676C7E;} + .d2-4275644664 .fill-N3{fill:#9499AB;} + .d2-4275644664 .fill-N4{fill:#CFD2DD;} + .d2-4275644664 .fill-N5{fill:#DEE1EB;} + .d2-4275644664 .fill-N6{fill:#EEF1F8;} + .d2-4275644664 .fill-N7{fill:#FFFFFF;} + .d2-4275644664 .fill-B1{fill:#0D32B2;} + .d2-4275644664 .fill-B2{fill:#0D32B2;} + .d2-4275644664 .fill-B3{fill:#E3E9FD;} + .d2-4275644664 .fill-B4{fill:#E3E9FD;} + .d2-4275644664 .fill-B5{fill:#EDF0FD;} + .d2-4275644664 .fill-B6{fill:#F7F8FE;} + .d2-4275644664 .fill-AA2{fill:#4A6FF3;} + .d2-4275644664 .fill-AA4{fill:#EDF0FD;} + .d2-4275644664 .fill-AA5{fill:#F7F8FE;} + .d2-4275644664 .fill-AB4{fill:#EDF0FD;} + .d2-4275644664 .fill-AB5{fill:#F7F8FE;} + .d2-4275644664 .stroke-N1{stroke:#0A0F25;} + .d2-4275644664 .stroke-N2{stroke:#676C7E;} + .d2-4275644664 .stroke-N3{stroke:#9499AB;} + .d2-4275644664 .stroke-N4{stroke:#CFD2DD;} + .d2-4275644664 .stroke-N5{stroke:#DEE1EB;} + .d2-4275644664 .stroke-N6{stroke:#EEF1F8;} + .d2-4275644664 .stroke-N7{stroke:#FFFFFF;} + .d2-4275644664 .stroke-B1{stroke:#0D32B2;} + .d2-4275644664 .stroke-B2{stroke:#0D32B2;} + .d2-4275644664 .stroke-B3{stroke:#E3E9FD;} + .d2-4275644664 .stroke-B4{stroke:#E3E9FD;} + .d2-4275644664 .stroke-B5{stroke:#EDF0FD;} + .d2-4275644664 .stroke-B6{stroke:#F7F8FE;} + .d2-4275644664 .stroke-AA2{stroke:#4A6FF3;} + .d2-4275644664 .stroke-AA4{stroke:#EDF0FD;} + .d2-4275644664 .stroke-AA5{stroke:#F7F8FE;} + .d2-4275644664 .stroke-AB4{stroke:#EDF0FD;} + .d2-4275644664 .stroke-AB5{stroke:#F7F8FE;} + .d2-4275644664 .background-color-N1{background-color:#0A0F25;} + .d2-4275644664 .background-color-N2{background-color:#676C7E;} + .d2-4275644664 .background-color-N3{background-color:#9499AB;} + .d2-4275644664 .background-color-N4{background-color:#CFD2DD;} + .d2-4275644664 .background-color-N5{background-color:#DEE1EB;} + .d2-4275644664 .background-color-N6{background-color:#EEF1F8;} + .d2-4275644664 .background-color-N7{background-color:#FFFFFF;} + .d2-4275644664 .background-color-B1{background-color:#0D32B2;} + .d2-4275644664 .background-color-B2{background-color:#0D32B2;} + .d2-4275644664 .background-color-B3{background-color:#E3E9FD;} + .d2-4275644664 .background-color-B4{background-color:#E3E9FD;} + .d2-4275644664 .background-color-B5{background-color:#EDF0FD;} + .d2-4275644664 .background-color-B6{background-color:#F7F8FE;} + .d2-4275644664 .background-color-AA2{background-color:#4A6FF3;} + .d2-4275644664 .background-color-AA4{background-color:#EDF0FD;} + .d2-4275644664 .background-color-AA5{background-color:#F7F8FE;} + .d2-4275644664 .background-color-AB4{background-color:#EDF0FD;} + .d2-4275644664 .background-color-AB5{background-color:#F7F8FE;} + .d2-4275644664 .color-N1{color:#0A0F25;} + .d2-4275644664 .color-N2{color:#676C7E;} + .d2-4275644664 .color-N3{color:#9499AB;} + .d2-4275644664 .color-N4{color:#CFD2DD;} + .d2-4275644664 .color-N5{color:#DEE1EB;} + .d2-4275644664 .color-N6{color:#EEF1F8;} + .d2-4275644664 .color-N7{color:#FFFFFF;} + .d2-4275644664 .color-B1{color:#0D32B2;} + .d2-4275644664 .color-B2{color:#0D32B2;} + .d2-4275644664 .color-B3{color:#E3E9FD;} + .d2-4275644664 .color-B4{color:#E3E9FD;} + .d2-4275644664 .color-B5{color:#EDF0FD;} + .d2-4275644664 .color-B6{color:#F7F8FE;} + .d2-4275644664 .color-AA2{color:#4A6FF3;} + .d2-4275644664 .color-AA4{color:#EDF0FD;} + .d2-4275644664 .color-AA5{color:#F7F8FE;} + .d2-4275644664 .color-AB4{color:#EDF0FD;} + .d2-4275644664 .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}]]> @@ -111,9 +111,9 @@ -Left Constant NearcenterdirectionsRight Constant NearseqmoreBottom Left Constant Neardefaultlayouthererectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrightleftisconstantandalsogridscoreritemResponseitemessayRubricconceptitemOutcomestylishcontaineradagreelktalathisisgrid12341234updownnearax +Left Constant NearcenterdirectionsRight Constant NearseqmoreBottom Left Constant Neardefaultlayouthererectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrightleftisconstantandalsogridscoreritemResponseitemessayRubricconceptitemOutcomestylishcontaineradagreelktalathisisgrid12341234updownnearax -ya_sequencea_shapesequencefinallybrow 1row 2row 3row 4row 5withasequence diagramyou canchild of is12341234scoreritemResponseitemessayRubricconceptsequencefrom one constant nearhaveanothergridhere andgrandchildscorerconceptessayRubricitemitemOutcomeitemResponse123continuenesting ororruns thisruns thisruns thisA straight edge across straight edge across nested typesdefault layoutdefault layoutdefault layout in styleto inside sequence diagramto inside sequence diagramto inside sequence diagramto constant nearfrom within constant nearto another getItem() itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)score +ya_sequencea_shapesequencefinallybrow 1row 2row 3row 4row 5withasequence diagramyou canchild of is12341234scoreritemResponseitemessayRubricconceptsequencefrom one constant nearhaveanothergridhere andgrandchildscorerconceptessayRubricitemitemOutcomeitemResponse123continuenesting ororruns thisruns thisruns thisA straight edge across straight edge across nested typesdefault layoutdefault layoutdefault layout in styleto inside sequence diagramto inside sequence diagramto inside sequence diagramto constant nearfrom within constant nearto another getItem() itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)score @@ -141,7 +141,7 @@ - + diff --git a/e2etests/testdata/stable/nesting_power/elk/board.exp.json b/e2etests/testdata/stable/nesting_power/elk/board.exp.json index 850f29b6c..6835dd774 100644 --- a/e2etests/testdata/stable/nesting_power/elk/board.exp.json +++ b/e2etests/testdata/stable/nesting_power/elk/board.exp.json @@ -2038,6 +2038,7 @@ "fields": null, "methods": null, "columns": null, + "contentAspectRatio": 2.586678832116788, "label": "cloud", "fontSize": 16, "fontFamily": "DEFAULT", diff --git a/e2etests/testdata/stable/nesting_power/elk/sketch.exp.svg b/e2etests/testdata/stable/nesting_power/elk/sketch.exp.svg index 662f438e7..de741bcab 100644 --- a/e2etests/testdata/stable/nesting_power/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/nesting_power/elk/sketch.exp.svg @@ -1,23 +1,23 @@ - + .d2-945478938 .fill-N1{fill:#0A0F25;} + .d2-945478938 .fill-N2{fill:#676C7E;} + .d2-945478938 .fill-N3{fill:#9499AB;} + .d2-945478938 .fill-N4{fill:#CFD2DD;} + .d2-945478938 .fill-N5{fill:#DEE1EB;} + .d2-945478938 .fill-N6{fill:#EEF1F8;} + .d2-945478938 .fill-N7{fill:#FFFFFF;} + .d2-945478938 .fill-B1{fill:#0D32B2;} + .d2-945478938 .fill-B2{fill:#0D32B2;} + .d2-945478938 .fill-B3{fill:#E3E9FD;} + .d2-945478938 .fill-B4{fill:#E3E9FD;} + .d2-945478938 .fill-B5{fill:#EDF0FD;} + .d2-945478938 .fill-B6{fill:#F7F8FE;} + .d2-945478938 .fill-AA2{fill:#4A6FF3;} + .d2-945478938 .fill-AA4{fill:#EDF0FD;} + .d2-945478938 .fill-AA5{fill:#F7F8FE;} + .d2-945478938 .fill-AB4{fill:#EDF0FD;} + .d2-945478938 .fill-AB5{fill:#F7F8FE;} + .d2-945478938 .stroke-N1{stroke:#0A0F25;} + .d2-945478938 .stroke-N2{stroke:#676C7E;} + .d2-945478938 .stroke-N3{stroke:#9499AB;} + .d2-945478938 .stroke-N4{stroke:#CFD2DD;} + .d2-945478938 .stroke-N5{stroke:#DEE1EB;} + .d2-945478938 .stroke-N6{stroke:#EEF1F8;} + .d2-945478938 .stroke-N7{stroke:#FFFFFF;} + .d2-945478938 .stroke-B1{stroke:#0D32B2;} + .d2-945478938 .stroke-B2{stroke:#0D32B2;} + .d2-945478938 .stroke-B3{stroke:#E3E9FD;} + .d2-945478938 .stroke-B4{stroke:#E3E9FD;} + .d2-945478938 .stroke-B5{stroke:#EDF0FD;} + .d2-945478938 .stroke-B6{stroke:#F7F8FE;} + .d2-945478938 .stroke-AA2{stroke:#4A6FF3;} + .d2-945478938 .stroke-AA4{stroke:#EDF0FD;} + .d2-945478938 .stroke-AA5{stroke:#F7F8FE;} + .d2-945478938 .stroke-AB4{stroke:#EDF0FD;} + .d2-945478938 .stroke-AB5{stroke:#F7F8FE;} + .d2-945478938 .background-color-N1{background-color:#0A0F25;} + .d2-945478938 .background-color-N2{background-color:#676C7E;} + .d2-945478938 .background-color-N3{background-color:#9499AB;} + .d2-945478938 .background-color-N4{background-color:#CFD2DD;} + .d2-945478938 .background-color-N5{background-color:#DEE1EB;} + .d2-945478938 .background-color-N6{background-color:#EEF1F8;} + .d2-945478938 .background-color-N7{background-color:#FFFFFF;} + .d2-945478938 .background-color-B1{background-color:#0D32B2;} + .d2-945478938 .background-color-B2{background-color:#0D32B2;} + .d2-945478938 .background-color-B3{background-color:#E3E9FD;} + .d2-945478938 .background-color-B4{background-color:#E3E9FD;} + .d2-945478938 .background-color-B5{background-color:#EDF0FD;} + .d2-945478938 .background-color-B6{background-color:#F7F8FE;} + .d2-945478938 .background-color-AA2{background-color:#4A6FF3;} + .d2-945478938 .background-color-AA4{background-color:#EDF0FD;} + .d2-945478938 .background-color-AA5{background-color:#F7F8FE;} + .d2-945478938 .background-color-AB4{background-color:#EDF0FD;} + .d2-945478938 .background-color-AB5{background-color:#F7F8FE;} + .d2-945478938 .color-N1{color:#0A0F25;} + .d2-945478938 .color-N2{color:#676C7E;} + .d2-945478938 .color-N3{color:#9499AB;} + .d2-945478938 .color-N4{color:#CFD2DD;} + .d2-945478938 .color-N5{color:#DEE1EB;} + .d2-945478938 .color-N6{color:#EEF1F8;} + .d2-945478938 .color-N7{color:#FFFFFF;} + .d2-945478938 .color-B1{color:#0D32B2;} + .d2-945478938 .color-B2{color:#0D32B2;} + .d2-945478938 .color-B3{color:#E3E9FD;} + .d2-945478938 .color-B4{color:#E3E9FD;} + .d2-945478938 .color-B5{color:#EDF0FD;} + .d2-945478938 .color-B6{color:#F7F8FE;} + .d2-945478938 .color-AA2{color:#4A6FF3;} + .d2-945478938 .color-AA4{color:#EDF0FD;} + .d2-945478938 .color-AA5{color:#F7F8FE;} + .d2-945478938 .color-AB4{color:#EDF0FD;} + .d2-945478938 .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}]]> @@ -111,9 +111,9 @@ -Left Constant NearcenterdirectionsRight Constant NearseqmoreBottom Left Constant Neardefaultlayouthererectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrightleftisconstantandalsogridscoreritemResponseitemessayRubricconceptitemOutcomestylishcontaineradagreelktalathisisgrid12341234updownnearax +Left Constant NearcenterdirectionsRight Constant NearseqmoreBottom Left Constant Neardefaultlayouthererectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrightleftisconstantandalsogridscoreritemResponseitemessayRubricconceptitemOutcomestylishcontaineradagreelktalathisisgrid12341234updownnearax -ya_sequencea_shapesequencefinallybrow 1row 2row 3row 4row 5withasequence diagramyou canchild of is12341234scoreritemResponseitemessayRubricconceptsequencefrom one constant nearhaveanothergridhere andgrandchildscorerconceptessayRubricitemitemOutcomeitemResponse123continuenesting ororruns thisruns thisruns thisA straight edge across straight edge across nested typesdefault layoutdefault layoutdefault layout in styleto inside sequence diagramto inside sequence diagramto inside sequence diagramto constant nearfrom within constant nearto another getItem() itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)score +ya_sequencea_shapesequencefinallybrow 1row 2row 3row 4row 5withasequence diagramyou canchild of is12341234scoreritemResponseitemessayRubricconceptsequencefrom one constant nearhaveanothergridhere andgrandchildscorerconceptessayRubricitemitemOutcomeitemResponse123continuenesting ororruns thisruns thisruns thisA straight edge across straight edge across nested typesdefault layoutdefault layoutdefault layout in styleto inside sequence diagramto inside sequence diagramto inside sequence diagramto constant nearfrom within constant nearto another getItem() itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)score @@ -141,7 +141,7 @@ - + diff --git a/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/board.exp.json index 8cf348535..59e6b6e8a 100644 --- a/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/board.exp.json @@ -167,6 +167,7 @@ "fields": null, "methods": null, "columns": null, + "contentAspectRatio": 4.253649635036496, "label": "cloudyyyy", "fontSize": 16, "fontFamily": "DEFAULT", diff --git a/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/sketch.exp.svg index 5a568171e..e9162553c 100644 --- a/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/sketch.exp.svg @@ -1,30 +1,30 @@ -a labelblabelsa class+public() boolvoid-private() intvoidcloudyyyya := 5 + .d2-3691248312 .fill-N1{fill:#0A0F25;} + .d2-3691248312 .fill-N2{fill:#676C7E;} + .d2-3691248312 .fill-N3{fill:#9499AB;} + .d2-3691248312 .fill-N4{fill:#CFD2DD;} + .d2-3691248312 .fill-N5{fill:#DEE1EB;} + .d2-3691248312 .fill-N6{fill:#EEF1F8;} + .d2-3691248312 .fill-N7{fill:#FFFFFF;} + .d2-3691248312 .fill-B1{fill:#0D32B2;} + .d2-3691248312 .fill-B2{fill:#0D32B2;} + .d2-3691248312 .fill-B3{fill:#E3E9FD;} + .d2-3691248312 .fill-B4{fill:#E3E9FD;} + .d2-3691248312 .fill-B5{fill:#EDF0FD;} + .d2-3691248312 .fill-B6{fill:#F7F8FE;} + .d2-3691248312 .fill-AA2{fill:#4A6FF3;} + .d2-3691248312 .fill-AA4{fill:#EDF0FD;} + .d2-3691248312 .fill-AA5{fill:#F7F8FE;} + .d2-3691248312 .fill-AB4{fill:#EDF0FD;} + .d2-3691248312 .fill-AB5{fill:#F7F8FE;} + .d2-3691248312 .stroke-N1{stroke:#0A0F25;} + .d2-3691248312 .stroke-N2{stroke:#676C7E;} + .d2-3691248312 .stroke-N3{stroke:#9499AB;} + .d2-3691248312 .stroke-N4{stroke:#CFD2DD;} + .d2-3691248312 .stroke-N5{stroke:#DEE1EB;} + .d2-3691248312 .stroke-N6{stroke:#EEF1F8;} + .d2-3691248312 .stroke-N7{stroke:#FFFFFF;} + .d2-3691248312 .stroke-B1{stroke:#0D32B2;} + .d2-3691248312 .stroke-B2{stroke:#0D32B2;} + .d2-3691248312 .stroke-B3{stroke:#E3E9FD;} + .d2-3691248312 .stroke-B4{stroke:#E3E9FD;} + .d2-3691248312 .stroke-B5{stroke:#EDF0FD;} + .d2-3691248312 .stroke-B6{stroke:#F7F8FE;} + .d2-3691248312 .stroke-AA2{stroke:#4A6FF3;} + .d2-3691248312 .stroke-AA4{stroke:#EDF0FD;} + .d2-3691248312 .stroke-AA5{stroke:#F7F8FE;} + .d2-3691248312 .stroke-AB4{stroke:#EDF0FD;} + .d2-3691248312 .stroke-AB5{stroke:#F7F8FE;} + .d2-3691248312 .background-color-N1{background-color:#0A0F25;} + .d2-3691248312 .background-color-N2{background-color:#676C7E;} + .d2-3691248312 .background-color-N3{background-color:#9499AB;} + .d2-3691248312 .background-color-N4{background-color:#CFD2DD;} + .d2-3691248312 .background-color-N5{background-color:#DEE1EB;} + .d2-3691248312 .background-color-N6{background-color:#EEF1F8;} + .d2-3691248312 .background-color-N7{background-color:#FFFFFF;} + .d2-3691248312 .background-color-B1{background-color:#0D32B2;} + .d2-3691248312 .background-color-B2{background-color:#0D32B2;} + .d2-3691248312 .background-color-B3{background-color:#E3E9FD;} + .d2-3691248312 .background-color-B4{background-color:#E3E9FD;} + .d2-3691248312 .background-color-B5{background-color:#EDF0FD;} + .d2-3691248312 .background-color-B6{background-color:#F7F8FE;} + .d2-3691248312 .background-color-AA2{background-color:#4A6FF3;} + .d2-3691248312 .background-color-AA4{background-color:#EDF0FD;} + .d2-3691248312 .background-color-AA5{background-color:#F7F8FE;} + .d2-3691248312 .background-color-AB4{background-color:#EDF0FD;} + .d2-3691248312 .background-color-AB5{background-color:#F7F8FE;} + .d2-3691248312 .color-N1{color:#0A0F25;} + .d2-3691248312 .color-N2{color:#676C7E;} + .d2-3691248312 .color-N3{color:#9499AB;} + .d2-3691248312 .color-N4{color:#CFD2DD;} + .d2-3691248312 .color-N5{color:#DEE1EB;} + .d2-3691248312 .color-N6{color:#EEF1F8;} + .d2-3691248312 .color-N7{color:#FFFFFF;} + .d2-3691248312 .color-B1{color:#0D32B2;} + .d2-3691248312 .color-B2{color:#0D32B2;} + .d2-3691248312 .color-B3{color:#E3E9FD;} + .d2-3691248312 .color-B4{color:#E3E9FD;} + .d2-3691248312 .color-B5{color:#EDF0FD;} + .d2-3691248312 .color-B6{color:#F7F8FE;} + .d2-3691248312 .color-AA2{color:#4A6FF3;} + .d2-3691248312 .color-AA4{color:#EDF0FD;} + .d2-3691248312 .color-AA5{color:#F7F8FE;} + .d2-3691248312 .color-AB4{color:#EDF0FD;} + .d2-3691248312 .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}]]>a labelblabelsa class+public() boolvoid-private() intvoidcloudyyyya := 5 b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersidintnamevarchar result := callThisFunction(obj, 5) midthis sideother side +fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersidintnamevarchar result := callThisFunction(obj, 5) midthis sideother side diff --git a/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/board.exp.json index 8cf348535..59e6b6e8a 100644 --- a/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/board.exp.json @@ -167,6 +167,7 @@ "fields": null, "methods": null, "columns": null, + "contentAspectRatio": 4.253649635036496, "label": "cloudyyyy", "fontSize": 16, "fontFamily": "DEFAULT", diff --git a/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/sketch.exp.svg index 5a568171e..e9162553c 100644 --- a/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/sketch.exp.svg @@ -1,30 +1,30 @@ -a labelblabelsa class+public() boolvoid-private() intvoidcloudyyyya := 5 + .d2-3691248312 .fill-N1{fill:#0A0F25;} + .d2-3691248312 .fill-N2{fill:#676C7E;} + .d2-3691248312 .fill-N3{fill:#9499AB;} + .d2-3691248312 .fill-N4{fill:#CFD2DD;} + .d2-3691248312 .fill-N5{fill:#DEE1EB;} + .d2-3691248312 .fill-N6{fill:#EEF1F8;} + .d2-3691248312 .fill-N7{fill:#FFFFFF;} + .d2-3691248312 .fill-B1{fill:#0D32B2;} + .d2-3691248312 .fill-B2{fill:#0D32B2;} + .d2-3691248312 .fill-B3{fill:#E3E9FD;} + .d2-3691248312 .fill-B4{fill:#E3E9FD;} + .d2-3691248312 .fill-B5{fill:#EDF0FD;} + .d2-3691248312 .fill-B6{fill:#F7F8FE;} + .d2-3691248312 .fill-AA2{fill:#4A6FF3;} + .d2-3691248312 .fill-AA4{fill:#EDF0FD;} + .d2-3691248312 .fill-AA5{fill:#F7F8FE;} + .d2-3691248312 .fill-AB4{fill:#EDF0FD;} + .d2-3691248312 .fill-AB5{fill:#F7F8FE;} + .d2-3691248312 .stroke-N1{stroke:#0A0F25;} + .d2-3691248312 .stroke-N2{stroke:#676C7E;} + .d2-3691248312 .stroke-N3{stroke:#9499AB;} + .d2-3691248312 .stroke-N4{stroke:#CFD2DD;} + .d2-3691248312 .stroke-N5{stroke:#DEE1EB;} + .d2-3691248312 .stroke-N6{stroke:#EEF1F8;} + .d2-3691248312 .stroke-N7{stroke:#FFFFFF;} + .d2-3691248312 .stroke-B1{stroke:#0D32B2;} + .d2-3691248312 .stroke-B2{stroke:#0D32B2;} + .d2-3691248312 .stroke-B3{stroke:#E3E9FD;} + .d2-3691248312 .stroke-B4{stroke:#E3E9FD;} + .d2-3691248312 .stroke-B5{stroke:#EDF0FD;} + .d2-3691248312 .stroke-B6{stroke:#F7F8FE;} + .d2-3691248312 .stroke-AA2{stroke:#4A6FF3;} + .d2-3691248312 .stroke-AA4{stroke:#EDF0FD;} + .d2-3691248312 .stroke-AA5{stroke:#F7F8FE;} + .d2-3691248312 .stroke-AB4{stroke:#EDF0FD;} + .d2-3691248312 .stroke-AB5{stroke:#F7F8FE;} + .d2-3691248312 .background-color-N1{background-color:#0A0F25;} + .d2-3691248312 .background-color-N2{background-color:#676C7E;} + .d2-3691248312 .background-color-N3{background-color:#9499AB;} + .d2-3691248312 .background-color-N4{background-color:#CFD2DD;} + .d2-3691248312 .background-color-N5{background-color:#DEE1EB;} + .d2-3691248312 .background-color-N6{background-color:#EEF1F8;} + .d2-3691248312 .background-color-N7{background-color:#FFFFFF;} + .d2-3691248312 .background-color-B1{background-color:#0D32B2;} + .d2-3691248312 .background-color-B2{background-color:#0D32B2;} + .d2-3691248312 .background-color-B3{background-color:#E3E9FD;} + .d2-3691248312 .background-color-B4{background-color:#E3E9FD;} + .d2-3691248312 .background-color-B5{background-color:#EDF0FD;} + .d2-3691248312 .background-color-B6{background-color:#F7F8FE;} + .d2-3691248312 .background-color-AA2{background-color:#4A6FF3;} + .d2-3691248312 .background-color-AA4{background-color:#EDF0FD;} + .d2-3691248312 .background-color-AA5{background-color:#F7F8FE;} + .d2-3691248312 .background-color-AB4{background-color:#EDF0FD;} + .d2-3691248312 .background-color-AB5{background-color:#F7F8FE;} + .d2-3691248312 .color-N1{color:#0A0F25;} + .d2-3691248312 .color-N2{color:#676C7E;} + .d2-3691248312 .color-N3{color:#9499AB;} + .d2-3691248312 .color-N4{color:#CFD2DD;} + .d2-3691248312 .color-N5{color:#DEE1EB;} + .d2-3691248312 .color-N6{color:#EEF1F8;} + .d2-3691248312 .color-N7{color:#FFFFFF;} + .d2-3691248312 .color-B1{color:#0D32B2;} + .d2-3691248312 .color-B2{color:#0D32B2;} + .d2-3691248312 .color-B3{color:#E3E9FD;} + .d2-3691248312 .color-B4{color:#E3E9FD;} + .d2-3691248312 .color-B5{color:#EDF0FD;} + .d2-3691248312 .color-B6{color:#F7F8FE;} + .d2-3691248312 .color-AA2{color:#4A6FF3;} + .d2-3691248312 .color-AA4{color:#EDF0FD;} + .d2-3691248312 .color-AA5{color:#F7F8FE;} + .d2-3691248312 .color-AB4{color:#EDF0FD;} + .d2-3691248312 .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}]]>a labelblabelsa class+public() boolvoid-private() intvoidcloudyyyya := 5 b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersidintnamevarchar result := callThisFunction(obj, 5) midthis sideother side +fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersidintnamevarchar result := callThisFunction(obj, 5) midthis sideother side diff --git a/e2etests/testdata/todo/container_label_edge_adjustment/dagre/board.exp.json b/e2etests/testdata/todo/container_label_edge_adjustment/dagre/board.exp.json index 94c8bbff0..909eb92e7 100644 --- a/e2etests/testdata/todo/container_label_edge_adjustment/dagre/board.exp.json +++ b/e2etests/testdata/todo/container_label_edge_adjustment/dagre/board.exp.json @@ -71,6 +71,7 @@ "fields": null, "methods": null, "columns": null, + "contentAspectRatio": 7.2903685241231955, "label": "a container label", "fontSize": 28, "fontFamily": "DEFAULT", diff --git a/e2etests/testdata/todo/container_label_edge_adjustment/dagre/sketch.exp.svg b/e2etests/testdata/todo/container_label_edge_adjustment/dagre/sketch.exp.svg index bf2707789..262f3a5d7 100644 --- a/e2etests/testdata/todo/container_label_edge_adjustment/dagre/sketch.exp.svg +++ b/e2etests/testdata/todo/container_label_edge_adjustment/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -aa container labeldefgc + .d2-2683099636 .fill-N1{fill:#0A0F25;} + .d2-2683099636 .fill-N2{fill:#676C7E;} + .d2-2683099636 .fill-N3{fill:#9499AB;} + .d2-2683099636 .fill-N4{fill:#CFD2DD;} + .d2-2683099636 .fill-N5{fill:#DEE1EB;} + .d2-2683099636 .fill-N6{fill:#EEF1F8;} + .d2-2683099636 .fill-N7{fill:#FFFFFF;} + .d2-2683099636 .fill-B1{fill:#0D32B2;} + .d2-2683099636 .fill-B2{fill:#0D32B2;} + .d2-2683099636 .fill-B3{fill:#E3E9FD;} + .d2-2683099636 .fill-B4{fill:#E3E9FD;} + .d2-2683099636 .fill-B5{fill:#EDF0FD;} + .d2-2683099636 .fill-B6{fill:#F7F8FE;} + .d2-2683099636 .fill-AA2{fill:#4A6FF3;} + .d2-2683099636 .fill-AA4{fill:#EDF0FD;} + .d2-2683099636 .fill-AA5{fill:#F7F8FE;} + .d2-2683099636 .fill-AB4{fill:#EDF0FD;} + .d2-2683099636 .fill-AB5{fill:#F7F8FE;} + .d2-2683099636 .stroke-N1{stroke:#0A0F25;} + .d2-2683099636 .stroke-N2{stroke:#676C7E;} + .d2-2683099636 .stroke-N3{stroke:#9499AB;} + .d2-2683099636 .stroke-N4{stroke:#CFD2DD;} + .d2-2683099636 .stroke-N5{stroke:#DEE1EB;} + .d2-2683099636 .stroke-N6{stroke:#EEF1F8;} + .d2-2683099636 .stroke-N7{stroke:#FFFFFF;} + .d2-2683099636 .stroke-B1{stroke:#0D32B2;} + .d2-2683099636 .stroke-B2{stroke:#0D32B2;} + .d2-2683099636 .stroke-B3{stroke:#E3E9FD;} + .d2-2683099636 .stroke-B4{stroke:#E3E9FD;} + .d2-2683099636 .stroke-B5{stroke:#EDF0FD;} + .d2-2683099636 .stroke-B6{stroke:#F7F8FE;} + .d2-2683099636 .stroke-AA2{stroke:#4A6FF3;} + .d2-2683099636 .stroke-AA4{stroke:#EDF0FD;} + .d2-2683099636 .stroke-AA5{stroke:#F7F8FE;} + .d2-2683099636 .stroke-AB4{stroke:#EDF0FD;} + .d2-2683099636 .stroke-AB5{stroke:#F7F8FE;} + .d2-2683099636 .background-color-N1{background-color:#0A0F25;} + .d2-2683099636 .background-color-N2{background-color:#676C7E;} + .d2-2683099636 .background-color-N3{background-color:#9499AB;} + .d2-2683099636 .background-color-N4{background-color:#CFD2DD;} + .d2-2683099636 .background-color-N5{background-color:#DEE1EB;} + .d2-2683099636 .background-color-N6{background-color:#EEF1F8;} + .d2-2683099636 .background-color-N7{background-color:#FFFFFF;} + .d2-2683099636 .background-color-B1{background-color:#0D32B2;} + .d2-2683099636 .background-color-B2{background-color:#0D32B2;} + .d2-2683099636 .background-color-B3{background-color:#E3E9FD;} + .d2-2683099636 .background-color-B4{background-color:#E3E9FD;} + .d2-2683099636 .background-color-B5{background-color:#EDF0FD;} + .d2-2683099636 .background-color-B6{background-color:#F7F8FE;} + .d2-2683099636 .background-color-AA2{background-color:#4A6FF3;} + .d2-2683099636 .background-color-AA4{background-color:#EDF0FD;} + .d2-2683099636 .background-color-AA5{background-color:#F7F8FE;} + .d2-2683099636 .background-color-AB4{background-color:#EDF0FD;} + .d2-2683099636 .background-color-AB5{background-color:#F7F8FE;} + .d2-2683099636 .color-N1{color:#0A0F25;} + .d2-2683099636 .color-N2{color:#676C7E;} + .d2-2683099636 .color-N3{color:#9499AB;} + .d2-2683099636 .color-N4{color:#CFD2DD;} + .d2-2683099636 .color-N5{color:#DEE1EB;} + .d2-2683099636 .color-N6{color:#EEF1F8;} + .d2-2683099636 .color-N7{color:#FFFFFF;} + .d2-2683099636 .color-B1{color:#0D32B2;} + .d2-2683099636 .color-B2{color:#0D32B2;} + .d2-2683099636 .color-B3{color:#E3E9FD;} + .d2-2683099636 .color-B4{color:#E3E9FD;} + .d2-2683099636 .color-B5{color:#EDF0FD;} + .d2-2683099636 .color-B6{color:#F7F8FE;} + .d2-2683099636 .color-AA2{color:#4A6FF3;} + .d2-2683099636 .color-AA4{color:#EDF0FD;} + .d2-2683099636 .color-AA5{color:#F7F8FE;} + .d2-2683099636 .color-AB4{color:#EDF0FD;} + .d2-2683099636 .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}]]>aa container labeldefgc diff --git a/e2etests/testdata/todo/container_label_edge_adjustment/elk/board.exp.json b/e2etests/testdata/todo/container_label_edge_adjustment/elk/board.exp.json index 639bb3611..a35a89c9d 100644 --- a/e2etests/testdata/todo/container_label_edge_adjustment/elk/board.exp.json +++ b/e2etests/testdata/todo/container_label_edge_adjustment/elk/board.exp.json @@ -71,6 +71,7 @@ "fields": null, "methods": null, "columns": null, + "contentAspectRatio": 7.2903685241231955, "label": "a container label", "fontSize": 28, "fontFamily": "DEFAULT", diff --git a/e2etests/testdata/todo/container_label_edge_adjustment/elk/sketch.exp.svg b/e2etests/testdata/todo/container_label_edge_adjustment/elk/sketch.exp.svg index 54733e80b..d031c6f33 100644 --- a/e2etests/testdata/todo/container_label_edge_adjustment/elk/sketch.exp.svg +++ b/e2etests/testdata/todo/container_label_edge_adjustment/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -aa container labeldefgc + .d2-1911948766 .fill-N1{fill:#0A0F25;} + .d2-1911948766 .fill-N2{fill:#676C7E;} + .d2-1911948766 .fill-N3{fill:#9499AB;} + .d2-1911948766 .fill-N4{fill:#CFD2DD;} + .d2-1911948766 .fill-N5{fill:#DEE1EB;} + .d2-1911948766 .fill-N6{fill:#EEF1F8;} + .d2-1911948766 .fill-N7{fill:#FFFFFF;} + .d2-1911948766 .fill-B1{fill:#0D32B2;} + .d2-1911948766 .fill-B2{fill:#0D32B2;} + .d2-1911948766 .fill-B3{fill:#E3E9FD;} + .d2-1911948766 .fill-B4{fill:#E3E9FD;} + .d2-1911948766 .fill-B5{fill:#EDF0FD;} + .d2-1911948766 .fill-B6{fill:#F7F8FE;} + .d2-1911948766 .fill-AA2{fill:#4A6FF3;} + .d2-1911948766 .fill-AA4{fill:#EDF0FD;} + .d2-1911948766 .fill-AA5{fill:#F7F8FE;} + .d2-1911948766 .fill-AB4{fill:#EDF0FD;} + .d2-1911948766 .fill-AB5{fill:#F7F8FE;} + .d2-1911948766 .stroke-N1{stroke:#0A0F25;} + .d2-1911948766 .stroke-N2{stroke:#676C7E;} + .d2-1911948766 .stroke-N3{stroke:#9499AB;} + .d2-1911948766 .stroke-N4{stroke:#CFD2DD;} + .d2-1911948766 .stroke-N5{stroke:#DEE1EB;} + .d2-1911948766 .stroke-N6{stroke:#EEF1F8;} + .d2-1911948766 .stroke-N7{stroke:#FFFFFF;} + .d2-1911948766 .stroke-B1{stroke:#0D32B2;} + .d2-1911948766 .stroke-B2{stroke:#0D32B2;} + .d2-1911948766 .stroke-B3{stroke:#E3E9FD;} + .d2-1911948766 .stroke-B4{stroke:#E3E9FD;} + .d2-1911948766 .stroke-B5{stroke:#EDF0FD;} + .d2-1911948766 .stroke-B6{stroke:#F7F8FE;} + .d2-1911948766 .stroke-AA2{stroke:#4A6FF3;} + .d2-1911948766 .stroke-AA4{stroke:#EDF0FD;} + .d2-1911948766 .stroke-AA5{stroke:#F7F8FE;} + .d2-1911948766 .stroke-AB4{stroke:#EDF0FD;} + .d2-1911948766 .stroke-AB5{stroke:#F7F8FE;} + .d2-1911948766 .background-color-N1{background-color:#0A0F25;} + .d2-1911948766 .background-color-N2{background-color:#676C7E;} + .d2-1911948766 .background-color-N3{background-color:#9499AB;} + .d2-1911948766 .background-color-N4{background-color:#CFD2DD;} + .d2-1911948766 .background-color-N5{background-color:#DEE1EB;} + .d2-1911948766 .background-color-N6{background-color:#EEF1F8;} + .d2-1911948766 .background-color-N7{background-color:#FFFFFF;} + .d2-1911948766 .background-color-B1{background-color:#0D32B2;} + .d2-1911948766 .background-color-B2{background-color:#0D32B2;} + .d2-1911948766 .background-color-B3{background-color:#E3E9FD;} + .d2-1911948766 .background-color-B4{background-color:#E3E9FD;} + .d2-1911948766 .background-color-B5{background-color:#EDF0FD;} + .d2-1911948766 .background-color-B6{background-color:#F7F8FE;} + .d2-1911948766 .background-color-AA2{background-color:#4A6FF3;} + .d2-1911948766 .background-color-AA4{background-color:#EDF0FD;} + .d2-1911948766 .background-color-AA5{background-color:#F7F8FE;} + .d2-1911948766 .background-color-AB4{background-color:#EDF0FD;} + .d2-1911948766 .background-color-AB5{background-color:#F7F8FE;} + .d2-1911948766 .color-N1{color:#0A0F25;} + .d2-1911948766 .color-N2{color:#676C7E;} + .d2-1911948766 .color-N3{color:#9499AB;} + .d2-1911948766 .color-N4{color:#CFD2DD;} + .d2-1911948766 .color-N5{color:#DEE1EB;} + .d2-1911948766 .color-N6{color:#EEF1F8;} + .d2-1911948766 .color-N7{color:#FFFFFF;} + .d2-1911948766 .color-B1{color:#0D32B2;} + .d2-1911948766 .color-B2{color:#0D32B2;} + .d2-1911948766 .color-B3{color:#E3E9FD;} + .d2-1911948766 .color-B4{color:#E3E9FD;} + .d2-1911948766 .color-B5{color:#EDF0FD;} + .d2-1911948766 .color-B6{color:#F7F8FE;} + .d2-1911948766 .color-AA2{color:#4A6FF3;} + .d2-1911948766 .color-AA4{color:#EDF0FD;} + .d2-1911948766 .color-AA5{color:#F7F8FE;} + .d2-1911948766 .color-AB4{color:#EDF0FD;} + .d2-1911948766 .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}]]>aa container labeldefgc - + diff --git a/e2etests/testdata/todo/shape_set_width_height/dagre/board.exp.json b/e2etests/testdata/todo/shape_set_width_height/dagre/board.exp.json index 8b613b932..8003466c4 100644 --- a/e2etests/testdata/todo/shape_set_width_height/dagre/board.exp.json +++ b/e2etests/testdata/todo/shape_set_width_height/dagre/board.exp.json @@ -399,6 +399,7 @@ "fields": null, "methods": null, "columns": null, + "contentAspectRatio": 2.8467153284671527, "label": "cloud", "fontSize": 16, "fontFamily": "DEFAULT", diff --git a/e2etests/testdata/todo/shape_set_width_height/dagre/sketch.exp.svg b/e2etests/testdata/todo/shape_set_width_height/dagre/sketch.exp.svg index b92a00d2f..ff8137755 100644 --- a/e2etests/testdata/todo/shape_set_width_height/dagre/sketch.exp.svg +++ b/e2etests/testdata/todo/shape_set_width_height/dagre/sketch.exp.svg @@ -1,34 +1,34 @@ -containerscloudtall cylinderclass2-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidusersidintnamestringemailstringpasswordstringlast_logindatetimecontainer

markdown text expanded to 800x400

@@ -859,7 +859,7 @@ b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b)circle containerdiamond containeroval containerhexagon containerdiamondcirclehexagonoval +fmt.Printf("%d", b)circle containerdiamond containeroval containerhexagon containerdiamondcirclehexagonoval diff --git a/e2etests/testdata/todo/shape_set_width_height/elk/board.exp.json b/e2etests/testdata/todo/shape_set_width_height/elk/board.exp.json index 82bc185d5..58763e1ec 100644 --- a/e2etests/testdata/todo/shape_set_width_height/elk/board.exp.json +++ b/e2etests/testdata/todo/shape_set_width_height/elk/board.exp.json @@ -399,6 +399,7 @@ "fields": null, "methods": null, "columns": null, + "contentAspectRatio": 2.8467153284671527, "label": "cloud", "fontSize": 16, "fontFamily": "DEFAULT", diff --git a/e2etests/testdata/todo/shape_set_width_height/elk/sketch.exp.svg b/e2etests/testdata/todo/shape_set_width_height/elk/sketch.exp.svg index 43e4a2549..c6de94257 100644 --- a/e2etests/testdata/todo/shape_set_width_height/elk/sketch.exp.svg +++ b/e2etests/testdata/todo/shape_set_width_height/elk/sketch.exp.svg @@ -1,34 +1,34 @@ -containerscloudtall cylinderclass2-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidusersidintnamestringemailstringpasswordstringlast_logindatetimecontainer

markdown text expanded to 800x400

@@ -859,7 +859,7 @@ b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b)circle containerdiamond containeroval containerhexagon containerdiamondcirclehexagonoval +fmt.Printf("%d", b)circle containerdiamond containeroval containerhexagon containerdiamondcirclehexagonoval diff --git a/lib/shape/shape.go b/lib/shape/shape.go index 29bbdc36e..50ce3e324 100644 --- a/lib/shape/shape.go +++ b/lib/shape/shape.go @@ -45,6 +45,9 @@ type Shape interface { GetBox() *geo.Box GetInnerBox() *geo.Box + // cloud shape has different innerBoxes depending on content's aspect ratio + GetInnerBoxForContent(width, height float64) *geo.Box + SetInnerBoxAspectRatio(aspectRatio float64) // placing a rectangle of the given size and padding inside the shape, return the position relative to the shape's TopLeft GetInsidePlacement(width, height, paddingX, paddingY float64) geo.Point @@ -88,6 +91,15 @@ func (s baseShape) GetInnerBox() *geo.Box { return s.Box } +// only cloud shape needs this right now +func (s baseShape) GetInnerBoxForContent(width, height float64) *geo.Box { + return nil +} + +func (s baseShape) SetInnerBoxAspectRatio(aspectRatio float64) { + // only used for cloud +} + func (s baseShape) GetInsidePlacement(_, _, paddingX, paddingY float64) geo.Point { innerTL := (*s.FullShape).GetInnerBox().TopLeft return *geo.NewPoint(innerTL.X+paddingX/2, innerTL.Y+paddingY/2) diff --git a/lib/shape/shape_cloud.go b/lib/shape/shape_cloud.go index 11a34e6bc..c4db16f72 100644 --- a/lib/shape/shape_cloud.go +++ b/lib/shape/shape_cloud.go @@ -30,6 +30,7 @@ const CLOUD_SQUARE_INNER_HEIGHT = 0.663 type shapeCloud struct { *baseShape + innerBoxAspectRatio *float64 } func NewCloud(box *geo.Box) Shape { @@ -38,17 +39,26 @@ func NewCloud(box *geo.Box) Shape { Type: CLOUD_TYPE, Box: box, }, + innerBoxAspectRatio: go2.Pointer(0.), } shape.FullShape = go2.Pointer(Shape(shape)) return shape } -// TODO this isn't always accurate since the content aspect ratio might be different from the final shape's https://github.com/terrastruct/d2/issues/1735 func (s shapeCloud) GetInnerBox() *geo.Box { - width := s.Box.Width - height := s.Box.Height + if s.innerBoxAspectRatio != nil && *s.innerBoxAspectRatio != 0. { + return s.GetInnerBoxForContent(*s.innerBoxAspectRatio, 1) + } else { + return s.GetInnerBoxForContent(s.Box.Width, s.Box.Height) + } +} + +// we need this since the content's aspect ratio determines which placement is used +func (s shapeCloud) GetInnerBoxForContent(width, height float64) *geo.Box { insideTL := s.GetInsidePlacement(width, height, 0, 0) aspectRatio := width / height + // aspect ratio and position are computed with given dimensions, but final box size is determined by shape size + width, height = s.Box.Width, s.Box.Height if aspectRatio > CLOUD_WIDE_ASPECT_BOUNDARY { width *= CLOUD_WIDE_INNER_WIDTH height *= CLOUD_WIDE_INNER_HEIGHT @@ -62,6 +72,11 @@ func (s shapeCloud) GetInnerBox() *geo.Box { return geo.NewBox(&insideTL, width, height) } +func (s shapeCloud) SetInnerBoxAspectRatio(aspectRatio float64) { + // only used for cloud + *s.innerBoxAspectRatio = aspectRatio +} + func (s shapeCloud) GetDimensionsToFit(width, height, paddingX, paddingY float64) (float64, float64) { width += paddingX height += paddingY