From e7b72b4365b804fccfb0d7b34334fe97e687b697 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BAlio=20C=C3=A9sar=20Batista?= Date: Tue, 29 Nov 2022 14:21:23 -0800 Subject: [PATCH 01/19] Add RenderPriority to objects and edges --- d2exporter/export.go | 19 ++++++++++++++++--- d2graph/d2graph.go | 4 ++++ d2renderers/d2svg/d2svg.go | 33 ++++++++++++++++++++------------- d2target/d2target.go | 17 ++++++++++++++++- 4 files changed, 56 insertions(+), 17 deletions(-) diff --git a/d2exporter/export.go b/d2exporter/export.go index 987ede37d..da15a0424 100644 --- a/d2exporter/export.go +++ b/d2exporter/export.go @@ -8,6 +8,7 @@ import ( "oss.terrastruct.com/d2/d2target" "oss.terrastruct.com/d2/d2themes" "oss.terrastruct.com/d2/d2themes/d2themescatalog" + "oss.terrastruct.com/d2/lib/go2" ) func Export(ctx context.Context, g *d2graph.Graph, themeID int64) (*d2target.Diagram, error) { @@ -16,13 +17,16 @@ func Export(ctx context.Context, g *d2graph.Graph, themeID int64) (*d2target.Dia diagram := d2target.NewDiagram() diagram.Shapes = make([]d2target.Shape, len(g.Objects)) + highestObjectPriority := 0 for i := range g.Objects { diagram.Shapes[i] = toShape(g.Objects[i], &theme) + highestObjectPriority = go2.IntMax(highestObjectPriority, diagram.Shapes[i].RenderPriority) } + edgeDefaultRenderPriority := highestObjectPriority + 1 diagram.Connections = make([]d2target.Connection, len(g.Edges)) for i := range g.Edges { - diagram.Connections[i] = toConnection(g.Edges[i], &theme) + diagram.Connections[i] = toConnection(g.Edges[i], &theme, edgeDefaultRenderPriority) } return diagram, nil @@ -88,13 +92,17 @@ func toShape(obj *d2graph.Object, theme *d2themes.Theme) d2target.Shape { shape := d2target.BaseShape() shape.SetType(obj.Attributes.Shape.Value) shape.ID = obj.AbsID() + if obj.RenderPriority == nil { + shape.RenderPriority = int(obj.Level()) + } else { + shape.RenderPriority = *obj.RenderPriority + } shape.Pos = d2target.NewPoint(int(obj.TopLeft.X), int(obj.TopLeft.Y)) shape.Width = int(obj.Width) shape.Height = int(obj.Height) text := obj.Text() shape.FontSize = text.FontSize - shape.Level = int(obj.Level()) applyStyles(shape, obj) applyTheme(shape, obj, theme) @@ -130,9 +138,14 @@ func toShape(obj *d2graph.Object, theme *d2themes.Theme) d2target.Shape { return *shape } -func toConnection(edge *d2graph.Edge, theme *d2themes.Theme) d2target.Connection { +func toConnection(edge *d2graph.Edge, theme *d2themes.Theme, defaultRenderPriotity int) d2target.Connection { connection := d2target.BaseConnection() connection.ID = edge.AbsID() + if edge.RenderPriority == nil { + connection.RenderPriority = defaultRenderPriotity + } else { + connection.RenderPriority = *edge.RenderPriority + } // edge.Edge.ID = go2.StringToIntHash(connection.ID) text := edge.Text() diff --git a/d2graph/d2graph.go b/d2graph/d2graph.go index 7bc2ba1cc..b18455682 100644 --- a/d2graph/d2graph.go +++ b/d2graph/d2graph.go @@ -78,6 +78,8 @@ type Object struct { ChildrenArray []*Object `json:"-"` Attributes Attributes `json:"attributes"` + + RenderPriority *int `json:"renderPriority",omitempty` } type Attributes struct { @@ -630,6 +632,8 @@ type Edge struct { References []EdgeReference `json:"references,omitempty"` Attributes Attributes `json:"attributes"` + + RenderPriority *int `json:"renderPriority,omitempty"` } type EdgeReference struct { diff --git a/d2renderers/d2svg/d2svg.go b/d2renderers/d2svg/d2svg.go index 9d2cb1bd1..21f55a077 100644 --- a/d2renderers/d2svg/d2svg.go +++ b/d2renderers/d2svg/d2svg.go @@ -10,6 +10,7 @@ import ( "fmt" "hash/fnv" "io" + "sort" "strings" "math" @@ -983,25 +984,31 @@ func Render(diagram *d2target.Diagram) ([]byte, error) { // SVG has no notion of z-index. The z-index is effectively the order it's drawn. // So draw from the least nested to most nested idToShape := make(map[string]d2target.Shape) - highest := 1 + allObjects := make([]d2target.DiagramObject, 0, len(diagram.Shapes)+len(diagram.Connections)) for _, s := range diagram.Shapes { - highest = go2.Max(highest, s.Level) idToShape[s.ID] = s + allObjects = append(allObjects, s) } - for i := 1; i <= highest; i++ { - for _, s := range diagram.Shapes { - if s.Level == i { - err := drawShape(buf, s) - if err != nil { - return nil, err - } - } - } + for _, c := range diagram.Connections { + allObjects = append(allObjects, c) } + sort.SliceStable(allObjects, func(i, j int) bool { + return allObjects[i].GetPriority() < allObjects[j].GetPriority() + }) + markers := map[string]struct{}{} - for _, c := range diagram.Connections { - drawConnection(buf, c, markers, idToShape) + for _, obj := range allObjects { + if c, is := obj.(d2target.Connection); is { + drawConnection(buf, c, markers, idToShape) + } else if s, is := obj.(d2target.Shape); is { + err := drawShape(buf, s) + if err != nil { + return nil, err + } + } else { + return nil, fmt.Errorf("unknow object of type %t", obj) + } } embedFonts(buf) diff --git a/d2target/d2target.go b/d2target/d2target.go index 1582db666..0b25b35fe 100644 --- a/d2target/d2target.go +++ b/d2target/d2target.go @@ -17,6 +17,10 @@ const ( MAX_ICON_SIZE = 64 ) +type DiagramObject interface { + GetPriority() int +} + type Diagram struct { Name string `json:"name"` Description string `json:"description,omitempty"` @@ -91,7 +95,6 @@ type Shape struct { Pos Point `json:"pos"` Width int `json:"width"` Height int `json:"height"` - Level int `json:"level"` Opacity float64 `json:"opacity"` StrokeDash float64 `json:"strokeDash"` @@ -117,6 +120,8 @@ type Shape struct { Text LabelPosition string `json:"labelPosition,omitempty"` + + RenderPriority int `json:"renderPriority"` } func (s *Shape) SetType(t string) { @@ -130,6 +135,10 @@ func (s *Shape) SetType(t string) { s.Type = strings.ToLower(t) } +func (s Shape) GetPriority() int { + return s.RenderPriority +} + type Text struct { Label string `json:"label"` FontSize int `json:"fontSize"` @@ -183,6 +192,8 @@ type Connection struct { Animated bool `json:"animated"` Tooltip string `json:"tooltip"` Icon *url.URL `json:"icon"` + + RenderPriority int `json:"renderPriority"` } func BaseConnection() *Connection { @@ -210,6 +221,10 @@ func (c *Connection) GetLabelTopLeft() *geo.Point { ) } +func (c Connection) GetPriority() int { + return c.RenderPriority +} + type Arrowhead string const ( From e13f8f6711568d1f17189a8c4a07f19958da29c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BAlio=20C=C3=A9sar=20Batista?= Date: Tue, 29 Nov 2022 14:22:23 -0800 Subject: [PATCH 02/19] update tests --- .../sanity/1_to_2/dagre/board.exp.json | 18 +- .../testdata/sanity/1_to_2/elk/board.exp.json | 18 +- .../sanity/basic/dagre/board.exp.json | 11 +- .../testdata/sanity/basic/elk/board.exp.json | 11 +- .../child_to_child/dagre/board.exp.json | 19 +- .../sanity/child_to_child/elk/board.exp.json | 19 +- .../connection_label/dagre/board.exp.json | 11 +- .../connection_label/elk/board.exp.json | 11 +- .../stable/all_shapes/dagre/board.exp.json | 101 +-- .../stable/all_shapes/elk/board.exp.json | 101 +-- .../all_shapes_multiple/dagre/board.exp.json | 101 +-- .../all_shapes_multiple/elk/board.exp.json | 101 +-- .../all_shapes_shadow/dagre/board.exp.json | 101 +-- .../all_shapes_shadow/elk/board.exp.json | 101 +-- .../arrowhead_adjustment/dagre/board.exp.json | 31 +- .../arrowhead_adjustment/elk/board.exp.json | 31 +- .../arrowhead_labels/dagre/board.exp.json | 11 +- .../arrowhead_labels/elk/board.exp.json | 11 +- .../stable/binary_tree/dagre/board.exp.json | 102 +-- .../stable/binary_tree/elk/board.exp.json | 102 +-- .../stable/chaos1/dagre/board.exp.json | 26 +- .../testdata/stable/chaos1/elk/board.exp.json | 66 +- .../stable/chaos2/dagre/board.exp.json | 93 +-- .../testdata/stable/chaos2/elk/board.exp.json | 381 ++++++----- .../child_parent_edges/dagre/board.exp.json | 25 +- .../child_parent_edges/elk/board.exp.json | 65 +- .../circular_dependency/dagre/board.exp.json | 24 +- .../circular_dependency/elk/board.exp.json | 24 +- .../stable/class/dagre/board.exp.json | 4 +- .../testdata/stable/class/elk/board.exp.json | 4 +- .../stable/code_snippet/dagre/board.exp.json | 18 +- .../stable/code_snippet/elk/board.exp.json | 18 +- .../connected_container/dagre/board.exp.json | 34 +- .../connected_container/elk/board.exp.json | 82 +-- .../container_edges/dagre/board.exp.json | 50 +- .../stable/container_edges/elk/board.exp.json | 170 ++--- .../stable/dense/dagre/board.exp.json | 140 ++-- .../testdata/stable/dense/elk/board.exp.json | 140 ++-- .../different_subgraphs/dagre/board.exp.json | 142 ++-- .../different_subgraphs/elk/board.exp.json | 426 ++++++------ .../stable/font_colors/dagre/board.exp.json | 11 +- .../stable/font_colors/elk/board.exp.json | 11 +- .../giant_markdown_test/dagre/board.exp.json | 18 +- .../giant_markdown_test/elk/board.exp.json | 18 +- .../testdata/stable/hr/dagre/board.exp.json | 18 +- .../testdata/stable/hr/elk/board.exp.json | 18 +- .../stable/images/dagre/board.exp.json | 11 +- .../testdata/stable/images/elk/board.exp.json | 11 +- .../stable/investigate/dagre/board.exp.json | 202 +++--- .../stable/investigate/elk/board.exp.json | 636 +++++++++--------- .../stable/large_arch/dagre/board.exp.json | 189 +++--- .../stable/large_arch/elk/board.exp.json | 585 ++++++++-------- .../stable/latex/dagre/board.exp.json | 42 +- .../testdata/stable/latex/elk/board.exp.json | 42 +- .../testdata/stable/li1/dagre/board.exp.json | 18 +- .../testdata/stable/li1/elk/board.exp.json | 18 +- .../testdata/stable/li2/dagre/board.exp.json | 18 +- .../testdata/stable/li2/elk/board.exp.json | 18 +- .../testdata/stable/li3/dagre/board.exp.json | 18 +- .../testdata/stable/li3/elk/board.exp.json | 18 +- .../testdata/stable/li4/dagre/board.exp.json | 18 +- .../testdata/stable/li4/elk/board.exp.json | 18 +- .../stable/lone_h1/dagre/board.exp.json | 18 +- .../stable/lone_h1/elk/board.exp.json | 18 +- .../stable/markdown/dagre/board.exp.json | 18 +- .../stable/markdown/elk/board.exp.json | 18 +- .../md_2space_newline/dagre/board.exp.json | 8 +- .../md_2space_newline/elk/board.exp.json | 8 +- .../md_backslash_newline/dagre/board.exp.json | 8 +- .../md_backslash_newline/elk/board.exp.json | 8 +- .../md_code_block_fenced/dagre/board.exp.json | 18 +- .../md_code_block_fenced/elk/board.exp.json | 18 +- .../dagre/board.exp.json | 18 +- .../md_code_block_indented/elk/board.exp.json | 18 +- .../md_code_inline/dagre/board.exp.json | 18 +- .../stable/md_code_inline/elk/board.exp.json | 18 +- .../multiline_text/dagre/board.exp.json | 4 +- .../stable/multiline_text/elk/board.exp.json | 4 +- .../multiple_trees/dagre/board.exp.json | 158 +++-- .../stable/multiple_trees/elk/board.exp.json | 158 +++-- .../stable/n22_e32/dagre/board.exp.json | 183 ++--- .../stable/n22_e32/elk/board.exp.json | 183 ++--- .../one_container_loop/dagre/board.exp.json | 53 +- .../one_container_loop/elk/board.exp.json | 169 ++--- .../dagre/board.exp.json | 46 +- .../elk/board.exp.json | 46 +- .../testdata/stable/p/dagre/board.exp.json | 18 +- e2etests/testdata/stable/p/elk/board.exp.json | 18 +- .../testdata/stable/pre/dagre/board.exp.json | 18 +- .../testdata/stable/pre/elk/board.exp.json | 18 +- .../stable/sql_tables/dagre/board.exp.json | 25 +- .../stable/sql_tables/elk/board.exp.json | 25 +- .../stable/square_3d/dagre/board.exp.json | 11 +- .../stable/square_3d/elk/board.exp.json | 11 +- .../dagre/board.exp.json | 136 ++-- .../elk/board.exp.json | 376 ++++++----- .../stable/stylish/dagre/board.exp.json | 11 +- .../stable/stylish/elk/board.exp.json | 11 +- .../stable/us_map/dagre/board.exp.json | 524 +++++++++------ .../testdata/stable/us_map/elk/board.exp.json | 524 +++++++++------ .../container_child_edge/dagre/board.exp.json | 18 +- .../container_child_edge/elk/board.exp.json | 54 +- .../TestCompile/basic_icon.exp.json | 6 +- .../TestCompile/basic_sequence.exp.json | 6 +- .../TestCompile/basic_shape.exp.json | 6 +- .../TestCompile/basic_style.exp.json | 6 +- .../TestCompile/class_paren.exp.json | 6 +- .../TestCompile/class_style.exp.json | 6 +- testdata/d2compiler/TestCompile/edge.exp.json | 9 +- .../edge_arrowhead_fields.exp.json | 9 +- .../TestCompile/edge_chain.exp.json | 12 +- .../TestCompile/edge_chain_map.exp.json | 12 +- .../TestCompile/edge_column_index.exp.json | 9 +- .../TestCompile/edge_exclusive_style.exp.json | 9 +- .../TestCompile/edge_flat_arrowhead.exp.json | 9 +- .../edge_flat_label_arrowhead.exp.json | 9 +- .../TestCompile/edge_in_column.exp.json | 6 +- .../TestCompile/edge_index.exp.json | 9 +- .../TestCompile/edge_index_map.exp.json | 9 +- .../TestCompile/edge_index_nested.exp.json | 12 +- .../edge_index_nested_cross_scope.exp.json | 12 +- .../edge_key_group_flat_nested.exp.json | 12 +- ..._key_group_flat_nested_underscore.exp.json | 12 +- ..._group_map_flat_nested_underscore.exp.json | 12 +- ...e_key_group_map_nested_underscore.exp.json | 12 +- .../TestCompile/edge_label_map.exp.json | 9 +- .../d2compiler/TestCompile/edge_map.exp.json | 9 +- .../TestCompile/edge_map_arrowhead.exp.json | 9 +- .../TestCompile/edge_map_group_flat.exp.json | 9 +- .../edge_map_group_semiflat.exp.json | 9 +- .../TestCompile/edge_map_nested.exp.json | 9 +- .../TestCompile/edge_map_nested_flat.exp.json | 9 +- .../TestCompile/edge_mixed_arrowhead.exp.json | 9 +- .../edge_non_shape_arrowhead.exp.json | 9 +- .../edge_semiflat_arrowhead.exp.json | 9 +- .../TestCompile/escaped_id.exp.json | 6 +- .../TestCompile/image_style.exp.json | 6 +- .../TestCompile/nested_sql.exp.json | 9 +- .../d2compiler/TestCompile/path_link.exp.json | 6 +- .../reserved_icon_near_style.exp.json | 9 +- .../TestCompile/root_sequence.exp.json | 3 +- .../d2compiler/TestCompile/sql_paren.exp.json | 6 +- .../TestCompile/stroke-width.exp.json | 6 +- .../TestCompile/table_style.exp.json | 6 +- .../TestCompile/table_style_map.exp.json | 6 +- .../TestCompile/underscore_edge.exp.json | 9 +- .../underscore_edge_chain.exp.json | 12 +- .../underscore_edge_existing.exp.json | 12 +- .../underscore_edge_index.exp.json | 12 +- .../underscore_edge_nested.exp.json | 12 +- .../underscore_parent_create.exp.json | 9 +- .../underscore_parent_not_root.exp.json | 12 +- .../underscore_parent_preference_1.exp.json | 9 +- .../underscore_parent_preference_2.exp.json | 9 +- .../underscore_parent_squared.exp.json | 12 +- .../d2compiler/TestCompile/url_link.exp.json | 6 +- .../TestExport/connection/arrowhead.exp.json | 11 +- .../TestExport/connection/basic.exp.json | 11 +- .../connection/stroke-dash.exp.json | 11 +- .../connection/theme_stroke-dash.exp.json | 14 +- .../TestExport/label/basic_shape.exp.json | 4 +- .../label/connection_font_color.exp.json | 11 +- .../label/shape_font_color.exp.json | 4 +- .../TestExport/shape/basic.exp.json | 4 +- .../TestExport/shape/border-radius.exp.json | 4 +- .../shape/image_dimensions.exp.json | 4 +- .../TestExport/shape/synonyms.exp.json | 8 +- .../TestExport/shape/text_color.exp.json | 4 +- .../theme/connection_with_bold.exp.json | 11 +- .../theme/connection_with_italic.exp.json | 11 +- .../theme/connection_without_italic.exp.json | 11 +- .../theme/shape_with_italic.exp.json | 4 +- .../theme/shape_without_bold.exp.json | 4 +- testdata/d2oracle/TestCreate/base.exp.json | 6 +- .../d2oracle/TestCreate/container.exp.json | 9 +- .../TestCreate/container_edge.exp.json | 12 +- .../TestCreate/container_edge_label.exp.json | 12 +- testdata/d2oracle/TestCreate/edge.exp.json | 9 +- .../d2oracle/TestCreate/edge_nested.exp.json | 12 +- .../d2oracle/TestCreate/edge_scope.exp.json | 12 +- .../TestCreate/edge_scope_flat.exp.json | 12 +- .../TestCreate/edge_scope_nested.exp.json | 15 +- .../d2oracle/TestCreate/edge_unique.exp.json | 18 +- testdata/d2oracle/TestCreate/gen_key.exp.json | 9 +- .../d2oracle/TestCreate/gen_key_n.exp.json | 45 +- .../TestCreate/gen_key_nested.exp.json | 18 +- .../TestCreate/gen_key_scope.exp.json | 18 +- .../TestCreate/gen_key_suffix.exp.json | 9 +- .../TestCreate/make_scope_multiline.exp.json | 9 +- .../make_scope_multiline_spacing_1.exp.json | 15 +- .../make_scope_multiline_spacing_2.exp.json | 15 +- testdata/d2oracle/TestCreate/nested.exp.json | 12 +- testdata/d2oracle/TestCreate/scope.exp.json | 15 +- .../TestDelete/breakup_arrowhead.exp.json | 6 +- .../d2oracle/TestDelete/children.exp.json | 12 +- .../TestDelete/children_conflicts.exp.json | 9 +- .../children_edge_conflicts.exp.json | 12 +- .../children_edges_flat_conflicts.exp.json | 18 +- .../children_flat_conflicts.exp.json | 9 +- .../children_multiple_conflicts.exp.json | 15 +- .../children_nested_conflicts.exp.json | 12 +- ...ldren_nested_referenced_conflicts.exp.json | 12 +- .../children_no_self_conflict.exp.json | 6 +- .../TestDelete/children_order.exp.json | 15 +- .../children_referenced_conflicts.exp.json | 9 +- .../TestDelete/children_scope.exp.json | 18 +- .../TestDelete/container_near.exp.json | 12 +- .../d2oracle/TestDelete/delete_icon.exp.json | 9 +- .../d2oracle/TestDelete/delete_link.exp.json | 6 +- .../d2oracle/TestDelete/delete_near.exp.json | 9 +- .../delete_needed_flat_near.exp.json | 9 +- .../delete_redundant_flat_near.exp.json | 9 +- .../TestDelete/delete_tooltip.exp.json | 6 +- .../edge_both_identical_childs.exp.json | 15 +- .../d2oracle/TestDelete/edge_common.exp.json | 9 +- .../TestDelete/edge_common_2.exp.json | 9 +- .../TestDelete/edge_common_3.exp.json | 12 +- .../TestDelete/edge_common_4.exp.json | 12 +- .../TestDelete/edge_conflict.exp.json | 15 +- .../TestDelete/edge_decrement.exp.json | 9 +- .../d2oracle/TestDelete/edge_first.exp.json | 24 +- .../TestDelete/edge_flat_style.exp.json | 6 +- .../TestDelete/edge_identical_child.exp.json | 18 +- .../TestDelete/edge_key_style.exp.json | 9 +- .../d2oracle/TestDelete/edge_last.exp.json | 27 +- .../TestDelete/edge_map_style.exp.json | 9 +- .../d2oracle/TestDelete/edge_middle.exp.json | 27 +- .../d2oracle/TestDelete/empty_map.exp.json | 9 +- testdata/d2oracle/TestDelete/flat.exp.json | 3 +- .../TestDelete/flat_reserved.exp.json | 9 +- .../TestDelete/hoist_children.exp.json | 9 +- .../TestDelete/hoist_edge_children.exp.json | 12 +- .../TestDelete/key_with_edges.exp.json | 12 +- .../TestDelete/key_with_edges_2.exp.json | 9 +- .../TestDelete/key_with_edges_3.exp.json | 9 +- .../TestDelete/key_with_edges_4.exp.json | 12 +- .../d2oracle/TestDelete/multi_near.exp.json | 15 +- .../multi_path_map_conflict.exp.json | 12 +- .../multi_path_map_no_conflict.exp.json | 12 +- .../multiple_flat_middle_container.exp.json | 12 +- .../TestDelete/multiple_flat_style.exp.json | 6 +- .../TestDelete/multiple_map_styles.exp.json | 6 +- testdata/d2oracle/TestDelete/near.exp.json | 6 +- testdata/d2oracle/TestDelete/nested.exp.json | 12 +- .../d2oracle/TestDelete/nested_2.exp.json | 12 +- .../TestDelete/nested_edge_key_style.exp.json | 12 +- .../TestDelete/nested_flat_style.exp.json | 6 +- .../TestDelete/nested_reserved.exp.json | 12 +- .../nested_underscore_update.exp.json | 9 +- .../d2oracle/TestDelete/node_in_edge.exp.json | 21 +- .../TestDelete/node_in_edge_last.exp.json | 24 +- .../only_delete_edge_reserved.exp.json | 9 +- .../only_delete_obj_reserved.exp.json | 9 +- testdata/d2oracle/TestDelete/order_1.exp.json | 12 +- testdata/d2oracle/TestDelete/order_2.exp.json | 9 +- testdata/d2oracle/TestDelete/order_3.exp.json | 9 +- testdata/d2oracle/TestDelete/order_4.exp.json | 6 +- testdata/d2oracle/TestDelete/order_5.exp.json | 18 +- testdata/d2oracle/TestDelete/order_6.exp.json | 15 +- testdata/d2oracle/TestDelete/order_7.exp.json | 18 +- testdata/d2oracle/TestDelete/order_8.exp.json | 18 +- .../d2oracle/TestDelete/shape_class.exp.json | 6 +- .../TestDelete/shape_sql_table.exp.json | 12 +- .../TestDelete/singular_flat_style.exp.json | 6 +- .../TestDelete/singular_map_style.exp.json | 6 +- .../underscore_no_conflict.exp.json | 12 +- .../TestDelete/underscore_remove.exp.json | 18 +- .../TestMove/append_multiple_styles.exp.json | 9 +- testdata/d2oracle/TestMove/basic.exp.json | 6 +- .../d2oracle/TestMove/basic_nested.exp.json | 9 +- .../TestMove/basic_out_of_container.exp.json | 9 +- .../TestMove/between_containers.exp.json | 12 +- .../TestMove/chain_connected_nested.exp.json | 12 +- ..._connected_nested_no_extra_create.exp.json | 15 +- .../TestMove/connected_nested.exp.json | 12 +- .../d2oracle/TestMove/container_near.exp.json | 21 +- .../TestMove/edge_across_containers.exp.json | 15 +- .../d2oracle/TestMove/edge_basic.exp.json | 9 +- .../TestMove/edge_chain_basic.exp.json | 12 +- .../TestMove/edge_chain_circular.exp.json | 12 +- .../edge_chain_into_container.exp.json | 15 +- .../edge_chain_out_container.exp.json | 15 +- .../d2oracle/TestMove/edge_conflict.exp.json | 18 +- .../TestMove/edge_into_container.exp.json | 15 +- .../TestMove/edge_nested_basic.exp.json | 12 +- .../TestMove/edge_out_of_container.exp.json | 12 +- .../d2oracle/TestMove/extend_map.exp.json | 15 +- .../TestMove/extend_stationary_path.exp.json | 12 +- .../TestMove/flat_between_containers.exp.json | 12 +- .../d2oracle/TestMove/flat_merge.exp.json | 15 +- .../TestMove/flat_middle_container.exp.json | 15 +- .../TestMove/flat_nested_merge.exp.json | 33 +- .../flat_nested_merge_multiple_refs.exp.json | 27 +- .../flat_reparent_with_map_value.exp.json | 9 +- ...lat_reparent_with_mixed_map_value.exp.json | 12 +- .../flat_reparent_with_value.exp.json | 9 +- .../d2oracle/TestMove/flat_style.exp.json | 9 +- .../TestMove/full_edge_slice.exp.json | 15 +- .../d2oracle/TestMove/full_slice.exp.json | 12 +- testdata/d2oracle/TestMove/gnarly_1.exp.json | 39 +- .../hoist_container_children.exp.json | 15 +- .../into_container_existing_map.exp.json | 12 +- .../into_container_nonexisting_map.exp.json | 9 +- .../into_container_with_flat_keys.exp.json | 9 +- .../into_container_with_flat_style.exp.json | 9 +- .../d2oracle/TestMove/map_transplant.exp.json | 15 +- .../d2oracle/TestMove/map_with_label.exp.json | 12 +- .../TestMove/merge_nested_maps.exp.json | 27 +- .../d2oracle/TestMove/merge_reserved.exp.json | 21 +- .../TestMove/middle_container.exp.json | 12 +- .../TestMove/move_container_children.exp.json | 18 +- .../move_container_conflict_children.exp.json | 18 +- .../move_into_key_with_value.exp.json | 9 +- .../TestMove/move_out_of_edge.exp.json | 21 +- .../TestMove/move_out_of_nested_edge.exp.json | 21 +- .../TestMove/multiple_nesting_levels.exp.json | 24 +- testdata/d2oracle/TestMove/near.exp.json | 9 +- .../d2oracle/TestMove/nhooyr_one.exp.json | 15 +- .../d2oracle/TestMove/nhooyr_two.exp.json | 21 +- .../d2oracle/TestMove/parentheses.exp.json | 12 +- .../TestMove/partial_edge_slice.exp.json | 12 +- .../d2oracle/TestMove/partial_slice.exp.json | 9 +- testdata/d2oracle/TestMove/rename_2.exp.json | 18 +- testdata/d2oracle/TestMove/reuse_map.exp.json | 18 +- .../d2oracle/TestMove/slice_style.exp.json | 9 +- .../TestMove/underscore_children.exp.json | 9 +- .../underscore_edge_children.exp.json | 12 +- .../underscore_edge_container_1.exp.json | 12 +- .../underscore_edge_container_2.exp.json | 12 +- .../underscore_edge_container_3.exp.json | 12 +- .../underscore_edge_container_4.exp.json | 12 +- .../underscore_edge_container_5.exp.json | 12 +- .../TestMove/underscore_edge_split.exp.json | 18 +- .../TestMove/underscore_merge.exp.json | 12 +- .../TestMove/underscore_split.exp.json | 15 +- .../TestMove/underscore_split_out.exp.json | 18 +- .../TestMove/underscore_transplant.exp.json | 12 +- .../d2oracle/TestMove/unique_name.exp.json | 15 +- .../unique_name_with_references.exp.json | 18 +- testdata/d2oracle/TestRename/arrows.exp.json | 9 +- .../d2oracle/TestRename/arrows_chain.exp.json | 15 +- .../TestRename/arrows_complex.exp.json | 15 +- .../TestRename/arrows_trim_common.exp.json | 18 +- .../TestRename/arrows_trim_common_2.exp.json | 18 +- .../TestRename/complex_edge_1.exp.json | 15 +- .../TestRename/complex_edge_2.exp.json | 15 +- .../d2oracle/TestRename/conflict.exp.json | 9 +- .../d2oracle/TestRename/conflict_2.exp.json | 18 +- .../TestRename/conflict_with_dots.exp.json | 9 +- .../d2oracle/TestRename/container.exp.json | 51 +- testdata/d2oracle/TestRename/edges.exp.json | 27 +- testdata/d2oracle/TestRename/flat.exp.json | 6 +- .../d2oracle/TestRename/generated.exp.json | 6 +- testdata/d2oracle/TestRename/near.exp.json | 9 +- testdata/d2oracle/TestRename/nested.exp.json | 18 +- testdata/d2oracle/TestSet/base.exp.json | 6 +- .../TestSet/block_string_multiline.exp.json | 6 +- .../TestSet/block_string_oneline.exp.json | 6 +- testdata/d2oracle/TestSet/edge.exp.json | 9 +- .../TestSet/edge_append_style.exp.json | 9 +- testdata/d2oracle/TestSet/edge_chain.exp.json | 15 +- .../TestSet/edge_chain_append_style.exp.json | 12 +- .../edge_chain_existing_style.exp.json | 12 +- .../TestSet/edge_chain_nested_set.exp.json | 15 +- .../d2oracle/TestSet/edge_index_case.exp.json | 21 +- .../TestSet/edge_index_nested.exp.json | 12 +- .../TestSet/edge_key_and_key.exp.json | 12 +- testdata/d2oracle/TestSet/edge_label.exp.json | 9 +- .../TestSet/edge_merge_style.exp.json | 9 +- .../TestSet/edge_nested_label_set.exp.json | 12 +- .../TestSet/edge_nested_style_set.exp.json | 12 +- .../TestSet/expanded_map_style.exp.json | 6 +- testdata/d2oracle/TestSet/icon.exp.json | 6 +- .../d2oracle/TestSet/inline_style.exp.json | 6 +- testdata/d2oracle/TestSet/label.exp.json | 6 +- .../d2oracle/TestSet/label_primary.exp.json | 12 +- .../d2oracle/TestSet/label_replace.exp.json | 6 +- .../d2oracle/TestSet/label_unset.exp.json | 6 +- .../d2oracle/TestSet/map_key_missing.exp.json | 9 +- .../d2oracle/TestSet/nested_alex.exp.json | 12 +- testdata/d2oracle/TestSet/new_style.exp.json | 6 +- .../d2oracle/TestSet/replace_shape.exp.json | 6 +- .../d2oracle/TestSet/replace_style.exp.json | 6 +- .../TestSet/replace_style_edgecase.exp.json | 6 +- testdata/d2oracle/TestSet/shape.exp.json | 6 +- .../TestSet/shape_nested_style_set.exp.json | 6 +- 386 files changed, 6561 insertions(+), 4679 deletions(-) diff --git a/e2etests/testdata/sanity/1_to_2/dagre/board.exp.json b/e2etests/testdata/sanity/1_to_2/dagre/board.exp.json index 25104c1a5..9d7bafb1e 100644 --- a/e2etests/testdata/sanity/1_to_2/dagre/board.exp.json +++ b/e2etests/testdata/sanity/1_to_2/dagre/board.exp.json @@ -10,7 +10,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "b", @@ -48,7 +48,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -75,7 +74,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "c", @@ -86,7 +86,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -113,7 +112,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -162,7 +162,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(a -> c)[0]", @@ -209,7 +210,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/sanity/1_to_2/elk/board.exp.json b/e2etests/testdata/sanity/1_to_2/elk/board.exp.json index 6c709942a..1ff2e7f96 100644 --- a/e2etests/testdata/sanity/1_to_2/elk/board.exp.json +++ b/e2etests/testdata/sanity/1_to_2/elk/board.exp.json @@ -10,7 +10,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "b", @@ -48,7 +48,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -75,7 +74,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "c", @@ -86,7 +86,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -113,7 +112,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -153,7 +153,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(a -> c)[0]", @@ -199,7 +200,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/sanity/basic/dagre/board.exp.json b/e2etests/testdata/sanity/basic/dagre/board.exp.json index e6bd79868..49f25e27a 100644 --- a/e2etests/testdata/sanity/basic/dagre/board.exp.json +++ b/e2etests/testdata/sanity/basic/dagre/board.exp.json @@ -10,7 +10,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "b", @@ -48,7 +48,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -75,7 +74,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -124,7 +124,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/sanity/basic/elk/board.exp.json b/e2etests/testdata/sanity/basic/elk/board.exp.json index 5661d68d7..caf6ed051 100644 --- a/e2etests/testdata/sanity/basic/elk/board.exp.json +++ b/e2etests/testdata/sanity/basic/elk/board.exp.json @@ -10,7 +10,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "b", @@ -48,7 +48,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -75,7 +74,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -115,7 +115,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/sanity/child_to_child/dagre/board.exp.json b/e2etests/testdata/sanity/child_to_child/dagre/board.exp.json index b27380f82..54e4d4f5f 100644 --- a/e2etests/testdata/sanity/child_to_child/dagre/board.exp.json +++ b/e2etests/testdata/sanity/child_to_child/dagre/board.exp.json @@ -10,7 +10,6 @@ }, "width": 213, "height": 226, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 17, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "a.b", @@ -48,7 +48,6 @@ }, "width": 113, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -75,7 +74,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "c", @@ -86,7 +86,6 @@ }, "width": 214, "height": 226, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -113,7 +112,8 @@ "underline": false, "labelWidth": 17, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "c.d", @@ -124,7 +124,6 @@ }, "width": 114, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -151,7 +150,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 } ], "connections": [ @@ -212,7 +212,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 } ] } diff --git a/e2etests/testdata/sanity/child_to_child/elk/board.exp.json b/e2etests/testdata/sanity/child_to_child/elk/board.exp.json index 8bc9b6211..8aeadea21 100644 --- a/e2etests/testdata/sanity/child_to_child/elk/board.exp.json +++ b/e2etests/testdata/sanity/child_to_child/elk/board.exp.json @@ -10,7 +10,6 @@ }, "width": 263, "height": 276, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 17, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "a.b", @@ -48,7 +48,6 @@ }, "width": 113, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -75,7 +74,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "c", @@ -86,7 +86,6 @@ }, "width": 264, "height": 276, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -113,7 +112,8 @@ "underline": false, "labelWidth": 17, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "c.d", @@ -124,7 +124,6 @@ }, "width": 114, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -151,7 +150,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 } ], "connections": [ @@ -191,7 +191,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 } ] } diff --git a/e2etests/testdata/sanity/connection_label/dagre/board.exp.json b/e2etests/testdata/sanity/connection_label/dagre/board.exp.json index d1f6a5b5d..0692526cb 100644 --- a/e2etests/testdata/sanity/connection_label/dagre/board.exp.json +++ b/e2etests/testdata/sanity/connection_label/dagre/board.exp.json @@ -10,7 +10,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "b", @@ -48,7 +48,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -75,7 +74,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -124,7 +124,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/sanity/connection_label/elk/board.exp.json b/e2etests/testdata/sanity/connection_label/elk/board.exp.json index de990b413..9b5235b5a 100644 --- a/e2etests/testdata/sanity/connection_label/elk/board.exp.json +++ b/e2etests/testdata/sanity/connection_label/elk/board.exp.json @@ -10,7 +10,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "b", @@ -48,7 +48,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -75,7 +74,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -115,7 +115,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/stable/all_shapes/dagre/board.exp.json b/e2etests/testdata/stable/all_shapes/dagre/board.exp.json index 6f4eccd75..3474b9562 100644 --- a/e2etests/testdata/stable/all_shapes/dagre/board.exp.json +++ b/e2etests/testdata/stable/all_shapes/dagre/board.exp.json @@ -10,7 +10,6 @@ }, "width": 171, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 71, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "square", @@ -48,7 +48,6 @@ }, "width": 154, "height": 154, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -75,7 +74,8 @@ "underline": false, "labelWidth": 54, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "page", @@ -86,7 +86,6 @@ }, "width": 139, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -113,7 +112,8 @@ "underline": false, "labelWidth": 39, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "parallelogram", @@ -124,7 +124,6 @@ }, "width": 204, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -151,7 +150,8 @@ "underline": false, "labelWidth": 104, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "document", @@ -162,7 +162,6 @@ }, "width": 177, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -189,7 +188,8 @@ "underline": false, "labelWidth": 77, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "cylinder", @@ -200,7 +200,6 @@ }, "width": 164, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -227,7 +226,8 @@ "underline": false, "labelWidth": 64, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "queue", @@ -238,7 +238,6 @@ }, "width": 149, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -265,7 +264,8 @@ "underline": false, "labelWidth": 49, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "package", @@ -276,7 +276,6 @@ }, "width": 163, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -303,7 +302,8 @@ "underline": false, "labelWidth": 63, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "step", @@ -314,7 +314,6 @@ }, "width": 136, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -341,7 +340,8 @@ "underline": false, "labelWidth": 36, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "callout", @@ -352,7 +352,6 @@ }, "width": 155, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -379,7 +378,8 @@ "underline": false, "labelWidth": 55, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "stored_data", @@ -390,7 +390,6 @@ }, "width": 191, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -417,7 +416,8 @@ "underline": false, "labelWidth": 91, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "person", @@ -428,7 +428,6 @@ }, "width": 153, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -455,7 +454,8 @@ "underline": false, "labelWidth": 53, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "diamond", @@ -466,7 +466,6 @@ }, "width": 168, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -493,7 +492,8 @@ "underline": false, "labelWidth": 68, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "oval", @@ -504,7 +504,6 @@ }, "width": 136, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -531,7 +530,8 @@ "underline": false, "labelWidth": 36, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "circle", @@ -542,7 +542,6 @@ }, "width": 144, "height": 144, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -569,7 +568,8 @@ "underline": false, "labelWidth": 44, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "hexagon", @@ -580,7 +580,6 @@ }, "width": 165, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -607,7 +606,8 @@ "underline": false, "labelWidth": 65, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "cloud", @@ -618,7 +618,6 @@ }, "width": 145, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -645,7 +644,8 @@ "underline": false, "labelWidth": 45, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -694,7 +694,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(square -> page)[0]", @@ -741,7 +742,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(parallelogram -> document)[0]", @@ -788,7 +790,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(document -> cylinder)[0]", @@ -835,7 +838,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(queue -> package)[0]", @@ -882,7 +886,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(package -> step)[0]", @@ -929,7 +934,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(callout -> stored_data)[0]", @@ -976,7 +982,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(stored_data -> person)[0]", @@ -1023,7 +1030,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(diamond -> oval)[0]", @@ -1070,7 +1078,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(oval -> circle)[0]", @@ -1117,7 +1126,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(hexagon -> cloud)[0]", @@ -1164,7 +1174,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/stable/all_shapes/elk/board.exp.json b/e2etests/testdata/stable/all_shapes/elk/board.exp.json index 811647e29..450dd97c6 100644 --- a/e2etests/testdata/stable/all_shapes/elk/board.exp.json +++ b/e2etests/testdata/stable/all_shapes/elk/board.exp.json @@ -10,7 +10,6 @@ }, "width": 171, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 71, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "square", @@ -48,7 +48,6 @@ }, "width": 154, "height": 154, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -75,7 +74,8 @@ "underline": false, "labelWidth": 54, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "page", @@ -86,7 +86,6 @@ }, "width": 139, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -113,7 +112,8 @@ "underline": false, "labelWidth": 39, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "parallelogram", @@ -124,7 +124,6 @@ }, "width": 204, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -151,7 +150,8 @@ "underline": false, "labelWidth": 104, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "document", @@ -162,7 +162,6 @@ }, "width": 177, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -189,7 +188,8 @@ "underline": false, "labelWidth": 77, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "cylinder", @@ -200,7 +200,6 @@ }, "width": 164, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -227,7 +226,8 @@ "underline": false, "labelWidth": 64, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "queue", @@ -238,7 +238,6 @@ }, "width": 149, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -265,7 +264,8 @@ "underline": false, "labelWidth": 49, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "package", @@ -276,7 +276,6 @@ }, "width": 163, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -303,7 +302,8 @@ "underline": false, "labelWidth": 63, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "step", @@ -314,7 +314,6 @@ }, "width": 136, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -341,7 +340,8 @@ "underline": false, "labelWidth": 36, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "callout", @@ -352,7 +352,6 @@ }, "width": 155, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -379,7 +378,8 @@ "underline": false, "labelWidth": 55, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "stored_data", @@ -390,7 +390,6 @@ }, "width": 191, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -417,7 +416,8 @@ "underline": false, "labelWidth": 91, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "person", @@ -428,7 +428,6 @@ }, "width": 153, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -455,7 +454,8 @@ "underline": false, "labelWidth": 53, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "diamond", @@ -466,7 +466,6 @@ }, "width": 168, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -493,7 +492,8 @@ "underline": false, "labelWidth": 68, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "oval", @@ -504,7 +504,6 @@ }, "width": 136, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -531,7 +530,8 @@ "underline": false, "labelWidth": 36, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "circle", @@ -542,7 +542,6 @@ }, "width": 144, "height": 144, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -569,7 +568,8 @@ "underline": false, "labelWidth": 44, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "hexagon", @@ -580,7 +580,6 @@ }, "width": 165, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -607,7 +606,8 @@ "underline": false, "labelWidth": 65, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "cloud", @@ -618,7 +618,6 @@ }, "width": 145, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -645,7 +644,8 @@ "underline": false, "labelWidth": 45, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -685,7 +685,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(square -> page)[0]", @@ -723,7 +724,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(parallelogram -> document)[0]", @@ -761,7 +763,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(document -> cylinder)[0]", @@ -799,7 +802,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(queue -> package)[0]", @@ -837,7 +841,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(package -> step)[0]", @@ -875,7 +880,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(callout -> stored_data)[0]", @@ -913,7 +919,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(stored_data -> person)[0]", @@ -951,7 +958,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(diamond -> oval)[0]", @@ -989,7 +997,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(oval -> circle)[0]", @@ -1027,7 +1036,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(hexagon -> cloud)[0]", @@ -1065,7 +1075,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } 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 b379936c3..a896471a6 100644 --- a/e2etests/testdata/stable/all_shapes_multiple/dagre/board.exp.json +++ b/e2etests/testdata/stable/all_shapes_multiple/dagre/board.exp.json @@ -10,7 +10,6 @@ }, "width": 171, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 71, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "square", @@ -48,7 +48,6 @@ }, "width": 154, "height": 154, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -75,7 +74,8 @@ "underline": false, "labelWidth": 54, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "page", @@ -86,7 +86,6 @@ }, "width": 139, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -113,7 +112,8 @@ "underline": false, "labelWidth": 39, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "parallelogram", @@ -124,7 +124,6 @@ }, "width": 204, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -151,7 +150,8 @@ "underline": false, "labelWidth": 104, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "document", @@ -162,7 +162,6 @@ }, "width": 177, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -189,7 +188,8 @@ "underline": false, "labelWidth": 77, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "cylinder", @@ -200,7 +200,6 @@ }, "width": 164, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -227,7 +226,8 @@ "underline": false, "labelWidth": 64, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "queue", @@ -238,7 +238,6 @@ }, "width": 149, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -265,7 +264,8 @@ "underline": false, "labelWidth": 49, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "package", @@ -276,7 +276,6 @@ }, "width": 163, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -303,7 +302,8 @@ "underline": false, "labelWidth": 63, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "step", @@ -314,7 +314,6 @@ }, "width": 136, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -341,7 +340,8 @@ "underline": false, "labelWidth": 36, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "callout", @@ -352,7 +352,6 @@ }, "width": 155, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -379,7 +378,8 @@ "underline": false, "labelWidth": 55, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "stored_data", @@ -390,7 +390,6 @@ }, "width": 191, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -417,7 +416,8 @@ "underline": false, "labelWidth": 91, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "person", @@ -428,7 +428,6 @@ }, "width": 153, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -455,7 +454,8 @@ "underline": false, "labelWidth": 53, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "diamond", @@ -466,7 +466,6 @@ }, "width": 168, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -493,7 +492,8 @@ "underline": false, "labelWidth": 68, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "oval", @@ -504,7 +504,6 @@ }, "width": 136, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -531,7 +530,8 @@ "underline": false, "labelWidth": 36, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "circle", @@ -542,7 +542,6 @@ }, "width": 144, "height": 144, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -569,7 +568,8 @@ "underline": false, "labelWidth": 44, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "hexagon", @@ -580,7 +580,6 @@ }, "width": 165, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -607,7 +606,8 @@ "underline": false, "labelWidth": 65, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "cloud", @@ -618,7 +618,6 @@ }, "width": 145, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -645,7 +644,8 @@ "underline": false, "labelWidth": 45, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -694,7 +694,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(square -> page)[0]", @@ -741,7 +742,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(parallelogram -> document)[0]", @@ -788,7 +790,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(document -> cylinder)[0]", @@ -835,7 +838,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(queue -> package)[0]", @@ -882,7 +886,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(package -> step)[0]", @@ -929,7 +934,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(callout -> stored_data)[0]", @@ -976,7 +982,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(stored_data -> person)[0]", @@ -1023,7 +1030,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(diamond -> oval)[0]", @@ -1070,7 +1078,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(oval -> circle)[0]", @@ -1117,7 +1126,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(hexagon -> cloud)[0]", @@ -1164,7 +1174,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } 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 bf2621398..29a117de8 100644 --- a/e2etests/testdata/stable/all_shapes_multiple/elk/board.exp.json +++ b/e2etests/testdata/stable/all_shapes_multiple/elk/board.exp.json @@ -10,7 +10,6 @@ }, "width": 171, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 71, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "square", @@ -48,7 +48,6 @@ }, "width": 154, "height": 154, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -75,7 +74,8 @@ "underline": false, "labelWidth": 54, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "page", @@ -86,7 +86,6 @@ }, "width": 139, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -113,7 +112,8 @@ "underline": false, "labelWidth": 39, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "parallelogram", @@ -124,7 +124,6 @@ }, "width": 204, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -151,7 +150,8 @@ "underline": false, "labelWidth": 104, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "document", @@ -162,7 +162,6 @@ }, "width": 177, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -189,7 +188,8 @@ "underline": false, "labelWidth": 77, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "cylinder", @@ -200,7 +200,6 @@ }, "width": 164, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -227,7 +226,8 @@ "underline": false, "labelWidth": 64, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "queue", @@ -238,7 +238,6 @@ }, "width": 149, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -265,7 +264,8 @@ "underline": false, "labelWidth": 49, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "package", @@ -276,7 +276,6 @@ }, "width": 163, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -303,7 +302,8 @@ "underline": false, "labelWidth": 63, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "step", @@ -314,7 +314,6 @@ }, "width": 136, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -341,7 +340,8 @@ "underline": false, "labelWidth": 36, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "callout", @@ -352,7 +352,6 @@ }, "width": 155, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -379,7 +378,8 @@ "underline": false, "labelWidth": 55, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "stored_data", @@ -390,7 +390,6 @@ }, "width": 191, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -417,7 +416,8 @@ "underline": false, "labelWidth": 91, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "person", @@ -428,7 +428,6 @@ }, "width": 153, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -455,7 +454,8 @@ "underline": false, "labelWidth": 53, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "diamond", @@ -466,7 +466,6 @@ }, "width": 168, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -493,7 +492,8 @@ "underline": false, "labelWidth": 68, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "oval", @@ -504,7 +504,6 @@ }, "width": 136, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -531,7 +530,8 @@ "underline": false, "labelWidth": 36, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "circle", @@ -542,7 +542,6 @@ }, "width": 144, "height": 144, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -569,7 +568,8 @@ "underline": false, "labelWidth": 44, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "hexagon", @@ -580,7 +580,6 @@ }, "width": 165, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -607,7 +606,8 @@ "underline": false, "labelWidth": 65, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "cloud", @@ -618,7 +618,6 @@ }, "width": 145, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -645,7 +644,8 @@ "underline": false, "labelWidth": 45, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -685,7 +685,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(square -> page)[0]", @@ -723,7 +724,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(parallelogram -> document)[0]", @@ -761,7 +763,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(document -> cylinder)[0]", @@ -799,7 +802,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(queue -> package)[0]", @@ -837,7 +841,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(package -> step)[0]", @@ -875,7 +880,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(callout -> stored_data)[0]", @@ -913,7 +919,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(stored_data -> person)[0]", @@ -951,7 +958,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(diamond -> oval)[0]", @@ -989,7 +997,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(oval -> circle)[0]", @@ -1027,7 +1036,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(hexagon -> cloud)[0]", @@ -1065,7 +1075,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } 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 b751096e7..751abdf1f 100644 --- a/e2etests/testdata/stable/all_shapes_shadow/dagre/board.exp.json +++ b/e2etests/testdata/stable/all_shapes_shadow/dagre/board.exp.json @@ -10,7 +10,6 @@ }, "width": 171, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 71, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "square", @@ -48,7 +48,6 @@ }, "width": 154, "height": 154, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -75,7 +74,8 @@ "underline": false, "labelWidth": 54, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "page", @@ -86,7 +86,6 @@ }, "width": 139, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -113,7 +112,8 @@ "underline": false, "labelWidth": 39, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "parallelogram", @@ -124,7 +124,6 @@ }, "width": 204, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -151,7 +150,8 @@ "underline": false, "labelWidth": 104, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "document", @@ -162,7 +162,6 @@ }, "width": 177, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -189,7 +188,8 @@ "underline": false, "labelWidth": 77, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "cylinder", @@ -200,7 +200,6 @@ }, "width": 164, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -227,7 +226,8 @@ "underline": false, "labelWidth": 64, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "queue", @@ -238,7 +238,6 @@ }, "width": 149, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -265,7 +264,8 @@ "underline": false, "labelWidth": 49, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "package", @@ -276,7 +276,6 @@ }, "width": 163, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -303,7 +302,8 @@ "underline": false, "labelWidth": 63, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "step", @@ -314,7 +314,6 @@ }, "width": 136, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -341,7 +340,8 @@ "underline": false, "labelWidth": 36, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "callout", @@ -352,7 +352,6 @@ }, "width": 155, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -379,7 +378,8 @@ "underline": false, "labelWidth": 55, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "stored_data", @@ -390,7 +390,6 @@ }, "width": 191, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -417,7 +416,8 @@ "underline": false, "labelWidth": 91, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "person", @@ -428,7 +428,6 @@ }, "width": 153, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -455,7 +454,8 @@ "underline": false, "labelWidth": 53, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "diamond", @@ -466,7 +466,6 @@ }, "width": 168, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -493,7 +492,8 @@ "underline": false, "labelWidth": 68, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "oval", @@ -504,7 +504,6 @@ }, "width": 136, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -531,7 +530,8 @@ "underline": false, "labelWidth": 36, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "circle", @@ -542,7 +542,6 @@ }, "width": 144, "height": 144, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -569,7 +568,8 @@ "underline": false, "labelWidth": 44, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "hexagon", @@ -580,7 +580,6 @@ }, "width": 165, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -607,7 +606,8 @@ "underline": false, "labelWidth": 65, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "cloud", @@ -618,7 +618,6 @@ }, "width": 145, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -645,7 +644,8 @@ "underline": false, "labelWidth": 45, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -694,7 +694,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(square -> page)[0]", @@ -741,7 +742,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(parallelogram -> document)[0]", @@ -788,7 +790,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(document -> cylinder)[0]", @@ -835,7 +838,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(queue -> package)[0]", @@ -882,7 +886,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(package -> step)[0]", @@ -929,7 +934,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(callout -> stored_data)[0]", @@ -976,7 +982,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(stored_data -> person)[0]", @@ -1023,7 +1030,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(diamond -> oval)[0]", @@ -1070,7 +1078,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(oval -> circle)[0]", @@ -1117,7 +1126,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(hexagon -> cloud)[0]", @@ -1164,7 +1174,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } 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 147234806..4e0f04fa1 100644 --- a/e2etests/testdata/stable/all_shapes_shadow/elk/board.exp.json +++ b/e2etests/testdata/stable/all_shapes_shadow/elk/board.exp.json @@ -10,7 +10,6 @@ }, "width": 171, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 71, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "square", @@ -48,7 +48,6 @@ }, "width": 154, "height": 154, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -75,7 +74,8 @@ "underline": false, "labelWidth": 54, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "page", @@ -86,7 +86,6 @@ }, "width": 139, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -113,7 +112,8 @@ "underline": false, "labelWidth": 39, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "parallelogram", @@ -124,7 +124,6 @@ }, "width": 204, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -151,7 +150,8 @@ "underline": false, "labelWidth": 104, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "document", @@ -162,7 +162,6 @@ }, "width": 177, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -189,7 +188,8 @@ "underline": false, "labelWidth": 77, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "cylinder", @@ -200,7 +200,6 @@ }, "width": 164, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -227,7 +226,8 @@ "underline": false, "labelWidth": 64, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "queue", @@ -238,7 +238,6 @@ }, "width": 149, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -265,7 +264,8 @@ "underline": false, "labelWidth": 49, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "package", @@ -276,7 +276,6 @@ }, "width": 163, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -303,7 +302,8 @@ "underline": false, "labelWidth": 63, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "step", @@ -314,7 +314,6 @@ }, "width": 136, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -341,7 +340,8 @@ "underline": false, "labelWidth": 36, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "callout", @@ -352,7 +352,6 @@ }, "width": 155, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -379,7 +378,8 @@ "underline": false, "labelWidth": 55, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "stored_data", @@ -390,7 +390,6 @@ }, "width": 191, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -417,7 +416,8 @@ "underline": false, "labelWidth": 91, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "person", @@ -428,7 +428,6 @@ }, "width": 153, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -455,7 +454,8 @@ "underline": false, "labelWidth": 53, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "diamond", @@ -466,7 +466,6 @@ }, "width": 168, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -493,7 +492,8 @@ "underline": false, "labelWidth": 68, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "oval", @@ -504,7 +504,6 @@ }, "width": 136, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -531,7 +530,8 @@ "underline": false, "labelWidth": 36, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "circle", @@ -542,7 +542,6 @@ }, "width": 144, "height": 144, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -569,7 +568,8 @@ "underline": false, "labelWidth": 44, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "hexagon", @@ -580,7 +580,6 @@ }, "width": 165, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -607,7 +606,8 @@ "underline": false, "labelWidth": 65, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "cloud", @@ -618,7 +618,6 @@ }, "width": 145, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -645,7 +644,8 @@ "underline": false, "labelWidth": 45, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -685,7 +685,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(square -> page)[0]", @@ -723,7 +724,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(parallelogram -> document)[0]", @@ -761,7 +763,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(document -> cylinder)[0]", @@ -799,7 +802,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(queue -> package)[0]", @@ -837,7 +841,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(package -> step)[0]", @@ -875,7 +880,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(callout -> stored_data)[0]", @@ -913,7 +919,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(stored_data -> person)[0]", @@ -951,7 +958,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(diamond -> oval)[0]", @@ -989,7 +997,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(oval -> circle)[0]", @@ -1027,7 +1036,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(hexagon -> cloud)[0]", @@ -1065,7 +1075,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/stable/arrowhead_adjustment/dagre/board.exp.json b/e2etests/testdata/stable/arrowhead_adjustment/dagre/board.exp.json index 882b69a62..4af38b29d 100644 --- a/e2etests/testdata/stable/arrowhead_adjustment/dagre/board.exp.json +++ b/e2etests/testdata/stable/arrowhead_adjustment/dagre/board.exp.json @@ -10,7 +10,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 7, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "b", @@ -48,7 +48,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 8, @@ -75,7 +74,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "a", @@ -86,7 +86,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 8, @@ -113,7 +112,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "Oval", @@ -124,7 +124,6 @@ }, "width": 100, "height": 100, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 6, @@ -150,7 +149,8 @@ "bold": true, "underline": false, "labelWidth": 0, - "labelHeight": 0 + "labelHeight": 0, + "renderPriority": 1 } ], "connections": [ @@ -199,7 +199,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(c -> b)[0]", @@ -258,7 +259,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(a <-> Oval)[0]", @@ -305,7 +307,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(c -- a)[0]", @@ -352,7 +355,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(Oval <-> c)[0]", @@ -411,7 +415,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/stable/arrowhead_adjustment/elk/board.exp.json b/e2etests/testdata/stable/arrowhead_adjustment/elk/board.exp.json index 0130bc347..dce8c385a 100644 --- a/e2etests/testdata/stable/arrowhead_adjustment/elk/board.exp.json +++ b/e2etests/testdata/stable/arrowhead_adjustment/elk/board.exp.json @@ -10,7 +10,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 7, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "b", @@ -48,7 +48,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 8, @@ -75,7 +74,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "a", @@ -86,7 +86,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 8, @@ -113,7 +112,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "Oval", @@ -124,7 +124,6 @@ }, "width": 100, "height": 100, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 6, @@ -150,7 +149,8 @@ "bold": true, "underline": false, "labelWidth": 0, - "labelHeight": 0 + "labelHeight": 0, + "renderPriority": 1 } ], "connections": [ @@ -198,7 +198,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(c -> b)[0]", @@ -236,7 +237,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(a <-> Oval)[0]", @@ -274,7 +276,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(c -- a)[0]", @@ -320,7 +323,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(Oval <-> c)[0]", @@ -374,7 +378,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/stable/arrowhead_labels/dagre/board.exp.json b/e2etests/testdata/stable/arrowhead_labels/dagre/board.exp.json index 60b8d8edd..d192fbe0a 100644 --- a/e2etests/testdata/stable/arrowhead_labels/dagre/board.exp.json +++ b/e2etests/testdata/stable/arrowhead_labels/dagre/board.exp.json @@ -10,7 +10,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "b", @@ -48,7 +48,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -75,7 +74,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -124,7 +124,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/stable/arrowhead_labels/elk/board.exp.json b/e2etests/testdata/stable/arrowhead_labels/elk/board.exp.json index baa8b7d7e..cb62ff8b9 100644 --- a/e2etests/testdata/stable/arrowhead_labels/elk/board.exp.json +++ b/e2etests/testdata/stable/arrowhead_labels/elk/board.exp.json @@ -10,7 +10,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "b", @@ -48,7 +48,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -75,7 +74,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -115,7 +115,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/stable/binary_tree/dagre/board.exp.json b/e2etests/testdata/stable/binary_tree/dagre/board.exp.json index 3a6b384e4..a382b8675 100644 --- a/e2etests/testdata/stable/binary_tree/dagre/board.exp.json +++ b/e2etests/testdata/stable/binary_tree/dagre/board.exp.json @@ -10,7 +10,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "b", @@ -48,7 +48,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -75,7 +74,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "c", @@ -86,7 +86,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -113,7 +112,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "d", @@ -124,7 +124,6 @@ }, "width": 114, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -151,7 +150,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "e", @@ -162,7 +162,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -189,7 +188,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "f", @@ -200,7 +200,6 @@ }, "width": 111, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -227,7 +226,8 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "g", @@ -238,7 +238,6 @@ }, "width": 114, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -265,7 +264,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "h", @@ -276,7 +276,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -303,7 +302,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "i", @@ -314,7 +314,6 @@ }, "width": 109, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -341,7 +340,8 @@ "underline": false, "labelWidth": 9, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "j", @@ -352,7 +352,6 @@ }, "width": 110, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -379,7 +378,8 @@ "underline": false, "labelWidth": 10, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "k", @@ -390,7 +390,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -417,7 +416,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "l", @@ -428,7 +428,6 @@ }, "width": 109, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -455,7 +454,8 @@ "underline": false, "labelWidth": 9, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "m", @@ -466,7 +466,6 @@ }, "width": 117, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -493,7 +492,8 @@ "underline": false, "labelWidth": 17, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "n", @@ -504,7 +504,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -531,7 +530,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "o", @@ -542,7 +542,6 @@ }, "width": 114, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -569,7 +568,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -618,7 +618,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(a -> c)[0]", @@ -665,7 +666,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(b -> d)[0]", @@ -712,7 +714,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(b -> e)[0]", @@ -759,7 +762,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(c -> f)[0]", @@ -806,7 +810,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(c -> g)[0]", @@ -853,7 +858,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(d -> h)[0]", @@ -900,7 +906,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(d -> i)[0]", @@ -947,7 +954,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(e -> j)[0]", @@ -994,7 +1002,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(e -> k)[0]", @@ -1041,7 +1050,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(f -> l)[0]", @@ -1088,7 +1098,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(f -> m)[0]", @@ -1135,7 +1146,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(g -> n)[0]", @@ -1182,7 +1194,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(g -> o)[0]", @@ -1229,7 +1242,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/stable/binary_tree/elk/board.exp.json b/e2etests/testdata/stable/binary_tree/elk/board.exp.json index fe1cfc467..e96bdd115 100644 --- a/e2etests/testdata/stable/binary_tree/elk/board.exp.json +++ b/e2etests/testdata/stable/binary_tree/elk/board.exp.json @@ -10,7 +10,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "b", @@ -48,7 +48,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -75,7 +74,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "c", @@ -86,7 +86,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -113,7 +112,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "d", @@ -124,7 +124,6 @@ }, "width": 114, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -151,7 +150,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "e", @@ -162,7 +162,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -189,7 +188,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "f", @@ -200,7 +200,6 @@ }, "width": 111, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -227,7 +226,8 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "g", @@ -238,7 +238,6 @@ }, "width": 114, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -265,7 +264,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "h", @@ -276,7 +276,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -303,7 +302,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "i", @@ -314,7 +314,6 @@ }, "width": 109, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -341,7 +340,8 @@ "underline": false, "labelWidth": 9, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "j", @@ -352,7 +352,6 @@ }, "width": 110, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -379,7 +378,8 @@ "underline": false, "labelWidth": 10, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "k", @@ -390,7 +390,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -417,7 +416,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "l", @@ -428,7 +428,6 @@ }, "width": 109, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -455,7 +454,8 @@ "underline": false, "labelWidth": 9, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "m", @@ -466,7 +466,6 @@ }, "width": 117, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -493,7 +492,8 @@ "underline": false, "labelWidth": 17, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "n", @@ -504,7 +504,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -531,7 +530,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "o", @@ -542,7 +542,6 @@ }, "width": 114, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -569,7 +568,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -609,7 +609,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(a -> c)[0]", @@ -655,7 +656,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(b -> d)[0]", @@ -701,7 +703,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(b -> e)[0]", @@ -739,7 +742,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(c -> f)[0]", @@ -785,7 +789,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(c -> g)[0]", @@ -823,7 +828,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(d -> h)[0]", @@ -861,7 +867,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(d -> i)[0]", @@ -907,7 +914,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(e -> j)[0]", @@ -945,7 +953,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(e -> k)[0]", @@ -991,7 +1000,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(f -> l)[0]", @@ -1029,7 +1039,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(f -> m)[0]", @@ -1075,7 +1086,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(g -> n)[0]", @@ -1121,7 +1133,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(g -> o)[0]", @@ -1159,7 +1172,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/stable/chaos1/dagre/board.exp.json b/e2etests/testdata/stable/chaos1/dagre/board.exp.json index b1b5defb8..1e92ed1fa 100644 --- a/e2etests/testdata/stable/chaos1/dagre/board.exp.json +++ b/e2etests/testdata/stable/chaos1/dagre/board.exp.json @@ -10,7 +10,6 @@ }, "width": 251, "height": 452, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 46, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "aaa.bbb", @@ -48,7 +48,6 @@ }, "width": 132, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -75,7 +74,8 @@ "underline": false, "labelWidth": 32, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "ddd", @@ -86,7 +86,6 @@ }, "width": 133, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -113,7 +112,8 @@ "underline": false, "labelWidth": 33, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "eee", @@ -124,7 +124,6 @@ }, "width": 130, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -151,7 +150,8 @@ "underline": false, "labelWidth": 30, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "aaa.ccc", @@ -162,7 +162,6 @@ }, "width": 128, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -189,7 +188,8 @@ "underline": false, "labelWidth": 28, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 } ], "connections": [ @@ -238,7 +238,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(eee <- aaa.ccc)[0]", @@ -285,7 +286,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 } ] } diff --git a/e2etests/testdata/stable/chaos1/elk/board.exp.json b/e2etests/testdata/stable/chaos1/elk/board.exp.json index 5e28a8c41..d4ed9e86a 100644 --- a/e2etests/testdata/stable/chaos1/elk/board.exp.json +++ b/e2etests/testdata/stable/chaos1/elk/board.exp.json @@ -5,12 +5,11 @@ "id": "aaa", "type": "", "pos": { - "x": 12, - "y": 364 + "x": 375, + "y": 12 }, - "width": 430, - "height": 317, - "level": 1, + "width": 325, + "height": 422, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,18 +36,18 @@ "underline": false, "labelWidth": 46, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "aaa.bbb", "type": "callout", "pos": { - "x": 87, - "y": 439 + "x": 450, + "y": 87 }, "width": 132, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -75,18 +74,18 @@ "underline": false, "labelWidth": 32, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "ddd", "type": "cylinder", "pos": { - "x": 85, - "y": 12 + "x": 12, + "y": 87 }, "width": 133, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -113,18 +112,18 @@ "underline": false, "labelWidth": 33, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "eee", "type": "document", "pos": { - "x": 238, - "y": 12 + "x": 15, + "y": 233 }, "width": 130, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -151,18 +150,18 @@ "underline": false, "labelWidth": 30, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "aaa.ccc", "type": "", "pos": { - "x": 239, - "y": 439 + "x": 452, + "y": 233 }, "width": 128, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -189,7 +188,8 @@ "underline": false, "labelWidth": 28, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 } ], "connections": [ @@ -219,17 +219,18 @@ "labelPercentage": 0, "route": [ { - "x": 303, - "y": 565 + "x": 580, + "y": 296 }, { - "x": 303, - "y": 681 + "x": 700, + "y": 296 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(eee <- aaa.ccc)[0]", @@ -257,17 +258,18 @@ "labelPercentage": 0, "route": [ { - "x": 303, - "y": 138 + "x": 145, + "y": 296 }, { - "x": 303, - "y": 439 + "x": 452, + "y": 296 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 } ] } diff --git a/e2etests/testdata/stable/chaos2/dagre/board.exp.json b/e2etests/testdata/stable/chaos2/dagre/board.exp.json index 8caeb8bd9..da047dac0 100644 --- a/e2etests/testdata/stable/chaos2/dagre/board.exp.json +++ b/e2etests/testdata/stable/chaos2/dagre/board.exp.json @@ -10,7 +10,6 @@ }, "width": 1117, "height": 1654, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 32, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "aa.bb", @@ -48,7 +48,6 @@ }, "width": 776, "height": 1554, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -75,7 +74,8 @@ "underline": false, "labelWidth": 31, "labelHeight": 36, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 2 }, { "id": "aa.bb.cc", @@ -86,7 +86,6 @@ }, "width": 510, "height": 676, - "level": 3, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -113,7 +112,8 @@ "underline": false, "labelWidth": 24, "labelHeight": 31, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 3 }, { "id": "aa.bb.cc.dd", @@ -124,7 +124,6 @@ }, "width": 355, "height": 226, - "level": 4, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -151,7 +150,8 @@ "underline": false, "labelWidth": 22, "labelHeight": 26, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 4 }, { "id": "aa.bb.cc.dd.ee", @@ -162,7 +162,6 @@ }, "width": 16, "height": 24, - "level": 5, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -188,7 +187,8 @@ "bold": true, "underline": false, "labelWidth": 16, - "labelHeight": 24 + "labelHeight": 24, + "renderPriority": 5 }, { "id": "aa.bb.cc.dd.ff", @@ -199,7 +199,6 @@ }, "width": 117, "height": 126, - "level": 5, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -226,7 +225,8 @@ "underline": false, "labelWidth": 17, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 5 }, { "id": "aa.bb.cc.gg", @@ -237,7 +237,6 @@ }, "width": 17, "height": 24, - "level": 4, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -263,7 +262,8 @@ "bold": true, "underline": false, "labelWidth": 17, - "labelHeight": 24 + "labelHeight": 24, + "renderPriority": 4 }, { "id": "aa.bb.cc.hh", @@ -274,7 +274,6 @@ }, "width": 123, "height": 126, - "level": 4, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -301,7 +300,8 @@ "underline": false, "labelWidth": 23, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 4 }, { "id": "aa.bb.ii", @@ -312,7 +312,6 @@ }, "width": 367, "height": 226, - "level": 3, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -339,7 +338,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 31, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 3 }, { "id": "aa.bb.ii.jj", @@ -350,7 +350,6 @@ }, "width": 115, "height": 126, - "level": 4, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -377,7 +376,8 @@ "underline": false, "labelWidth": 15, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 4 }, { "id": "aa.bb.kk", @@ -388,7 +388,6 @@ }, "width": 126, "height": 126, - "level": 3, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -415,7 +414,8 @@ "underline": false, "labelWidth": 22, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 3 }, { "id": "aa.ll", @@ -426,7 +426,6 @@ }, "width": 114, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -453,7 +452,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "aa.mm", @@ -464,7 +464,6 @@ }, "width": 131, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -491,7 +490,8 @@ "underline": false, "labelWidth": 31, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "aa.nn", @@ -502,7 +502,6 @@ }, "width": 18, "height": 24, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -528,7 +527,8 @@ "bold": true, "underline": false, "labelWidth": 18, - "labelHeight": 24 + "labelHeight": 24, + "renderPriority": 2 }, { "id": "aa.oo", @@ -539,7 +539,6 @@ }, "width": 123, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -566,7 +565,8 @@ "underline": false, "labelWidth": 23, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 } ], "connections": [ @@ -615,7 +615,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 6 }, { "id": "aa.bb.cc.(gg -- hh)[0]", @@ -662,7 +663,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 6 }, { "id": "aa.bb.(ii -> cc.dd)[0]", @@ -757,7 +759,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 6 }, { "id": "aa.(ll <-> bb)[0]", @@ -804,7 +807,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 6 }, { "id": "aa.(mm -> bb.cc)[0]", @@ -863,7 +867,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 6 }, { "id": "aa.(mm -> ll)[0]", @@ -910,7 +915,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 6 }, { "id": "aa.(mm <-> bb)[0]", @@ -957,7 +963,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 6 }, { "id": "aa.(ll <-> bb.cc.gg)[0]", @@ -1052,7 +1059,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 6 }, { "id": "aa.(mm <- bb.ii)[0]", @@ -1099,7 +1107,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 6 }, { "id": "aa.(bb.cc <- ll)[0]", @@ -1146,7 +1155,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 6 }, { "id": "aa.(bb.ii <-> ll)[0]", @@ -1205,7 +1215,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 6 } ] } diff --git a/e2etests/testdata/stable/chaos2/elk/board.exp.json b/e2etests/testdata/stable/chaos2/elk/board.exp.json index fbe4f1cdd..81bd699b6 100644 --- a/e2etests/testdata/stable/chaos2/elk/board.exp.json +++ b/e2etests/testdata/stable/chaos2/elk/board.exp.json @@ -8,9 +8,8 @@ "x": 12, "y": 12 }, - "width": 892, - "height": 1707, - "level": 1, + "width": 1656, + "height": 897, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,18 +36,18 @@ "underline": false, "labelWidth": 32, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "aa.bb", "type": "", "pos": { - "x": 144, - "y": 445 + "x": 434, + "y": 132 }, - "width": 685, - "height": 1174, - "level": 2, + "width": 1134, + "height": 702, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -75,18 +74,18 @@ "underline": false, "labelWidth": 31, "labelHeight": 36, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 2 }, { "id": "aa.bb.cc", "type": "", "pos": { - "x": 290, - "y": 841 + "x": 819, + "y": 278 }, - "width": 464, - "height": 703, - "level": 3, + "width": 674, + "height": 481, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -113,18 +112,18 @@ "underline": false, "labelWidth": 24, "labelHeight": 31, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 3 }, { "id": "aa.bb.cc.dd", "type": "rectangle", "pos": { - "x": 376, - "y": 916 + "x": 894, + "y": 364 }, - "width": 303, - "height": 276, - "level": 4, + "width": 267, + "height": 320, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -151,18 +150,18 @@ "underline": false, "labelWidth": 22, "labelHeight": 26, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 4 }, { "id": "aa.bb.cc.dd.ee", "type": "text", "pos": { - "x": 588, - "y": 1093 + "x": 1070, + "y": 585 }, "width": 16, "height": 24, - "level": 5, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -188,18 +187,18 @@ "bold": true, "underline": false, "labelWidth": 16, - "labelHeight": 24 + "labelHeight": 24, + "renderPriority": 5 }, { "id": "aa.bb.cc.dd.ff", "type": "", "pos": { - "x": 451, - "y": 991 + "x": 969, + "y": 439 }, "width": 117, "height": 126, - "level": 5, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -226,18 +225,18 @@ "underline": false, "labelWidth": 17, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 5 }, { "id": "aa.bb.cc.gg", "type": "text", "pos": { - "x": 585, - "y": 1258 + "x": 1221, + "y": 581 }, "width": 17, "height": 24, - "level": 4, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -263,18 +262,18 @@ "bold": true, "underline": false, "labelWidth": 17, - "labelHeight": 24 + "labelHeight": 24, + "renderPriority": 4 }, { "id": "aa.bb.cc.hh", "type": "", "pos": { - "x": 532, - "y": 1343 + "x": 1295, + "y": 530 }, "width": 123, "height": 126, - "level": 4, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -301,18 +300,18 @@ "underline": false, "labelWidth": 23, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 4 }, { "id": "aa.bb.ii", "type": "package", "pos": { - "x": 376, - "y": 520 + "x": 509, + "y": 364 }, "width": 265, "height": 276, - "level": 3, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -339,18 +338,18 @@ "underline": false, "labelWidth": 14, "labelHeight": 31, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 3 }, { "id": "aa.bb.ii.jj", "type": "diamond", "pos": { - "x": 451, - "y": 595 + "x": 584, + "y": 439 }, "width": 115, "height": 126, - "level": 4, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -377,18 +376,18 @@ "underline": false, "labelWidth": 15, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 4 }, { "id": "aa.bb.kk", "type": "oval", "pos": { - "x": 219, - "y": 595 + "x": 579, + "y": 207 }, "width": 126, "height": 126, - "level": 3, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -415,18 +414,18 @@ "underline": false, "labelWidth": 22, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 3 }, { "id": "aa.ll", "type": "", "pos": { - "x": 357, - "y": 233 + "x": 238, + "y": 356 }, "width": 114, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -453,18 +452,18 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "aa.mm", "type": "cylinder", "pos": { - "x": 462, - "y": 87 + "x": 87, + "y": 471 }, "width": 131, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -491,18 +490,18 @@ "underline": false, "labelWidth": 31, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "aa.nn", "type": "text", "pos": { - "x": 424, - "y": 138 + "x": 144, + "y": 427 }, "width": 18, "height": 24, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -528,18 +527,18 @@ "bold": true, "underline": false, "labelWidth": 18, - "labelHeight": 24 + "labelHeight": 24, + "renderPriority": 2 }, { "id": "aa.oo", "type": "", "pos": { - "x": 613, - "y": 87 + "x": 91, + "y": 617 }, "width": 123, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -566,7 +565,8 @@ "underline": false, "labelWidth": 23, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 } ], "connections": [ @@ -596,17 +596,18 @@ "labelPercentage": 0, "route": [ { - "x": 596, - "y": 1117 + "x": 1086, + "y": 597 }, { - "x": 596, - "y": 1258 + "x": 1221, + "y": 597 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 6 }, { "id": "aa.bb.cc.(gg -- hh)[0]", @@ -634,17 +635,18 @@ "labelPercentage": 0, "route": [ { - "x": 593.1666666666666, - "y": 1282 + "x": 1238, + "y": 593 }, { - "x": 593.1666666666666, - "y": 1343 + "x": 1295, + "y": 593 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 6 }, { "id": "aa.bb.(ii -> cc.dd)[0]", @@ -672,25 +674,26 @@ "labelPercentage": 0, "route": [ { - "x": 552.6666666666666, - "y": 796 + "x": 774, + "y": 548 }, { - "x": 552.6666666666666, - "y": 816 + "x": 794, + "y": 548 }, { - "x": 451, - "y": 816 + "x": 794, + "y": 439 }, { - "x": 451, - "y": 916 + "x": 894, + "y": 439 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 6 }, { "id": "aa.(ll <-> bb)[0]", @@ -718,25 +721,34 @@ "labelPercentage": 0, "route": [ { - "x": 424.9000000000001, - "y": 359 + "x": 352, + "y": 431.6 }, { - "x": 424.9000000000001, - "y": 420 + "x": 362, + "y": 431.6 }, { - "x": 345.00000000000006, - "y": 420 + "x": 362, + "y": 421.80000000000007 }, { - "x": 345.00000000000006, - "y": 445 + "x": 409, + "y": 421.80000000000007 + }, + { + "x": 409, + "y": 333.00000000000006 + }, + { + "x": 434, + "y": 333.00000000000006 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 6 }, { "id": "aa.(mm -> bb.cc)[0]", @@ -764,33 +776,34 @@ "labelPercentage": 0, "route": [ { - "x": 566.5, - "y": 213 + "x": 218, + "y": 572 }, { - "x": 566.5, - "y": 420 + "x": 409, + "y": 572 }, { - "x": 651, - "y": 420 + "x": 409, + "y": 650 }, { - "x": 651, - "y": 826 + "x": 804, + "y": 650 }, { - "x": 461.00000000000006, - "y": 826 + "x": 804, + "y": 449.00000000000006 }, { - "x": 461.00000000000006, - "y": 841 + "x": 819, + "y": 449.00000000000006 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 6 }, { "id": "aa.(mm -> ll)[0]", @@ -818,25 +831,26 @@ "labelPercentage": 0, "route": [ { - "x": 487.90000000000003, - "y": 213 + "x": 218, + "y": 496.40000000000003 }, { - "x": 487.90000000000003, - "y": 223 + "x": 228, + "y": 496.40000000000003 }, { - "x": 413.50000000000006, - "y": 223 + "x": 228, + "y": 419.00000000000006 }, { - "x": 413.50000000000006, - "y": 233 + "x": 238, + "y": 419.00000000000006 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 6 }, { "id": "aa.(mm <-> bb)[0]", @@ -864,33 +878,34 @@ "labelPercentage": 0, "route": [ { - "x": 540.3000000000001, - "y": 213 + "x": 218, + "y": 546.8000000000001 }, { - "x": 540.3000000000001, - "y": 223 + "x": 228, + "y": 546.8000000000001 }, { - "x": 537.5, - "y": 223 + "x": 228, + "y": 537 }, { - "x": 537.5, - "y": 420 + "x": 409, + "y": 537 }, { - "x": 518.5, - "y": 420 + "x": 409, + "y": 512 }, { - "x": 518.5, - "y": 445 + "x": 434, + "y": 512 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 6 }, { "id": "aa.(ll <-> bb.cc.gg)[0]", @@ -918,33 +933,34 @@ "labelPercentage": 0, "route": [ { - "x": 447.70000000000005, - "y": 359 + "x": 352, + "y": 456.80000000000007 }, { - "x": 447.70000000000005, - "y": 430 + "x": 419, + "y": 456.80000000000007 }, { - "x": 365.00000000000006, - "y": 430 + "x": 419, + "y": 353.00000000000006 }, { - "x": 365.00000000000006, - "y": 1248 + "x": 1211, + "y": 353.00000000000006 }, { - "x": 590.3333333333334, - "y": 1248 + "x": 1211, + "y": 589 }, { - "x": 590.3333333333334, - "y": 1258 + "x": 1221, + "y": 589 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 6 }, { "id": "aa.(mm <- bb.ii)[0]", @@ -972,25 +988,26 @@ "labelPercentage": 0, "route": [ { - "x": 514.1, - "y": 213 + "x": 218, + "y": 521.6 }, { - "x": 514.1, - "y": 223 + "x": 228, + "y": 521.6 }, { - "x": 508.50000000000006, - "y": 223 + "x": 228, + "y": 502.00000000000006 }, { - "x": 508.50000000000006, - "y": 520 + "x": 509, + "y": 502.00000000000006 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 6 }, { "id": "aa.(bb.cc <- ll)[0]", @@ -1018,33 +1035,34 @@ "labelPercentage": 0, "route": [ { - "x": 461.00000000000006, - "y": 1544 + "x": 1493, + "y": 449.00000000000006 }, { - "x": 461.0000000000001, - "y": 1644 + "x": 1593, + "y": 449.0000000000001 }, { - "x": 105.00000000000006, - "y": 1644 + "x": 1593, + "y": 87.00000000000006 }, { - "x": 105.00000000000006, - "y": 369 + "x": 362, + "y": 87.00000000000006 }, { - "x": 379.3000000000001, - "y": 369 + "x": 362, + "y": 381.2000000000001 }, { - "x": 379.3000000000001, - "y": 359 + "x": 352, + "y": 381.2000000000001 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 6 }, { "id": "aa.(bb.ii <-> ll)[0]", @@ -1072,41 +1090,42 @@ "labelPercentage": 0, "route": [ { - "x": 464.33333333333337, - "y": 796 + "x": 774, + "y": 456.00000000000006 }, { - "x": 464.33333333333337, - "y": 806 + "x": 784, + "y": 456.00000000000006 }, { - "x": 279.00000000000006, - "y": 806 + "x": 784, + "y": 267.00000000000006 }, { - "x": 279.0000000000001, - "y": 1634 + "x": 1583, + "y": 267.0000000000001 }, { - "x": 134.0000000000001, - "y": 1634 + "x": 1583, + "y": 122.00000000000011 }, { - "x": 134.0000000000001, - "y": 379 + "x": 372, + "y": 122.00000000000011 }, { - "x": 402.10000000000014, - "y": 379 + "x": 372, + "y": 406.4000000000001 }, { - "x": 402.10000000000014, - "y": 359 + "x": 352, + "y": 406.4000000000001 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 6 } ] } diff --git a/e2etests/testdata/stable/child_parent_edges/dagre/board.exp.json b/e2etests/testdata/stable/child_parent_edges/dagre/board.exp.json index 8c3d30dfc..7fca43601 100644 --- a/e2etests/testdata/stable/child_parent_edges/dagre/board.exp.json +++ b/e2etests/testdata/stable/child_parent_edges/dagre/board.exp.json @@ -10,7 +10,6 @@ }, "width": 524, "height": 426, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 17, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "a.b", @@ -48,7 +48,6 @@ }, "width": 444, "height": 326, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -75,7 +74,8 @@ "underline": false, "labelWidth": 17, "labelHeight": 36, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 2 }, { "id": "a.b.c", @@ -86,7 +86,6 @@ }, "width": 364, "height": 226, - "level": 3, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -113,7 +112,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 31, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 3 }, { "id": "a.b.c.d", @@ -124,7 +124,6 @@ }, "width": 114, "height": 126, - "level": 4, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -151,7 +150,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 4 } ], "connections": [ @@ -236,7 +236,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 5 }, { "id": "a.(b -> b.c)[0]", @@ -319,7 +320,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 5 }, { "id": "a.(b.c.d -> b)[0]", @@ -366,7 +368,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 5 } ] } diff --git a/e2etests/testdata/stable/child_parent_edges/elk/board.exp.json b/e2etests/testdata/stable/child_parent_edges/elk/board.exp.json index 41f392aef..39671b77e 100644 --- a/e2etests/testdata/stable/child_parent_edges/elk/board.exp.json +++ b/e2etests/testdata/stable/child_parent_edges/elk/board.exp.json @@ -8,9 +8,8 @@ "x": 12, "y": 12 }, - "width": 574, - "height": 601, - "level": 1, + "width": 589, + "height": 586, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 17, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "a.b", @@ -46,9 +46,8 @@ "x": 87, "y": 87 }, - "width": 424, - "height": 451, - "level": 2, + "width": 439, + "height": 436, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -75,7 +74,8 @@ "underline": false, "labelWidth": 17, "labelHeight": 36, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 2 }, { "id": "a.b.c", @@ -86,7 +86,6 @@ }, "width": 264, "height": 276, - "level": 3, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -113,7 +112,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 31, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 3 }, { "id": "a.b.c.d", @@ -124,7 +124,6 @@ }, "width": 114, "height": 126, - "level": 4, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -151,7 +150,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 4 } ], "connections": [ @@ -181,17 +181,18 @@ "labelPercentage": 0, "route": [ { - "x": 162, - "y": 538 + "x": 526, + "y": 162 }, { - "x": 162, - "y": 613 + "x": 601, + "y": 162 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 5 }, { "id": "a.(b -> b.c)[0]", @@ -219,17 +220,18 @@ "labelPercentage": 0, "route": [ { - "x": 237, - "y": 87 + "x": 87, + "y": 237 }, { - "x": 237, - "y": 162 + "x": 162, + "y": 237 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 5 }, { "id": "a.(b.c.d -> b)[0]", @@ -257,25 +259,26 @@ "labelPercentage": 0, "route": [ { - "x": 294, - "y": 363 + "x": 351, + "y": 300 }, { - "x": 294, - "y": 453 + "x": 441, + "y": 300 }, { - "x": 436, - "y": 453 + "x": 441, + "y": 448 }, { - "x": 436, - "y": 87 + "x": 87, + "y": 448 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 5 } ] } diff --git a/e2etests/testdata/stable/circular_dependency/dagre/board.exp.json b/e2etests/testdata/stable/circular_dependency/dagre/board.exp.json index c965af9c1..34f41340e 100644 --- a/e2etests/testdata/stable/circular_dependency/dagre/board.exp.json +++ b/e2etests/testdata/stable/circular_dependency/dagre/board.exp.json @@ -10,7 +10,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "b", @@ -48,7 +48,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -75,7 +74,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "c", @@ -86,7 +86,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -113,7 +112,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -162,7 +162,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(b -> c)[0]", @@ -209,7 +210,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(c -> b)[0]", @@ -256,7 +258,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(b -> a)[0]", @@ -303,7 +306,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/stable/circular_dependency/elk/board.exp.json b/e2etests/testdata/stable/circular_dependency/elk/board.exp.json index eef9a097a..789996fdd 100644 --- a/e2etests/testdata/stable/circular_dependency/elk/board.exp.json +++ b/e2etests/testdata/stable/circular_dependency/elk/board.exp.json @@ -10,7 +10,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "b", @@ -48,7 +48,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -75,7 +74,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "c", @@ -86,7 +86,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -113,7 +112,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -153,7 +153,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(b -> c)[0]", @@ -191,7 +192,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(c -> b)[0]", @@ -229,7 +231,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(b -> a)[0]", @@ -267,7 +270,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/stable/class/dagre/board.exp.json b/e2etests/testdata/stable/class/dagre/board.exp.json index 501753f8d..bcd0af21a 100644 --- a/e2etests/testdata/stable/class/dagre/board.exp.json +++ b/e2etests/testdata/stable/class/dagre/board.exp.json @@ -10,7 +10,6 @@ }, "width": 339, "height": 368, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -68,7 +67,8 @@ "bold": true, "underline": false, "labelWidth": 150, - "labelHeight": 36 + "labelHeight": 36, + "renderPriority": 1 } ], "connections": [] diff --git a/e2etests/testdata/stable/class/elk/board.exp.json b/e2etests/testdata/stable/class/elk/board.exp.json index 592a921c2..b1b21ae18 100644 --- a/e2etests/testdata/stable/class/elk/board.exp.json +++ b/e2etests/testdata/stable/class/elk/board.exp.json @@ -10,7 +10,6 @@ }, "width": 339, "height": 368, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -68,7 +67,8 @@ "bold": true, "underline": false, "labelWidth": 150, - "labelHeight": 36 + "labelHeight": 36, + "renderPriority": 1 } ], "connections": [] diff --git a/e2etests/testdata/stable/code_snippet/dagre/board.exp.json b/e2etests/testdata/stable/code_snippet/dagre/board.exp.json index 79b6896f4..9e17997bb 100644 --- a/e2etests/testdata/stable/code_snippet/dagre/board.exp.json +++ b/e2etests/testdata/stable/code_snippet/dagre/board.exp.json @@ -10,7 +10,6 @@ }, "width": 755, "height": 166, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -36,7 +35,8 @@ "bold": true, "underline": false, "labelWidth": 755, - "labelHeight": 166 + "labelHeight": 166, + "renderPriority": 1 }, { "id": "x", @@ -47,7 +47,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -74,7 +73,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "y", @@ -85,7 +85,6 @@ }, "width": 114, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -112,7 +111,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -161,7 +161,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(hey -> y)[0]", @@ -208,7 +209,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/stable/code_snippet/elk/board.exp.json b/e2etests/testdata/stable/code_snippet/elk/board.exp.json index 2c9cfc714..a3c075e00 100644 --- a/e2etests/testdata/stable/code_snippet/elk/board.exp.json +++ b/e2etests/testdata/stable/code_snippet/elk/board.exp.json @@ -10,7 +10,6 @@ }, "width": 755, "height": 166, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -36,7 +35,8 @@ "bold": true, "underline": false, "labelWidth": 755, - "labelHeight": 166 + "labelHeight": 166, + "renderPriority": 1 }, { "id": "x", @@ -47,7 +47,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -74,7 +73,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "y", @@ -85,7 +85,6 @@ }, "width": 114, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -112,7 +111,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -152,7 +152,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(hey -> y)[0]", @@ -190,7 +191,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/stable/connected_container/dagre/board.exp.json b/e2etests/testdata/stable/connected_container/dagre/board.exp.json index 33ddd4b57..f1beb9a58 100644 --- a/e2etests/testdata/stable/connected_container/dagre/board.exp.json +++ b/e2etests/testdata/stable/connected_container/dagre/board.exp.json @@ -10,7 +10,6 @@ }, "width": 213, "height": 226, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 17, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "a.b", @@ -48,7 +48,6 @@ }, "width": 113, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -75,7 +74,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "c", @@ -86,7 +86,6 @@ }, "width": 214, "height": 226, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -113,7 +112,8 @@ "underline": false, "labelWidth": 17, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "c.d", @@ -124,7 +124,6 @@ }, "width": 114, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -151,7 +150,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "f", @@ -162,7 +162,6 @@ }, "width": 294, "height": 326, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -189,7 +188,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "f.h", @@ -200,7 +200,6 @@ }, "width": 214, "height": 226, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -227,7 +226,8 @@ "underline": false, "labelWidth": 16, "labelHeight": 36, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 2 }, { "id": "f.h.g", @@ -238,7 +238,6 @@ }, "width": 114, "height": 126, - "level": 3, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -265,7 +264,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 3 } ], "connections": [ @@ -326,7 +326,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 4 }, { "id": "(c.d -> f.h.g)[0]", @@ -397,7 +398,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 4 } ] } diff --git a/e2etests/testdata/stable/connected_container/elk/board.exp.json b/e2etests/testdata/stable/connected_container/elk/board.exp.json index 73c9e7864..5538d2a86 100644 --- a/e2etests/testdata/stable/connected_container/elk/board.exp.json +++ b/e2etests/testdata/stable/connected_container/elk/board.exp.json @@ -5,12 +5,11 @@ "id": "a", "type": "", "pos": { - "x": 88, - "y": 12 + "x": 12, + "y": 87 }, "width": 263, "height": 276, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,18 +36,18 @@ "underline": false, "labelWidth": 17, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "a.b", "type": "", "pos": { - "x": 163, - "y": 87 + "x": 87, + "y": 162 }, "width": 113, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -75,18 +74,18 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "c", "type": "", "pos": { - "x": 87, - "y": 398 + "x": 385, + "y": 87 }, "width": 264, "height": 276, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -113,18 +112,18 @@ "underline": false, "labelWidth": 17, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "c.d", "type": "", "pos": { - "x": 162, - "y": 473 + "x": 460, + "y": 162 }, "width": 114, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -151,18 +150,18 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "f", "type": "", "pos": { - "x": 12, - "y": 784 + "x": 759, + "y": 12 }, - "width": 414, - "height": 431, - "level": 1, + "width": 419, + "height": 426, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -189,18 +188,18 @@ "underline": false, "labelWidth": 14, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "f.h", "type": "", "pos": { - "x": 87, - "y": 864 + "x": 839, + "y": 87 }, "width": 264, "height": 276, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -227,18 +226,18 @@ "underline": false, "labelWidth": 16, "labelHeight": 36, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 2 }, { "id": "f.h.g", "type": "", "pos": { - "x": 162, - "y": 939 + "x": 914, + "y": 162 }, "width": 114, "height": 126, - "level": 3, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -265,7 +264,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 3 } ], "connections": [ @@ -295,17 +295,18 @@ "labelPercentage": 0, "route": [ { - "x": 219, - "y": 213 + "x": 200, + "y": 225 }, { - "x": 219, - "y": 473 + "x": 460, + "y": 225 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 4 }, { "id": "(c.d -> f.h.g)[0]", @@ -333,17 +334,18 @@ "labelPercentage": 0, "route": [ { - "x": 219, - "y": 599 + "x": 574, + "y": 225 }, { - "x": 219, - "y": 939 + "x": 914, + "y": 225 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 4 } ] } diff --git a/e2etests/testdata/stable/container_edges/dagre/board.exp.json b/e2etests/testdata/stable/container_edges/dagre/board.exp.json index 8166e4d26..8a6a6faf4 100644 --- a/e2etests/testdata/stable/container_edges/dagre/board.exp.json +++ b/e2etests/testdata/stable/container_edges/dagre/board.exp.json @@ -10,7 +10,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "g", @@ -48,7 +48,6 @@ }, "width": 253, "height": 878, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -75,7 +74,8 @@ "underline": false, "labelWidth": 18, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "g.b", @@ -86,7 +86,6 @@ }, "width": 113, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -113,7 +112,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "d", @@ -124,7 +124,6 @@ }, "width": 293, "height": 326, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -151,7 +150,8 @@ "underline": false, "labelWidth": 18, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "d.h", @@ -162,7 +162,6 @@ }, "width": 213, "height": 226, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -189,7 +188,8 @@ "underline": false, "labelWidth": 16, "labelHeight": 36, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 2 }, { "id": "d.h.c", @@ -200,7 +200,6 @@ }, "width": 113, "height": 126, - "level": 3, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -227,7 +226,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 3 }, { "id": "g.e", @@ -238,7 +238,6 @@ }, "width": 113, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -265,7 +264,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "f", @@ -276,7 +276,6 @@ }, "width": 111, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -303,7 +302,8 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -352,7 +352,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 4 }, { "id": "(g.b -> d.h.c)[0]", @@ -411,7 +412,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 4 }, { "id": "(d -> g.e)[0]", @@ -458,7 +460,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 4 }, { "id": "(g.e -> f)[0]", @@ -505,7 +508,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 4 }, { "id": "(f -> g)[0]", @@ -552,7 +556,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 4 }, { "id": "(g -> d.h)[0]", @@ -599,7 +604,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 4 } ] } diff --git a/e2etests/testdata/stable/container_edges/elk/board.exp.json b/e2etests/testdata/stable/container_edges/elk/board.exp.json index eff0f69f1..8dd4c0f0b 100644 --- a/e2etests/testdata/stable/container_edges/elk/board.exp.json +++ b/e2etests/testdata/stable/container_edges/elk/board.exp.json @@ -5,12 +5,11 @@ "id": "a", "type": "", "pos": { - "x": 162, - "y": 12 + "x": 12, + "y": 162 }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,18 +36,18 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "g", "type": "", "pos": { - "x": 87, - "y": 253 + "x": 240, + "y": 87 }, - "width": 396, - "height": 276, - "level": 1, + "width": 263, + "height": 422, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -75,18 +74,18 @@ "underline": false, "labelWidth": 18, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "g.b", "type": "", "pos": { - "x": 162, - "y": 328 + "x": 315, + "y": 162 }, "width": 113, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -113,18 +112,18 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "d", "type": "", "pos": { - "x": 12, - "y": 639 + "x": 613, + "y": 12 }, - "width": 413, - "height": 431, - "level": 1, + "width": 418, + "height": 426, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -151,18 +150,18 @@ "underline": false, "labelWidth": 18, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "d.h", "type": "", "pos": { - "x": 87, - "y": 719 + "x": 693, + "y": 87 }, "width": 263, "height": 276, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -189,18 +188,18 @@ "underline": false, "labelWidth": 16, "labelHeight": 36, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 2 }, { "id": "d.h.c", "type": "", "pos": { - "x": 162, - "y": 794 + "x": 768, + "y": 162 }, "width": 113, "height": 126, - "level": 3, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -227,18 +226,18 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 3 }, { "id": "g.e", "type": "", "pos": { - "x": 295, - "y": 328 + "x": 315, + "y": 308 }, "width": 113, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -265,18 +264,18 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "f", "type": "", "pos": { - "x": 445, - "y": 639 + "x": 613, + "y": 458 }, "width": 111, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -303,7 +302,8 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -333,17 +333,18 @@ "labelPercentage": 0, "route": [ { - "x": 218.5, - "y": 138 + "x": 125, + "y": 225 }, { - "x": 218.5, - "y": 328 + "x": 315, + "y": 225 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 4 }, { "id": "(g.b -> d.h.c)[0]", @@ -371,17 +372,18 @@ "labelPercentage": 0, "route": [ { - "x": 218.5, - "y": 454 + "x": 428, + "y": 225 }, { - "x": 218.5, - "y": 794 + "x": 768, + "y": 225 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 4 }, { "id": "(d -> g.e)[0]", @@ -409,33 +411,34 @@ "labelPercentage": 0, "route": [ { - "x": 87, - "y": 1070 + "x": 1031, + "y": 87 }, { - "x": 87, - "y": 1120 + "x": 1081, + "y": 87 }, { - "x": 566, - "y": 1120 + "x": 1081, + "y": 594 }, { - "x": 566, - "y": 188 + "x": 175, + "y": 594 }, { - "x": 351.5, - "y": 188 + "x": 175, + "y": 371 }, { - "x": 351.5, - "y": 328 + "x": 315, + "y": 371 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 4 }, { "id": "(g.e -> f)[0]", @@ -463,25 +466,26 @@ "labelPercentage": 0, "route": [ { - "x": 351.5, - "y": 454 + "x": 428, + "y": 371 }, { - "x": 351.5, - "y": 584 + "x": 558, + "y": 371 }, { - "x": 482, - "y": 584 + "x": 558, + "y": 500 }, { - "x": 482, - "y": 639 + "x": 613, + "y": 500 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 4 }, { "id": "(f -> g)[0]", @@ -509,25 +513,26 @@ "labelPercentage": 0, "route": [ { - "x": 519, - "y": 639 + "x": 613, + "y": 542 }, { - "x": 519, - "y": 198 + "x": 185, + "y": 542 }, { - "x": 361.5, - "y": 198 + "x": 185, + "y": 381 }, { - "x": 361.5, - "y": 253 + "x": 240, + "y": 381 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 4 }, { "id": "(g -> d.h)[0]", @@ -555,17 +560,18 @@ "labelPercentage": 0, "route": [ { - "x": 228.5, - "y": 529 + "x": 503, + "y": 235 }, { - "x": 228.5, - "y": 719 + "x": 693, + "y": 235 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 4 } ] } diff --git a/e2etests/testdata/stable/dense/dagre/board.exp.json b/e2etests/testdata/stable/dense/dagre/board.exp.json index 45e6e5df1..95d37e599 100644 --- a/e2etests/testdata/stable/dense/dagre/board.exp.json +++ b/e2etests/testdata/stable/dense/dagre/board.exp.json @@ -10,7 +10,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "b", @@ -48,7 +48,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -75,7 +74,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "c", @@ -86,7 +86,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -113,7 +112,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "d", @@ -124,7 +124,6 @@ }, "width": 114, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -151,7 +150,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "e", @@ -162,7 +162,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -189,7 +188,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "f", @@ -200,7 +200,6 @@ }, "width": 111, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -227,7 +226,8 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "g", @@ -238,7 +238,6 @@ }, "width": 114, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -265,7 +264,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "h", @@ -276,7 +276,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -303,7 +302,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "i", @@ -314,7 +314,6 @@ }, "width": 109, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -341,7 +340,8 @@ "underline": false, "labelWidth": 9, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "j", @@ -352,7 +352,6 @@ }, "width": 110, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -379,7 +378,8 @@ "underline": false, "labelWidth": 10, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "k", @@ -390,7 +390,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -417,7 +416,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "l", @@ -428,7 +428,6 @@ }, "width": 109, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -455,7 +454,8 @@ "underline": false, "labelWidth": 9, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "m", @@ -466,7 +466,6 @@ }, "width": 117, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -493,7 +492,8 @@ "underline": false, "labelWidth": 17, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "n", @@ -504,7 +504,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -531,7 +530,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "o", @@ -542,7 +542,6 @@ }, "width": 114, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -569,7 +568,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "p", @@ -580,7 +580,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -607,7 +606,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "q", @@ -618,7 +618,6 @@ }, "width": 114, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -645,7 +644,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -694,7 +694,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(c -> b)[0]", @@ -753,7 +754,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(d -> e)[0]", @@ -812,7 +814,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(f -> e)[0]", @@ -871,7 +874,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(b -> f)[0]", @@ -930,7 +934,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(b -> g)[0]", @@ -977,7 +982,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(g -> f)[0]", @@ -1024,7 +1030,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(b -> h)[0]", @@ -1071,7 +1078,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(b -> i)[0]", @@ -1178,7 +1186,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(b -> d)[0]", @@ -1237,7 +1246,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(j -> c)[0]", @@ -1284,7 +1294,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(j -> a)[0]", @@ -1343,7 +1354,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(b -> j)[0]", @@ -1390,7 +1402,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(i -> k)[0]", @@ -1437,7 +1450,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(d -> l)[0]", @@ -1484,7 +1498,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(l -> e)[0]", @@ -1531,7 +1546,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(m -> l)[0]", @@ -1578,7 +1594,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(m -> n)[0]", @@ -1625,7 +1642,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(n -> i)[0]", @@ -1672,7 +1690,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(d -> n)[0]", @@ -1719,7 +1738,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(f -> n)[0]", @@ -1766,7 +1786,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(b -> o)[0]", @@ -1813,7 +1834,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(p -> l)[0]", @@ -1860,7 +1882,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(e -> q)[0]", @@ -1907,7 +1930,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/stable/dense/elk/board.exp.json b/e2etests/testdata/stable/dense/elk/board.exp.json index d9c745b45..467b4fef7 100644 --- a/e2etests/testdata/stable/dense/elk/board.exp.json +++ b/e2etests/testdata/stable/dense/elk/board.exp.json @@ -10,7 +10,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "b", @@ -48,7 +48,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -75,7 +74,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "c", @@ -86,7 +86,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -113,7 +112,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "d", @@ -124,7 +124,6 @@ }, "width": 114, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -151,7 +150,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "e", @@ -162,7 +162,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -189,7 +188,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "f", @@ -200,7 +200,6 @@ }, "width": 111, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -227,7 +226,8 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "g", @@ -238,7 +238,6 @@ }, "width": 114, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -265,7 +264,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "h", @@ -276,7 +276,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -303,7 +302,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "i", @@ -314,7 +314,6 @@ }, "width": 109, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -341,7 +340,8 @@ "underline": false, "labelWidth": 9, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "j", @@ -352,7 +352,6 @@ }, "width": 110, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -379,7 +378,8 @@ "underline": false, "labelWidth": 10, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "k", @@ -390,7 +390,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -417,7 +416,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "l", @@ -428,7 +428,6 @@ }, "width": 109, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -455,7 +454,8 @@ "underline": false, "labelWidth": 9, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "m", @@ -466,7 +466,6 @@ }, "width": 117, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -493,7 +492,8 @@ "underline": false, "labelWidth": 17, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "n", @@ -504,7 +504,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -531,7 +530,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "o", @@ -542,7 +542,6 @@ }, "width": 114, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -569,7 +568,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "p", @@ -580,7 +580,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -607,7 +606,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "q", @@ -618,7 +618,6 @@ }, "width": 114, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -645,7 +644,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -685,7 +685,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(c -> b)[0]", @@ -731,7 +732,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(d -> e)[0]", @@ -777,7 +779,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(f -> e)[0]", @@ -823,7 +826,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(b -> f)[0]", @@ -869,7 +873,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(b -> g)[0]", @@ -915,7 +920,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(g -> f)[0]", @@ -961,7 +967,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(b -> h)[0]", @@ -1007,7 +1014,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(b -> i)[0]", @@ -1061,7 +1069,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(b -> d)[0]", @@ -1099,7 +1108,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(j -> c)[0]", @@ -1137,7 +1147,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(j -> a)[0]", @@ -1183,7 +1194,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(b -> j)[0]", @@ -1237,7 +1249,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(i -> k)[0]", @@ -1275,7 +1288,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(d -> l)[0]", @@ -1321,7 +1335,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(l -> e)[0]", @@ -1367,7 +1382,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(m -> l)[0]", @@ -1413,7 +1429,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(m -> n)[0]", @@ -1459,7 +1476,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(n -> i)[0]", @@ -1497,7 +1515,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(d -> n)[0]", @@ -1535,7 +1554,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(f -> n)[0]", @@ -1581,7 +1601,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(b -> o)[0]", @@ -1627,7 +1648,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(p -> l)[0]", @@ -1665,7 +1687,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(e -> q)[0]", @@ -1703,7 +1726,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/stable/different_subgraphs/dagre/board.exp.json b/e2etests/testdata/stable/different_subgraphs/dagre/board.exp.json index d5ef295bb..532972a34 100644 --- a/e2etests/testdata/stable/different_subgraphs/dagre/board.exp.json +++ b/e2etests/testdata/stable/different_subgraphs/dagre/board.exp.json @@ -10,7 +10,6 @@ }, "width": 465, "height": 904, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 77, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "a", @@ -48,7 +48,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -75,7 +74,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "tree", @@ -86,7 +86,6 @@ }, "width": 134, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -113,7 +112,8 @@ "underline": false, "labelWidth": 34, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "and", @@ -124,7 +124,6 @@ }, "width": 132, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -151,7 +150,8 @@ "underline": false, "labelWidth": 32, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "nodes", @@ -162,7 +162,6 @@ }, "width": 147, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -189,7 +188,8 @@ "underline": false, "labelWidth": 47, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "some", @@ -200,7 +200,6 @@ }, "width": 143, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -227,7 +226,8 @@ "underline": false, "labelWidth": 43, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "more", @@ -238,7 +238,6 @@ }, "width": 141, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -265,7 +264,8 @@ "underline": false, "labelWidth": 41, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "many", @@ -276,7 +276,6 @@ }, "width": 145, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -303,7 +302,8 @@ "underline": false, "labelWidth": 45, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "then", @@ -314,7 +314,6 @@ }, "width": 138, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -341,7 +340,8 @@ "underline": false, "labelWidth": 38, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "here", @@ -352,7 +352,6 @@ }, "width": 136, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -379,7 +378,8 @@ "underline": false, "labelWidth": 36, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "you", @@ -390,7 +390,6 @@ }, "width": 132, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -417,7 +416,8 @@ "underline": false, "labelWidth": 32, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "have", @@ -428,7 +428,6 @@ }, "width": 138, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -455,7 +454,8 @@ "underline": false, "labelWidth": 38, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "hierarchy", @@ -466,7 +466,6 @@ }, "width": 173, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -493,7 +492,8 @@ "underline": false, "labelWidth": 73, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "another", @@ -504,7 +504,6 @@ }, "width": 163, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -531,7 +530,8 @@ "underline": false, "labelWidth": 63, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "of", @@ -542,7 +542,6 @@ }, "width": 120, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -569,7 +568,8 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "nesting", @@ -580,7 +580,6 @@ }, "width": 158, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -607,7 +606,8 @@ "underline": false, "labelWidth": 58, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "trees", @@ -618,7 +618,6 @@ }, "width": 142, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -645,7 +644,8 @@ "underline": false, "labelWidth": 42, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "finally.a", @@ -656,7 +656,6 @@ }, "width": 113, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -683,7 +682,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "finally.tree", @@ -694,7 +694,6 @@ }, "width": 134, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -721,7 +720,8 @@ "underline": false, "labelWidth": 34, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "finally.inside", @@ -732,7 +732,6 @@ }, "width": 148, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -759,7 +758,8 @@ "underline": false, "labelWidth": 48, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "finally.hierarchy", @@ -770,7 +770,6 @@ }, "width": 173, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -797,7 +796,8 @@ "underline": false, "labelWidth": 73, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "finally.root", @@ -808,7 +808,6 @@ }, "width": 135, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -835,7 +834,8 @@ "underline": false, "labelWidth": 35, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 } ], "connections": [ @@ -884,7 +884,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(a -> and)[0]", @@ -931,7 +932,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(a -> nodes)[0]", @@ -978,7 +980,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(and -> some)[0]", @@ -1025,7 +1028,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(tree -> more)[0]", @@ -1072,7 +1076,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(tree -> many)[0]", @@ -1119,7 +1124,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(then -> here)[0]", @@ -1166,7 +1172,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(here -> you)[0]", @@ -1213,7 +1220,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(have -> hierarchy)[0]", @@ -1260,7 +1268,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(then -> hierarchy)[0]", @@ -1307,7 +1316,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(finally -> another)[0]", @@ -1354,7 +1364,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(another -> of)[0]", @@ -1401,7 +1412,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(nesting -> trees)[0]", @@ -1448,7 +1460,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(finally -> trees)[0]", @@ -1495,7 +1508,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "finally.(a -> tree)[0]", @@ -1542,7 +1556,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "finally.(inside -> a)[0]", @@ -1589,7 +1604,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "finally.(tree -> hierarchy)[0]", @@ -1636,7 +1652,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "finally.(a -> root)[0]", @@ -1683,7 +1700,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 } ] } diff --git a/e2etests/testdata/stable/different_subgraphs/elk/board.exp.json b/e2etests/testdata/stable/different_subgraphs/elk/board.exp.json index 09b3469c1..98a4b2393 100644 --- a/e2etests/testdata/stable/different_subgraphs/elk/board.exp.json +++ b/e2etests/testdata/stable/different_subgraphs/elk/board.exp.json @@ -5,12 +5,11 @@ "id": "finally", "type": "", "pos": { - "x": 843, - "y": 12 + "x": 12, + "y": 742 }, - "width": 458, - "height": 714, - "level": 1, + "width": 779, + "height": 422, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,18 +36,18 @@ "underline": false, "labelWidth": 77, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "a", "type": "", "pos": { - "x": 57, - "y": 600 + "x": 678, + "y": 44 }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -75,18 +74,18 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "tree", "type": "", "pos": { - "x": 362, - "y": 836 + "x": 927, + "y": 325 }, "width": 134, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -113,18 +112,18 @@ "underline": false, "labelWidth": 34, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "and", "type": "", "pos": { - "x": 179, - "y": 836 + "x": 922, + "y": 158 }, "width": 132, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -151,18 +150,18 @@ "underline": false, "labelWidth": 32, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "nodes", "type": "", "pos": { - "x": 12, - "y": 836 + "x": 901, + "y": 12 }, "width": 147, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -189,18 +188,18 @@ "underline": false, "labelWidth": 47, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "some", "type": "", "pos": { - "x": 174, - "y": 1062 + "x": 1174, + "y": 158 }, "width": 143, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -227,18 +226,18 @@ "underline": false, "labelWidth": 43, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "more", "type": "", "pos": { - "x": 337, - "y": 1062 + "x": 1174, + "y": 304 }, "width": 141, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -265,18 +264,18 @@ "underline": false, "labelWidth": 41, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "many", "type": "", "pos": { - "x": 498, - "y": 1062 + "x": 1174, + "y": 450 }, "width": 145, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -303,18 +302,18 @@ "underline": false, "labelWidth": 45, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "then", "type": "", "pos": { - "x": 685, - "y": 600 + "x": 653, + "y": 596 }, "width": 138, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -341,18 +340,18 @@ "underline": false, "labelWidth": 38, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "here", "type": "", "pos": { - "x": 709, - "y": 836 + "x": 920, + "y": 617 }, "width": 136, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -379,18 +378,18 @@ "underline": false, "labelWidth": 36, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "you", "type": "", "pos": { - "x": 711, - "y": 1062 + "x": 1174, + "y": 617 }, "width": 132, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -417,18 +416,18 @@ "underline": false, "labelWidth": 32, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "have", "type": "", "pos": { - "x": 505, - "y": 600 + "x": 653, + "y": 450 }, "width": 138, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -455,18 +454,18 @@ "underline": false, "labelWidth": 38, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "hierarchy", "type": "", "pos": { - "x": 516, - "y": 836 + "x": 901, + "y": 471 }, "width": 173, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -493,18 +492,18 @@ "underline": false, "labelWidth": 73, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "another", "type": "", "pos": { - "x": 915, - "y": 836 + "x": 906, + "y": 820 }, "width": 163, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -531,18 +530,18 @@ "underline": false, "labelWidth": 63, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "of", "type": "", "pos": { - "x": 936, - "y": 1062 + "x": 1174, + "y": 820 }, "width": 120, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -569,18 +568,18 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "nesting", "type": "", "pos": { - "x": 1322, - "y": 600 + "x": 633, + "y": 1184 }, "width": 158, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -607,18 +606,18 @@ "underline": false, "labelWidth": 58, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "trees", "type": "", "pos": { - "x": 1306, - "y": 836 + "x": 901, + "y": 1163 }, "width": 142, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -645,18 +644,18 @@ "underline": false, "labelWidth": 42, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "finally.a", "type": "", "pos": { - "x": 948, - "y": 233 + "x": 255, + "y": 838 }, "width": 113, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -683,18 +682,18 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "finally.tree", "type": "", "pos": { - "x": 1073, - "y": 379 + "x": 389, + "y": 963 }, "width": 134, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -721,18 +720,18 @@ "underline": false, "labelWidth": 34, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "finally.inside", "type": "", "pos": { - "x": 930, - "y": 87 + "x": 87, + "y": 838 }, "width": 148, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -759,18 +758,18 @@ "underline": false, "labelWidth": 48, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "finally.hierarchy", "type": "", "pos": { - "x": 1054, - "y": 525 + "x": 543, + "y": 963 }, "width": 173, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -797,18 +796,18 @@ "underline": false, "labelWidth": 73, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "finally.root", "type": "", "pos": { - "x": 918, - "y": 379 + "x": 388, + "y": 817 }, "width": 135, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -835,7 +834,8 @@ "underline": false, "labelWidth": 35, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 } ], "connections": [ @@ -865,25 +865,26 @@ "labelPercentage": 0, "route": [ { - "x": 142, - "y": 726 + "x": 791, + "y": 138 }, { - "x": 142, - "y": 776 + "x": 841, + "y": 138 }, { - "x": 429.3333333333333, - "y": 776 + "x": 841, + "y": 388 }, { - "x": 429.3333333333333, - "y": 836 + "x": 927, + "y": 388 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(a -> and)[0]", @@ -911,25 +912,26 @@ "labelPercentage": 0, "route": [ { - "x": 113.75, - "y": 726 + "x": 791, + "y": 106.5 }, { - "x": 113.75, - "y": 786 + "x": 851, + "y": 106.5 }, { - "x": 245, - "y": 786 + "x": 851, + "y": 221 }, { - "x": 245, - "y": 836 + "x": 921.5, + "y": 221 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(a -> nodes)[0]", @@ -957,17 +959,18 @@ "labelPercentage": 0, "route": [ { - "x": 85.5, - "y": 726 + "x": 791, + "y": 75 }, { - "x": 85.5, - "y": 836 + "x": 901, + "y": 75 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(and -> some)[0]", @@ -995,17 +998,18 @@ "labelPercentage": 0, "route": [ { - "x": 245, - "y": 962 + "x": 1053.5, + "y": 221 }, { - "x": 245, - "y": 1062 + "x": 1174, + "y": 221 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(tree -> more)[0]", @@ -1033,17 +1037,18 @@ "labelPercentage": 0, "route": [ { - "x": 407, - "y": 962 + "x": 1061, + "y": 367 }, { - "x": 407, - "y": 1062 + "x": 1174, + "y": 367 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(tree -> many)[0]", @@ -1071,25 +1076,26 @@ "labelPercentage": 0, "route": [ { - "x": 451.66666666666663, - "y": 962 + "x": 1061, + "y": 409 }, { - "x": 451.66666666666663, - "y": 1012 + "x": 1124, + "y": 409 }, { - "x": 570, - "y": 1012 + "x": 1124, + "y": 513 }, { - "x": 570, - "y": 1062 + "x": 1174, + "y": 513 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(then -> here)[0]", @@ -1117,17 +1123,18 @@ "labelPercentage": 0, "route": [ { - "x": 777.3333333333333, - "y": 726 + "x": 791, + "y": 680 }, { - "x": 777.3333333333333, - "y": 836 + "x": 919.5, + "y": 680 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(here -> you)[0]", @@ -1155,17 +1162,18 @@ "labelPercentage": 0, "route": [ { - "x": 777.3333333333333, - "y": 962 + "x": 1055.5, + "y": 680 }, { - "x": 777.3333333333333, - "y": 1062 + "x": 1174, + "y": 680 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(have -> hierarchy)[0]", @@ -1193,17 +1201,18 @@ "labelPercentage": 0, "route": [ { - "x": 574, - "y": 726 + "x": 791, + "y": 513 }, { - "x": 574, - "y": 836 + "x": 901, + "y": 513 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(then -> hierarchy)[0]", @@ -1231,25 +1240,26 @@ "labelPercentage": 0, "route": [ { - "x": 731.3333333333333, - "y": 726 + "x": 791, + "y": 638 }, { - "x": 731.3333333333333, - "y": 776 + "x": 841, + "y": 638 }, { - "x": 631.6666666666666, - "y": 776 + "x": 841, + "y": 555 }, { - "x": 631.6666666666666, - "y": 836 + "x": 901, + "y": 555 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(finally -> another)[0]", @@ -1277,17 +1287,18 @@ "labelPercentage": 0, "route": [ { - "x": 996.1666666666666, - "y": 726 + "x": 791, + "y": 882.6666666666666 }, { - "x": 996.1666666666666, - "y": 836 + "x": 906, + "y": 882.6666666666666 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(another -> of)[0]", @@ -1315,17 +1326,18 @@ "labelPercentage": 0, "route": [ { - "x": 996.1666666666666, - "y": 962 + "x": 1069, + "y": 882.6666666666666 }, { - "x": 996.1666666666666, - "y": 1062 + "x": 1174, + "y": 882.6666666666666 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(nesting -> trees)[0]", @@ -1353,17 +1365,18 @@ "labelPercentage": 0, "route": [ { - "x": 1400.8333333333333, - "y": 726 + "x": 791, + "y": 1247 }, { - "x": 1400.8333333333333, - "y": 836 + "x": 901, + "y": 1247 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(finally -> trees)[0]", @@ -1391,25 +1404,26 @@ "labelPercentage": 0, "route": [ { - "x": 1149, - "y": 726 + "x": 791, + "y": 1023.3333333333333 }, { - "x": 1149, - "y": 776 + "x": 841, + "y": 1023.3333333333333 }, { - "x": 1353.4999999999998, - "y": 776 + "x": 841, + "y": 1205 }, { - "x": 1353.4999999999998, - "y": 836 + "x": 901, + "y": 1205 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "finally.(a -> tree)[0]", @@ -1437,25 +1451,26 @@ "labelPercentage": 0, "route": [ { - "x": 1023.1666666666667, - "y": 359 + "x": 368, + "y": 922 }, { - "x": 1023.1666666666667, - "y": 369 + "x": 378, + "y": 922 }, { - "x": 1140, - "y": 369 + "x": 378, + "y": 1026 }, { - "x": 1140, - "y": 379 + "x": 388.5, + "y": 1026 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "finally.(inside -> a)[0]", @@ -1483,17 +1498,18 @@ "labelPercentage": 0, "route": [ { - "x": 1004.3333333333333, - "y": 213 + "x": 235, + "y": 901 }, { - "x": 1004.3333333333333, - "y": 233 + "x": 255, + "y": 901 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "finally.(tree -> hierarchy)[0]", @@ -1521,17 +1537,18 @@ "labelPercentage": 0, "route": [ { - "x": 1140, - "y": 505 + "x": 522.5, + "y": 1026 }, { - "x": 1140, - "y": 525 + "x": 543, + "y": 1026 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "finally.(a -> root)[0]", @@ -1559,17 +1576,18 @@ "labelPercentage": 0, "route": [ { - "x": 985.5, - "y": 359 + "x": 368, + "y": 880 }, { - "x": 985.5, - "y": 379 + "x": 388, + "y": 880 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 } ] } diff --git a/e2etests/testdata/stable/font_colors/dagre/board.exp.json b/e2etests/testdata/stable/font_colors/dagre/board.exp.json index 6ce3d7a71..d524acac7 100644 --- a/e2etests/testdata/stable/font_colors/dagre/board.exp.json +++ b/e2etests/testdata/stable/font_colors/dagre/board.exp.json @@ -10,7 +10,6 @@ }, "width": 145, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 45, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "beta", @@ -48,7 +48,6 @@ }, "width": 136, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -75,7 +74,8 @@ "underline": false, "labelWidth": 36, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -124,7 +124,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/stable/font_colors/elk/board.exp.json b/e2etests/testdata/stable/font_colors/elk/board.exp.json index 41a5119ca..97f5ef1e7 100644 --- a/e2etests/testdata/stable/font_colors/elk/board.exp.json +++ b/e2etests/testdata/stable/font_colors/elk/board.exp.json @@ -10,7 +10,6 @@ }, "width": 145, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 45, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "beta", @@ -48,7 +48,6 @@ }, "width": 136, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -75,7 +74,8 @@ "underline": false, "labelWidth": 36, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -115,7 +115,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/stable/giant_markdown_test/dagre/board.exp.json b/e2etests/testdata/stable/giant_markdown_test/dagre/board.exp.json index c304942de..1a49d7bd3 100644 --- a/e2etests/testdata/stable/giant_markdown_test/dagre/board.exp.json +++ b/e2etests/testdata/stable/giant_markdown_test/dagre/board.exp.json @@ -10,7 +10,6 @@ }, "width": 3051, "height": 4848, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -36,7 +35,8 @@ "bold": true, "underline": false, "labelWidth": 3051, - "labelHeight": 4848 + "labelHeight": 4848, + "renderPriority": 1 }, { "id": "a", @@ -47,7 +47,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -74,7 +73,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "b", @@ -85,7 +85,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -112,7 +111,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -161,7 +161,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(md -> b)[0]", @@ -208,7 +209,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/stable/giant_markdown_test/elk/board.exp.json b/e2etests/testdata/stable/giant_markdown_test/elk/board.exp.json index d9d6bd7ea..2549b36c1 100644 --- a/e2etests/testdata/stable/giant_markdown_test/elk/board.exp.json +++ b/e2etests/testdata/stable/giant_markdown_test/elk/board.exp.json @@ -10,7 +10,6 @@ }, "width": 3051, "height": 4848, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -36,7 +35,8 @@ "bold": true, "underline": false, "labelWidth": 3051, - "labelHeight": 4848 + "labelHeight": 4848, + "renderPriority": 1 }, { "id": "a", @@ -47,7 +47,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -74,7 +73,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "b", @@ -85,7 +85,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -112,7 +111,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -152,7 +152,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(md -> b)[0]", @@ -190,7 +191,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/stable/hr/dagre/board.exp.json b/e2etests/testdata/stable/hr/dagre/board.exp.json index 59e823a02..3b8e292c5 100644 --- a/e2etests/testdata/stable/hr/dagre/board.exp.json +++ b/e2etests/testdata/stable/hr/dagre/board.exp.json @@ -10,7 +10,6 @@ }, "width": 738, "height": 134, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -36,7 +35,8 @@ "bold": true, "underline": false, "labelWidth": 738, - "labelHeight": 134 + "labelHeight": 134, + "renderPriority": 1 }, { "id": "a", @@ -47,7 +47,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -74,7 +73,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "b", @@ -85,7 +85,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -112,7 +111,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -161,7 +161,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(md -> b)[0]", @@ -208,7 +209,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/stable/hr/elk/board.exp.json b/e2etests/testdata/stable/hr/elk/board.exp.json index e87cc8d55..1b72165b7 100644 --- a/e2etests/testdata/stable/hr/elk/board.exp.json +++ b/e2etests/testdata/stable/hr/elk/board.exp.json @@ -10,7 +10,6 @@ }, "width": 738, "height": 134, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -36,7 +35,8 @@ "bold": true, "underline": false, "labelWidth": 738, - "labelHeight": 134 + "labelHeight": 134, + "renderPriority": 1 }, { "id": "a", @@ -47,7 +47,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -74,7 +73,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "b", @@ -85,7 +85,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -112,7 +111,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -152,7 +152,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(md -> b)[0]", @@ -190,7 +191,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/stable/images/dagre/board.exp.json b/e2etests/testdata/stable/images/dagre/board.exp.json index e56ad310a..533f47dc4 100644 --- a/e2etests/testdata/stable/images/dagre/board.exp.json +++ b/e2etests/testdata/stable/images/dagre/board.exp.json @@ -10,7 +10,6 @@ }, "width": 128, "height": 128, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -48,7 +47,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "OUTSIDE_TOP_CENTER" + "labelPosition": "OUTSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "b", @@ -59,7 +59,6 @@ }, "width": 128, "height": 128, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -97,7 +96,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "OUTSIDE_TOP_CENTER" + "labelPosition": "OUTSIDE_TOP_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -146,7 +146,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/stable/images/elk/board.exp.json b/e2etests/testdata/stable/images/elk/board.exp.json index ba0e242c0..4fe15a290 100644 --- a/e2etests/testdata/stable/images/elk/board.exp.json +++ b/e2etests/testdata/stable/images/elk/board.exp.json @@ -10,7 +10,6 @@ }, "width": 128, "height": 128, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -48,7 +47,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "OUTSIDE_TOP_CENTER" + "labelPosition": "OUTSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "b", @@ -59,7 +59,6 @@ }, "width": 128, "height": 128, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -97,7 +96,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "OUTSIDE_TOP_CENTER" + "labelPosition": "OUTSIDE_TOP_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -137,7 +137,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/stable/investigate/dagre/board.exp.json b/e2etests/testdata/stable/investigate/dagre/board.exp.json index 4c216559b..3bd1b06ea 100644 --- a/e2etests/testdata/stable/investigate/dagre/board.exp.json +++ b/e2etests/testdata/stable/investigate/dagre/board.exp.json @@ -10,7 +10,6 @@ }, "width": 122, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 22, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "bb", @@ -48,7 +48,6 @@ }, "width": 123, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -75,7 +74,8 @@ "underline": false, "labelWidth": 23, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "cc", @@ -86,7 +86,6 @@ }, "width": 121, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -113,7 +112,8 @@ "underline": false, "labelWidth": 21, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "dd", @@ -124,7 +124,6 @@ }, "width": 577, "height": 226, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -151,7 +150,8 @@ "underline": false, "labelWidth": 34, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "dd.ee", @@ -162,7 +162,6 @@ }, "width": 122, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -189,7 +188,8 @@ "underline": false, "labelWidth": 22, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "ll", @@ -200,7 +200,6 @@ }, "width": 545, "height": 457, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -227,7 +226,8 @@ "underline": false, "labelWidth": 18, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "ll.mm", @@ -238,7 +238,6 @@ }, "width": 131, "height": 131, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -265,7 +264,8 @@ "underline": false, "labelWidth": 31, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "ff", @@ -276,7 +276,6 @@ }, "width": 567, "height": 457, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -303,7 +302,8 @@ "underline": false, "labelWidth": 23, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "ff.mm", @@ -314,7 +314,6 @@ }, "width": 131, "height": 131, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -341,7 +340,8 @@ "underline": false, "labelWidth": 31, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "ff.gg", @@ -352,7 +352,6 @@ }, "width": 123, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -379,7 +378,8 @@ "underline": false, "labelWidth": 23, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "dd.hh", @@ -390,7 +390,6 @@ }, "width": 123, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -417,7 +416,8 @@ "underline": false, "labelWidth": 23, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "ww", @@ -428,7 +428,6 @@ }, "width": 131, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -466,7 +465,8 @@ "underline": false, "labelWidth": 31, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "yy", @@ -477,7 +477,6 @@ }, "width": 323, "height": 452, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -504,7 +503,8 @@ "underline": false, "labelWidth": 32, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "yy.zz", @@ -515,7 +515,6 @@ }, "width": 120, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -553,7 +552,8 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "ad", @@ -564,7 +564,6 @@ }, "width": 123, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -591,7 +590,8 @@ "underline": false, "labelWidth": 23, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "nn", @@ -602,7 +602,6 @@ }, "width": 769, "height": 226, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -629,7 +628,8 @@ "underline": false, "labelWidth": 33, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "ii", @@ -640,7 +640,6 @@ }, "width": 114, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -667,7 +666,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "jj", @@ -678,7 +678,6 @@ }, "width": 115, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -705,7 +704,8 @@ "underline": false, "labelWidth": 15, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "kk", @@ -716,7 +716,6 @@ }, "width": 122, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -743,7 +742,8 @@ "underline": false, "labelWidth": 22, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "nn.oo", @@ -754,7 +754,6 @@ }, "width": 123, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -781,7 +780,8 @@ "underline": false, "labelWidth": 23, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "ff.pp", @@ -792,7 +792,6 @@ }, "width": 123, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -819,7 +818,8 @@ "underline": false, "labelWidth": 23, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "ll.qq", @@ -830,7 +830,6 @@ }, "width": 124, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -857,7 +856,8 @@ "underline": false, "labelWidth": 24, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "ll.rr", @@ -868,7 +868,6 @@ }, "width": 118, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -895,7 +894,8 @@ "underline": false, "labelWidth": 18, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "ss", @@ -906,7 +906,6 @@ }, "width": 218, "height": 226, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -933,7 +932,8 @@ "underline": false, "labelWidth": 28, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "ss.tt", @@ -944,7 +944,6 @@ }, "width": 118, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -971,7 +970,8 @@ "underline": false, "labelWidth": 18, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "uu", @@ -982,7 +982,6 @@ }, "width": 223, "height": 226, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1009,7 +1008,8 @@ "underline": false, "labelWidth": 32, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "uu.vv", @@ -1020,7 +1020,6 @@ }, "width": 123, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1047,7 +1046,8 @@ "underline": false, "labelWidth": 23, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "rm", @@ -1058,7 +1058,6 @@ }, "width": 124, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1085,7 +1084,8 @@ "underline": false, "labelWidth": 24, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "nn.xx", @@ -1096,7 +1096,6 @@ }, "width": 122, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1123,7 +1122,8 @@ "underline": false, "labelWidth": 22, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "yy.ab", @@ -1134,7 +1134,6 @@ }, "width": 123, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1161,7 +1160,8 @@ "underline": false, "labelWidth": 23, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "nn.ac", @@ -1172,7 +1172,6 @@ }, "width": 122, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1199,7 +1198,8 @@ "underline": false, "labelWidth": 22, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 } ], "connections": [ @@ -1248,7 +1248,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(bb -- cc)[0]", @@ -1295,7 +1296,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(aa -> dd.ee)[0]", @@ -1390,7 +1392,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(bb -> ff.gg)[0]", @@ -1653,7 +1656,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(cc -> dd.hh)[0]", @@ -1700,7 +1704,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(dd.ee -> ii)[0]", @@ -1747,7 +1752,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(ii -- jj)[0]", @@ -1794,7 +1800,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(jj -> kk)[0]", @@ -1853,7 +1860,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(kk -> ff.mm)[0]", @@ -1960,7 +1968,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(ff.mm -> ll.mm)[0]", @@ -2043,7 +2052,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(ll.mm -> nn.oo)[0]", @@ -2174,7 +2184,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "ff.(gg -> pp)[0]", @@ -2221,7 +2232,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(ff.pp -> ll.qq)[0]", @@ -2280,7 +2292,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "ll.(qq -> rr)[0]", @@ -2327,7 +2340,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(dd.hh -> ss.tt)[0]", @@ -2410,7 +2424,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(ss.tt -> uu.vv)[0]", @@ -2469,7 +2484,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(kk -> ww)[0]", @@ -2516,7 +2532,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(uu.vv -> ww)[0]", @@ -2563,7 +2580,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(ww -> rm)[0]", @@ -2706,7 +2724,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(rm -> nn.xx)[0]", @@ -2837,7 +2856,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(ll.rr -> yy.zz)[0]", @@ -2896,7 +2916,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(rm -> yy.zz)[0]", @@ -2955,7 +2976,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "yy.(zz -> ab)[0]", @@ -3002,7 +3024,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(yy.ab -> nn.ac)[0]", @@ -3061,7 +3084,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(nn.ac -> ad)[0]", @@ -3108,7 +3132,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(ww -> ff.gg)[0]", @@ -3155,7 +3180,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 } ] } diff --git a/e2etests/testdata/stable/investigate/elk/board.exp.json b/e2etests/testdata/stable/investigate/elk/board.exp.json index 71de56eb3..a06755349 100644 --- a/e2etests/testdata/stable/investigate/elk/board.exp.json +++ b/e2etests/testdata/stable/investigate/elk/board.exp.json @@ -5,12 +5,11 @@ "id": "aa", "type": "step", "pos": { - "x": 435, - "y": 12 + "x": 12, + "y": 450 }, "width": 122, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,18 +36,18 @@ "underline": false, "labelWidth": 22, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "bb", "type": "step", "pos": { - "x": 292, - "y": 238 + "x": 234, + "y": 304 }, "width": 123, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -75,18 +74,18 @@ "underline": false, "labelWidth": 23, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "cc", "type": "step", "pos": { - "x": 314, - "y": 464 + "x": 457, + "y": 325 }, "width": 121, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -113,18 +112,18 @@ "underline": false, "labelWidth": 21, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "dd", "type": "", "pos": { - "x": 238, - "y": 816 + "x": 792, + "y": 250 }, - "width": 415, - "height": 276, - "level": 1, + "width": 273, + "height": 422, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -151,18 +150,18 @@ "underline": false, "labelWidth": 34, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "dd.ee", "type": "diamond", "pos": { - "x": 456, - "y": 891 + "x": 868, + "y": 471 }, "width": 122, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -189,18 +188,18 @@ "underline": false, "labelWidth": 22, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "ll", "type": "", "pos": { - "x": 253, - "y": 3094 + "x": 3033, + "y": 268 }, - "width": 425, + "width": 419, "height": 427, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -227,18 +226,18 @@ "underline": false, "labelWidth": 18, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "ll.mm", "type": "oval", "pos": { - "x": 472, - "y": 3169 + "x": 3108, + "y": 489 }, "width": 131, "height": 131, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -265,18 +264,18 @@ "underline": false, "labelWidth": 31, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "ff", "type": "", "pos": { - "x": 254, - "y": 2436 + "x": 2391, + "y": 268 }, "width": 424, "height": 427, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -303,18 +302,18 @@ "underline": false, "labelWidth": 23, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "ff.mm", "type": "oval", "pos": { - "x": 472, - "y": 2511 + "x": 2466, + "y": 489 }, "width": 131, "height": 131, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -341,18 +340,18 @@ "underline": false, "labelWidth": 31, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "ff.gg", "type": "diamond", "pos": { - "x": 329, - "y": 2513 + "x": 2469, + "y": 343 }, "width": 123, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -379,18 +378,18 @@ "underline": false, "labelWidth": 23, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "dd.hh", "type": "diamond", "pos": { - "x": 313, - "y": 891 + "x": 867, + "y": 325 }, "width": 123, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -417,18 +416,18 @@ "underline": false, "labelWidth": 23, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "ww", "type": "queue", "pos": { - "x": 127, - "y": 2195 + "x": 2145, + "y": 143 }, "width": 131, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -466,18 +465,18 @@ "underline": false, "labelWidth": 31, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "yy", "type": "", "pos": { - "x": 75, - "y": 3631 + "x": 3562, + "y": 89 }, - "width": 273, - "height": 422, - "level": 1, + "width": 413, + "height": 276, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -504,18 +503,18 @@ "underline": false, "labelWidth": 32, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "yy.zz", "type": "queue", "pos": { - "x": 152, - "y": 3706 + "x": 3637, + "y": 164 }, "width": 120, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -553,18 +552,18 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "ad", "type": "parallelogram", "pos": { - "x": 333, - "y": 4554 + "x": 4473, + "y": 346 }, "width": 123, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -591,18 +590,18 @@ "underline": false, "labelWidth": 23, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "nn", "type": "cylinder", "pos": { - "x": 117, - "y": 4173 + "x": 4095, + "y": 125 }, - "width": 557, - "height": 276, - "level": 1, + "width": 273, + "height": 568, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -629,18 +628,18 @@ "underline": false, "labelWidth": 33, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "ii", "type": "", "pos": { - "x": 460, - "y": 1197 + "x": 1170, + "y": 471 }, "width": 114, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -667,18 +666,18 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "jj", "type": "", "pos": { - "x": 459, - "y": 1503 + "x": 1466, + "y": 471 }, "width": 115, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -705,18 +704,18 @@ "underline": false, "labelWidth": 15, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "kk", "type": "", "pos": { - "x": 456, - "y": 1914 + "x": 1868, + "y": 471 }, "width": 122, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -743,18 +742,18 @@ "underline": false, "labelWidth": 22, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "nn.oo", "type": "", "pos": { - "x": 476, - "y": 4248 + "x": 4170, + "y": 492 }, "width": 123, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -781,18 +780,18 @@ "underline": false, "labelWidth": 23, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "ff.pp", "type": "", "pos": { - "x": 329, - "y": 2662 + "x": 2617, + "y": 343 }, "width": 123, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -819,18 +818,18 @@ "underline": false, "labelWidth": 23, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "ll.qq", "type": "", "pos": { - "x": 328, - "y": 3172 + "x": 3112, + "y": 343 }, "width": 124, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -857,18 +856,18 @@ "underline": false, "labelWidth": 24, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "ll.rr", "type": "", "pos": { - "x": 331, - "y": 3320 + "x": 3259, + "y": 343 }, "width": 118, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -895,18 +894,18 @@ "underline": false, "labelWidth": 18, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "ss", "type": "", "pos": { - "x": 37, - "y": 1428 + "x": 1389, + "y": 47 }, "width": 268, "height": 276, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -933,18 +932,18 @@ "underline": false, "labelWidth": 28, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "ss.tt", "type": "", "pos": { - "x": 112, - "y": 1503 + "x": 1464, + "y": 122 }, "width": 118, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -971,18 +970,18 @@ "underline": false, "labelWidth": 18, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "uu", "type": "", "pos": { - "x": 34, - "y": 1814 + "x": 1767, + "y": 47 }, "width": 273, "height": 276, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1009,18 +1008,18 @@ "underline": false, "labelWidth": 32, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "uu.vv", "type": "", "pos": { - "x": 109, - "y": 1889 + "x": 1842, + "y": 122 }, "width": 123, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1047,18 +1046,18 @@ "underline": false, "labelWidth": 23, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "rm", "type": "", "pos": { - "x": 109, - "y": 3295 + "x": 3230, + "y": 122 }, "width": 124, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1085,18 +1084,18 @@ "underline": false, "labelWidth": 24, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "nn.xx", "type": "", "pos": { - "x": 192, - "y": 4248 + "x": 4170, + "y": 200 }, "width": 122, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1123,18 +1122,18 @@ "underline": false, "labelWidth": 22, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "yy.ab", "type": "", "pos": { - "x": 150, - "y": 3852 + "x": 3777, + "y": 164 }, "width": 123, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1161,18 +1160,18 @@ "underline": false, "labelWidth": 23, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "nn.ac", "type": "", "pos": { - "x": 334, - "y": 4248 + "x": 4171, + "y": 346 }, "width": 122, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1199,7 +1198,8 @@ "underline": false, "labelWidth": 22, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 } ], "connections": [ @@ -1229,25 +1229,26 @@ "labelPercentage": 0, "route": [ { - "x": 476, - "y": 138 + "x": 134, + "y": 491.5 }, { - "x": 476, - "y": 188 + "x": 184, + "y": 491.5 }, { - "x": 353.66666666666663, - "y": 188 + "x": 184, + "y": 366.5 }, { - "x": 353.66666666666663, - "y": 238 + "x": 234, + "y": 366.5 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(bb -- cc)[0]", @@ -1275,17 +1276,18 @@ "labelPercentage": 0, "route": [ { - "x": 374.16666666666663, - "y": 364 + "x": 357, + "y": 387.5 }, { - "x": 374.16666666666663, - "y": 464 + "x": 457, + "y": 387.5 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(aa -> dd.ee)[0]", @@ -1313,17 +1315,18 @@ "labelPercentage": 0, "route": [ { - "x": 516.6666666666666, - "y": 138 + "x": 134, + "y": 533.5 }, { - "x": 516.6666666666666, - "y": 891 + "x": 867.5, + "y": 533.5 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(bb -> ff.gg)[0]", @@ -1351,33 +1354,34 @@ "labelPercentage": 0, "route": [ { - "x": 333.16666666666663, - "y": 364 + "x": 357, + "y": 345.5 }, { - "x": 333.16666666666663, - "y": 414 + "x": 407, + "y": 345.5 }, { - "x": 23, - "y": 414 + "x": 407, + "y": 36 }, { - "x": 23, - "y": 2381 + "x": 2336, + "y": 36 }, { - "x": 369.5, - "y": 2381 + "x": 2336, + "y": 385 }, { - "x": 369.5, - "y": 2512.6666666666665 + "x": 2468.6666666666665, + "y": 385 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(cc -> dd.hh)[0]", @@ -1405,17 +1409,18 @@ "labelPercentage": 0, "route": [ { - "x": 374.16666666666663, - "y": 590 + "x": 578, + "y": 387.5 }, { - "x": 374.16666666666663, - "y": 891 + "x": 867, + "y": 387.5 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(dd.ee -> ii)[0]", @@ -1443,17 +1448,18 @@ "labelPercentage": 0, "route": [ { - "x": 516.6666666666666, - "y": 1017 + "x": 989.5, + "y": 533.5 }, { - "x": 516.6666666666666, - "y": 1197 + "x": 1170, + "y": 533.5 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(ii -- jj)[0]", @@ -1481,17 +1487,18 @@ "labelPercentage": 0, "route": [ { - "x": 516.6666666666666, - "y": 1323 + "x": 1284, + "y": 533.5 }, { - "x": 516.6666666666666, - "y": 1503 + "x": 1465.5, + "y": 533.5 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(jj -> kk)[0]", @@ -1519,17 +1526,18 @@ "labelPercentage": 0, "route": [ { - "x": 516.6666666666666, - "y": 1629 + "x": 1580.5, + "y": 533.5 }, { - "x": 516.6666666666666, - "y": 1914 + "x": 1867.6666666666667, + "y": 533.5 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(kk -> ff.mm)[0]", @@ -1557,17 +1565,18 @@ "labelPercentage": 0, "route": [ { - "x": 537, - "y": 2040 + "x": 1989.6666666666667, + "y": 554.5 }, { - "x": 537, - "y": 2511 + "x": 2466, + "y": 554.5 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(ff.mm -> ll.mm)[0]", @@ -1595,17 +1604,18 @@ "labelPercentage": 0, "route": [ { - "x": 537, - "y": 2642 + "x": 2597, + "y": 554.5 }, { - "x": 537, - "y": 3169 + "x": 3108, + "y": 554.5 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(ll.mm -> nn.oo)[0]", @@ -1633,17 +1643,18 @@ "labelPercentage": 0, "route": [ { - "x": 537, - "y": 3300 + "x": 3239, + "y": 554.5 }, { - "x": 537, - "y": 4248 + "x": 4170, + "y": 554.5 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "ff.(gg -> pp)[0]", @@ -1671,17 +1682,18 @@ "labelPercentage": 0, "route": [ { - "x": 390.5, - "y": 2638.6666666666665 + "x": 2591.6666666666665, + "y": 406 }, { - "x": 390.5, - "y": 2662 + "x": 2617, + "y": 406 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(ff.pp -> ll.qq)[0]", @@ -1709,25 +1721,18 @@ "labelPercentage": 0, "route": [ { - "x": 390, - "y": 2788 + "x": 2740, + "y": 406 }, { - "x": 390, - "y": 2918 - }, - { - "x": 389.5, - "y": 2918 - }, - { - "x": 389.5, - "y": 3171.5 + "x": 3111.5, + "y": 406 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "ll.(qq -> rr)[0]", @@ -1755,17 +1760,18 @@ "labelPercentage": 0, "route": [ { - "x": 390, - "y": 3297.5 + "x": 3235.5, + "y": 406 }, { - "x": 390, - "y": 3320 + "x": 3259, + "y": 406 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(dd.hh -> ss.tt)[0]", @@ -1793,25 +1799,26 @@ "labelPercentage": 0, "route": [ { - "x": 374.16666666666663, - "y": 1017 + "x": 990, + "y": 387.5 }, { - "x": 374.16666666666663, - "y": 1147 + "x": 1120, + "y": 387.5 }, { - "x": 170.49999999999997, - "y": 1147 + "x": 1120, + "y": 185 }, { - "x": 170.49999999999997, - "y": 1503 + "x": 1464, + "y": 185 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(ss.tt -> uu.vv)[0]", @@ -1839,17 +1846,18 @@ "labelPercentage": 0, "route": [ { - "x": 170.5, - "y": 1629 + "x": 1582, + "y": 185 }, { - "x": 170.5, - "y": 1889 + "x": 1842, + "y": 185 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(kk -> ww)[0]", @@ -1877,25 +1885,26 @@ "labelPercentage": 0, "route": [ { - "x": 496.3333333333333, - "y": 2040 + "x": 1989.6666666666667, + "y": 512.5 }, { - "x": 496.3333333333333, - "y": 2145 + "x": 2095, + "y": 512.5 }, { - "x": 214.16666666666669, - "y": 2145 + "x": 2095, + "y": 227 }, { - "x": 214.16666666666669, - "y": 2195 + "x": 2145, + "y": 227 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(uu.vv -> ww)[0]", @@ -1923,17 +1932,18 @@ "labelPercentage": 0, "route": [ { - "x": 170.5, - "y": 2015 + "x": 1965, + "y": 185 }, { - "x": 170.5, - "y": 2195 + "x": 2145, + "y": 185 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(ww -> rm)[0]", @@ -1961,17 +1971,18 @@ "labelPercentage": 0, "route": [ { - "x": 170.5, - "y": 2321 + "x": 2276, + "y": 185 }, { - "x": 170.5, - "y": 3294.6666666666665 + "x": 3229.6666666666665, + "y": 185 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(rm -> nn.xx)[0]", @@ -1999,33 +2010,34 @@ "labelPercentage": 0, "route": [ { - "x": 149.83333333333331, - "y": 3420.6666666666665 + "x": 3353.6666666666665, + "y": 164 }, { - "x": 149.83333333333331, - "y": 3576 + "x": 3507, + "y": 164 }, { - "x": 63.666666666666664, - "y": 3576 + "x": 3507, + "y": 78 }, { - "x": 63.666666666666664, - "y": 4118 + "x": 4040, + "y": 78 }, { - "x": 252.5, - "y": 4118 + "x": 4040, + "y": 262.5 }, { - "x": 252.5, - "y": 4248 + "x": 4170, + "y": 262.5 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(ll.rr -> yy.zz)[0]", @@ -2053,25 +2065,26 @@ "labelPercentage": 0, "route": [ { - "x": 389.5, - "y": 3446 + "x": 3377, + "y": 406 }, { - "x": 389.5, - "y": 3576 + "x": 3507, + "y": 406 }, { - "x": 231.16666666666666, - "y": 3576 + "x": 3507, + "y": 248 }, { - "x": 231.16666666666666, - "y": 3706 + "x": 3637, + "y": 248 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(rm -> yy.zz)[0]", @@ -2099,17 +2112,18 @@ "labelPercentage": 0, "route": [ { - "x": 191.16666666666666, - "y": 3420.6666666666665 + "x": 3353.6666666666665, + "y": 206 }, { - "x": 191.16666666666666, - "y": 3706 + "x": 3637, + "y": 206 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "yy.(zz -> ab)[0]", @@ -2137,17 +2151,18 @@ "labelPercentage": 0, "route": [ { - "x": 211.5, - "y": 3832 + "x": 3757, + "y": 227 }, { - "x": 211.5, - "y": 3852 + "x": 3777, + "y": 227 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(yy.ab -> nn.ac)[0]", @@ -2175,25 +2190,26 @@ "labelPercentage": 0, "route": [ { - "x": 211.16666666666666, - "y": 3978 + "x": 3900, + "y": 227 }, { - "x": 211.16666666666666, - "y": 4108 + "x": 4030, + "y": 227 }, { - "x": 394.5, - "y": 4108 + "x": 4030, + "y": 408.5 }, { - "x": 394.5, - "y": 4248 + "x": 4170.5, + "y": 408.5 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(nn.ac -> ad)[0]", @@ -2221,17 +2237,18 @@ "labelPercentage": 0, "route": [ { - "x": 394.5, - "y": 4374 + "x": 4292.5, + "y": 408.5 }, { - "x": 394.5, - "y": 4554 + "x": 4473, + "y": 408.5 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(ww -> ff.gg)[0]", @@ -2259,25 +2276,26 @@ "labelPercentage": 0, "route": [ { - "x": 214.16666666666669, - "y": 2321 + "x": 2276, + "y": 227 }, { - "x": 214.16666666666669, - "y": 2371 + "x": 2326, + "y": 227 }, { - "x": 410.5, - "y": 2371 + "x": 2326, + "y": 427 }, { - "x": 410.5, - "y": 2512.6666666666665 + "x": 2468.6666666666665, + "y": 427 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 } ] } diff --git a/e2etests/testdata/stable/large_arch/dagre/board.exp.json b/e2etests/testdata/stable/large_arch/dagre/board.exp.json index 7e21e0bfb..6c3ff8667 100644 --- a/e2etests/testdata/stable/large_arch/dagre/board.exp.json +++ b/e2etests/testdata/stable/large_arch/dagre/board.exp.json @@ -10,7 +10,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "b", @@ -48,7 +48,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -75,7 +74,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "c", @@ -86,7 +86,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -113,7 +112,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "d", @@ -124,7 +124,6 @@ }, "width": 114, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -151,7 +150,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "e", @@ -162,7 +162,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -189,7 +188,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "f", @@ -200,7 +200,6 @@ }, "width": 111, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -227,7 +226,8 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "g", @@ -238,7 +238,6 @@ }, "width": 114, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -265,7 +264,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "h", @@ -276,7 +276,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -303,7 +302,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "i", @@ -314,7 +314,6 @@ }, "width": 781, "height": 702, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -341,7 +340,8 @@ "underline": false, "labelWidth": 9, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "i.j", @@ -352,7 +352,6 @@ }, "width": 578, "height": 226, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -379,7 +378,8 @@ "underline": false, "labelWidth": 11, "labelHeight": 36, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 2 }, { "id": "i.j.k", @@ -390,7 +390,6 @@ }, "width": 113, "height": 126, - "level": 3, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -417,7 +416,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 3 }, { "id": "i.j.l", @@ -428,7 +428,6 @@ }, "width": 109, "height": 126, - "level": 3, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -455,7 +454,8 @@ "underline": false, "labelWidth": 9, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 3 }, { "id": "i.m", @@ -466,7 +466,6 @@ }, "width": 117, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -493,7 +492,8 @@ "underline": false, "labelWidth": 17, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "i.n", @@ -504,7 +504,6 @@ }, "width": 113, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -531,7 +530,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "i.o", @@ -542,7 +542,6 @@ }, "width": 213, "height": 226, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -569,7 +568,8 @@ "underline": false, "labelWidth": 16, "labelHeight": 36, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 2 }, { "id": "i.o.p", @@ -580,7 +580,6 @@ }, "width": 113, "height": 126, - "level": 3, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -607,7 +606,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 3 }, { "id": "q", @@ -618,7 +618,6 @@ }, "width": 114, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -645,7 +644,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "r", @@ -656,7 +656,6 @@ }, "width": 1886, "height": 752, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -683,7 +682,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "r.s", @@ -694,7 +694,6 @@ }, "width": 647, "height": 652, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -721,7 +720,8 @@ "underline": false, "labelWidth": 15, "labelHeight": 36, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 2 }, { "id": "r.s.t", @@ -732,7 +732,6 @@ }, "width": 111, "height": 126, - "level": 3, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -759,7 +758,8 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 3 }, { "id": "r.s.u", @@ -770,7 +770,6 @@ }, "width": 214, "height": 226, - "level": 3, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -797,7 +796,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 31, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 3 }, { "id": "r.s.u.v", @@ -808,7 +808,6 @@ }, "width": 114, "height": 126, - "level": 4, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -835,7 +834,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 4 }, { "id": "r.s.w", @@ -846,7 +846,6 @@ }, "width": 118, "height": 126, - "level": 3, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -873,7 +872,8 @@ "underline": false, "labelWidth": 18, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 3 }, { "id": "r.s.x", @@ -884,7 +884,6 @@ }, "width": 113, "height": 126, - "level": 3, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -911,7 +910,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 3 }, { "id": "r.s.y", @@ -922,7 +922,6 @@ }, "width": 114, "height": 126, - "level": 3, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -949,7 +948,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 3 }, { "id": "r.z", @@ -960,7 +960,6 @@ }, "width": 112, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -987,7 +986,8 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "r.aa", @@ -998,7 +998,6 @@ }, "width": 122, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1025,7 +1024,8 @@ "underline": false, "labelWidth": 22, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "r.bb", @@ -1036,7 +1036,6 @@ }, "width": 405, "height": 226, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1063,7 +1062,8 @@ "underline": false, "labelWidth": 31, "labelHeight": 36, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 2 }, { "id": "r.bb.cc", @@ -1074,7 +1074,6 @@ }, "width": 121, "height": 126, - "level": 3, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1101,7 +1100,8 @@ "underline": false, "labelWidth": 21, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 3 }, { "id": "r.bb.dd", @@ -1112,7 +1112,6 @@ }, "width": 124, "height": 126, - "level": 3, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1139,7 +1138,8 @@ "underline": false, "labelWidth": 24, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 3 }, { "id": "r.ee", @@ -1150,7 +1150,6 @@ }, "width": 122, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1177,7 +1176,8 @@ "underline": false, "labelWidth": 22, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "r.ff", @@ -1188,7 +1188,6 @@ }, "width": 117, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1215,7 +1214,8 @@ "underline": false, "labelWidth": 17, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "r.gg", @@ -1226,7 +1226,6 @@ }, "width": 123, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1253,7 +1252,8 @@ "underline": false, "labelWidth": 23, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 } ], "connections": [ @@ -1326,7 +1326,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 5 }, { "id": "i.(j.l -> o.p)[0]", @@ -1397,7 +1398,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 5 }, { "id": "(q -> i.m)[0]", @@ -1456,7 +1458,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 5 }, { "id": "(i.m -> q)[0]", @@ -1515,7 +1518,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 5 }, { "id": "(i.n -> q)[0]", @@ -1574,7 +1578,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 5 }, { "id": "(i.m -> c)[0]", @@ -1633,7 +1638,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 5 }, { "id": "(i.m -> d)[0]", @@ -1692,7 +1698,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 5 }, { "id": "(i.m -> g)[0]", @@ -1751,7 +1758,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 5 }, { "id": "(i.m -> f)[0]", @@ -1810,7 +1818,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 5 }, { "id": "(d -> e)[0]", @@ -1857,7 +1866,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 5 }, { "id": "r.s.(x -> t)[0]", @@ -1928,7 +1938,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 5 }, { "id": "r.s.(x -> w)[0]", @@ -1999,7 +2010,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 5 }, { "id": "r.(gg -> s.t)[0]", @@ -2070,7 +2082,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 5 }, { "id": "r.(s.u.v -> z)[0]", @@ -2141,7 +2154,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 5 }, { "id": "r.(aa -> s.t)[0]", @@ -2212,7 +2226,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 5 }, { "id": "(r.s.w -> i.m)[0]", @@ -2283,7 +2298,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 5 }, { "id": "(r.s.t -> g)[0]", @@ -2402,7 +2418,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 5 }, { "id": "(r.s.t -> h)[0]", @@ -2473,7 +2490,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 5 }, { "id": "r.(ee -> ff)[0]", @@ -2544,7 +2562,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 5 } ] } diff --git a/e2etests/testdata/stable/large_arch/elk/board.exp.json b/e2etests/testdata/stable/large_arch/elk/board.exp.json index bb0e4b09c..c5890113d 100644 --- a/e2etests/testdata/stable/large_arch/elk/board.exp.json +++ b/e2etests/testdata/stable/large_arch/elk/board.exp.json @@ -5,12 +5,11 @@ "id": "a", "type": "", "pos": { - "x": 1657, - "y": 541 + "x": 528, + "y": 1728 }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,18 +36,18 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "b", "type": "", "pos": { - "x": 1524, - "y": 541 + "x": 528, + "y": 1582 }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -75,18 +74,18 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "c", "type": "", "pos": { - "x": 578, - "y": 2178 + "x": 2112, + "y": 604 }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -113,18 +112,18 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "d", "type": "", "pos": { - "x": 711, - "y": 2178 + "x": 2112, + "y": 750 }, "width": 114, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -151,18 +150,18 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "e", "type": "", "pos": { - "x": 712, - "y": 2404 + "x": 2326, + "y": 750 }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -189,18 +188,18 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "f", "type": "", "pos": { - "x": 447, - "y": 2178 + "x": 2112, + "y": 458 }, "width": 111, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -227,18 +226,18 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "g", "type": "", "pos": { - "x": 919, - "y": 2178 + "x": 2112, + "y": 955 }, "width": 114, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -265,18 +264,18 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "h", "type": "", "pos": { - "x": 1006, - "y": 1311 + "x": 1271, + "y": 1050 }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -303,18 +302,18 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "i", "type": "", "pos": { - "x": 239, - "y": 1311 + "x": 1271, + "y": 237 }, - "width": 746, - "height": 732, - "level": 1, + "width": 706, + "height": 792, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -341,18 +340,18 @@ "underline": false, "labelWidth": 9, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "i.j", "type": "", "pos": { - "x": 517, - "y": 1386 + "x": 1346, + "y": 532 }, - "width": 392, - "height": 276, - "level": 2, + "width": 263, + "height": 422, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -379,18 +378,18 @@ "underline": false, "labelWidth": 11, "labelHeight": 36, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 2 }, { "id": "i.j.k", "type": "", "pos": { - "x": 592, - "y": 1461 + "x": 1421, + "y": 607 }, "width": 113, "height": 126, - "level": 3, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -417,18 +416,18 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 3 }, { "id": "i.j.l", "type": "", "pos": { - "x": 725, - "y": 1461 + "x": 1425, + "y": 753 }, "width": 109, "height": 126, - "level": 3, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -455,18 +454,18 @@ "underline": false, "labelWidth": 9, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 3 }, { "id": "i.m", "type": "", "pos": { - "x": 447, - "y": 1784 + "x": 1728, + "y": 458 }, "width": 117, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -493,18 +492,18 @@ "underline": false, "labelWidth": 17, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "i.n", "type": "", "pos": { - "x": 314, - "y": 1842 + "x": 1789, + "y": 312 }, "width": 113, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -531,18 +530,18 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "i.o", "type": "", "pos": { - "x": 648, - "y": 1692 + "x": 1639, + "y": 678 }, "width": 263, "height": 276, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -569,18 +568,18 @@ "underline": false, "labelWidth": 16, "labelHeight": 36, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 2 }, { "id": "i.o.p", "type": "", "pos": { - "x": 723, - "y": 1767 + "x": 1714, + "y": 753 }, "width": 113, "height": 126, - "level": 3, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -607,18 +606,18 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 3 }, { "id": "q", "type": "", "pos": { - "x": 313, - "y": 2178 + "x": 2112, + "y": 312 }, "width": 114, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -645,7 +644,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "r", @@ -654,9 +654,8 @@ "x": 12, "y": 12 }, - "width": 1492, - "height": 1179, - "level": 1, + "width": 1139, + "height": 1550, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -683,18 +682,18 @@ "underline": false, "labelWidth": 13, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "r.s", "type": "", "pos": { - "x": 87, - "y": 388 + "x": 386, + "y": 87 }, - "width": 767, - "height": 577, - "level": 2, + "width": 553, + "height": 812, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -721,18 +720,18 @@ "underline": false, "labelWidth": 15, "labelHeight": 36, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 2 }, { "id": "r.s.t", "type": "", "pos": { - "x": 669, - "y": 671 + "x": 658, + "y": 698 }, "width": 111, "height": 126, - "level": 3, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -759,18 +758,18 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 3 }, { "id": "r.s.u", "type": "", "pos": { - "x": 162, - "y": 609 + "x": 595, + "y": 162 }, "width": 264, "height": 276, - "level": 3, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -797,18 +796,18 @@ "underline": false, "labelWidth": 14, "labelHeight": 31, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 3 }, { "id": "r.s.u.v", "type": "", "pos": { - "x": 237, - "y": 684 + "x": 670, + "y": 237 }, "width": 114, "height": 126, - "level": 4, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -835,18 +834,18 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 4 }, { "id": "r.s.w", "type": "", "pos": { - "x": 446, - "y": 687 + "x": 671, + "y": 458 }, "width": 118, "height": 126, - "level": 3, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -873,18 +872,18 @@ "underline": false, "labelWidth": 18, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 3 }, { "id": "r.s.x", "type": "", "pos": { - "x": 467, - "y": 463 + "x": 462, + "y": 479 }, "width": 113, "height": 126, - "level": 3, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -911,18 +910,18 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 3 }, { "id": "r.s.y", "type": "", "pos": { - "x": 600, - "y": 463 + "x": 461, + "y": 625 }, "width": 114, "height": 126, - "level": 3, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -949,18 +948,18 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 3 }, { "id": "r.z", "type": "", "pos": { - "x": 238, - "y": 990 + "x": 964, + "y": 237 }, "width": 112, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -987,18 +986,18 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "r.aa", "type": "", "pos": { - "x": 549, - "y": 237 + "x": 239, + "y": 584 }, "width": 122, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1025,18 +1024,18 @@ "underline": false, "labelWidth": 22, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "r.bb", "type": "", "pos": { - "x": 1014, - "y": 87 + "x": 87, + "y": 1065 }, - "width": 415, - "height": 276, - "level": 2, + "width": 274, + "height": 422, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1063,18 +1062,18 @@ "underline": false, "labelWidth": 31, "labelHeight": 36, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 2 }, { "id": "r.bb.cc", "type": "", "pos": { - "x": 1089, - "y": 162 + "x": 164, + "y": 1140 }, "width": 121, "height": 126, - "level": 3, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1101,18 +1100,18 @@ "underline": false, "labelWidth": 21, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 3 }, { "id": "r.bb.dd", "type": "", "pos": { - "x": 1230, - "y": 162 + "x": 162, + "y": 1286 }, "width": 124, "height": 126, - "level": 3, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1139,18 +1138,18 @@ "underline": false, "labelWidth": 24, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 3 }, { "id": "r.ee", "type": "", "pos": { - "x": 872, - "y": 237 + "x": 239, + "y": 919 }, "width": 122, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1177,18 +1176,18 @@ "underline": false, "labelWidth": 22, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "r.ff", "type": "", "pos": { - "x": 875, - "y": 388 + "x": 386, + "y": 919 }, "width": 117, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1215,18 +1214,18 @@ "underline": false, "labelWidth": 17, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "r.gg", "type": "", "pos": { - "x": 691, - "y": 237 + "x": 238, + "y": 730 }, "width": 123, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1253,7 +1252,8 @@ "underline": false, "labelWidth": 23, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 } ], "connections": [ @@ -1283,25 +1283,26 @@ "labelPercentage": 0, "route": [ { - "x": 648, - "y": 1587 + "x": 1534, + "y": 670 }, { - "x": 648, - "y": 1677 + "x": 1624, + "y": 670 }, { - "x": 534.75, - "y": 1677 + "x": 1624, + "y": 552.5 }, { - "x": 534.75, - "y": 1783.875 + "x": 1728.375, + "y": 552.5 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 5 }, { "id": "i.(j.l -> o.p)[0]", @@ -1329,17 +1330,18 @@ "labelPercentage": 0, "route": [ { - "x": 779, - "y": 1587 + "x": 1534, + "y": 816 }, { - "x": 779, - "y": 1767 + "x": 1714, + "y": 816 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 5 }, { "id": "(q -> i.m)[0]", @@ -1367,33 +1369,34 @@ "labelPercentage": 0, "route": [ { - "x": 341.5, - "y": 2178 + "x": 2112, + "y": 343.5 }, { - "x": 341.5, - "y": 2098 + "x": 2032, + "y": 343.5 }, { - "x": 228.5, - "y": 2098 + "x": 2032, + "y": 227 }, { - "x": 228.5, - "y": 1256 + "x": 1216, + "y": 227 }, { - "x": 475.75, - "y": 1256 + "x": 1216, + "y": 489.5 }, { - "x": 475.75, - "y": 1783.875 + "x": 1728.375, + "y": 489.5 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 5 }, { "id": "(i.m -> q)[0]", @@ -1421,25 +1424,26 @@ "labelPercentage": 0, "route": [ { - "x": 466, - "y": 1909.875 + "x": 1845.375, + "y": 479 }, { - "x": 466, - "y": 2098 + "x": 2032, + "y": 479 }, { - "x": 398.5, - "y": 2098 + "x": 2032, + "y": 406.5 }, { - "x": 398.5, - "y": 2178 + "x": 2112, + "y": 406.5 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 5 }, { "id": "(i.n -> q)[0]", @@ -1467,17 +1471,18 @@ "labelPercentage": 0, "route": [ { - "x": 370, - "y": 1968 + "x": 1902, + "y": 375 }, { - "x": 370, - "y": 2178 + "x": 2112, + "y": 375 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 5 }, { "id": "(i.m -> c)[0]", @@ -1505,25 +1510,26 @@ "labelPercentage": 0, "route": [ { - "x": 505, - "y": 1909.875 + "x": 1845.375, + "y": 521 }, { - "x": 505, - "y": 2118 + "x": 2052, + "y": 521 }, { - "x": 634.5, - "y": 2118 + "x": 2052, + "y": 667 }, { - "x": 634.5, - "y": 2178 + "x": 2112, + "y": 667 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 5 }, { "id": "(i.m -> d)[0]", @@ -1551,25 +1557,26 @@ "labelPercentage": 0, "route": [ { - "x": 524.5, - "y": 1909.875 + "x": 1845.375, + "y": 542 }, { - "x": 524.5, - "y": 2108 + "x": 2042, + "y": 542 }, { - "x": 768, - "y": 2108 + "x": 2042, + "y": 813 }, { - "x": 768, - "y": 2178 + "x": 2112, + "y": 813 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 5 }, { "id": "(i.m -> g)[0]", @@ -1597,25 +1604,26 @@ "labelPercentage": 0, "route": [ { - "x": 544, - "y": 1909.875 + "x": 1845.375, + "y": 563 }, { - "x": 544, - "y": 2098 + "x": 2032, + "y": 563 }, { - "x": 957, - "y": 2098 + "x": 2032, + "y": 997 }, { - "x": 957, - "y": 2178 + "x": 2112, + "y": 997 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 5 }, { "id": "(i.m -> f)[0]", @@ -1643,25 +1651,26 @@ "labelPercentage": 0, "route": [ { - "x": 485.5, - "y": 1909.875 + "x": 1845.375, + "y": 500 }, { - "x": 485.5, - "y": 2128 + "x": 2062, + "y": 500 }, { - "x": 502.5, - "y": 2128 + "x": 2062, + "y": 521 }, { - "x": 502.5, - "y": 2178 + "x": 2112, + "y": 521 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 5 }, { "id": "(d -> e)[0]", @@ -1689,17 +1698,18 @@ "labelPercentage": 0, "route": [ { - "x": 768, - "y": 2304 + "x": 2226, + "y": 813 }, { - "x": 768, - "y": 2404 + "x": 2326, + "y": 813 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 5 }, { "id": "r.s.(x -> t)[0]", @@ -1727,25 +1737,26 @@ "labelPercentage": 0, "route": [ { - "x": 542.6666666666666, - "y": 589 + "x": 575, + "y": 563 }, { - "x": 542.6666666666666, - "y": 599 + "x": 585, + "y": 563 }, { - "x": 696.5833333333333, - "y": 599 + "x": 585, + "y": 729.5 }, { - "x": 696.5833333333333, - "y": 671 + "x": 658.2, + "y": 729.5 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 5 }, { "id": "r.s.(x -> w)[0]", @@ -1773,17 +1784,18 @@ "labelPercentage": 0, "route": [ { - "x": 505, - "y": 589 + "x": 575, + "y": 521 }, { - "x": 505, - "y": 686.5 + "x": 670.5, + "y": 521 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 5 }, { "id": "r.(gg -> s.t)[0]", @@ -1811,17 +1823,18 @@ "labelPercentage": 0, "route": [ { - "x": 752.0833333333333, - "y": 363 + "x": 361, + "y": 792.5 }, { - "x": 752.0833333333333, - "y": 671 + "x": 658.2, + "y": 792.5 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 5 }, { "id": "r.(s.u.v -> z)[0]", @@ -1849,17 +1862,18 @@ "labelPercentage": 0, "route": [ { - "x": 294, - "y": 810 + "x": 784, + "y": 300 }, { - "x": 294, - "y": 990 + "x": 964, + "y": 300 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 5 }, { "id": "r.(aa -> s.t)[0]", @@ -1887,25 +1901,26 @@ "labelPercentage": 0, "route": [ { - "x": 609.5833333333333, - "y": 363 + "x": 361, + "y": 646.5 }, { - "x": 609.5833333333333, - "y": 373 + "x": 371, + "y": 646.5 }, { - "x": 724.3333333333333, - "y": 373 + "x": 371, + "y": 761 }, { - "x": 724.3333333333333, - "y": 671 + "x": 658.2, + "y": 761 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 5 }, { "id": "(r.s.w -> i.m)[0]", @@ -1933,17 +1948,18 @@ "labelPercentage": 0, "route": [ { - "x": 505, - "y": 812.5 + "x": 788.5, + "y": 521 }, { - "x": 505, - "y": 1783.875 + "x": 1728.375, + "y": 521 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 5 }, { "id": "(r.s.t -> g)[0]", @@ -1971,25 +1987,26 @@ "labelPercentage": 0, "route": [ { - "x": 705.8333333333333, - "y": 797 + "x": 769.2, + "y": 740 }, { - "x": 705.8333333333333, - "y": 1256 + "x": 1216, + "y": 740 }, { - "x": 995, - "y": 1256 + "x": 1216, + "y": 1039 }, { - "x": 995, - "y": 2178 + "x": 2112, + "y": 1039 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 5 }, { "id": "(r.s.t -> h)[0]", @@ -2017,25 +2034,26 @@ "labelPercentage": 0, "route": [ { - "x": 742.8333333333333, - "y": 797 + "x": 769.2, + "y": 782 }, { - "x": 742.8333333333333, - "y": 1246 + "x": 1206, + "y": 782 }, { - "x": 1062.5, - "y": 1246 + "x": 1206, + "y": 1113 }, { - "x": 1062.5, - "y": 1311 + "x": 1271, + "y": 1113 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 5 }, { "id": "r.(ee -> ff)[0]", @@ -2063,17 +2081,18 @@ "labelPercentage": 0, "route": [ { - "x": 933.3333333333333, - "y": 363 + "x": 361, + "y": 982 }, { - "x": 933.3333333333333, - "y": 388 + "x": 386, + "y": 982 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 5 } ] } diff --git a/e2etests/testdata/stable/latex/dagre/board.exp.json b/e2etests/testdata/stable/latex/dagre/board.exp.json index 50277d20d..625bc1dae 100644 --- a/e2etests/testdata/stable/latex/dagre/board.exp.json +++ b/e2etests/testdata/stable/latex/dagre/board.exp.json @@ -10,7 +10,6 @@ }, "width": 382, "height": 101, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -36,7 +35,8 @@ "bold": true, "underline": false, "labelWidth": 382, - "labelHeight": 101 + "labelHeight": 101, + "renderPriority": 1 }, { "id": "b", @@ -47,7 +47,6 @@ }, "width": 65, "height": 18, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -73,7 +72,8 @@ "bold": true, "underline": false, "labelWidth": 65, - "labelHeight": 18 + "labelHeight": 18, + "renderPriority": 1 }, { "id": "z", @@ -84,7 +84,6 @@ }, "width": 179, "height": 51, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -110,7 +109,8 @@ "bold": true, "underline": false, "labelWidth": 179, - "labelHeight": 51 + "labelHeight": 51, + "renderPriority": 1 }, { "id": "c", @@ -121,7 +121,6 @@ }, "width": 214, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -148,7 +147,8 @@ "underline": false, "labelWidth": 114, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "sugar", @@ -159,7 +159,6 @@ }, "width": 146, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -186,7 +185,8 @@ "underline": false, "labelWidth": 46, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "solution", @@ -197,7 +197,6 @@ }, "width": 164, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -224,7 +223,8 @@ "underline": false, "labelWidth": 64, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -273,7 +273,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(z -> b)[0]", @@ -320,7 +321,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(a -> c)[0]", @@ -367,7 +369,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(b -> c)[0]", @@ -414,7 +417,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(sugar -> c)[0]", @@ -461,7 +465,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(c -> solution)[0]", @@ -508,7 +513,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/stable/latex/elk/board.exp.json b/e2etests/testdata/stable/latex/elk/board.exp.json index 9e2d35a69..9aeaa4a30 100644 --- a/e2etests/testdata/stable/latex/elk/board.exp.json +++ b/e2etests/testdata/stable/latex/elk/board.exp.json @@ -10,7 +10,6 @@ }, "width": 382, "height": 101, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -36,7 +35,8 @@ "bold": true, "underline": false, "labelWidth": 382, - "labelHeight": 101 + "labelHeight": 101, + "renderPriority": 1 }, { "id": "b", @@ -47,7 +47,6 @@ }, "width": 65, "height": 18, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -73,7 +72,8 @@ "bold": true, "underline": false, "labelWidth": 65, - "labelHeight": 18 + "labelHeight": 18, + "renderPriority": 1 }, { "id": "z", @@ -84,7 +84,6 @@ }, "width": 179, "height": 51, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -110,7 +109,8 @@ "bold": true, "underline": false, "labelWidth": 179, - "labelHeight": 51 + "labelHeight": 51, + "renderPriority": 1 }, { "id": "c", @@ -121,7 +121,6 @@ }, "width": 214, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -148,7 +147,8 @@ "underline": false, "labelWidth": 114, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "sugar", @@ -159,7 +159,6 @@ }, "width": 146, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -186,7 +185,8 @@ "underline": false, "labelWidth": 46, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "solution", @@ -197,7 +197,6 @@ }, "width": 164, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -224,7 +223,8 @@ "underline": false, "labelWidth": 64, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -272,7 +272,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(z -> b)[0]", @@ -310,7 +311,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(a -> c)[0]", @@ -356,7 +358,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(b -> c)[0]", @@ -394,7 +397,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(sugar -> c)[0]", @@ -440,7 +444,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(c -> solution)[0]", @@ -478,7 +483,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/stable/li1/dagre/board.exp.json b/e2etests/testdata/stable/li1/dagre/board.exp.json index 021f2b3dd..5f039fe94 100644 --- a/e2etests/testdata/stable/li1/dagre/board.exp.json +++ b/e2etests/testdata/stable/li1/dagre/board.exp.json @@ -10,7 +10,6 @@ }, "width": 379, "height": 100, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -36,7 +35,8 @@ "bold": true, "underline": false, "labelWidth": 379, - "labelHeight": 100 + "labelHeight": 100, + "renderPriority": 1 }, { "id": "a", @@ -47,7 +47,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -74,7 +73,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "b", @@ -85,7 +85,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -112,7 +111,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -161,7 +161,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(md -> b)[0]", @@ -208,7 +209,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/stable/li1/elk/board.exp.json b/e2etests/testdata/stable/li1/elk/board.exp.json index fb6f530b2..c0139e612 100644 --- a/e2etests/testdata/stable/li1/elk/board.exp.json +++ b/e2etests/testdata/stable/li1/elk/board.exp.json @@ -10,7 +10,6 @@ }, "width": 379, "height": 100, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -36,7 +35,8 @@ "bold": true, "underline": false, "labelWidth": 379, - "labelHeight": 100 + "labelHeight": 100, + "renderPriority": 1 }, { "id": "a", @@ -47,7 +47,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -74,7 +73,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "b", @@ -85,7 +85,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -112,7 +111,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -152,7 +152,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(md -> b)[0]", @@ -190,7 +191,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/stable/li2/dagre/board.exp.json b/e2etests/testdata/stable/li2/dagre/board.exp.json index aad26509e..879be0a21 100644 --- a/e2etests/testdata/stable/li2/dagre/board.exp.json +++ b/e2etests/testdata/stable/li2/dagre/board.exp.json @@ -10,7 +10,6 @@ }, "width": 245, "height": 76, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -36,7 +35,8 @@ "bold": true, "underline": false, "labelWidth": 245, - "labelHeight": 76 + "labelHeight": 76, + "renderPriority": 1 }, { "id": "a", @@ -47,7 +47,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -74,7 +73,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "b", @@ -85,7 +85,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -112,7 +111,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -161,7 +161,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(md -> b)[0]", @@ -208,7 +209,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/stable/li2/elk/board.exp.json b/e2etests/testdata/stable/li2/elk/board.exp.json index 170a4afb1..b34fee101 100644 --- a/e2etests/testdata/stable/li2/elk/board.exp.json +++ b/e2etests/testdata/stable/li2/elk/board.exp.json @@ -10,7 +10,6 @@ }, "width": 245, "height": 76, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -36,7 +35,8 @@ "bold": true, "underline": false, "labelWidth": 245, - "labelHeight": 76 + "labelHeight": 76, + "renderPriority": 1 }, { "id": "a", @@ -47,7 +47,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -74,7 +73,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "b", @@ -85,7 +85,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -112,7 +111,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -152,7 +152,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(md -> b)[0]", @@ -190,7 +191,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/stable/li3/dagre/board.exp.json b/e2etests/testdata/stable/li3/dagre/board.exp.json index 9bad93fb3..49a3d4e95 100644 --- a/e2etests/testdata/stable/li3/dagre/board.exp.json +++ b/e2etests/testdata/stable/li3/dagre/board.exp.json @@ -10,7 +10,6 @@ }, "width": 347, "height": 512, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -36,7 +35,8 @@ "bold": true, "underline": false, "labelWidth": 347, - "labelHeight": 512 + "labelHeight": 512, + "renderPriority": 1 }, { "id": "a", @@ -47,7 +47,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -74,7 +73,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "b", @@ -85,7 +85,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -112,7 +111,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -161,7 +161,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(md -> b)[0]", @@ -208,7 +209,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/stable/li3/elk/board.exp.json b/e2etests/testdata/stable/li3/elk/board.exp.json index 75acbe9f2..77b744fe7 100644 --- a/e2etests/testdata/stable/li3/elk/board.exp.json +++ b/e2etests/testdata/stable/li3/elk/board.exp.json @@ -10,7 +10,6 @@ }, "width": 347, "height": 512, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -36,7 +35,8 @@ "bold": true, "underline": false, "labelWidth": 347, - "labelHeight": 512 + "labelHeight": 512, + "renderPriority": 1 }, { "id": "a", @@ -47,7 +47,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -74,7 +73,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "b", @@ -85,7 +85,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -112,7 +111,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -152,7 +152,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(md -> b)[0]", @@ -190,7 +191,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/stable/li4/dagre/board.exp.json b/e2etests/testdata/stable/li4/dagre/board.exp.json index 57a034b99..c5251df40 100644 --- a/e2etests/testdata/stable/li4/dagre/board.exp.json +++ b/e2etests/testdata/stable/li4/dagre/board.exp.json @@ -10,7 +10,6 @@ }, "width": 920, "height": 376, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -36,7 +35,8 @@ "bold": true, "underline": false, "labelWidth": 920, - "labelHeight": 376 + "labelHeight": 376, + "renderPriority": 1 }, { "id": "a", @@ -47,7 +47,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -74,7 +73,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "b", @@ -85,7 +85,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -112,7 +111,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -161,7 +161,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(md -> b)[0]", @@ -208,7 +209,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/stable/li4/elk/board.exp.json b/e2etests/testdata/stable/li4/elk/board.exp.json index eae59ea12..a7b64e572 100644 --- a/e2etests/testdata/stable/li4/elk/board.exp.json +++ b/e2etests/testdata/stable/li4/elk/board.exp.json @@ -10,7 +10,6 @@ }, "width": 920, "height": 376, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -36,7 +35,8 @@ "bold": true, "underline": false, "labelWidth": 920, - "labelHeight": 376 + "labelHeight": 376, + "renderPriority": 1 }, { "id": "a", @@ -47,7 +47,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -74,7 +73,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "b", @@ -85,7 +85,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -112,7 +111,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -152,7 +152,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(md -> b)[0]", @@ -190,7 +191,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/stable/lone_h1/dagre/board.exp.json b/e2etests/testdata/stable/lone_h1/dagre/board.exp.json index 7c99b7389..cf9e8beac 100644 --- a/e2etests/testdata/stable/lone_h1/dagre/board.exp.json +++ b/e2etests/testdata/stable/lone_h1/dagre/board.exp.json @@ -10,7 +10,6 @@ }, "width": 266, "height": 50, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -36,7 +35,8 @@ "bold": true, "underline": false, "labelWidth": 266, - "labelHeight": 50 + "labelHeight": 50, + "renderPriority": 1 }, { "id": "a", @@ -47,7 +47,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -74,7 +73,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "b", @@ -85,7 +85,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -112,7 +111,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -161,7 +161,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(md -> b)[0]", @@ -208,7 +209,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/stable/lone_h1/elk/board.exp.json b/e2etests/testdata/stable/lone_h1/elk/board.exp.json index db02754be..fbe7c467c 100644 --- a/e2etests/testdata/stable/lone_h1/elk/board.exp.json +++ b/e2etests/testdata/stable/lone_h1/elk/board.exp.json @@ -10,7 +10,6 @@ }, "width": 266, "height": 50, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -36,7 +35,8 @@ "bold": true, "underline": false, "labelWidth": 266, - "labelHeight": 50 + "labelHeight": 50, + "renderPriority": 1 }, { "id": "a", @@ -47,7 +47,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -74,7 +73,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "b", @@ -85,7 +85,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -112,7 +111,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -152,7 +152,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(md -> b)[0]", @@ -190,7 +191,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/stable/markdown/dagre/board.exp.json b/e2etests/testdata/stable/markdown/dagre/board.exp.json index 921665d67..77bd71cba 100644 --- a/e2etests/testdata/stable/markdown/dagre/board.exp.json +++ b/e2etests/testdata/stable/markdown/dagre/board.exp.json @@ -10,7 +10,6 @@ }, "width": 531, "height": 186, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -36,7 +35,8 @@ "bold": true, "underline": false, "labelWidth": 531, - "labelHeight": 186 + "labelHeight": 186, + "renderPriority": 1 }, { "id": "x", @@ -47,7 +47,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -74,7 +73,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "y", @@ -85,7 +85,6 @@ }, "width": 114, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -112,7 +111,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -161,7 +161,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(hey -> y)[0]", @@ -208,7 +209,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/stable/markdown/elk/board.exp.json b/e2etests/testdata/stable/markdown/elk/board.exp.json index 28d1dd88c..dd83d3f25 100644 --- a/e2etests/testdata/stable/markdown/elk/board.exp.json +++ b/e2etests/testdata/stable/markdown/elk/board.exp.json @@ -10,7 +10,6 @@ }, "width": 531, "height": 186, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -36,7 +35,8 @@ "bold": true, "underline": false, "labelWidth": 531, - "labelHeight": 186 + "labelHeight": 186, + "renderPriority": 1 }, { "id": "x", @@ -47,7 +47,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -74,7 +73,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "y", @@ -85,7 +85,6 @@ }, "width": 114, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -112,7 +111,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -152,7 +152,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(hey -> y)[0]", @@ -190,7 +191,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/stable/md_2space_newline/dagre/board.exp.json b/e2etests/testdata/stable/md_2space_newline/dagre/board.exp.json index f67223c23..5c21ada1b 100644 --- a/e2etests/testdata/stable/md_2space_newline/dagre/board.exp.json +++ b/e2etests/testdata/stable/md_2space_newline/dagre/board.exp.json @@ -10,7 +10,6 @@ }, "width": 559, "height": 148, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 129, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "markdown.md", @@ -48,7 +48,6 @@ }, "width": 459, "height": 48, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -74,7 +73,8 @@ "bold": true, "underline": false, "labelWidth": 459, - "labelHeight": 48 + "labelHeight": 48, + "renderPriority": 2 } ], "connections": [] diff --git a/e2etests/testdata/stable/md_2space_newline/elk/board.exp.json b/e2etests/testdata/stable/md_2space_newline/elk/board.exp.json index a856cf8a0..790ab2c6a 100644 --- a/e2etests/testdata/stable/md_2space_newline/elk/board.exp.json +++ b/e2etests/testdata/stable/md_2space_newline/elk/board.exp.json @@ -10,7 +10,6 @@ }, "width": 609, "height": 198, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 129, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "markdown.md", @@ -48,7 +48,6 @@ }, "width": 459, "height": 48, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -74,7 +73,8 @@ "bold": true, "underline": false, "labelWidth": 459, - "labelHeight": 48 + "labelHeight": 48, + "renderPriority": 2 } ], "connections": [] diff --git a/e2etests/testdata/stable/md_backslash_newline/dagre/board.exp.json b/e2etests/testdata/stable/md_backslash_newline/dagre/board.exp.json index de8d2ef89..614d6a4b6 100644 --- a/e2etests/testdata/stable/md_backslash_newline/dagre/board.exp.json +++ b/e2etests/testdata/stable/md_backslash_newline/dagre/board.exp.json @@ -10,7 +10,6 @@ }, "width": 559, "height": 148, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 129, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "markdown.md", @@ -48,7 +48,6 @@ }, "width": 459, "height": 48, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -74,7 +73,8 @@ "bold": true, "underline": false, "labelWidth": 459, - "labelHeight": 48 + "labelHeight": 48, + "renderPriority": 2 } ], "connections": [] diff --git a/e2etests/testdata/stable/md_backslash_newline/elk/board.exp.json b/e2etests/testdata/stable/md_backslash_newline/elk/board.exp.json index 03cbdd66f..91387c558 100644 --- a/e2etests/testdata/stable/md_backslash_newline/elk/board.exp.json +++ b/e2etests/testdata/stable/md_backslash_newline/elk/board.exp.json @@ -10,7 +10,6 @@ }, "width": 609, "height": 198, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 129, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "markdown.md", @@ -48,7 +48,6 @@ }, "width": 459, "height": 48, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -74,7 +73,8 @@ "bold": true, "underline": false, "labelWidth": 459, - "labelHeight": 48 + "labelHeight": 48, + "renderPriority": 2 } ], "connections": [] diff --git a/e2etests/testdata/stable/md_code_block_fenced/dagre/board.exp.json b/e2etests/testdata/stable/md_code_block_fenced/dagre/board.exp.json index d4e76fdd2..173395e1d 100644 --- a/e2etests/testdata/stable/md_code_block_fenced/dagre/board.exp.json +++ b/e2etests/testdata/stable/md_code_block_fenced/dagre/board.exp.json @@ -10,7 +10,6 @@ }, "width": 196, "height": 111, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -36,7 +35,8 @@ "bold": true, "underline": false, "labelWidth": 196, - "labelHeight": 111 + "labelHeight": 111, + "renderPriority": 1 }, { "id": "a", @@ -47,7 +47,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -74,7 +73,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "b", @@ -85,7 +85,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -112,7 +111,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -161,7 +161,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(md -> b)[0]", @@ -208,7 +209,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/stable/md_code_block_fenced/elk/board.exp.json b/e2etests/testdata/stable/md_code_block_fenced/elk/board.exp.json index 69acc4f0b..d2537dce7 100644 --- a/e2etests/testdata/stable/md_code_block_fenced/elk/board.exp.json +++ b/e2etests/testdata/stable/md_code_block_fenced/elk/board.exp.json @@ -10,7 +10,6 @@ }, "width": 196, "height": 111, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -36,7 +35,8 @@ "bold": true, "underline": false, "labelWidth": 196, - "labelHeight": 111 + "labelHeight": 111, + "renderPriority": 1 }, { "id": "a", @@ -47,7 +47,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -74,7 +73,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "b", @@ -85,7 +85,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -112,7 +111,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -152,7 +152,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(md -> b)[0]", @@ -190,7 +191,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/stable/md_code_block_indented/dagre/board.exp.json b/e2etests/testdata/stable/md_code_block_indented/dagre/board.exp.json index b3d0d09ea..589f65a09 100644 --- a/e2etests/testdata/stable/md_code_block_indented/dagre/board.exp.json +++ b/e2etests/testdata/stable/md_code_block_indented/dagre/board.exp.json @@ -10,7 +10,6 @@ }, "width": 212, "height": 151, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -36,7 +35,8 @@ "bold": true, "underline": false, "labelWidth": 212, - "labelHeight": 151 + "labelHeight": 151, + "renderPriority": 1 }, { "id": "a", @@ -47,7 +47,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -74,7 +73,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "b", @@ -85,7 +85,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -112,7 +111,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -161,7 +161,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(md -> b)[0]", @@ -208,7 +209,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/stable/md_code_block_indented/elk/board.exp.json b/e2etests/testdata/stable/md_code_block_indented/elk/board.exp.json index a54a9f797..19de1d4ab 100644 --- a/e2etests/testdata/stable/md_code_block_indented/elk/board.exp.json +++ b/e2etests/testdata/stable/md_code_block_indented/elk/board.exp.json @@ -10,7 +10,6 @@ }, "width": 212, "height": 151, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -36,7 +35,8 @@ "bold": true, "underline": false, "labelWidth": 212, - "labelHeight": 151 + "labelHeight": 151, + "renderPriority": 1 }, { "id": "a", @@ -47,7 +47,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -74,7 +73,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "b", @@ -85,7 +85,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -112,7 +111,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -152,7 +152,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(md -> b)[0]", @@ -190,7 +191,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/stable/md_code_inline/dagre/board.exp.json b/e2etests/testdata/stable/md_code_inline/dagre/board.exp.json index 903f3b439..580a3965d 100644 --- a/e2etests/testdata/stable/md_code_inline/dagre/board.exp.json +++ b/e2etests/testdata/stable/md_code_inline/dagre/board.exp.json @@ -10,7 +10,6 @@ }, "width": 46, "height": 24, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -36,7 +35,8 @@ "bold": true, "underline": false, "labelWidth": 46, - "labelHeight": 24 + "labelHeight": 24, + "renderPriority": 1 }, { "id": "a", @@ -47,7 +47,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -74,7 +73,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "b", @@ -85,7 +85,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -112,7 +111,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -161,7 +161,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(md -> b)[0]", @@ -208,7 +209,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/stable/md_code_inline/elk/board.exp.json b/e2etests/testdata/stable/md_code_inline/elk/board.exp.json index dfe12622f..80f2ae836 100644 --- a/e2etests/testdata/stable/md_code_inline/elk/board.exp.json +++ b/e2etests/testdata/stable/md_code_inline/elk/board.exp.json @@ -10,7 +10,6 @@ }, "width": 46, "height": 24, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -36,7 +35,8 @@ "bold": true, "underline": false, "labelWidth": 46, - "labelHeight": 24 + "labelHeight": 24, + "renderPriority": 1 }, { "id": "a", @@ -47,7 +47,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -74,7 +73,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "b", @@ -85,7 +85,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -112,7 +111,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -152,7 +152,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(md -> b)[0]", @@ -190,7 +191,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/stable/multiline_text/dagre/board.exp.json b/e2etests/testdata/stable/multiline_text/dagre/board.exp.json index ccbb6734a..8588cf436 100644 --- a/e2etests/testdata/stable/multiline_text/dagre/board.exp.json +++ b/e2etests/testdata/stable/multiline_text/dagre/board.exp.json @@ -10,7 +10,6 @@ }, "width": 202, "height": 158, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 102, "labelHeight": 58, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [] diff --git a/e2etests/testdata/stable/multiline_text/elk/board.exp.json b/e2etests/testdata/stable/multiline_text/elk/board.exp.json index bd4d35ae5..71715e15e 100644 --- a/e2etests/testdata/stable/multiline_text/elk/board.exp.json +++ b/e2etests/testdata/stable/multiline_text/elk/board.exp.json @@ -10,7 +10,6 @@ }, "width": 202, "height": 158, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 102, "labelHeight": 58, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [] diff --git a/e2etests/testdata/stable/multiple_trees/dagre/board.exp.json b/e2etests/testdata/stable/multiple_trees/dagre/board.exp.json index c50cbdd26..731a2f2d9 100644 --- a/e2etests/testdata/stable/multiple_trees/dagre/board.exp.json +++ b/e2etests/testdata/stable/multiple_trees/dagre/board.exp.json @@ -10,7 +10,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "b", @@ -48,7 +48,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -75,7 +74,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "c", @@ -86,7 +86,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -113,7 +112,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "d", @@ -124,7 +124,6 @@ }, "width": 114, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -151,7 +150,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "e", @@ -162,7 +162,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -189,7 +188,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "f", @@ -200,7 +200,6 @@ }, "width": 111, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -227,7 +226,8 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "g", @@ -238,7 +238,6 @@ }, "width": 114, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -265,7 +264,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "h", @@ -276,7 +276,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -303,7 +302,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "i", @@ -314,7 +314,6 @@ }, "width": 109, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -341,7 +340,8 @@ "underline": false, "labelWidth": 9, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "j", @@ -352,7 +352,6 @@ }, "width": 110, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -379,7 +378,8 @@ "underline": false, "labelWidth": 10, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "k", @@ -390,7 +390,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -417,7 +416,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "l", @@ -428,7 +428,6 @@ }, "width": 109, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -455,7 +454,8 @@ "underline": false, "labelWidth": 9, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "m", @@ -466,7 +466,6 @@ }, "width": 117, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -493,7 +492,8 @@ "underline": false, "labelWidth": 17, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "n", @@ -504,7 +504,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -531,7 +530,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "o", @@ -542,7 +542,6 @@ }, "width": 114, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -569,7 +568,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "p", @@ -580,7 +580,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -607,7 +606,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "q", @@ -618,7 +618,6 @@ }, "width": 114, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -645,7 +644,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "r", @@ -656,7 +656,6 @@ }, "width": 111, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -683,7 +682,8 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "s", @@ -694,7 +694,6 @@ }, "width": 112, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -721,7 +720,8 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "t", @@ -732,7 +732,6 @@ }, "width": 111, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -759,7 +758,8 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "u", @@ -770,7 +770,6 @@ }, "width": 114, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -797,7 +796,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "v", @@ -808,7 +808,6 @@ }, "width": 114, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -835,7 +834,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "w", @@ -846,7 +846,6 @@ }, "width": 118, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -873,7 +872,8 @@ "underline": false, "labelWidth": 18, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -922,7 +922,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(a -> c)[0]", @@ -969,7 +970,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(a -> d)[0]", @@ -1016,7 +1018,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(a -> e)[0]", @@ -1063,7 +1066,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(a -> f)[0]", @@ -1110,7 +1114,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(g -> a)[0]", @@ -1157,7 +1162,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(a -> h)[0]", @@ -1204,7 +1210,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(i -> b)[0]", @@ -1251,7 +1258,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(j -> b)[0]", @@ -1298,7 +1306,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(k -> g)[0]", @@ -1345,7 +1354,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(l -> g)[0]", @@ -1392,7 +1402,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(c -> m)[0]", @@ -1439,7 +1450,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(c -> n)[0]", @@ -1486,7 +1498,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(d -> o)[0]", @@ -1533,7 +1546,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(d -> p)[0]", @@ -1580,7 +1594,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(e -> q)[0]", @@ -1627,7 +1642,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(e -> r)[0]", @@ -1674,7 +1690,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(p -> s)[0]", @@ -1721,7 +1738,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(f -> t)[0]", @@ -1768,7 +1786,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(f -> u)[0]", @@ -1815,7 +1834,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(v -> h)[0]", @@ -1862,7 +1882,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(w -> h)[0]", @@ -1909,7 +1930,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/stable/multiple_trees/elk/board.exp.json b/e2etests/testdata/stable/multiple_trees/elk/board.exp.json index 8b8520f1e..63102b849 100644 --- a/e2etests/testdata/stable/multiple_trees/elk/board.exp.json +++ b/e2etests/testdata/stable/multiple_trees/elk/board.exp.json @@ -10,7 +10,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "b", @@ -48,7 +48,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -75,7 +74,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "c", @@ -86,7 +86,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -113,7 +112,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "d", @@ -124,7 +124,6 @@ }, "width": 114, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -151,7 +150,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "e", @@ -162,7 +162,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -189,7 +188,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "f", @@ -200,7 +200,6 @@ }, "width": 111, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -227,7 +226,8 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "g", @@ -238,7 +238,6 @@ }, "width": 114, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -265,7 +264,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "h", @@ -276,7 +276,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -303,7 +302,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "i", @@ -314,7 +314,6 @@ }, "width": 109, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -341,7 +340,8 @@ "underline": false, "labelWidth": 9, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "j", @@ -352,7 +352,6 @@ }, "width": 110, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -379,7 +378,8 @@ "underline": false, "labelWidth": 10, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "k", @@ -390,7 +390,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -417,7 +416,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "l", @@ -428,7 +428,6 @@ }, "width": 109, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -455,7 +454,8 @@ "underline": false, "labelWidth": 9, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "m", @@ -466,7 +466,6 @@ }, "width": 117, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -493,7 +492,8 @@ "underline": false, "labelWidth": 17, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "n", @@ -504,7 +504,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -531,7 +530,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "o", @@ -542,7 +542,6 @@ }, "width": 114, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -569,7 +568,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "p", @@ -580,7 +580,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -607,7 +606,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "q", @@ -618,7 +618,6 @@ }, "width": 114, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -645,7 +644,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "r", @@ -656,7 +656,6 @@ }, "width": 111, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -683,7 +682,8 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "s", @@ -694,7 +694,6 @@ }, "width": 112, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -721,7 +720,8 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "t", @@ -732,7 +732,6 @@ }, "width": 111, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -759,7 +758,8 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "u", @@ -770,7 +770,6 @@ }, "width": 114, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -797,7 +796,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "v", @@ -808,7 +808,6 @@ }, "width": 114, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -835,7 +834,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "w", @@ -846,7 +846,6 @@ }, "width": 118, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -873,7 +872,8 @@ "underline": false, "labelWidth": 18, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -921,7 +921,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(a -> c)[0]", @@ -967,7 +968,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(a -> d)[0]", @@ -1013,7 +1015,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(a -> e)[0]", @@ -1051,7 +1054,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(a -> f)[0]", @@ -1097,7 +1101,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(g -> a)[0]", @@ -1135,7 +1140,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(a -> h)[0]", @@ -1181,7 +1187,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(i -> b)[0]", @@ -1219,7 +1226,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(j -> b)[0]", @@ -1265,7 +1273,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(k -> g)[0]", @@ -1311,7 +1320,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(l -> g)[0]", @@ -1349,7 +1359,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(c -> m)[0]", @@ -1395,7 +1406,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(c -> n)[0]", @@ -1433,7 +1445,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(d -> o)[0]", @@ -1479,7 +1492,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(d -> p)[0]", @@ -1517,7 +1531,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(e -> q)[0]", @@ -1555,7 +1570,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(e -> r)[0]", @@ -1601,7 +1617,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(p -> s)[0]", @@ -1639,7 +1656,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(f -> t)[0]", @@ -1677,7 +1695,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(f -> u)[0]", @@ -1723,7 +1742,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(v -> h)[0]", @@ -1769,7 +1789,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(w -> h)[0]", @@ -1807,7 +1828,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/stable/n22_e32/dagre/board.exp.json b/e2etests/testdata/stable/n22_e32/dagre/board.exp.json index 0a91698c3..2a566b70c 100644 --- a/e2etests/testdata/stable/n22_e32/dagre/board.exp.json +++ b/e2etests/testdata/stable/n22_e32/dagre/board.exp.json @@ -10,7 +10,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "b", @@ -48,7 +48,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -75,7 +74,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "c", @@ -86,7 +86,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -113,7 +112,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "d", @@ -124,7 +124,6 @@ }, "width": 114, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -151,7 +150,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "e", @@ -162,7 +162,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -189,7 +188,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "f", @@ -200,7 +200,6 @@ }, "width": 111, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -227,7 +226,8 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "g", @@ -238,7 +238,6 @@ }, "width": 114, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -265,7 +264,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "h", @@ -276,7 +276,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -303,7 +302,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "i", @@ -314,7 +314,6 @@ }, "width": 109, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -341,7 +340,8 @@ "underline": false, "labelWidth": 9, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "j", @@ -352,7 +352,6 @@ }, "width": 110, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -379,7 +378,8 @@ "underline": false, "labelWidth": 10, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "k", @@ -390,7 +390,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -417,7 +416,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "l", @@ -428,7 +428,6 @@ }, "width": 109, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -455,7 +454,8 @@ "underline": false, "labelWidth": 9, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "m", @@ -466,7 +466,6 @@ }, "width": 117, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -493,7 +492,8 @@ "underline": false, "labelWidth": 17, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "n", @@ -504,7 +504,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -531,7 +530,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "o", @@ -542,7 +542,6 @@ }, "width": 114, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -569,7 +568,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "p", @@ -580,7 +580,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -607,7 +606,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "q", @@ -618,7 +618,6 @@ }, "width": 114, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -645,7 +644,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "r", @@ -656,7 +656,6 @@ }, "width": 111, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -683,7 +682,8 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "s", @@ -694,7 +694,6 @@ }, "width": 112, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -721,7 +720,8 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "t", @@ -732,7 +732,6 @@ }, "width": 111, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -759,7 +758,8 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "u", @@ -770,7 +770,6 @@ }, "width": 114, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -797,7 +796,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -858,7 +858,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(c -> a)[0]", @@ -941,7 +942,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(d -> a)[0]", @@ -988,7 +990,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(d -> b)[0]", @@ -1071,7 +1074,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(d -> e)[0]", @@ -1118,7 +1122,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(e -> f)[0]", @@ -1165,7 +1170,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(f -> b)[0]", @@ -1212,7 +1218,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(c -> f)[0]", @@ -1319,7 +1326,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(g -> c)[0]", @@ -1378,7 +1386,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(g -> h)[0]", @@ -1425,7 +1434,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(h -> i)[0]", @@ -1472,7 +1482,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(i -> j)[0]", @@ -1519,7 +1530,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(j -> k)[0]", @@ -1566,7 +1578,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(k -> e)[0]", @@ -1613,7 +1626,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(j -> f)[0]", @@ -1696,7 +1710,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(l -> m)[0]", @@ -1755,7 +1770,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(n -> l)[0]", @@ -1802,7 +1818,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(n -> l)[1]", @@ -1849,7 +1866,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(n -> m)[0]", @@ -1932,7 +1950,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(n -> o)[0]", @@ -1979,7 +1998,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(o -> p)[0]", @@ -2026,7 +2046,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(p -> m)[0]", @@ -2073,7 +2094,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(n -> p)[0]", @@ -2132,7 +2154,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(q -> n)[0]", @@ -2239,7 +2262,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(q -> r)[0]", @@ -2286,7 +2310,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(r -> s)[0]", @@ -2333,7 +2358,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(s -> t)[0]", @@ -2380,7 +2406,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(t -> u)[0]", @@ -2427,7 +2454,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(u -> o)[0]", @@ -2474,7 +2502,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(t -> p)[0]", @@ -2557,7 +2586,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(c -> t)[0]", @@ -2604,7 +2634,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(s -> a)[0]", @@ -2687,7 +2718,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(u -> a)[0]", @@ -2734,7 +2766,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/stable/n22_e32/elk/board.exp.json b/e2etests/testdata/stable/n22_e32/elk/board.exp.json index aaf499efe..d64ba8f50 100644 --- a/e2etests/testdata/stable/n22_e32/elk/board.exp.json +++ b/e2etests/testdata/stable/n22_e32/elk/board.exp.json @@ -10,7 +10,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "b", @@ -48,7 +48,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -75,7 +74,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "c", @@ -86,7 +86,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -113,7 +112,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "d", @@ -124,7 +124,6 @@ }, "width": 114, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -151,7 +150,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "e", @@ -162,7 +162,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -189,7 +188,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "f", @@ -200,7 +200,6 @@ }, "width": 111, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -227,7 +226,8 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "g", @@ -238,7 +238,6 @@ }, "width": 114, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -265,7 +264,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "h", @@ -276,7 +276,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -303,7 +302,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "i", @@ -314,7 +314,6 @@ }, "width": 109, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -341,7 +340,8 @@ "underline": false, "labelWidth": 9, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "j", @@ -352,7 +352,6 @@ }, "width": 110, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -379,7 +378,8 @@ "underline": false, "labelWidth": 10, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "k", @@ -390,7 +390,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -417,7 +416,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "l", @@ -428,7 +428,6 @@ }, "width": 109, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -455,7 +454,8 @@ "underline": false, "labelWidth": 9, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "m", @@ -466,7 +466,6 @@ }, "width": 117, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -493,7 +492,8 @@ "underline": false, "labelWidth": 17, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "n", @@ -504,7 +504,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -531,7 +530,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "o", @@ -542,7 +542,6 @@ }, "width": 114, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -569,7 +568,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "p", @@ -580,7 +580,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -607,7 +606,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "q", @@ -618,7 +618,6 @@ }, "width": 114, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -645,7 +644,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "r", @@ -656,7 +656,6 @@ }, "width": 111, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -683,7 +682,8 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "s", @@ -694,7 +694,6 @@ }, "width": 112, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -721,7 +720,8 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "t", @@ -732,7 +732,6 @@ }, "width": 111, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -759,7 +758,8 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "u", @@ -770,7 +770,6 @@ }, "width": 114, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -797,7 +796,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -845,7 +845,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(c -> a)[0]", @@ -891,7 +892,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(d -> a)[0]", @@ -937,7 +939,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(d -> b)[0]", @@ -975,7 +978,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(d -> e)[0]", @@ -1021,7 +1025,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(e -> f)[0]", @@ -1059,7 +1064,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(f -> b)[0]", @@ -1105,7 +1111,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(c -> f)[0]", @@ -1159,7 +1166,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(g -> c)[0]", @@ -1197,7 +1205,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(g -> h)[0]", @@ -1243,7 +1252,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(h -> i)[0]", @@ -1281,7 +1291,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(i -> j)[0]", @@ -1319,7 +1330,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(j -> k)[0]", @@ -1357,7 +1369,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(k -> e)[0]", @@ -1395,7 +1408,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(j -> f)[0]", @@ -1449,7 +1463,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(l -> m)[0]", @@ -1495,7 +1510,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(n -> l)[0]", @@ -1541,7 +1557,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(n -> l)[1]", @@ -1579,7 +1596,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(n -> m)[0]", @@ -1625,7 +1643,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(n -> o)[0]", @@ -1671,7 +1690,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(o -> p)[0]", @@ -1709,7 +1729,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(p -> m)[0]", @@ -1755,7 +1776,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(n -> p)[0]", @@ -1809,7 +1831,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(q -> n)[0]", @@ -1847,7 +1870,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(q -> r)[0]", @@ -1893,7 +1917,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(r -> s)[0]", @@ -1931,7 +1956,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(s -> t)[0]", @@ -1969,7 +1995,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(t -> u)[0]", @@ -2007,7 +2034,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(u -> o)[0]", @@ -2045,7 +2073,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(t -> p)[0]", @@ -2099,7 +2128,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(c -> t)[0]", @@ -2145,7 +2175,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(s -> a)[0]", @@ -2199,7 +2230,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(u -> a)[0]", @@ -2245,7 +2277,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/stable/one_container_loop/dagre/board.exp.json b/e2etests/testdata/stable/one_container_loop/dagre/board.exp.json index 0b60af818..c4db831dc 100644 --- a/e2etests/testdata/stable/one_container_loop/dagre/board.exp.json +++ b/e2etests/testdata/stable/one_container_loop/dagre/board.exp.json @@ -10,7 +10,6 @@ }, "width": 479, "height": 226, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 17, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "a.b", @@ -48,7 +48,6 @@ }, "width": 113, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -75,7 +74,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "c", @@ -86,7 +86,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -113,7 +112,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "d", @@ -124,7 +124,6 @@ }, "width": 114, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -151,7 +150,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "e", @@ -162,7 +162,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -189,7 +188,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "f", @@ -200,7 +200,6 @@ }, "width": 111, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -227,7 +226,8 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "g", @@ -238,7 +238,6 @@ }, "width": 114, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -265,7 +264,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "a.h", @@ -276,7 +276,6 @@ }, "width": 113, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -303,7 +302,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 } ], "connections": [ @@ -424,7 +424,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(d -> c)[0]", @@ -471,7 +472,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(e -> c)[0]", @@ -518,7 +520,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(f -> d)[0]", @@ -565,7 +568,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(a -> e)[0]", @@ -648,7 +652,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(g -> f)[0]", @@ -695,7 +700,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(a.h -> g)[0]", @@ -742,7 +748,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 } ] } diff --git a/e2etests/testdata/stable/one_container_loop/elk/board.exp.json b/e2etests/testdata/stable/one_container_loop/elk/board.exp.json index d5560cc6d..e964e8aa3 100644 --- a/e2etests/testdata/stable/one_container_loop/elk/board.exp.json +++ b/e2etests/testdata/stable/one_container_loop/elk/board.exp.json @@ -8,9 +8,8 @@ "x": 12, "y": 12 }, - "width": 396, - "height": 276, - "level": 1, + "width": 263, + "height": 422, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,18 +36,18 @@ "underline": false, "labelWidth": 17, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "a.b", "type": "", "pos": { - "x": 220, - "y": 87 + "x": 87, + "y": 233 }, "width": 113, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -75,18 +74,18 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "c", "type": "", "pos": { - "x": 209, - "y": 1071 + "x": 1021, + "y": 223 }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -113,18 +112,18 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "d", "type": "", "pos": { - "x": 209, - "y": 845 + "x": 807, + "y": 223 }, "width": 114, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -151,18 +150,18 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "e", "type": "", "pos": { - "x": 77, - "y": 619 + "x": 594, + "y": 77 }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -189,18 +188,18 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "f", "type": "", "pos": { - "x": 210, - "y": 619 + "x": 595, + "y": 223 }, "width": 111, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -227,18 +226,18 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "g", "type": "", "pos": { - "x": 209, - "y": 393 + "x": 380, + "y": 223 }, "width": 114, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -265,7 +264,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "a.h", @@ -276,7 +276,6 @@ }, "width": 113, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -303,7 +302,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 } ], "connections": [ @@ -333,33 +333,34 @@ "labelPercentage": 0, "route": [ { - "x": 276.5, - "y": 213 + "x": 200, + "y": 296 }, { - "x": 276.5, - "y": 343 + "x": 330, + "y": 296 }, { - "x": 332.5, - "y": 343 + "x": 330, + "y": 359 }, { - "x": 332.5, - "y": 1021 + "x": 971, + "y": 359 }, { - "x": 293.75, - "y": 1021 + "x": 971, + "y": 317.5 }, { - "x": 293.75, - "y": 1071 + "x": 1021, + "y": 317.5 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(d -> c)[0]", @@ -387,17 +388,18 @@ "labelPercentage": 0, "route": [ { - "x": 265.5, - "y": 971 + "x": 921, + "y": 286 }, { - "x": 265.5, - "y": 1071 + "x": 1021, + "y": 286 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(e -> c)[0]", @@ -425,25 +427,26 @@ "labelPercentage": 0, "route": [ { - "x": 133.5, - "y": 745 + "x": 707, + "y": 140 }, { - "x": 133.5, - "y": 1021 + "x": 971, + "y": 140 }, { - "x": 237.25, - "y": 1021 + "x": 971, + "y": 254.5 }, { - "x": 237.25, - "y": 1071 + "x": 1021, + "y": 254.5 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(f -> d)[0]", @@ -471,17 +474,18 @@ "labelPercentage": 0, "route": [ { - "x": 265.5, - "y": 745 + "x": 706, + "y": 286 }, { - "x": 265.5, - "y": 845 + "x": 807, + "y": 286 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(a -> e)[0]", @@ -509,17 +513,18 @@ "labelPercentage": 0, "route": [ { - "x": 133.5, - "y": 288 + "x": 275, + "y": 140 }, { - "x": 133.5, - "y": 619 + "x": 594, + "y": 140 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(g -> f)[0]", @@ -547,17 +552,18 @@ "labelPercentage": 0, "route": [ { - "x": 265.5, - "y": 519 + "x": 494, + "y": 286 }, { - "x": 265.5, - "y": 619 + "x": 595, + "y": 286 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(a.h -> g)[0]", @@ -585,25 +591,26 @@ "labelPercentage": 0, "route": [ { - "x": 143.5, - "y": 213 + "x": 200, + "y": 150 }, { - "x": 143.5, - "y": 343 + "x": 330, + "y": 150 }, { - "x": 265.5, - "y": 343 + "x": 330, + "y": 286 }, { - "x": 265.5, - "y": 393 + "x": 380, + "y": 286 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 } ] } diff --git a/e2etests/testdata/stable/one_three_one_container/dagre/board.exp.json b/e2etests/testdata/stable/one_three_one_container/dagre/board.exp.json index ffc66f955..71bee9e25 100644 --- a/e2etests/testdata/stable/one_three_one_container/dagre/board.exp.json +++ b/e2etests/testdata/stable/one_three_one_container/dagre/board.exp.json @@ -10,7 +10,6 @@ }, "width": 506, "height": 226, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 45, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "top.start", @@ -48,7 +48,6 @@ }, "width": 140, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -75,7 +74,8 @@ "underline": false, "labelWidth": 40, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "a", @@ -86,7 +86,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -113,7 +112,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "b", @@ -124,7 +124,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -151,7 +150,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "c", @@ -162,7 +162,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -189,7 +188,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "bottom", @@ -200,7 +200,6 @@ }, "width": 504, "height": 226, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -227,7 +226,8 @@ "underline": false, "labelWidth": 90, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "bottom.end", @@ -238,7 +238,6 @@ }, "width": 132, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -265,7 +264,8 @@ "underline": false, "labelWidth": 32, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 } ], "connections": [ @@ -314,7 +314,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(top.start -> b)[0]", @@ -361,7 +362,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(top.start -> c)[0]", @@ -408,7 +410,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(a -> bottom.end)[0]", @@ -455,7 +458,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(b -> bottom.end)[0]", @@ -502,7 +506,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(c -> bottom.end)[0]", @@ -549,7 +554,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 } ] } diff --git a/e2etests/testdata/stable/one_three_one_container/elk/board.exp.json b/e2etests/testdata/stable/one_three_one_container/elk/board.exp.json index 659cc9636..241f89289 100644 --- a/e2etests/testdata/stable/one_three_one_container/elk/board.exp.json +++ b/e2etests/testdata/stable/one_three_one_container/elk/board.exp.json @@ -10,7 +10,6 @@ }, "width": 290, "height": 276, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 45, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "top.start", @@ -48,7 +48,6 @@ }, "width": 140, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -75,7 +74,8 @@ "underline": false, "labelWidth": 40, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "a", @@ -86,7 +86,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -113,7 +112,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "b", @@ -124,7 +124,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -151,7 +150,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "c", @@ -162,7 +162,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -189,7 +188,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "bottom", @@ -200,7 +200,6 @@ }, "width": 282, "height": 276, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -227,7 +226,8 @@ "underline": false, "labelWidth": 90, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "bottom.end", @@ -238,7 +238,6 @@ }, "width": 132, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -265,7 +264,8 @@ "underline": false, "labelWidth": 32, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 } ], "connections": [ @@ -313,7 +313,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(top.start -> b)[0]", @@ -351,7 +352,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(top.start -> c)[0]", @@ -397,7 +399,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(a -> bottom.end)[0]", @@ -443,7 +446,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(b -> bottom.end)[0]", @@ -489,7 +493,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(c -> bottom.end)[0]", @@ -527,7 +532,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 } ] } diff --git a/e2etests/testdata/stable/p/dagre/board.exp.json b/e2etests/testdata/stable/p/dagre/board.exp.json index e7bf9c0a9..aeddaf2aa 100644 --- a/e2etests/testdata/stable/p/dagre/board.exp.json +++ b/e2etests/testdata/stable/p/dagre/board.exp.json @@ -10,7 +10,6 @@ }, "width": 1857, "height": 24, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -36,7 +35,8 @@ "bold": true, "underline": false, "labelWidth": 1857, - "labelHeight": 24 + "labelHeight": 24, + "renderPriority": 1 }, { "id": "a", @@ -47,7 +47,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -74,7 +73,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "b", @@ -85,7 +85,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -112,7 +111,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -161,7 +161,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(md -> b)[0]", @@ -208,7 +209,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/stable/p/elk/board.exp.json b/e2etests/testdata/stable/p/elk/board.exp.json index ab7b5da9c..903c02077 100644 --- a/e2etests/testdata/stable/p/elk/board.exp.json +++ b/e2etests/testdata/stable/p/elk/board.exp.json @@ -10,7 +10,6 @@ }, "width": 1857, "height": 24, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -36,7 +35,8 @@ "bold": true, "underline": false, "labelWidth": 1857, - "labelHeight": 24 + "labelHeight": 24, + "renderPriority": 1 }, { "id": "a", @@ -47,7 +47,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -74,7 +73,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "b", @@ -85,7 +85,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -112,7 +111,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -152,7 +152,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(md -> b)[0]", @@ -190,7 +191,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/stable/pre/dagre/board.exp.json b/e2etests/testdata/stable/pre/dagre/board.exp.json index 69727a4bd..39191a775 100644 --- a/e2etests/testdata/stable/pre/dagre/board.exp.json +++ b/e2etests/testdata/stable/pre/dagre/board.exp.json @@ -10,7 +10,6 @@ }, "width": 602, "height": 170, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -36,7 +35,8 @@ "bold": true, "underline": false, "labelWidth": 602, - "labelHeight": 170 + "labelHeight": 170, + "renderPriority": 1 }, { "id": "a", @@ -47,7 +47,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -74,7 +73,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "b", @@ -85,7 +85,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -112,7 +111,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -161,7 +161,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(md -> b)[0]", @@ -208,7 +209,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/stable/pre/elk/board.exp.json b/e2etests/testdata/stable/pre/elk/board.exp.json index 5d8247547..d6e712cae 100644 --- a/e2etests/testdata/stable/pre/elk/board.exp.json +++ b/e2etests/testdata/stable/pre/elk/board.exp.json @@ -10,7 +10,6 @@ }, "width": 602, "height": 170, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -36,7 +35,8 @@ "bold": true, "underline": false, "labelWidth": 602, - "labelHeight": 170 + "labelHeight": 170, + "renderPriority": 1 }, { "id": "a", @@ -47,7 +47,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -74,7 +73,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "b", @@ -85,7 +85,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -112,7 +111,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -152,7 +152,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(md -> b)[0]", @@ -190,7 +191,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/stable/sql_tables/dagre/board.exp.json b/e2etests/testdata/stable/sql_tables/dagre/board.exp.json index da031d9b2..fb2a64d31 100644 --- a/e2etests/testdata/stable/sql_tables/dagre/board.exp.json +++ b/e2etests/testdata/stable/sql_tables/dagre/board.exp.json @@ -10,7 +10,6 @@ }, "width": 259, "height": 216, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -67,7 +66,8 @@ "bold": true, "underline": false, "labelWidth": 61, - "labelHeight": 36 + "labelHeight": 36, + "renderPriority": 1 }, { "id": "products", @@ -78,7 +78,6 @@ }, "width": 290, "height": 180, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -129,7 +128,8 @@ "bold": true, "underline": false, "labelWidth": 99, - "labelHeight": 36 + "labelHeight": 36, + "renderPriority": 1 }, { "id": "orders", @@ -140,7 +140,6 @@ }, "width": 215, "height": 144, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -185,7 +184,8 @@ "bold": true, "underline": false, "labelWidth": 74, - "labelHeight": 36 + "labelHeight": 36, + "renderPriority": 1 }, { "id": "shipments", @@ -196,7 +196,6 @@ }, "width": 293, "height": 180, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -247,7 +246,8 @@ "bold": true, "underline": false, "labelWidth": 116, - "labelHeight": 36 + "labelHeight": 36, + "renderPriority": 1 } ], "connections": [ @@ -296,7 +296,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(products <-> orders)[0]", @@ -343,7 +344,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(shipments <-> orders)[0]", @@ -390,7 +392,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/stable/sql_tables/elk/board.exp.json b/e2etests/testdata/stable/sql_tables/elk/board.exp.json index 15d050e46..a6545e00d 100644 --- a/e2etests/testdata/stable/sql_tables/elk/board.exp.json +++ b/e2etests/testdata/stable/sql_tables/elk/board.exp.json @@ -10,7 +10,6 @@ }, "width": 259, "height": 216, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -67,7 +66,8 @@ "bold": true, "underline": false, "labelWidth": 61, - "labelHeight": 36 + "labelHeight": 36, + "renderPriority": 1 }, { "id": "products", @@ -78,7 +78,6 @@ }, "width": 290, "height": 180, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -129,7 +128,8 @@ "bold": true, "underline": false, "labelWidth": 99, - "labelHeight": 36 + "labelHeight": 36, + "renderPriority": 1 }, { "id": "orders", @@ -140,7 +140,6 @@ }, "width": 215, "height": 144, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -185,7 +184,8 @@ "bold": true, "underline": false, "labelWidth": 74, - "labelHeight": 36 + "labelHeight": 36, + "renderPriority": 1 }, { "id": "shipments", @@ -196,7 +196,6 @@ }, "width": 293, "height": 180, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -247,7 +246,8 @@ "bold": true, "underline": false, "labelWidth": 116, - "labelHeight": 36 + "labelHeight": 36, + "renderPriority": 1 } ], "connections": [ @@ -295,7 +295,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(products <-> orders)[0]", @@ -333,7 +334,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(shipments <-> orders)[0]", @@ -379,7 +381,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/stable/square_3d/dagre/board.exp.json b/e2etests/testdata/stable/square_3d/dagre/board.exp.json index 4275335d4..6f5e0886f 100644 --- a/e2etests/testdata/stable/square_3d/dagre/board.exp.json +++ b/e2etests/testdata/stable/square_3d/dagre/board.exp.json @@ -10,7 +10,6 @@ }, "width": 171, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 71, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "square", @@ -48,7 +48,6 @@ }, "width": 154, "height": 154, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -75,7 +74,8 @@ "underline": false, "labelWidth": 54, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -124,7 +124,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/stable/square_3d/elk/board.exp.json b/e2etests/testdata/stable/square_3d/elk/board.exp.json index 00d8f6ab4..8ec99672a 100644 --- a/e2etests/testdata/stable/square_3d/elk/board.exp.json +++ b/e2etests/testdata/stable/square_3d/elk/board.exp.json @@ -10,7 +10,6 @@ }, "width": 171, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 71, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "square", @@ -48,7 +48,6 @@ }, "width": 154, "height": 154, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -75,7 +74,8 @@ "underline": false, "labelWidth": 54, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -115,7 +115,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/stable/straight_hierarchy_container/dagre/board.exp.json b/e2etests/testdata/stable/straight_hierarchy_container/dagre/board.exp.json index ca1f3c399..c433558a2 100644 --- a/e2etests/testdata/stable/straight_hierarchy_container/dagre/board.exp.json +++ b/e2etests/testdata/stable/straight_hierarchy_container/dagre/board.exp.json @@ -10,7 +10,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "c", @@ -48,7 +48,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -75,7 +74,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "b", @@ -86,7 +86,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -113,7 +112,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "l1", @@ -124,7 +124,6 @@ }, "width": 719, "height": 226, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -151,7 +150,8 @@ "underline": false, "labelWidth": 24, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "l1.b", @@ -162,7 +162,6 @@ }, "width": 113, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -189,7 +188,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "l1.a", @@ -200,7 +200,6 @@ }, "width": 113, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -227,7 +226,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "l1.c", @@ -238,7 +238,6 @@ }, "width": 113, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -265,7 +264,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "l2c1", @@ -276,7 +276,6 @@ }, "width": 213, "height": 226, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -303,7 +302,8 @@ "underline": false, "labelWidth": 50, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "l2c1.a", @@ -314,7 +314,6 @@ }, "width": 113, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -341,7 +340,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "l2c3", @@ -352,7 +352,6 @@ }, "width": 213, "height": 226, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -379,7 +378,8 @@ "underline": false, "labelWidth": 50, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "l2c3.c", @@ -390,7 +390,6 @@ }, "width": 113, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -417,7 +416,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "l2c2", @@ -428,7 +428,6 @@ }, "width": 213, "height": 226, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -455,7 +454,8 @@ "underline": false, "labelWidth": 50, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "l2c2.b", @@ -466,7 +466,6 @@ }, "width": 113, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -493,7 +492,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "l3c1", @@ -504,7 +504,6 @@ }, "width": 466, "height": 226, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -531,7 +530,8 @@ "underline": false, "labelWidth": 50, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "l3c1.a", @@ -542,7 +542,6 @@ }, "width": 113, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -569,7 +568,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "l3c1.b", @@ -580,7 +580,6 @@ }, "width": 113, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -607,7 +606,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "l3c2", @@ -618,7 +618,6 @@ }, "width": 213, "height": 226, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -645,7 +644,8 @@ "underline": false, "labelWidth": 50, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "l3c2.c", @@ -656,7 +656,6 @@ }, "width": 113, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -683,7 +682,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "l4", @@ -694,7 +694,6 @@ }, "width": 799, "height": 326, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -721,7 +720,8 @@ "underline": false, "labelWidth": 25, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "l4.c1", @@ -732,7 +732,6 @@ }, "width": 213, "height": 226, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -759,7 +758,8 @@ "underline": false, "labelWidth": 26, "labelHeight": 36, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 2 }, { "id": "l4.c1.a", @@ -770,7 +770,6 @@ }, "width": 113, "height": 126, - "level": 3, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -797,7 +796,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 3 }, { "id": "l4.c2", @@ -808,7 +808,6 @@ }, "width": 213, "height": 226, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -835,7 +834,8 @@ "underline": false, "labelWidth": 26, "labelHeight": 36, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 2 }, { "id": "l4.c2.b", @@ -846,7 +846,6 @@ }, "width": 113, "height": 126, - "level": 3, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -873,7 +872,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 3 }, { "id": "l4.c3", @@ -884,7 +884,6 @@ }, "width": 213, "height": 226, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -911,7 +910,8 @@ "underline": false, "labelWidth": 26, "labelHeight": 36, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 2 }, { "id": "l4.c3.c", @@ -922,7 +922,6 @@ }, "width": 113, "height": 126, - "level": 3, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -949,7 +948,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 3 } ], "connections": [ @@ -998,7 +998,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 4 }, { "id": "(a -> l1.a)[0]", @@ -1045,7 +1046,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 4 }, { "id": "(c -> l1.c)[0]", @@ -1092,7 +1094,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 4 }, { "id": "(l1.a -> l2c1.a)[0]", @@ -1151,7 +1154,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 4 }, { "id": "(l1.c -> l2c3.c)[0]", @@ -1210,7 +1214,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 4 }, { "id": "(l1.b -> l2c2.b)[0]", @@ -1269,7 +1274,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 4 }, { "id": "(l2c1.a -> l3c1.a)[0]", @@ -1328,7 +1334,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 4 }, { "id": "(l2c2.b -> l3c1.b)[0]", @@ -1387,7 +1394,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 4 }, { "id": "(l2c3.c -> l3c2.c)[0]", @@ -1446,7 +1454,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 4 }, { "id": "(l3c1.a -> l4.c1.a)[0]", @@ -1517,7 +1526,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 4 }, { "id": "(l3c1.b -> l4.c2.b)[0]", @@ -1588,7 +1598,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 4 }, { "id": "(l3c2.c -> l4.c3.c)[0]", @@ -1659,7 +1670,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 4 } ] } diff --git a/e2etests/testdata/stable/straight_hierarchy_container/elk/board.exp.json b/e2etests/testdata/stable/straight_hierarchy_container/elk/board.exp.json index 57da4889a..523f6a77c 100644 --- a/e2etests/testdata/stable/straight_hierarchy_container/elk/board.exp.json +++ b/e2etests/testdata/stable/straight_hierarchy_container/elk/board.exp.json @@ -5,12 +5,11 @@ "id": "a", "type": "", "pos": { - "x": 295, - "y": 12 + "x": 12, + "y": 308 }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,18 +36,18 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "c", "type": "", "pos": { - "x": 162, - "y": 12 + "x": 12, + "y": 162 }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -75,18 +74,18 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "b", "type": "", "pos": { - "x": 428, - "y": 12 + "x": 12, + "y": 454 }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -113,18 +112,18 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "l1", "type": "", "pos": { - "x": 87, - "y": 243 + "x": 230, + "y": 87 }, - "width": 529, - "height": 276, - "level": 1, + "width": 263, + "height": 568, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -151,18 +150,18 @@ "underline": false, "labelWidth": 24, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "l1.b", "type": "", "pos": { - "x": 428, - "y": 318 + "x": 305, + "y": 454 }, "width": 113, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -189,18 +188,18 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "l1.a", "type": "", "pos": { - "x": 295, - "y": 318 + "x": 305, + "y": 308 }, "width": 113, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -227,18 +226,18 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "l1.c", "type": "", "pos": { - "x": 162, - "y": 318 + "x": 305, + "y": 162 }, "width": 113, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -265,18 +264,18 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "l2c1", "type": "", "pos": { - "x": 370, - "y": 639 + "x": 613, + "y": 383 }, "width": 263, "height": 276, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -303,18 +302,18 @@ "underline": false, "labelWidth": 50, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "l2c1.a", "type": "", "pos": { - "x": 445, - "y": 714 + "x": 688, + "y": 458 }, "width": 113, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -341,18 +340,18 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "l2c3", "type": "", "pos": { - "x": 87, - "y": 639 + "x": 613, + "y": 87 }, "width": 263, "height": 276, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -379,18 +378,18 @@ "underline": false, "labelWidth": 50, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "l2c3.c", "type": "", "pos": { - "x": 162, - "y": 714 + "x": 688, + "y": 162 }, "width": 113, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -417,18 +416,18 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "l2c2", "type": "", "pos": { - "x": 653, - "y": 639 + "x": 613, + "y": 679 }, "width": 263, "height": 276, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -455,18 +454,18 @@ "underline": false, "labelWidth": 50, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "l2c2.b", "type": "", "pos": { - "x": 728, - "y": 714 + "x": 688, + "y": 754 }, "width": 113, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -493,18 +492,18 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "l3c1", "type": "", "pos": { - "x": 370, - "y": 1025 + "x": 986, + "y": 383 }, - "width": 396, - "height": 276, - "level": 1, + "width": 263, + "height": 422, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -531,18 +530,18 @@ "underline": false, "labelWidth": 50, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "l3c1.a", "type": "", "pos": { - "x": 445, - "y": 1100 + "x": 1061, + "y": 458 }, "width": 113, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -569,18 +568,18 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "l3c1.b", "type": "", "pos": { - "x": 578, - "y": 1100 + "x": 1061, + "y": 604 }, "width": 113, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -607,18 +606,18 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "l3c2", "type": "", "pos": { - "x": 87, - "y": 1025 + "x": 986, + "y": 87 }, "width": 263, "height": 276, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -645,18 +644,18 @@ "underline": false, "labelWidth": 50, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "l3c2.c", "type": "", "pos": { - "x": 162, - "y": 1100 + "x": 1061, + "y": 162 }, "width": 113, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -683,18 +682,18 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "l4", "type": "", "pos": { - "x": 12, - "y": 1411 + "x": 1359, + "y": 12 }, - "width": 979, - "height": 431, - "level": 1, + "width": 418, + "height": 1018, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -721,18 +720,18 @@ "underline": false, "labelWidth": 25, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "l4.c1", "type": "", "pos": { - "x": 370, - "y": 1491 + "x": 1439, + "y": 383 }, "width": 263, "height": 276, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -759,18 +758,18 @@ "underline": false, "labelWidth": 26, "labelHeight": 36, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 2 }, { "id": "l4.c1.a", "type": "", "pos": { - "x": 445, - "y": 1566 + "x": 1514, + "y": 458 }, "width": 113, "height": 126, - "level": 3, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -797,18 +796,18 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 3 }, { "id": "l4.c2", "type": "", "pos": { - "x": 653, - "y": 1491 + "x": 1439, + "y": 679 }, "width": 263, "height": 276, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -835,18 +834,18 @@ "underline": false, "labelWidth": 26, "labelHeight": 36, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 2 }, { "id": "l4.c2.b", "type": "", "pos": { - "x": 728, - "y": 1566 + "x": 1514, + "y": 754 }, "width": 113, "height": 126, - "level": 3, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -873,18 +872,18 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 3 }, { "id": "l4.c3", "type": "", "pos": { - "x": 87, - "y": 1491 + "x": 1439, + "y": 87 }, "width": 263, "height": 276, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -911,18 +910,18 @@ "underline": false, "labelWidth": 26, "labelHeight": 36, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 2 }, { "id": "l4.c3.c", "type": "", "pos": { - "x": 162, - "y": 1566 + "x": 1514, + "y": 162 }, "width": 113, "height": 126, - "level": 3, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -949,7 +948,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 3 } ], "connections": [ @@ -979,17 +979,18 @@ "labelPercentage": 0, "route": [ { - "x": 484.5, - "y": 138 + "x": 125, + "y": 517 }, { - "x": 484.5, - "y": 318 + "x": 305, + "y": 517 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 4 }, { "id": "(a -> l1.a)[0]", @@ -1017,17 +1018,18 @@ "labelPercentage": 0, "route": [ { - "x": 351.5, - "y": 138 + "x": 125, + "y": 371 }, { - "x": 351.5, - "y": 318 + "x": 305, + "y": 371 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 4 }, { "id": "(c -> l1.c)[0]", @@ -1055,17 +1057,18 @@ "labelPercentage": 0, "route": [ { - "x": 218.5, - "y": 138 + "x": 125, + "y": 225 }, { - "x": 218.5, - "y": 318 + "x": 305, + "y": 225 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 4 }, { "id": "(l1.a -> l2c1.a)[0]", @@ -1093,25 +1096,26 @@ "labelPercentage": 0, "route": [ { - "x": 351.5, - "y": 444 + "x": 418, + "y": 371 }, { - "x": 351.5, - "y": 584 + "x": 558, + "y": 371 }, { - "x": 501.5, - "y": 584 + "x": 558, + "y": 521 }, { - "x": 501.5, - "y": 714 + "x": 688, + "y": 521 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 4 }, { "id": "(l1.c -> l2c3.c)[0]", @@ -1139,17 +1143,18 @@ "labelPercentage": 0, "route": [ { - "x": 218.5, - "y": 444 + "x": 418, + "y": 225 }, { - "x": 218.5, - "y": 714 + "x": 688, + "y": 225 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 4 }, { "id": "(l1.b -> l2c2.b)[0]", @@ -1177,25 +1182,26 @@ "labelPercentage": 0, "route": [ { - "x": 484.5, - "y": 444 + "x": 418, + "y": 517 }, { - "x": 484.5, - "y": 574 + "x": 548, + "y": 517 }, { - "x": 784.5, - "y": 574 + "x": 548, + "y": 817 }, { - "x": 784.5, - "y": 714 + "x": 688, + "y": 817 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 4 }, { "id": "(l2c1.a -> l3c1.a)[0]", @@ -1223,17 +1229,18 @@ "labelPercentage": 0, "route": [ { - "x": 501.5, - "y": 840 + "x": 801, + "y": 521 }, { - "x": 501.5, - "y": 1100 + "x": 1061, + "y": 521 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 4 }, { "id": "(l2c2.b -> l3c1.b)[0]", @@ -1261,25 +1268,26 @@ "labelPercentage": 0, "route": [ { - "x": 784.5, - "y": 840 + "x": 801, + "y": 817 }, { - "x": 784.5, - "y": 970 + "x": 931, + "y": 817 }, { - "x": 634.5, - "y": 970 + "x": 931, + "y": 667 }, { - "x": 634.5, - "y": 1100 + "x": 1061, + "y": 667 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 4 }, { "id": "(l2c3.c -> l3c2.c)[0]", @@ -1307,17 +1315,18 @@ "labelPercentage": 0, "route": [ { - "x": 218.5, - "y": 840 + "x": 801, + "y": 225 }, { - "x": 218.5, - "y": 1100 + "x": 1061, + "y": 225 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 4 }, { "id": "(l3c1.a -> l4.c1.a)[0]", @@ -1345,17 +1354,18 @@ "labelPercentage": 0, "route": [ { - "x": 501.5, - "y": 1226 + "x": 1174, + "y": 521 }, { - "x": 501.5, - "y": 1566 + "x": 1514, + "y": 521 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 4 }, { "id": "(l3c1.b -> l4.c2.b)[0]", @@ -1383,25 +1393,26 @@ "labelPercentage": 0, "route": [ { - "x": 634.5, - "y": 1226 + "x": 1174, + "y": 667 }, { - "x": 634.5, - "y": 1356 + "x": 1304, + "y": 667 }, { - "x": 784.5, - "y": 1356 + "x": 1304, + "y": 817 }, { - "x": 784.5, - "y": 1566 + "x": 1514, + "y": 817 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 4 }, { "id": "(l3c2.c -> l4.c3.c)[0]", @@ -1429,17 +1440,18 @@ "labelPercentage": 0, "route": [ { - "x": 218.5, - "y": 1226 + "x": 1174, + "y": 225 }, { - "x": 218.5, - "y": 1566 + "x": 1514, + "y": 225 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 4 } ] } diff --git a/e2etests/testdata/stable/stylish/dagre/board.exp.json b/e2etests/testdata/stable/stylish/dagre/board.exp.json index 2fe57244a..f06110cd6 100644 --- a/e2etests/testdata/stable/stylish/dagre/board.exp.json +++ b/e2etests/testdata/stable/stylish/dagre/board.exp.json @@ -10,7 +10,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 0.6, "strokeDash": 0, "strokeWidth": 5, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "y", @@ -48,7 +48,6 @@ }, "width": 114, "height": 126, - "level": 1, "opacity": 0.6, "strokeDash": 5, "strokeWidth": 2, @@ -75,7 +74,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -124,7 +124,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/stable/stylish/elk/board.exp.json b/e2etests/testdata/stable/stylish/elk/board.exp.json index bdcd5b00c..242692c39 100644 --- a/e2etests/testdata/stable/stylish/elk/board.exp.json +++ b/e2etests/testdata/stable/stylish/elk/board.exp.json @@ -10,7 +10,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 0.6, "strokeDash": 0, "strokeWidth": 5, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "y", @@ -48,7 +48,6 @@ }, "width": 114, "height": 126, - "level": 1, "opacity": 0.6, "strokeDash": 5, "strokeWidth": 2, @@ -75,7 +74,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -115,7 +115,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/stable/us_map/dagre/board.exp.json b/e2etests/testdata/stable/us_map/dagre/board.exp.json index c8701a10e..183821b87 100644 --- a/e2etests/testdata/stable/us_map/dagre/board.exp.json +++ b/e2etests/testdata/stable/us_map/dagre/board.exp.json @@ -10,7 +10,6 @@ }, "width": 126, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 26, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "HI", @@ -48,7 +48,6 @@ }, "width": 119, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -75,7 +74,8 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "AL", @@ -86,7 +86,6 @@ }, "width": 124, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -113,7 +112,8 @@ "underline": false, "labelWidth": 24, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "FL", @@ -124,7 +124,6 @@ }, "width": 121, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -151,7 +150,8 @@ "underline": false, "labelWidth": 21, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "GA", @@ -162,7 +162,6 @@ }, "width": 126, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -189,7 +188,8 @@ "underline": false, "labelWidth": 26, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "MS", @@ -200,7 +200,6 @@ }, "width": 126, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -227,7 +226,8 @@ "underline": false, "labelWidth": 26, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "TN", @@ -238,7 +238,6 @@ }, "width": 124, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -265,7 +264,8 @@ "underline": false, "labelWidth": 24, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "AZ", @@ -276,7 +276,6 @@ }, "width": 125, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -303,7 +302,8 @@ "underline": false, "labelWidth": 25, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "CA", @@ -314,7 +314,6 @@ }, "width": 125, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -341,7 +340,8 @@ "underline": false, "labelWidth": 25, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "NV", @@ -352,7 +352,6 @@ }, "width": 125, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -379,7 +378,8 @@ "underline": false, "labelWidth": 25, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "NM", @@ -390,7 +390,6 @@ }, "width": 126, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -417,7 +416,8 @@ "underline": false, "labelWidth": 26, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "UT", @@ -428,7 +428,6 @@ }, "width": 124, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -455,7 +454,8 @@ "underline": false, "labelWidth": 24, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "AR", @@ -466,7 +466,6 @@ }, "width": 126, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -493,7 +492,8 @@ "underline": false, "labelWidth": 26, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "LA", @@ -504,7 +504,6 @@ }, "width": 123, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -531,7 +530,8 @@ "underline": false, "labelWidth": 23, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "MO", @@ -542,7 +542,6 @@ }, "width": 128, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -569,7 +568,8 @@ "underline": false, "labelWidth": 28, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "OK", @@ -580,7 +580,6 @@ }, "width": 126, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -607,7 +606,8 @@ "underline": false, "labelWidth": 26, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "TX", @@ -618,7 +618,6 @@ }, "width": 123, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -645,7 +644,8 @@ "underline": false, "labelWidth": 23, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "OR", @@ -656,7 +656,6 @@ }, "width": 126, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -683,7 +682,8 @@ "underline": false, "labelWidth": 26, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "CO", @@ -694,7 +694,6 @@ }, "width": 126, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -721,7 +720,8 @@ "underline": false, "labelWidth": 26, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "KS", @@ -732,7 +732,6 @@ }, "width": 123, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -759,7 +758,8 @@ "underline": false, "labelWidth": 23, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "NE", @@ -770,7 +770,6 @@ }, "width": 123, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -797,7 +796,8 @@ "underline": false, "labelWidth": 23, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "WY", @@ -808,7 +808,6 @@ }, "width": 128, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -835,7 +834,8 @@ "underline": false, "labelWidth": 28, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "CT", @@ -846,7 +846,6 @@ }, "width": 124, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -873,7 +872,8 @@ "underline": false, "labelWidth": 24, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "MA", @@ -884,7 +884,6 @@ }, "width": 127, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -911,7 +910,8 @@ "underline": false, "labelWidth": 27, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "NY", @@ -922,7 +922,6 @@ }, "width": 124, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -949,7 +948,8 @@ "underline": false, "labelWidth": 24, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "RI", @@ -960,7 +960,6 @@ }, "width": 118, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -987,7 +986,8 @@ "underline": false, "labelWidth": 18, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "DE", @@ -998,7 +998,6 @@ }, "width": 123, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1025,7 +1024,8 @@ "underline": false, "labelWidth": 23, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "MD", @@ -1036,7 +1036,6 @@ }, "width": 127, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1063,7 +1062,8 @@ "underline": false, "labelWidth": 27, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "NJ", @@ -1074,7 +1074,6 @@ }, "width": 122, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1101,7 +1100,8 @@ "underline": false, "labelWidth": 22, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "PA", @@ -1112,7 +1112,6 @@ }, "width": 124, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1139,7 +1138,8 @@ "underline": false, "labelWidth": 24, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "NC", @@ -1150,7 +1150,6 @@ }, "width": 124, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1177,7 +1176,8 @@ "underline": false, "labelWidth": 24, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "SC", @@ -1188,7 +1188,6 @@ }, "width": 123, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1215,7 +1214,8 @@ "underline": false, "labelWidth": 23, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "ID", @@ -1226,7 +1226,6 @@ }, "width": 119, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1253,7 +1252,8 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "MT", @@ -1264,7 +1264,6 @@ }, "width": 126, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1291,7 +1290,8 @@ "underline": false, "labelWidth": 26, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "WA", @@ -1302,7 +1302,6 @@ }, "width": 129, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1329,7 +1328,8 @@ "underline": false, "labelWidth": 29, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "IL", @@ -1340,7 +1340,6 @@ }, "width": 117, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1367,7 +1366,8 @@ "underline": false, "labelWidth": 17, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "IN", @@ -1378,7 +1378,6 @@ }, "width": 119, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1405,7 +1404,8 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "IA", @@ -1416,7 +1416,6 @@ }, "width": 119, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1443,7 +1442,8 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "MI", @@ -1454,7 +1454,6 @@ }, "width": 121, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1481,7 +1480,8 @@ "underline": false, "labelWidth": 21, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "KY", @@ -1492,7 +1492,6 @@ }, "width": 123, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1519,7 +1518,8 @@ "underline": false, "labelWidth": 23, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "WI", @@ -1530,7 +1530,6 @@ }, "width": 123, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1557,7 +1556,8 @@ "underline": false, "labelWidth": 23, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "OH", @@ -1568,7 +1568,6 @@ }, "width": 126, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1595,7 +1594,8 @@ "underline": false, "labelWidth": 26, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "MN", @@ -1606,7 +1606,6 @@ }, "width": 127, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1633,7 +1632,8 @@ "underline": false, "labelWidth": 27, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "SD", @@ -1644,7 +1644,6 @@ }, "width": 124, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1671,7 +1670,8 @@ "underline": false, "labelWidth": 24, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "VA", @@ -1682,7 +1682,6 @@ }, "width": 125, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1709,7 +1708,8 @@ "underline": false, "labelWidth": 25, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "WV", @@ -1720,7 +1720,6 @@ }, "width": 129, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1747,7 +1746,8 @@ "underline": false, "labelWidth": 29, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "ME", @@ -1758,7 +1758,6 @@ }, "width": 125, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1785,7 +1784,8 @@ "underline": false, "labelWidth": 25, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "NH", @@ -1796,7 +1796,6 @@ }, "width": 125, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1823,7 +1822,8 @@ "underline": false, "labelWidth": 25, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "VT", @@ -1834,7 +1834,6 @@ }, "width": 124, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1861,7 +1860,8 @@ "underline": false, "labelWidth": 24, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "ND", @@ -1872,7 +1872,6 @@ }, "width": 125, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1899,7 +1898,8 @@ "underline": false, "labelWidth": 25, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -1948,7 +1948,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(FL -- GA)[0]", @@ -1995,7 +1996,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(GA -- MS)[0]", @@ -2042,7 +2044,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(MS -- TN)[0]", @@ -2173,7 +2176,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(AZ -- CA)[0]", @@ -2220,7 +2224,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(CA -- NV)[0]", @@ -2267,7 +2272,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(NV -- NM)[0]", @@ -2314,7 +2320,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(NM -- UT)[0]", @@ -2373,7 +2380,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(AR -- LA)[0]", @@ -2420,7 +2428,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(LA -- MS)[0]", @@ -2467,7 +2476,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(MS -- MO)[0]", @@ -2514,7 +2524,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(MO -- OK)[0]", @@ -2597,7 +2608,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(OK -- TN)[0]", @@ -2644,7 +2656,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(TN -- TX)[0]", @@ -2691,7 +2704,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(CA -- NV)[1]", @@ -2738,7 +2752,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(NV -- OR)[0]", @@ -2797,7 +2812,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(CO -- KS)[0]", @@ -2844,7 +2860,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(KS -- NE)[0]", @@ -2903,7 +2920,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(NE -- NM)[0]", @@ -2950,7 +2968,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(NM -- OK)[0]", @@ -2997,7 +3016,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(OK -- UT)[0]", @@ -3044,7 +3064,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(UT -- WY)[0]", @@ -3103,7 +3124,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(CT -- MA)[0]", @@ -3150,7 +3172,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(MA -- NY)[0]", @@ -3209,7 +3232,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(NY -- RI)[0]", @@ -3268,7 +3292,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(DE -- MD)[0]", @@ -3315,7 +3340,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(MD -- NJ)[0]", @@ -3362,7 +3388,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(NJ -- PA)[0]", @@ -3421,7 +3448,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(FL -- GA)[1]", @@ -3468,7 +3496,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(GA -- NC)[0]", @@ -3575,7 +3604,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(NC -- SC)[0]", @@ -3622,7 +3652,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(SC -- TN)[0]", @@ -3669,7 +3700,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(ID -- MT)[0]", @@ -3716,7 +3748,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(MT -- NV)[0]", @@ -3763,7 +3796,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(NV -- OR)[1]", @@ -3822,7 +3856,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(OR -- UT)[0]", @@ -3869,7 +3904,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(UT -- WA)[0]", @@ -3916,7 +3952,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(WA -- WY)[0]", @@ -3963,7 +4000,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(IL -- IN)[0]", @@ -4010,7 +4048,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(IN -- IA)[0]", @@ -4057,7 +4096,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(IA -- MI)[0]", @@ -4104,7 +4144,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(MI -- KY)[0]", @@ -4151,7 +4192,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(KY -- MO)[0]", @@ -4198,7 +4240,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(MO -- WI)[0]", @@ -4281,7 +4324,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(IN -- KY)[0]", @@ -4364,7 +4408,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(KY -- MI)[0]", @@ -4411,7 +4456,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(MI -- OH)[0]", @@ -4518,7 +4564,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(IA -- MN)[0]", @@ -4577,7 +4624,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(MN -- MO)[0]", @@ -4624,7 +4672,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(MO -- NE)[0]", @@ -4671,7 +4720,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(NE -- SD)[0]", @@ -4718,7 +4768,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(SD -- WI)[0]", @@ -4765,7 +4816,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(KS -- MO)[0]", @@ -4812,7 +4864,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(MO -- NE)[1]", @@ -4859,7 +4912,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(NE -- OK)[0]", @@ -4918,7 +4972,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(KY -- MO)[1]", @@ -4965,7 +5020,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(MO -- OH)[0]", @@ -5024,7 +5080,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(OH -- TN)[0]", @@ -5083,7 +5140,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(TN -- VA)[0]", @@ -5130,7 +5188,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(VA -- WV)[0]", @@ -5177,7 +5236,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(LA -- MS)[1]", @@ -5224,7 +5284,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(MS -- TX)[0]", @@ -5379,7 +5440,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(ME -- NH)[0]", @@ -5426,7 +5488,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(MD -- PA)[0]", @@ -5509,7 +5572,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(PA -- VA)[0]", @@ -5556,7 +5620,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(VA -- WV)[1]", @@ -5603,7 +5668,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(MA -- NH)[0]", @@ -5650,7 +5716,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(NH -- NY)[0]", @@ -5697,7 +5764,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(NY -- RI)[1]", @@ -5756,7 +5824,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(RI -- VT)[0]", @@ -5803,7 +5872,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(MI -- MN)[0]", @@ -5850,7 +5920,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(MN -- OH)[0]", @@ -5933,7 +6004,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(OH -- WI)[0]", @@ -5980,7 +6052,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(MN -- ND)[0]", @@ -6039,7 +6112,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(ND -- SD)[0]", @@ -6086,7 +6160,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(SD -- WI)[1]", @@ -6133,7 +6208,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(MS -- TN)[1]", @@ -6264,7 +6340,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(MO -- NE)[2]", @@ -6311,7 +6388,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(NE -- OK)[1]", @@ -6370,7 +6448,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(OK -- TN)[1]", @@ -6417,7 +6496,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(MT -- ND)[0]", @@ -6464,7 +6544,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(ND -- SD)[1]", @@ -6511,7 +6592,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(SD -- WY)[0]", @@ -6618,7 +6700,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(NE -- SD)[1]", @@ -6665,7 +6748,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(SD -- WY)[1]", @@ -6772,7 +6856,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(NV -- OR)[2]", @@ -6831,7 +6916,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(OR -- UT)[1]", @@ -6878,7 +6964,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(NH -- VT)[0]", @@ -6985,7 +7072,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(NJ -- NY)[0]", @@ -7032,7 +7120,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(NY -- PA)[0]", @@ -7079,7 +7168,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(NM -- OK)[1]", @@ -7126,7 +7216,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(OK -- TX)[0]", @@ -7185,7 +7276,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(NY -- PA)[1]", @@ -7232,7 +7324,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(PA -- RI)[0]", @@ -7279,7 +7372,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(RI -- VT)[1]", @@ -7326,7 +7420,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(NC -- SC)[1]", @@ -7373,7 +7468,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(SC -- TN)[1]", @@ -7420,7 +7516,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(TN -- VA)[1]", @@ -7467,7 +7564,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(ND -- SD)[2]", @@ -7514,7 +7612,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(OH -- PA)[0]", @@ -7573,7 +7672,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(PA -- WV)[0]", @@ -7632,7 +7732,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(OK -- TX)[1]", @@ -7691,7 +7792,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(OR -- WA)[0]", @@ -7750,7 +7852,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(PA -- WV)[1]", @@ -7809,7 +7912,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(SD -- WY)[2]", @@ -7916,7 +8020,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(TN -- VA)[2]", @@ -7963,7 +8068,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(UT -- WY)[1]", @@ -8022,7 +8128,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(VA -- WV)[2]", @@ -8069,7 +8176,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/stable/us_map/elk/board.exp.json b/e2etests/testdata/stable/us_map/elk/board.exp.json index 43d1260f2..dfd4d1b13 100644 --- a/e2etests/testdata/stable/us_map/elk/board.exp.json +++ b/e2etests/testdata/stable/us_map/elk/board.exp.json @@ -10,7 +10,6 @@ }, "width": 126, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 26, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "HI", @@ -48,7 +48,6 @@ }, "width": 119, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -75,7 +74,8 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "AL", @@ -86,7 +86,6 @@ }, "width": 124, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -113,7 +112,8 @@ "underline": false, "labelWidth": 24, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "FL", @@ -124,7 +124,6 @@ }, "width": 121, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -151,7 +150,8 @@ "underline": false, "labelWidth": 21, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "GA", @@ -162,7 +162,6 @@ }, "width": 126, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -189,7 +188,8 @@ "underline": false, "labelWidth": 26, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "MS", @@ -200,7 +200,6 @@ }, "width": 126, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -227,7 +226,8 @@ "underline": false, "labelWidth": 26, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "TN", @@ -238,7 +238,6 @@ }, "width": 124, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -265,7 +264,8 @@ "underline": false, "labelWidth": 24, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "AZ", @@ -276,7 +276,6 @@ }, "width": 125, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -303,7 +302,8 @@ "underline": false, "labelWidth": 25, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "CA", @@ -314,7 +314,6 @@ }, "width": 125, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -341,7 +340,8 @@ "underline": false, "labelWidth": 25, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "NV", @@ -352,7 +352,6 @@ }, "width": 125, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -379,7 +378,8 @@ "underline": false, "labelWidth": 25, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "NM", @@ -390,7 +390,6 @@ }, "width": 126, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -417,7 +416,8 @@ "underline": false, "labelWidth": 26, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "UT", @@ -428,7 +428,6 @@ }, "width": 124, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -455,7 +454,8 @@ "underline": false, "labelWidth": 24, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "AR", @@ -466,7 +466,6 @@ }, "width": 126, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -493,7 +492,8 @@ "underline": false, "labelWidth": 26, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "LA", @@ -504,7 +504,6 @@ }, "width": 123, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -531,7 +530,8 @@ "underline": false, "labelWidth": 23, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "MO", @@ -542,7 +542,6 @@ }, "width": 128, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -569,7 +568,8 @@ "underline": false, "labelWidth": 28, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "OK", @@ -580,7 +580,6 @@ }, "width": 126, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -607,7 +606,8 @@ "underline": false, "labelWidth": 26, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "TX", @@ -618,7 +618,6 @@ }, "width": 123, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -645,7 +644,8 @@ "underline": false, "labelWidth": 23, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "OR", @@ -656,7 +656,6 @@ }, "width": 126, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -683,7 +682,8 @@ "underline": false, "labelWidth": 26, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "CO", @@ -694,7 +694,6 @@ }, "width": 126, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -721,7 +720,8 @@ "underline": false, "labelWidth": 26, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "KS", @@ -732,7 +732,6 @@ }, "width": 123, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -759,7 +758,8 @@ "underline": false, "labelWidth": 23, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "NE", @@ -770,7 +770,6 @@ }, "width": 123, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -797,7 +796,8 @@ "underline": false, "labelWidth": 23, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "WY", @@ -808,7 +808,6 @@ }, "width": 128, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -835,7 +834,8 @@ "underline": false, "labelWidth": 28, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "CT", @@ -846,7 +846,6 @@ }, "width": 124, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -873,7 +872,8 @@ "underline": false, "labelWidth": 24, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "MA", @@ -884,7 +884,6 @@ }, "width": 127, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -911,7 +910,8 @@ "underline": false, "labelWidth": 27, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "NY", @@ -922,7 +922,6 @@ }, "width": 124, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -949,7 +948,8 @@ "underline": false, "labelWidth": 24, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "RI", @@ -960,7 +960,6 @@ }, "width": 118, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -987,7 +986,8 @@ "underline": false, "labelWidth": 18, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "DE", @@ -998,7 +998,6 @@ }, "width": 123, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1025,7 +1024,8 @@ "underline": false, "labelWidth": 23, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "MD", @@ -1036,7 +1036,6 @@ }, "width": 127, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1063,7 +1062,8 @@ "underline": false, "labelWidth": 27, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "NJ", @@ -1074,7 +1074,6 @@ }, "width": 122, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1101,7 +1100,8 @@ "underline": false, "labelWidth": 22, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "PA", @@ -1112,7 +1112,6 @@ }, "width": 124, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1139,7 +1138,8 @@ "underline": false, "labelWidth": 24, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "NC", @@ -1150,7 +1150,6 @@ }, "width": 124, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1177,7 +1176,8 @@ "underline": false, "labelWidth": 24, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "SC", @@ -1188,7 +1188,6 @@ }, "width": 123, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1215,7 +1214,8 @@ "underline": false, "labelWidth": 23, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "ID", @@ -1226,7 +1226,6 @@ }, "width": 119, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1253,7 +1252,8 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "MT", @@ -1264,7 +1264,6 @@ }, "width": 126, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1291,7 +1290,8 @@ "underline": false, "labelWidth": 26, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "WA", @@ -1302,7 +1302,6 @@ }, "width": 129, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1329,7 +1328,8 @@ "underline": false, "labelWidth": 29, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "IL", @@ -1340,7 +1340,6 @@ }, "width": 117, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1367,7 +1366,8 @@ "underline": false, "labelWidth": 17, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "IN", @@ -1378,7 +1378,6 @@ }, "width": 119, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1405,7 +1404,8 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "IA", @@ -1416,7 +1416,6 @@ }, "width": 119, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1443,7 +1442,8 @@ "underline": false, "labelWidth": 19, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "MI", @@ -1454,7 +1454,6 @@ }, "width": 121, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1481,7 +1480,8 @@ "underline": false, "labelWidth": 21, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "KY", @@ -1492,7 +1492,6 @@ }, "width": 123, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1519,7 +1518,8 @@ "underline": false, "labelWidth": 23, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "WI", @@ -1530,7 +1530,6 @@ }, "width": 123, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1557,7 +1556,8 @@ "underline": false, "labelWidth": 23, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "OH", @@ -1568,7 +1568,6 @@ }, "width": 126, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1595,7 +1594,8 @@ "underline": false, "labelWidth": 26, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "MN", @@ -1606,7 +1606,6 @@ }, "width": 127, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1633,7 +1632,8 @@ "underline": false, "labelWidth": 27, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "SD", @@ -1644,7 +1644,6 @@ }, "width": 124, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1671,7 +1670,8 @@ "underline": false, "labelWidth": 24, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "VA", @@ -1682,7 +1682,6 @@ }, "width": 125, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1709,7 +1708,8 @@ "underline": false, "labelWidth": 25, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "WV", @@ -1720,7 +1720,6 @@ }, "width": 129, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1747,7 +1746,8 @@ "underline": false, "labelWidth": 29, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "ME", @@ -1758,7 +1758,6 @@ }, "width": 125, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1785,7 +1784,8 @@ "underline": false, "labelWidth": 25, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "NH", @@ -1796,7 +1796,6 @@ }, "width": 125, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1823,7 +1822,8 @@ "underline": false, "labelWidth": 25, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "VT", @@ -1834,7 +1834,6 @@ }, "width": 124, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1861,7 +1860,8 @@ "underline": false, "labelWidth": 24, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 }, { "id": "ND", @@ -1872,7 +1872,6 @@ }, "width": 125, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1899,7 +1898,8 @@ "underline": false, "labelWidth": 25, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 1 } ], "connections": [ @@ -1939,7 +1939,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(FL -- GA)[0]", @@ -1977,7 +1978,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(GA -- MS)[0]", @@ -2015,7 +2017,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(MS -- TN)[0]", @@ -2069,7 +2072,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(AZ -- CA)[0]", @@ -2107,7 +2111,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(CA -- NV)[0]", @@ -2145,7 +2150,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(NV -- NM)[0]", @@ -2191,7 +2197,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(NM -- UT)[0]", @@ -2237,7 +2244,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(AR -- LA)[0]", @@ -2275,7 +2283,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(LA -- MS)[0]", @@ -2321,7 +2330,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(MS -- MO)[0]", @@ -2367,7 +2377,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(MO -- OK)[0]", @@ -2421,7 +2432,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(OK -- TN)[0]", @@ -2467,7 +2479,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(TN -- TX)[0]", @@ -2513,7 +2526,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(CA -- NV)[1]", @@ -2559,7 +2573,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(NV -- OR)[0]", @@ -2597,7 +2612,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(CO -- KS)[0]", @@ -2635,7 +2651,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(KS -- NE)[0]", @@ -2673,7 +2690,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(NE -- NM)[0]", @@ -2711,7 +2729,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(NM -- OK)[0]", @@ -2749,7 +2768,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(OK -- UT)[0]", @@ -2795,7 +2815,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(UT -- WY)[0]", @@ -2849,7 +2870,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(CT -- MA)[0]", @@ -2887,7 +2909,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(MA -- NY)[0]", @@ -2925,7 +2948,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(NY -- RI)[0]", @@ -2971,7 +2995,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(DE -- MD)[0]", @@ -3009,7 +3034,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(MD -- NJ)[0]", @@ -3047,7 +3073,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(NJ -- PA)[0]", @@ -3093,7 +3120,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(FL -- GA)[1]", @@ -3139,7 +3167,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(GA -- NC)[0]", @@ -3193,7 +3222,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(NC -- SC)[0]", @@ -3231,7 +3261,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(SC -- TN)[0]", @@ -3269,7 +3300,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(ID -- MT)[0]", @@ -3307,7 +3339,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(MT -- NV)[0]", @@ -3353,7 +3386,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(NV -- OR)[1]", @@ -3399,7 +3433,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(OR -- UT)[0]", @@ -3445,7 +3480,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(UT -- WA)[0]", @@ -3491,7 +3527,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(WA -- WY)[0]", @@ -3529,7 +3566,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(IL -- IN)[0]", @@ -3567,7 +3605,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(IN -- IA)[0]", @@ -3613,7 +3652,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(IA -- MI)[0]", @@ -3651,7 +3691,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(MI -- KY)[0]", @@ -3697,7 +3738,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(KY -- MO)[0]", @@ -3735,7 +3777,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(MO -- WI)[0]", @@ -3781,7 +3824,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(IN -- KY)[0]", @@ -3819,7 +3863,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(KY -- MI)[0]", @@ -3865,7 +3910,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(MI -- OH)[0]", @@ -3911,7 +3957,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(IA -- MN)[0]", @@ -3965,7 +4012,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(MN -- MO)[0]", @@ -4011,7 +4059,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(MO -- NE)[0]", @@ -4057,7 +4106,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(NE -- SD)[0]", @@ -4103,7 +4153,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(SD -- WI)[0]", @@ -4149,7 +4200,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(KS -- MO)[0]", @@ -4195,7 +4247,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(MO -- NE)[1]", @@ -4241,7 +4294,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(NE -- OK)[0]", @@ -4295,7 +4349,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(KY -- MO)[1]", @@ -4341,7 +4396,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(MO -- OH)[0]", @@ -4387,7 +4443,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(OH -- TN)[0]", @@ -4433,7 +4490,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(TN -- VA)[0]", @@ -4479,7 +4537,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(VA -- WV)[0]", @@ -4525,7 +4584,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(LA -- MS)[1]", @@ -4571,7 +4631,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(MS -- TX)[0]", @@ -4625,7 +4686,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(ME -- NH)[0]", @@ -4663,7 +4725,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(MD -- PA)[0]", @@ -4717,7 +4780,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(PA -- VA)[0]", @@ -4763,7 +4827,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(VA -- WV)[1]", @@ -4801,7 +4866,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(MA -- NH)[0]", @@ -4847,7 +4913,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(NH -- NY)[0]", @@ -4893,7 +4960,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(NY -- RI)[1]", @@ -4939,7 +5007,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(RI -- VT)[0]", @@ -4985,7 +5054,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(MI -- MN)[0]", @@ -5023,7 +5093,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(MN -- OH)[0]", @@ -5069,7 +5140,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(OH -- WI)[0]", @@ -5123,7 +5195,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(MN -- ND)[0]", @@ -5177,7 +5250,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(ND -- SD)[0]", @@ -5223,7 +5297,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(SD -- WI)[1]", @@ -5269,7 +5344,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(MS -- TN)[1]", @@ -5323,7 +5399,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(MO -- NE)[2]", @@ -5369,7 +5446,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(NE -- OK)[1]", @@ -5423,7 +5501,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(OK -- TN)[1]", @@ -5469,7 +5548,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(MT -- ND)[0]", @@ -5507,7 +5587,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(ND -- SD)[1]", @@ -5545,7 +5626,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(SD -- WY)[0]", @@ -5599,7 +5681,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(NE -- SD)[1]", @@ -5645,7 +5728,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(SD -- WY)[1]", @@ -5699,7 +5783,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(NV -- OR)[2]", @@ -5745,7 +5830,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(OR -- UT)[1]", @@ -5783,7 +5869,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(NH -- VT)[0]", @@ -5829,7 +5916,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(NJ -- NY)[0]", @@ -5875,7 +5963,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(NY -- PA)[0]", @@ -5921,7 +6010,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(NM -- OK)[1]", @@ -5967,7 +6057,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(OK -- TX)[0]", @@ -6013,7 +6104,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(NY -- PA)[1]", @@ -6059,7 +6151,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(PA -- RI)[0]", @@ -6105,7 +6198,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(RI -- VT)[1]", @@ -6151,7 +6245,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(NC -- SC)[1]", @@ -6197,7 +6292,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(SC -- TN)[1]", @@ -6243,7 +6339,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(TN -- VA)[1]", @@ -6281,7 +6378,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(ND -- SD)[2]", @@ -6327,7 +6425,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(OH -- PA)[0]", @@ -6373,7 +6472,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(PA -- WV)[0]", @@ -6419,7 +6519,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(OK -- TX)[1]", @@ -6465,7 +6566,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(OR -- WA)[0]", @@ -6511,7 +6613,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(PA -- WV)[1]", @@ -6565,7 +6668,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(SD -- WY)[2]", @@ -6611,7 +6715,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(TN -- VA)[2]", @@ -6657,7 +6762,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(UT -- WY)[1]", @@ -6703,7 +6809,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(VA -- WV)[2]", @@ -6749,7 +6856,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/e2etests/testdata/todo/container_child_edge/dagre/board.exp.json b/e2etests/testdata/todo/container_child_edge/dagre/board.exp.json index 7dc266f6c..57d723e04 100644 --- a/e2etests/testdata/todo/container_child_edge/dagre/board.exp.json +++ b/e2etests/testdata/todo/container_child_edge/dagre/board.exp.json @@ -10,7 +10,6 @@ }, "width": 255, "height": 452, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 117, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "container.first", @@ -48,7 +48,6 @@ }, "width": 135, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -75,7 +74,8 @@ "underline": false, "labelWidth": 35, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "container.second", @@ -86,7 +86,6 @@ }, "width": 155, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -113,7 +112,8 @@ "underline": false, "labelWidth": 55, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 } ], "connections": [ @@ -162,7 +162,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(container -> container.second)[0]", @@ -209,7 +210,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 } ] } diff --git a/e2etests/testdata/todo/container_child_edge/elk/board.exp.json b/e2etests/testdata/todo/container_child_edge/elk/board.exp.json index d87894482..76499a1f5 100644 --- a/e2etests/testdata/todo/container_child_edge/elk/board.exp.json +++ b/e2etests/testdata/todo/container_child_edge/elk/board.exp.json @@ -8,9 +8,8 @@ "x": 12, "y": 12 }, - "width": 336, - "height": 463, - "level": 1, + "width": 509, + "height": 321, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,18 +36,18 @@ "underline": false, "labelWidth": 117, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "renderPriority": 1 }, { "id": "container.first", "type": "", "pos": { - "x": 138, - "y": 87 + "x": 87, + "y": 132 }, "width": 135, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -75,18 +74,18 @@ "underline": false, "labelWidth": 35, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 }, { "id": "container.second", "type": "", "pos": { - "x": 102, - "y": 274 + "x": 291, + "y": 111 }, "width": 155, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -113,7 +112,8 @@ "underline": false, "labelWidth": 55, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "renderPriority": 2 } ], "connections": [ @@ -143,17 +143,18 @@ "labelPercentage": 0, "route": [ { - "x": 205.5, - "y": 213 + "x": 222, + "y": 195 }, { - "x": 205.5, - "y": 274 + "x": 291, + "y": 195 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 }, { "id": "(container -> container.second)[0]", @@ -181,25 +182,26 @@ "labelPercentage": 0, "route": [ { - "x": 117, - "y": 12 + "x": 12, + "y": 111 }, { - "x": 117, - "y": 264 + "x": 281, + "y": 111 }, { - "x": 153.83333333333334, - "y": 264 + "x": 281, + "y": 153 }, { - "x": 153.83333333333334, - "y": 274 + "x": 291, + "y": 153 } ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 3 } ] } diff --git a/testdata/d2compiler/TestCompile/basic_icon.exp.json b/testdata/d2compiler/TestCompile/basic_icon.exp.json index 25b5f7093..7c4c944bc 100644 --- a/testdata/d2compiler/TestCompile/basic_icon.exp.json +++ b/testdata/d2compiler/TestCompile/basic_icon.exp.json @@ -91,7 +91,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -148,7 +149,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2compiler/TestCompile/basic_sequence.exp.json b/testdata/d2compiler/TestCompile/basic_sequence.exp.json index 072abeff2..7baa4d61e 100644 --- a/testdata/d2compiler/TestCompile/basic_sequence.exp.json +++ b/testdata/d2compiler/TestCompile/basic_sequence.exp.json @@ -86,7 +86,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -131,7 +132,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2compiler/TestCompile/basic_shape.exp.json b/testdata/d2compiler/TestCompile/basic_shape.exp.json index 55a75ce1c..0f0be1707 100644 --- a/testdata/d2compiler/TestCompile/basic_shape.exp.json +++ b/testdata/d2compiler/TestCompile/basic_shape.exp.json @@ -86,7 +86,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -131,7 +132,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2compiler/TestCompile/basic_style.exp.json b/testdata/d2compiler/TestCompile/basic_style.exp.json index 1e2df17f0..4fbb48ecd 100644 --- a/testdata/d2compiler/TestCompile/basic_style.exp.json +++ b/testdata/d2compiler/TestCompile/basic_style.exp.json @@ -93,7 +93,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [], "objects": [ @@ -142,7 +143,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2compiler/TestCompile/class_paren.exp.json b/testdata/d2compiler/TestCompile/class_paren.exp.json index c86f7f020..b173f1700 100644 --- a/testdata/d2compiler/TestCompile/class_paren.exp.json +++ b/testdata/d2compiler/TestCompile/class_paren.exp.json @@ -185,7 +185,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [], "objects": [ @@ -251,7 +252,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2compiler/TestCompile/class_style.exp.json b/testdata/d2compiler/TestCompile/class_style.exp.json index 0b411d650..3f722271d 100644 --- a/testdata/d2compiler/TestCompile/class_style.exp.json +++ b/testdata/d2compiler/TestCompile/class_style.exp.json @@ -159,7 +159,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [], "objects": [ @@ -218,7 +219,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2compiler/TestCompile/edge.exp.json b/testdata/d2compiler/TestCompile/edge.exp.json index 09e4428ef..2dcea2883 100644 --- a/testdata/d2compiler/TestCompile/edge.exp.json +++ b/testdata/d2compiler/TestCompile/edge.exp.json @@ -70,7 +70,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -146,7 +147,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -189,7 +191,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json b/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json index bf32e2e02..8fdadb831 100644 --- a/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json +++ b/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json @@ -249,7 +249,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -355,7 +356,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -398,7 +400,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_chain.exp.json b/testdata/d2compiler/TestCompile/edge_chain.exp.json index 4aa8282e0..9462e68a6 100644 --- a/testdata/d2compiler/TestCompile/edge_chain.exp.json +++ b/testdata/d2compiler/TestCompile/edge_chain.exp.json @@ -117,7 +117,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -223,7 +224,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -286,7 +288,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "z", @@ -329,7 +332,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_chain_map.exp.json b/testdata/d2compiler/TestCompile/edge_chain_map.exp.json index 6c49a5af8..234bb27b2 100644 --- a/testdata/d2compiler/TestCompile/edge_chain_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_chain_map.exp.json @@ -146,7 +146,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -252,7 +253,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -315,7 +317,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "z", @@ -358,7 +361,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_column_index.exp.json b/testdata/d2compiler/TestCompile/edge_column_index.exp.json index c3cf797ee..307bbf42a 100644 --- a/testdata/d2compiler/TestCompile/edge_column_index.exp.json +++ b/testdata/d2compiler/TestCompile/edge_column_index.exp.json @@ -348,7 +348,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -473,7 +474,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "dst", @@ -563,7 +565,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json b/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json index b6b3c1a0d..2ef0fe280 100644 --- a/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json +++ b/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json @@ -115,7 +115,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -195,7 +196,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -238,7 +240,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json index d0220923f..1ef459b9d 100644 --- a/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json @@ -158,7 +158,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -270,7 +271,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -333,7 +335,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json index 4b56270c3..5b8dcfc16 100644 --- a/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json @@ -126,7 +126,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -215,7 +216,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -258,7 +260,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_in_column.exp.json b/testdata/d2compiler/TestCompile/edge_in_column.exp.json index 05c4e1e69..11e7303ff 100644 --- a/testdata/d2compiler/TestCompile/edge_in_column.exp.json +++ b/testdata/d2compiler/TestCompile/edge_in_column.exp.json @@ -161,7 +161,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [], "objects": [ @@ -216,7 +217,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_index.exp.json b/testdata/d2compiler/TestCompile/edge_index.exp.json index 1dab7db6a..298a710de 100644 --- a/testdata/d2compiler/TestCompile/edge_index.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index.exp.json @@ -141,7 +141,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -240,7 +241,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -303,7 +305,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_index_map.exp.json b/testdata/d2compiler/TestCompile/edge_index_map.exp.json index 1e1a5ff30..f98889700 100644 --- a/testdata/d2compiler/TestCompile/edge_index_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index_map.exp.json @@ -160,7 +160,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -259,7 +260,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -322,7 +324,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_index_nested.exp.json b/testdata/d2compiler/TestCompile/edge_index_nested.exp.json index 9f77b4f31..13e1a0b9c 100644 --- a/testdata/d2compiler/TestCompile/edge_index_nested.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index_nested.exp.json @@ -170,7 +170,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -249,7 +250,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "x", @@ -312,7 +314,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -375,7 +378,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json b/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json index 2be418922..6f6d027e9 100644 --- a/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json @@ -186,7 +186,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -285,7 +286,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "x", @@ -348,7 +350,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -411,7 +414,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json index 3ace9b870..d086a4ec2 100644 --- a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json +++ b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json @@ -199,7 +199,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -302,7 +303,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "a", @@ -365,7 +367,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -428,7 +431,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json index 34560630d..d53713bb3 100644 --- a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json +++ b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json @@ -205,7 +205,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -288,7 +289,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "a", @@ -362,7 +364,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -436,7 +439,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json index d1be6a904..92f716025 100644 --- a/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json +++ b/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json @@ -218,7 +218,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -301,7 +302,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "a", @@ -375,7 +377,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -449,7 +452,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json index 8373caa0b..40da04b16 100644 --- a/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json +++ b/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json @@ -236,7 +236,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -319,7 +320,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "a", @@ -393,7 +395,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -467,7 +470,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_label_map.exp.json b/testdata/d2compiler/TestCompile/edge_label_map.exp.json index e728aeb38..0ae1360ba 100644 --- a/testdata/d2compiler/TestCompile/edge_label_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_label_map.exp.json @@ -126,7 +126,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -206,7 +207,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "qwer", @@ -249,7 +251,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_map.exp.json b/testdata/d2compiler/TestCompile/edge_map.exp.json index c314961d7..466ad9742 100644 --- a/testdata/d2compiler/TestCompile/edge_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map.exp.json @@ -109,7 +109,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -185,7 +186,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -228,7 +230,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json index 961ff5094..f2a3b1b67 100644 --- a/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json @@ -138,7 +138,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -227,7 +228,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -270,7 +272,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json b/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json index 25c0db906..acf1b4c10 100644 --- a/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json @@ -154,7 +154,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -257,7 +258,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -320,7 +322,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json b/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json index 46422a6fe..bd4b388f4 100644 --- a/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json @@ -172,7 +172,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -275,7 +276,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -338,7 +340,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_map_nested.exp.json b/testdata/d2compiler/TestCompile/edge_map_nested.exp.json index 2097718a6..770fbb54b 100644 --- a/testdata/d2compiler/TestCompile/edge_map_nested.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_nested.exp.json @@ -134,7 +134,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -214,7 +215,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -257,7 +259,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json b/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json index 017d5dfc8..adc3e1726 100644 --- a/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json @@ -116,7 +116,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -196,7 +197,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -239,7 +241,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json index 9a50c75ff..0f5ce7b39 100644 --- a/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json @@ -226,7 +226,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -351,7 +352,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -414,7 +416,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json index 5142f8595..501d0e20d 100644 --- a/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json @@ -120,7 +120,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -209,7 +210,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -252,7 +254,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json index cd8446a1e..e6c04e50c 100644 --- a/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json @@ -176,7 +176,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -288,7 +289,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -351,7 +353,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2compiler/TestCompile/escaped_id.exp.json b/testdata/d2compiler/TestCompile/escaped_id.exp.json index af200618f..dfcbc3297 100644 --- a/testdata/d2compiler/TestCompile/escaped_id.exp.json +++ b/testdata/d2compiler/TestCompile/escaped_id.exp.json @@ -47,7 +47,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -92,7 +93,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2compiler/TestCompile/image_style.exp.json b/testdata/d2compiler/TestCompile/image_style.exp.json index 997030792..19ef7af05 100644 --- a/testdata/d2compiler/TestCompile/image_style.exp.json +++ b/testdata/d2compiler/TestCompile/image_style.exp.json @@ -168,7 +168,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [], "objects": [ @@ -229,7 +230,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2compiler/TestCompile/nested_sql.exp.json b/testdata/d2compiler/TestCompile/nested_sql.exp.json index 69e2f421c..bbbc784dd 100644 --- a/testdata/d2compiler/TestCompile/nested_sql.exp.json +++ b/testdata/d2compiler/TestCompile/nested_sql.exp.json @@ -181,7 +181,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [], "objects": [ @@ -226,7 +227,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "table", @@ -285,7 +287,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2compiler/TestCompile/path_link.exp.json b/testdata/d2compiler/TestCompile/path_link.exp.json index 300cfe06f..b81b11e4f 100644 --- a/testdata/d2compiler/TestCompile/path_link.exp.json +++ b/testdata/d2compiler/TestCompile/path_link.exp.json @@ -86,7 +86,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -132,7 +133,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json b/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json index 69651a4a9..97e668c4f 100644 --- a/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json +++ b/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json @@ -281,7 +281,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [], "objects": [ @@ -394,7 +395,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -437,7 +439,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2compiler/TestCompile/root_sequence.exp.json b/testdata/d2compiler/TestCompile/root_sequence.exp.json index 7ee72472d..0e5e10565 100644 --- a/testdata/d2compiler/TestCompile/root_sequence.exp.json +++ b/testdata/d2compiler/TestCompile/root_sequence.exp.json @@ -57,7 +57,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": null diff --git a/testdata/d2compiler/TestCompile/sql_paren.exp.json b/testdata/d2compiler/TestCompile/sql_paren.exp.json index 13eff1ae6..c19f71a7a 100644 --- a/testdata/d2compiler/TestCompile/sql_paren.exp.json +++ b/testdata/d2compiler/TestCompile/sql_paren.exp.json @@ -162,7 +162,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [], "objects": [ @@ -223,7 +224,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2compiler/TestCompile/stroke-width.exp.json b/testdata/d2compiler/TestCompile/stroke-width.exp.json index b947b14a2..cda5fddaa 100644 --- a/testdata/d2compiler/TestCompile/stroke-width.exp.json +++ b/testdata/d2compiler/TestCompile/stroke-width.exp.json @@ -93,7 +93,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [], "objects": [ @@ -142,7 +143,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2compiler/TestCompile/table_style.exp.json b/testdata/d2compiler/TestCompile/table_style.exp.json index f44f416b4..58b9dddbf 100644 --- a/testdata/d2compiler/TestCompile/table_style.exp.json +++ b/testdata/d2compiler/TestCompile/table_style.exp.json @@ -159,7 +159,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [], "objects": [ @@ -218,7 +219,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2compiler/TestCompile/table_style_map.exp.json b/testdata/d2compiler/TestCompile/table_style_map.exp.json index 4b150db68..866f01926 100644 --- a/testdata/d2compiler/TestCompile/table_style_map.exp.json +++ b/testdata/d2compiler/TestCompile/table_style_map.exp.json @@ -210,7 +210,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [], "objects": [ @@ -269,7 +270,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2compiler/TestCompile/underscore_edge.exp.json b/testdata/d2compiler/TestCompile/underscore_edge.exp.json index 84d29cf9c..fefb12e87 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge.exp.json @@ -121,7 +121,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -228,7 +229,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -282,7 +284,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json index c9eb30378..e5ee50012 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json @@ -180,7 +180,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -348,7 +349,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -402,7 +404,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "z", @@ -456,7 +459,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json index 4a3d687fe..5aec2ef74 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json @@ -187,7 +187,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -293,7 +294,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "a", @@ -367,7 +369,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -441,7 +444,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json index 705d516f8..eda805cd6 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json @@ -192,7 +192,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -271,7 +272,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "a", @@ -345,7 +347,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -419,7 +422,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json index 7d1942adb..decb6d5ea 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json @@ -161,7 +161,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -237,7 +238,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -311,7 +313,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "z", @@ -376,7 +379,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json index 830a09082..7551e9485 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json @@ -87,7 +87,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -132,7 +133,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -186,7 +188,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json index 7ca34f0e3..02226e45e 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json @@ -116,7 +116,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -161,7 +162,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -204,7 +206,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "z", @@ -258,7 +261,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json index 69b1b036e..19dbddc92 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json @@ -130,7 +130,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -175,7 +176,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -249,7 +251,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json index 00824907e..8aae38057 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json @@ -130,7 +130,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -206,7 +207,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "x", @@ -249,7 +251,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json index 1b9272a22..d99856cb7 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json @@ -127,7 +127,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -172,7 +173,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -215,7 +217,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "z", @@ -280,7 +283,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2compiler/TestCompile/url_link.exp.json b/testdata/d2compiler/TestCompile/url_link.exp.json index ee7b7a06e..084a87867 100644 --- a/testdata/d2compiler/TestCompile/url_link.exp.json +++ b/testdata/d2compiler/TestCompile/url_link.exp.json @@ -86,7 +86,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -132,7 +133,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2exporter/TestExport/connection/arrowhead.exp.json b/testdata/d2exporter/TestExport/connection/arrowhead.exp.json index 665dfb37c..329c0e39c 100644 --- a/testdata/d2exporter/TestExport/connection/arrowhead.exp.json +++ b/testdata/d2exporter/TestExport/connection/arrowhead.exp.json @@ -10,7 +10,6 @@ }, "width": 0, "height": 0, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -36,7 +35,8 @@ "bold": true, "underline": false, "labelWidth": 0, - "labelHeight": 0 + "labelHeight": 0, + "renderPriority": 1 }, { "id": "y", @@ -47,7 +47,6 @@ }, "width": 0, "height": 0, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -73,7 +72,8 @@ "bold": true, "underline": false, "labelWidth": 0, - "labelHeight": 0 + "labelHeight": 0, + "renderPriority": 1 } ], "connections": [ @@ -105,7 +105,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/testdata/d2exporter/TestExport/connection/basic.exp.json b/testdata/d2exporter/TestExport/connection/basic.exp.json index 4459332b3..81577fbf7 100644 --- a/testdata/d2exporter/TestExport/connection/basic.exp.json +++ b/testdata/d2exporter/TestExport/connection/basic.exp.json @@ -10,7 +10,6 @@ }, "width": 0, "height": 0, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -36,7 +35,8 @@ "bold": true, "underline": false, "labelWidth": 0, - "labelHeight": 0 + "labelHeight": 0, + "renderPriority": 1 }, { "id": "y", @@ -47,7 +47,6 @@ }, "width": 0, "height": 0, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -73,7 +72,8 @@ "bold": true, "underline": false, "labelWidth": 0, - "labelHeight": 0 + "labelHeight": 0, + "renderPriority": 1 } ], "connections": [ @@ -105,7 +105,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/testdata/d2exporter/TestExport/connection/stroke-dash.exp.json b/testdata/d2exporter/TestExport/connection/stroke-dash.exp.json index 70c56b898..8baa06de4 100644 --- a/testdata/d2exporter/TestExport/connection/stroke-dash.exp.json +++ b/testdata/d2exporter/TestExport/connection/stroke-dash.exp.json @@ -10,7 +10,6 @@ }, "width": 0, "height": 0, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -36,7 +35,8 @@ "bold": true, "underline": false, "labelWidth": 0, - "labelHeight": 0 + "labelHeight": 0, + "renderPriority": 1 }, { "id": "y", @@ -47,7 +47,6 @@ }, "width": 0, "height": 0, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -73,7 +72,8 @@ "bold": true, "underline": false, "labelWidth": 0, - "labelHeight": 0 + "labelHeight": 0, + "renderPriority": 1 } ], "connections": [ @@ -105,7 +105,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/testdata/d2exporter/TestExport/connection/theme_stroke-dash.exp.json b/testdata/d2exporter/TestExport/connection/theme_stroke-dash.exp.json index 8d71f6d80..6219c0366 100644 --- a/testdata/d2exporter/TestExport/connection/theme_stroke-dash.exp.json +++ b/testdata/d2exporter/TestExport/connection/theme_stroke-dash.exp.json @@ -10,7 +10,6 @@ }, "width": 0, "height": 0, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -36,7 +35,8 @@ "bold": true, "underline": false, "labelWidth": 0, - "labelHeight": 0 + "labelHeight": 0, + "renderPriority": 1 }, { "id": "y", @@ -47,7 +47,6 @@ }, "width": 0, "height": 0, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -73,7 +72,8 @@ "bold": true, "underline": false, "labelWidth": 0, - "labelHeight": 0 + "labelHeight": 0, + "renderPriority": 1 } ], "connections": [ @@ -105,7 +105,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 }, { "id": "(x -> y)[1]", @@ -135,7 +136,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/testdata/d2exporter/TestExport/label/basic_shape.exp.json b/testdata/d2exporter/TestExport/label/basic_shape.exp.json index 3f802e743..ace44bfb5 100644 --- a/testdata/d2exporter/TestExport/label/basic_shape.exp.json +++ b/testdata/d2exporter/TestExport/label/basic_shape.exp.json @@ -10,7 +10,6 @@ }, "width": 0, "height": 0, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -36,7 +35,8 @@ "bold": true, "underline": false, "labelWidth": 0, - "labelHeight": 0 + "labelHeight": 0, + "renderPriority": 1 } ], "connections": [] diff --git a/testdata/d2exporter/TestExport/label/connection_font_color.exp.json b/testdata/d2exporter/TestExport/label/connection_font_color.exp.json index b7dbac9f3..743214d12 100644 --- a/testdata/d2exporter/TestExport/label/connection_font_color.exp.json +++ b/testdata/d2exporter/TestExport/label/connection_font_color.exp.json @@ -10,7 +10,6 @@ }, "width": 0, "height": 0, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -36,7 +35,8 @@ "bold": true, "underline": false, "labelWidth": 0, - "labelHeight": 0 + "labelHeight": 0, + "renderPriority": 1 }, { "id": "y", @@ -47,7 +47,6 @@ }, "width": 0, "height": 0, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -73,7 +72,8 @@ "bold": true, "underline": false, "labelWidth": 0, - "labelHeight": 0 + "labelHeight": 0, + "renderPriority": 1 } ], "connections": [ @@ -105,7 +105,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/testdata/d2exporter/TestExport/label/shape_font_color.exp.json b/testdata/d2exporter/TestExport/label/shape_font_color.exp.json index 4ad10e627..053b98420 100644 --- a/testdata/d2exporter/TestExport/label/shape_font_color.exp.json +++ b/testdata/d2exporter/TestExport/label/shape_font_color.exp.json @@ -10,7 +10,6 @@ }, "width": 0, "height": 0, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -36,7 +35,8 @@ "bold": true, "underline": false, "labelWidth": 0, - "labelHeight": 0 + "labelHeight": 0, + "renderPriority": 1 } ], "connections": [] diff --git a/testdata/d2exporter/TestExport/shape/basic.exp.json b/testdata/d2exporter/TestExport/shape/basic.exp.json index 37448aad5..38166cb0f 100644 --- a/testdata/d2exporter/TestExport/shape/basic.exp.json +++ b/testdata/d2exporter/TestExport/shape/basic.exp.json @@ -10,7 +10,6 @@ }, "width": 0, "height": 0, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -36,7 +35,8 @@ "bold": true, "underline": false, "labelWidth": 0, - "labelHeight": 0 + "labelHeight": 0, + "renderPriority": 1 } ], "connections": [] diff --git a/testdata/d2exporter/TestExport/shape/border-radius.exp.json b/testdata/d2exporter/TestExport/shape/border-radius.exp.json index 53c93e150..c11fae3cf 100644 --- a/testdata/d2exporter/TestExport/shape/border-radius.exp.json +++ b/testdata/d2exporter/TestExport/shape/border-radius.exp.json @@ -10,7 +10,6 @@ }, "width": 0, "height": 0, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -36,7 +35,8 @@ "bold": true, "underline": false, "labelWidth": 0, - "labelHeight": 0 + "labelHeight": 0, + "renderPriority": 1 } ], "connections": [] diff --git a/testdata/d2exporter/TestExport/shape/image_dimensions.exp.json b/testdata/d2exporter/TestExport/shape/image_dimensions.exp.json index cc127ddba..4bdf44aa4 100644 --- a/testdata/d2exporter/TestExport/shape/image_dimensions.exp.json +++ b/testdata/d2exporter/TestExport/shape/image_dimensions.exp.json @@ -10,7 +10,6 @@ }, "width": 0, "height": 0, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -47,7 +46,8 @@ "bold": true, "underline": false, "labelWidth": 0, - "labelHeight": 0 + "labelHeight": 0, + "renderPriority": 1 } ], "connections": [] diff --git a/testdata/d2exporter/TestExport/shape/synonyms.exp.json b/testdata/d2exporter/TestExport/shape/synonyms.exp.json index 6b1d8f27b..8643832f1 100644 --- a/testdata/d2exporter/TestExport/shape/synonyms.exp.json +++ b/testdata/d2exporter/TestExport/shape/synonyms.exp.json @@ -10,7 +10,6 @@ }, "width": 0, "height": 0, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -36,7 +35,8 @@ "bold": true, "underline": false, "labelWidth": 0, - "labelHeight": 0 + "labelHeight": 0, + "renderPriority": 1 }, { "id": "y", @@ -47,7 +47,6 @@ }, "width": 0, "height": 0, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -73,7 +72,8 @@ "bold": true, "underline": false, "labelWidth": 0, - "labelHeight": 0 + "labelHeight": 0, + "renderPriority": 1 } ], "connections": [] diff --git a/testdata/d2exporter/TestExport/shape/text_color.exp.json b/testdata/d2exporter/TestExport/shape/text_color.exp.json index 39fc5164c..16b5218ed 100644 --- a/testdata/d2exporter/TestExport/shape/text_color.exp.json +++ b/testdata/d2exporter/TestExport/shape/text_color.exp.json @@ -10,7 +10,6 @@ }, "width": 0, "height": 0, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -36,7 +35,8 @@ "bold": true, "underline": false, "labelWidth": 0, - "labelHeight": 0 + "labelHeight": 0, + "renderPriority": 1 } ], "connections": [] diff --git a/testdata/d2exporter/TestExport/theme/connection_with_bold.exp.json b/testdata/d2exporter/TestExport/theme/connection_with_bold.exp.json index bb51aac7c..050dc5912 100644 --- a/testdata/d2exporter/TestExport/theme/connection_with_bold.exp.json +++ b/testdata/d2exporter/TestExport/theme/connection_with_bold.exp.json @@ -10,7 +10,6 @@ }, "width": 0, "height": 0, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -36,7 +35,8 @@ "bold": true, "underline": false, "labelWidth": 0, - "labelHeight": 0 + "labelHeight": 0, + "renderPriority": 1 }, { "id": "y", @@ -47,7 +47,6 @@ }, "width": 0, "height": 0, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -73,7 +72,8 @@ "bold": true, "underline": false, "labelWidth": 0, - "labelHeight": 0 + "labelHeight": 0, + "renderPriority": 1 } ], "connections": [ @@ -105,7 +105,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/testdata/d2exporter/TestExport/theme/connection_with_italic.exp.json b/testdata/d2exporter/TestExport/theme/connection_with_italic.exp.json index f0f5d8fe4..dbc729f84 100644 --- a/testdata/d2exporter/TestExport/theme/connection_with_italic.exp.json +++ b/testdata/d2exporter/TestExport/theme/connection_with_italic.exp.json @@ -10,7 +10,6 @@ }, "width": 0, "height": 0, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -36,7 +35,8 @@ "bold": true, "underline": false, "labelWidth": 0, - "labelHeight": 0 + "labelHeight": 0, + "renderPriority": 1 }, { "id": "y", @@ -47,7 +47,6 @@ }, "width": 0, "height": 0, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -73,7 +72,8 @@ "bold": true, "underline": false, "labelWidth": 0, - "labelHeight": 0 + "labelHeight": 0, + "renderPriority": 1 } ], "connections": [ @@ -105,7 +105,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/testdata/d2exporter/TestExport/theme/connection_without_italic.exp.json b/testdata/d2exporter/TestExport/theme/connection_without_italic.exp.json index 5dcbdc290..453384688 100644 --- a/testdata/d2exporter/TestExport/theme/connection_without_italic.exp.json +++ b/testdata/d2exporter/TestExport/theme/connection_without_italic.exp.json @@ -10,7 +10,6 @@ }, "width": 0, "height": 0, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -36,7 +35,8 @@ "bold": true, "underline": false, "labelWidth": 0, - "labelHeight": 0 + "labelHeight": 0, + "renderPriority": 1 }, { "id": "y", @@ -47,7 +47,6 @@ }, "width": 0, "height": 0, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -73,7 +72,8 @@ "bold": true, "underline": false, "labelWidth": 0, - "labelHeight": 0 + "labelHeight": 0, + "renderPriority": 1 } ], "connections": [ @@ -105,7 +105,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "renderPriority": 2 } ] } diff --git a/testdata/d2exporter/TestExport/theme/shape_with_italic.exp.json b/testdata/d2exporter/TestExport/theme/shape_with_italic.exp.json index 3f8c3fc3c..9d244d492 100644 --- a/testdata/d2exporter/TestExport/theme/shape_with_italic.exp.json +++ b/testdata/d2exporter/TestExport/theme/shape_with_italic.exp.json @@ -10,7 +10,6 @@ }, "width": 0, "height": 0, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -36,7 +35,8 @@ "bold": true, "underline": false, "labelWidth": 0, - "labelHeight": 0 + "labelHeight": 0, + "renderPriority": 1 } ], "connections": [] diff --git a/testdata/d2exporter/TestExport/theme/shape_without_bold.exp.json b/testdata/d2exporter/TestExport/theme/shape_without_bold.exp.json index 3111dd17e..2f704f889 100644 --- a/testdata/d2exporter/TestExport/theme/shape_without_bold.exp.json +++ b/testdata/d2exporter/TestExport/theme/shape_without_bold.exp.json @@ -10,7 +10,6 @@ }, "width": 0, "height": 0, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -36,7 +35,8 @@ "bold": false, "underline": false, "labelWidth": 0, - "labelHeight": 0 + "labelHeight": 0, + "renderPriority": 1 } ], "connections": [] diff --git a/testdata/d2oracle/TestCreate/base.exp.json b/testdata/d2oracle/TestCreate/base.exp.json index a7ac1c375..2be3eab89 100644 --- a/testdata/d2oracle/TestCreate/base.exp.json +++ b/testdata/d2oracle/TestCreate/base.exp.json @@ -47,7 +47,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -92,7 +93,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestCreate/container.exp.json b/testdata/d2oracle/TestCreate/container.exp.json index dc7bbf8f1..1038bff6b 100644 --- a/testdata/d2oracle/TestCreate/container.exp.json +++ b/testdata/d2oracle/TestCreate/container.exp.json @@ -76,7 +76,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -121,7 +122,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "q", @@ -164,7 +166,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestCreate/container_edge.exp.json b/testdata/d2oracle/TestCreate/container_edge.exp.json index 21565478e..775fe0d8e 100644 --- a/testdata/d2oracle/TestCreate/container_edge.exp.json +++ b/testdata/d2oracle/TestCreate/container_edge.exp.json @@ -99,7 +99,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -175,7 +176,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "x", @@ -218,7 +220,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -261,7 +264,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestCreate/container_edge_label.exp.json b/testdata/d2oracle/TestCreate/container_edge_label.exp.json index 77f7b9a48..4180265ec 100644 --- a/testdata/d2oracle/TestCreate/container_edge_label.exp.json +++ b/testdata/d2oracle/TestCreate/container_edge_label.exp.json @@ -109,7 +109,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -185,7 +186,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "x", @@ -228,7 +230,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -271,7 +274,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestCreate/edge.exp.json b/testdata/d2oracle/TestCreate/edge.exp.json index ec2ec4313..2137f8d1e 100644 --- a/testdata/d2oracle/TestCreate/edge.exp.json +++ b/testdata/d2oracle/TestCreate/edge.exp.json @@ -70,7 +70,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -146,7 +147,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -189,7 +191,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestCreate/edge_nested.exp.json b/testdata/d2oracle/TestCreate/edge_nested.exp.json index 5d8ed4b19..623835012 100644 --- a/testdata/d2oracle/TestCreate/edge_nested.exp.json +++ b/testdata/d2oracle/TestCreate/edge_nested.exp.json @@ -86,7 +86,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -162,7 +163,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "x", @@ -205,7 +207,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -248,7 +251,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestCreate/edge_scope.exp.json b/testdata/d2oracle/TestCreate/edge_scope.exp.json index 2ff35f256..f0a310e6e 100644 --- a/testdata/d2oracle/TestCreate/edge_scope.exp.json +++ b/testdata/d2oracle/TestCreate/edge_scope.exp.json @@ -99,7 +99,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -175,7 +176,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "x", @@ -218,7 +220,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -261,7 +264,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json b/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json index fa3474290..d69769e7d 100644 --- a/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json +++ b/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json @@ -99,7 +99,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -175,7 +176,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "x", @@ -218,7 +220,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -261,7 +264,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json b/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json index 32b0a3db0..928ec1363 100644 --- a/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json +++ b/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json @@ -110,7 +110,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -197,7 +198,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -251,7 +253,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "z", @@ -294,7 +297,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "q", @@ -337,7 +341,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestCreate/edge_unique.exp.json b/testdata/d2oracle/TestCreate/edge_unique.exp.json index 68eb01b49..7fd29e1f7 100644 --- a/testdata/d2oracle/TestCreate/edge_unique.exp.json +++ b/testdata/d2oracle/TestCreate/edge_unique.exp.json @@ -256,7 +256,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -422,7 +423,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -465,7 +467,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "hello", @@ -548,7 +551,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "x", @@ -631,7 +635,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -714,7 +719,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestCreate/gen_key.exp.json b/testdata/d2oracle/TestCreate/gen_key.exp.json index ee6032e00..8ce54edf9 100644 --- a/testdata/d2oracle/TestCreate/gen_key.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key.exp.json @@ -70,7 +70,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -115,7 +116,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "square 2", @@ -158,7 +160,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestCreate/gen_key_n.exp.json b/testdata/d2oracle/TestCreate/gen_key_n.exp.json index 66a55f903..d4f66c90c 100644 --- a/testdata/d2oracle/TestCreate/gen_key_n.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key_n.exp.json @@ -328,7 +328,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -395,7 +396,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -460,7 +462,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "z", @@ -525,7 +528,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "square", @@ -568,7 +572,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "square 2", @@ -611,7 +616,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "square 3", @@ -654,7 +660,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "square 4", @@ -697,7 +704,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "square 5", @@ -740,7 +748,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "square 6", @@ -783,7 +792,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "square 7", @@ -826,7 +836,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "square 8", @@ -869,7 +880,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "square 9", @@ -912,7 +924,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "square 10", @@ -955,7 +968,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "square 11", @@ -998,7 +1012,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestCreate/gen_key_nested.exp.json b/testdata/d2oracle/TestCreate/gen_key_nested.exp.json index ab99bdedd..0cce893e3 100644 --- a/testdata/d2oracle/TestCreate/gen_key_nested.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key_nested.exp.json @@ -136,7 +136,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -267,7 +268,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -396,7 +398,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "z", @@ -525,7 +528,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "square", @@ -601,7 +605,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "square 2", @@ -677,7 +682,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestCreate/gen_key_scope.exp.json b/testdata/d2oracle/TestCreate/gen_key_scope.exp.json index e429b1605..f62a11fc7 100644 --- a/testdata/d2oracle/TestCreate/gen_key_scope.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key_scope.exp.json @@ -121,7 +121,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -188,7 +189,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -253,7 +255,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "z", @@ -318,7 +321,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "square", @@ -361,7 +365,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "square 2", @@ -404,7 +409,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json b/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json index 4e34daf68..02aef8fa2 100644 --- a/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json @@ -70,7 +70,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -115,7 +116,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "x 2", @@ -158,7 +160,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json b/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json index c2d340411..9aeb2d0e3 100644 --- a/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json +++ b/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json @@ -109,7 +109,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -154,7 +155,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "orange", @@ -197,7 +199,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json index 73f6f3626..b456104f9 100644 --- a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json +++ b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json @@ -155,7 +155,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -200,7 +201,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "rawr", @@ -243,7 +245,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "orange", @@ -286,7 +289,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "after", @@ -329,7 +333,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json index edaeba937..bf9f264f4 100644 --- a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json +++ b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json @@ -155,7 +155,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -200,7 +201,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "rawr", @@ -243,7 +245,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "orange", @@ -286,7 +289,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "after", @@ -329,7 +333,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestCreate/nested.exp.json b/testdata/d2oracle/TestCreate/nested.exp.json index 2ba4dcb6f..2abb6239e 100644 --- a/testdata/d2oracle/TestCreate/nested.exp.json +++ b/testdata/d2oracle/TestCreate/nested.exp.json @@ -69,7 +69,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -136,7 +137,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "c", @@ -201,7 +203,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "square", @@ -266,7 +269,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestCreate/scope.exp.json b/testdata/d2oracle/TestCreate/scope.exp.json index 56bce7e52..7ccc83418 100644 --- a/testdata/d2oracle/TestCreate/scope.exp.json +++ b/testdata/d2oracle/TestCreate/scope.exp.json @@ -98,7 +98,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -165,7 +166,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -230,7 +232,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "z", @@ -295,7 +298,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "square", @@ -338,7 +342,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json b/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json index 404e508c0..2c346a43a 100644 --- a/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json +++ b/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json @@ -47,7 +47,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -92,7 +93,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/children.exp.json b/testdata/d2oracle/TestDelete/children.exp.json index 4d7148816..4417b0b6f 100644 --- a/testdata/d2oracle/TestDelete/children.exp.json +++ b/testdata/d2oracle/TestDelete/children.exp.json @@ -93,7 +93,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -169,7 +170,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "x", @@ -212,7 +214,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -255,7 +258,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/children_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_conflicts.exp.json index 8c9d70638..b92b264a6 100644 --- a/testdata/d2oracle/TestDelete/children_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_conflicts.exp.json @@ -70,7 +70,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -115,7 +116,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "x", @@ -158,7 +160,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json index 0f45cbe4c..aaf510380 100644 --- a/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json @@ -126,7 +126,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -202,7 +203,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "x 2", @@ -265,7 +267,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -308,7 +311,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json index 368b8310d..cd777527e 100644 --- a/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json @@ -219,7 +219,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -325,7 +326,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "z", @@ -368,7 +370,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "x 2", @@ -431,7 +434,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "z 2", @@ -494,7 +498,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -557,7 +562,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json index 74f50700a..4d13d98e0 100644 --- a/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json @@ -103,7 +103,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -168,7 +169,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "x", @@ -211,7 +213,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json index c49fc91ba..70b5de565 100644 --- a/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json @@ -195,7 +195,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -311,7 +312,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y 2", @@ -374,7 +376,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "x", @@ -417,7 +420,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -460,7 +464,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json index 313097061..cb5f1f72f 100644 --- a/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json @@ -99,7 +99,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -144,7 +145,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -187,7 +189,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "x", @@ -230,7 +233,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json index 725a50f18..cf46e105e 100644 --- a/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json @@ -158,7 +158,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -265,7 +266,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -350,7 +352,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "x", @@ -393,7 +396,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json b/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json index 91f74c667..bb05a94f4 100644 --- a/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json @@ -47,7 +47,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -92,7 +93,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/children_order.exp.json b/testdata/d2oracle/TestDelete/children_order.exp.json index ace7a8b31..f70786ab5 100644 --- a/testdata/d2oracle/TestDelete/children_order.exp.json +++ b/testdata/d2oracle/TestDelete/children_order.exp.json @@ -122,7 +122,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -167,7 +168,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "before", @@ -210,7 +212,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "congo", @@ -253,7 +256,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "after", @@ -296,7 +300,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json index 668543222..a6ae7aa51 100644 --- a/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json @@ -103,7 +103,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -168,7 +169,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "x", @@ -211,7 +213,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/children_scope.exp.json b/testdata/d2oracle/TestDelete/children_scope.exp.json index 7bd1b5112..14f17521a 100644 --- a/testdata/d2oracle/TestDelete/children_scope.exp.json +++ b/testdata/d2oracle/TestDelete/children_scope.exp.json @@ -133,7 +133,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -220,7 +221,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "q", @@ -274,7 +276,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "\"what's up\"", @@ -317,7 +320,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "x", @@ -360,7 +364,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -403,7 +408,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/container_near.exp.json b/testdata/d2oracle/TestDelete/container_near.exp.json index 704202b70..2c10a5b4f 100644 --- a/testdata/d2oracle/TestDelete/container_near.exp.json +++ b/testdata/d2oracle/TestDelete/container_near.exp.json @@ -171,7 +171,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -231,7 +232,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "z", @@ -274,7 +276,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "a", @@ -332,7 +335,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/delete_icon.exp.json b/testdata/d2oracle/TestDelete/delete_icon.exp.json index 9a370a688..ee9834538 100644 --- a/testdata/d2oracle/TestDelete/delete_icon.exp.json +++ b/testdata/d2oracle/TestDelete/delete_icon.exp.json @@ -97,7 +97,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -153,7 +154,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "x", @@ -208,7 +210,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/delete_link.exp.json b/testdata/d2oracle/TestDelete/delete_link.exp.json index bd4a60f19..d4de685b7 100644 --- a/testdata/d2oracle/TestDelete/delete_link.exp.json +++ b/testdata/d2oracle/TestDelete/delete_link.exp.json @@ -47,7 +47,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -92,7 +93,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/delete_near.exp.json b/testdata/d2oracle/TestDelete/delete_near.exp.json index 5ec43d9a8..3bd28fc81 100644 --- a/testdata/d2oracle/TestDelete/delete_near.exp.json +++ b/testdata/d2oracle/TestDelete/delete_near.exp.json @@ -70,7 +70,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -115,7 +116,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -158,7 +160,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json b/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json index 1fe0d5f5c..1b62b5b0e 100644 --- a/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json +++ b/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json @@ -70,7 +70,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -115,7 +116,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -158,7 +160,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json b/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json index e7e41216f..9790fed2a 100644 --- a/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json +++ b/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json @@ -70,7 +70,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -115,7 +116,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -158,7 +160,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/delete_tooltip.exp.json b/testdata/d2oracle/TestDelete/delete_tooltip.exp.json index cddd7377e..2048cb372 100644 --- a/testdata/d2oracle/TestDelete/delete_tooltip.exp.json +++ b/testdata/d2oracle/TestDelete/delete_tooltip.exp.json @@ -47,7 +47,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -92,7 +93,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json b/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json index c8c0b2a8f..e3c978fe3 100644 --- a/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json +++ b/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json @@ -103,7 +103,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -232,7 +233,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -297,7 +299,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "z", @@ -362,7 +365,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -416,7 +420,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/edge_common.exp.json b/testdata/d2oracle/TestDelete/edge_common.exp.json index f268c4258..4df49dc12 100644 --- a/testdata/d2oracle/TestDelete/edge_common.exp.json +++ b/testdata/d2oracle/TestDelete/edge_common.exp.json @@ -70,7 +70,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -146,7 +147,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -189,7 +191,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/edge_common_2.exp.json b/testdata/d2oracle/TestDelete/edge_common_2.exp.json index 81c153998..1b5745d9e 100644 --- a/testdata/d2oracle/TestDelete/edge_common_2.exp.json +++ b/testdata/d2oracle/TestDelete/edge_common_2.exp.json @@ -70,7 +70,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -146,7 +147,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -189,7 +191,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/edge_common_3.exp.json b/testdata/d2oracle/TestDelete/edge_common_3.exp.json index 884567505..3acfeba89 100644 --- a/testdata/d2oracle/TestDelete/edge_common_3.exp.json +++ b/testdata/d2oracle/TestDelete/edge_common_3.exp.json @@ -92,7 +92,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -179,7 +180,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "a", @@ -233,7 +235,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -287,7 +290,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/edge_common_4.exp.json b/testdata/d2oracle/TestDelete/edge_common_4.exp.json index b17687cc0..c14e7c239 100644 --- a/testdata/d2oracle/TestDelete/edge_common_4.exp.json +++ b/testdata/d2oracle/TestDelete/edge_common_4.exp.json @@ -92,7 +92,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -179,7 +180,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "a", @@ -233,7 +235,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -287,7 +290,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/edge_conflict.exp.json b/testdata/d2oracle/TestDelete/edge_conflict.exp.json index 151e6a69a..14e15eb5a 100644 --- a/testdata/d2oracle/TestDelete/edge_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/edge_conflict.exp.json @@ -115,7 +115,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -191,7 +192,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y 2", @@ -276,7 +278,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "a", @@ -330,7 +333,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -384,7 +388,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/edge_decrement.exp.json b/testdata/d2oracle/TestDelete/edge_decrement.exp.json index 7e8cd36b0..32b8cac47 100644 --- a/testdata/d2oracle/TestDelete/edge_decrement.exp.json +++ b/testdata/d2oracle/TestDelete/edge_decrement.exp.json @@ -452,7 +452,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -770,7 +771,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -953,7 +955,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/edge_first.exp.json b/testdata/d2oracle/TestDelete/edge_first.exp.json index ff36efa04..7f3ac442d 100644 --- a/testdata/d2oracle/TestDelete/edge_first.exp.json +++ b/testdata/d2oracle/TestDelete/edge_first.exp.json @@ -181,7 +181,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -309,7 +310,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "p", @@ -374,7 +376,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "d", @@ -439,7 +442,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "x", @@ -482,7 +486,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "p", @@ -525,7 +530,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -588,7 +594,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "z", @@ -631,7 +638,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/edge_flat_style.exp.json b/testdata/d2oracle/TestDelete/edge_flat_style.exp.json index 305e6a4aa..89f8fffc9 100644 --- a/testdata/d2oracle/TestDelete/edge_flat_style.exp.json +++ b/testdata/d2oracle/TestDelete/edge_flat_style.exp.json @@ -47,7 +47,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -92,7 +93,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/edge_identical_child.exp.json b/testdata/d2oracle/TestDelete/edge_identical_child.exp.json index eb781b86d..6740b6e25 100644 --- a/testdata/d2oracle/TestDelete/edge_identical_child.exp.json +++ b/testdata/d2oracle/TestDelete/edge_identical_child.exp.json @@ -103,7 +103,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -201,7 +202,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -266,7 +268,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "z", @@ -331,7 +334,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -385,7 +389,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -439,7 +444,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/edge_key_style.exp.json b/testdata/d2oracle/TestDelete/edge_key_style.exp.json index 7562e03e2..1d37dbb6b 100644 --- a/testdata/d2oracle/TestDelete/edge_key_style.exp.json +++ b/testdata/d2oracle/TestDelete/edge_key_style.exp.json @@ -70,7 +70,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -146,7 +147,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -189,7 +191,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/edge_last.exp.json b/testdata/d2oracle/TestDelete/edge_last.exp.json index ba877e571..8134f3cfa 100644 --- a/testdata/d2oracle/TestDelete/edge_last.exp.json +++ b/testdata/d2oracle/TestDelete/edge_last.exp.json @@ -218,7 +218,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -376,7 +377,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "p", @@ -441,7 +443,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "d", @@ -506,7 +509,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "p", @@ -549,7 +553,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "x", @@ -592,7 +597,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -655,7 +661,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "z", @@ -718,7 +725,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "q", @@ -761,7 +769,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/edge_map_style.exp.json b/testdata/d2oracle/TestDelete/edge_map_style.exp.json index 9ff8ae11c..10775542d 100644 --- a/testdata/d2oracle/TestDelete/edge_map_style.exp.json +++ b/testdata/d2oracle/TestDelete/edge_map_style.exp.json @@ -70,7 +70,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -146,7 +147,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -189,7 +191,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/edge_middle.exp.json b/testdata/d2oracle/TestDelete/edge_middle.exp.json index 91b14b60f..76697ba6b 100644 --- a/testdata/d2oracle/TestDelete/edge_middle.exp.json +++ b/testdata/d2oracle/TestDelete/edge_middle.exp.json @@ -204,7 +204,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -362,7 +363,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "p", @@ -427,7 +429,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "d", @@ -492,7 +495,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "x", @@ -535,7 +539,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -598,7 +603,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "z", @@ -641,7 +647,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "q", @@ -684,7 +691,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "p", @@ -727,7 +735,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/empty_map.exp.json b/testdata/d2oracle/TestDelete/empty_map.exp.json index 2acea4509..67daa1dbf 100644 --- a/testdata/d2oracle/TestDelete/empty_map.exp.json +++ b/testdata/d2oracle/TestDelete/empty_map.exp.json @@ -76,7 +76,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -121,7 +122,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -164,7 +166,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/flat.exp.json b/testdata/d2oracle/TestDelete/flat.exp.json index 3f6f4cf3f..6989c6fe4 100644 --- a/testdata/d2oracle/TestDelete/flat.exp.json +++ b/testdata/d2oracle/TestDelete/flat.exp.json @@ -23,7 +23,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": null diff --git a/testdata/d2oracle/TestDelete/flat_reserved.exp.json b/testdata/d2oracle/TestDelete/flat_reserved.exp.json index 601cb3246..d45648d53 100644 --- a/testdata/d2oracle/TestDelete/flat_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/flat_reserved.exp.json @@ -70,7 +70,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -146,7 +147,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "B", @@ -189,7 +191,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/hoist_children.exp.json b/testdata/d2oracle/TestDelete/hoist_children.exp.json index 6ef96aeff..730278ef3 100644 --- a/testdata/d2oracle/TestDelete/hoist_children.exp.json +++ b/testdata/d2oracle/TestDelete/hoist_children.exp.json @@ -76,7 +76,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -121,7 +122,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "c", @@ -164,7 +166,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json b/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json index 26f1c0df6..c162b8356 100644 --- a/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json +++ b/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json @@ -93,7 +93,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -169,7 +170,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "c", @@ -212,7 +214,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "d", @@ -255,7 +258,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/key_with_edges.exp.json b/testdata/d2oracle/TestDelete/key_with_edges.exp.json index 92d07ef4d..3e3b4a2da 100644 --- a/testdata/d2oracle/TestDelete/key_with_edges.exp.json +++ b/testdata/d2oracle/TestDelete/key_with_edges.exp.json @@ -92,7 +92,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -179,7 +180,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "meow", @@ -233,7 +235,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "bark", @@ -287,7 +290,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json b/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json index 1a050b474..561da5ef5 100644 --- a/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json +++ b/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json @@ -58,7 +58,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -114,7 +115,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "bark", @@ -168,7 +170,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json b/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json index 972602ab8..09f9f5f45 100644 --- a/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json +++ b/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json @@ -58,7 +58,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -114,7 +115,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "bark", @@ -168,7 +170,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json b/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json index 54537c67c..891ac2070 100644 --- a/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json +++ b/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json @@ -92,7 +92,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -179,7 +180,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "meow", @@ -233,7 +235,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "bark", @@ -287,7 +290,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/multi_near.exp.json b/testdata/d2oracle/TestDelete/multi_near.exp.json index 52e790bd6..cba5f597e 100644 --- a/testdata/d2oracle/TestDelete/multi_near.exp.json +++ b/testdata/d2oracle/TestDelete/multi_near.exp.json @@ -194,7 +194,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -239,7 +240,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "Bluefish", @@ -297,7 +299,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "Yo", @@ -355,7 +358,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "Blah", @@ -398,7 +402,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json b/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json index 512dee2e2..d80e57ef8 100644 --- a/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json @@ -128,7 +128,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -193,7 +194,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "z 2", @@ -236,7 +238,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "z", @@ -279,7 +282,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json b/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json index fe559c369..f4757cca1 100644 --- a/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json @@ -99,7 +99,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -144,7 +145,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "z", @@ -187,7 +189,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "z", @@ -230,7 +233,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json b/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json index c649b5ac0..eeeff7108 100644 --- a/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json +++ b/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json @@ -92,7 +92,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -179,7 +180,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "c", @@ -233,7 +235,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "d", @@ -287,7 +290,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json b/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json index 247e72c2f..8d3f7ab18 100644 --- a/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json +++ b/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json @@ -75,7 +75,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [], "objects": [ @@ -146,7 +147,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json b/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json index cfa33cab0..cdaf8faa6 100644 --- a/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json +++ b/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json @@ -111,7 +111,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [], "objects": [ @@ -160,7 +161,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/near.exp.json b/testdata/d2oracle/TestDelete/near.exp.json index 6991d9d32..c310382ac 100644 --- a/testdata/d2oracle/TestDelete/near.exp.json +++ b/testdata/d2oracle/TestDelete/near.exp.json @@ -47,7 +47,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -92,7 +93,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/nested.exp.json b/testdata/d2oracle/TestDelete/nested.exp.json index df80511e7..622f2272b 100644 --- a/testdata/d2oracle/TestDelete/nested.exp.json +++ b/testdata/d2oracle/TestDelete/nested.exp.json @@ -69,7 +69,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -136,7 +137,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "c", @@ -201,7 +203,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "d", @@ -266,7 +269,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/nested_2.exp.json b/testdata/d2oracle/TestDelete/nested_2.exp.json index 8279fda83..7fda03e84 100644 --- a/testdata/d2oracle/TestDelete/nested_2.exp.json +++ b/testdata/d2oracle/TestDelete/nested_2.exp.json @@ -69,7 +69,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -136,7 +137,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -201,7 +203,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "c", @@ -266,7 +269,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json b/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json index c37eda91d..b7d2a38cf 100644 --- a/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json +++ b/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json @@ -99,7 +99,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -175,7 +176,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "x", @@ -218,7 +220,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -261,7 +264,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/nested_flat_style.exp.json b/testdata/d2oracle/TestDelete/nested_flat_style.exp.json index 168b2d4b9..d8ccfe995 100644 --- a/testdata/d2oracle/TestDelete/nested_flat_style.exp.json +++ b/testdata/d2oracle/TestDelete/nested_flat_style.exp.json @@ -47,7 +47,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -92,7 +93,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/nested_reserved.exp.json b/testdata/d2oracle/TestDelete/nested_reserved.exp.json index 3795fe11d..be279b8c0 100644 --- a/testdata/d2oracle/TestDelete/nested_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/nested_reserved.exp.json @@ -103,7 +103,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -201,7 +202,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -297,7 +299,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "jingle", @@ -362,7 +365,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json b/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json index 23921a096..4e84d247e 100644 --- a/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json +++ b/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json @@ -87,7 +87,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -132,7 +133,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "pipe", @@ -186,7 +188,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/node_in_edge.exp.json b/testdata/d2oracle/TestDelete/node_in_edge.exp.json index d56558fd8..a877e9765 100644 --- a/testdata/d2oracle/TestDelete/node_in_edge.exp.json +++ b/testdata/d2oracle/TestDelete/node_in_edge.exp.json @@ -168,7 +168,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -274,7 +275,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "\"what's up\"", @@ -317,7 +319,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "x", @@ -360,7 +363,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -403,7 +407,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "q", @@ -446,7 +451,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "p", @@ -489,7 +495,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json b/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json index dd1456fcf..114905028 100644 --- a/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json +++ b/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json @@ -207,7 +207,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -354,7 +355,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -408,7 +410,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "\"what's up\"", @@ -451,7 +454,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "x", @@ -494,7 +498,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -557,7 +562,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "z", @@ -620,7 +626,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "q", @@ -663,7 +670,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json b/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json index 47a45ceaa..76a90a937 100644 --- a/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json @@ -166,7 +166,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -266,7 +267,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "B", @@ -329,7 +331,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json b/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json index 61f9dcdee..e272bd4c7 100644 --- a/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json @@ -166,7 +166,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -266,7 +267,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "B", @@ -329,7 +331,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/order_1.exp.json b/testdata/d2oracle/TestDelete/order_1.exp.json index c83f093cc..2ffe70df9 100644 --- a/testdata/d2oracle/TestDelete/order_1.exp.json +++ b/testdata/d2oracle/TestDelete/order_1.exp.json @@ -93,7 +93,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -169,7 +170,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -212,7 +214,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "z", @@ -255,7 +258,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/order_2.exp.json b/testdata/d2oracle/TestDelete/order_2.exp.json index 71042a674..f3159d273 100644 --- a/testdata/d2oracle/TestDelete/order_2.exp.json +++ b/testdata/d2oracle/TestDelete/order_2.exp.json @@ -70,7 +70,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -115,7 +116,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "z", @@ -158,7 +160,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/order_3.exp.json b/testdata/d2oracle/TestDelete/order_3.exp.json index 7c75321f9..15efbb349 100644 --- a/testdata/d2oracle/TestDelete/order_3.exp.json +++ b/testdata/d2oracle/TestDelete/order_3.exp.json @@ -70,7 +70,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -115,7 +116,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "z", @@ -158,7 +160,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/order_4.exp.json b/testdata/d2oracle/TestDelete/order_4.exp.json index ab41da5d0..7bbf3ecea 100644 --- a/testdata/d2oracle/TestDelete/order_4.exp.json +++ b/testdata/d2oracle/TestDelete/order_4.exp.json @@ -47,7 +47,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -92,7 +93,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/order_5.exp.json b/testdata/d2oracle/TestDelete/order_5.exp.json index c3336c5dd..208e77fbe 100644 --- a/testdata/d2oracle/TestDelete/order_5.exp.json +++ b/testdata/d2oracle/TestDelete/order_5.exp.json @@ -145,7 +145,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -251,7 +252,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -294,7 +296,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "c", @@ -337,7 +340,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "q", @@ -380,7 +384,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "p", @@ -423,7 +428,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/order_6.exp.json b/testdata/d2oracle/TestDelete/order_6.exp.json index 3f2e88242..959addd8e 100644 --- a/testdata/d2oracle/TestDelete/order_6.exp.json +++ b/testdata/d2oracle/TestDelete/order_6.exp.json @@ -121,7 +121,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -208,7 +209,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "lol", @@ -251,7 +253,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "p", @@ -316,7 +319,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "q", @@ -381,7 +385,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/order_7.exp.json b/testdata/d2oracle/TestDelete/order_7.exp.json index d6744ebb7..ae5aa7222 100644 --- a/testdata/d2oracle/TestDelete/order_7.exp.json +++ b/testdata/d2oracle/TestDelete/order_7.exp.json @@ -132,7 +132,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -230,7 +231,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "lol", @@ -273,7 +275,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "p", @@ -349,7 +352,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "q", @@ -425,7 +429,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "more", @@ -501,7 +506,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/order_8.exp.json b/testdata/d2oracle/TestDelete/order_8.exp.json index 735aad526..f18ba1800 100644 --- a/testdata/d2oracle/TestDelete/order_8.exp.json +++ b/testdata/d2oracle/TestDelete/order_8.exp.json @@ -139,7 +139,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -184,7 +185,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -227,7 +229,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "zebra", @@ -270,7 +273,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "q", @@ -313,7 +317,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "kang", @@ -356,7 +361,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/shape_class.exp.json b/testdata/d2oracle/TestDelete/shape_class.exp.json index ed1e50f18..4005b3a52 100644 --- a/testdata/d2oracle/TestDelete/shape_class.exp.json +++ b/testdata/d2oracle/TestDelete/shape_class.exp.json @@ -47,7 +47,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -92,7 +93,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/shape_sql_table.exp.json b/testdata/d2oracle/TestDelete/shape_sql_table.exp.json index 419ea072a..95693c309 100644 --- a/testdata/d2oracle/TestDelete/shape_sql_table.exp.json +++ b/testdata/d2oracle/TestDelete/shape_sql_table.exp.json @@ -267,7 +267,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -343,7 +344,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "disks", @@ -447,7 +449,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "AWS S3 Vancouver", @@ -490,7 +493,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/singular_flat_style.exp.json b/testdata/d2oracle/TestDelete/singular_flat_style.exp.json index 442097e70..0b2225cc4 100644 --- a/testdata/d2oracle/TestDelete/singular_flat_style.exp.json +++ b/testdata/d2oracle/TestDelete/singular_flat_style.exp.json @@ -47,7 +47,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -92,7 +93,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/singular_map_style.exp.json b/testdata/d2oracle/TestDelete/singular_map_style.exp.json index b75f55c35..2ff0d70fc 100644 --- a/testdata/d2oracle/TestDelete/singular_map_style.exp.json +++ b/testdata/d2oracle/TestDelete/singular_map_style.exp.json @@ -47,7 +47,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -92,7 +93,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json b/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json index a19da74fe..38f31be51 100644 --- a/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json @@ -110,7 +110,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -155,7 +156,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "z", @@ -209,7 +211,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "z", @@ -252,7 +255,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestDelete/underscore_remove.exp.json b/testdata/d2oracle/TestDelete/underscore_remove.exp.json index dd78e801c..ed625965a 100644 --- a/testdata/d2oracle/TestDelete/underscore_remove.exp.json +++ b/testdata/d2oracle/TestDelete/underscore_remove.exp.json @@ -139,7 +139,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -245,7 +246,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "a", @@ -288,7 +290,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -331,7 +334,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "c", @@ -374,7 +378,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "d", @@ -417,7 +422,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/append_multiple_styles.exp.json b/testdata/d2oracle/TestMove/append_multiple_styles.exp.json index 5693019db..ab5015156 100644 --- a/testdata/d2oracle/TestMove/append_multiple_styles.exp.json +++ b/testdata/d2oracle/TestMove/append_multiple_styles.exp.json @@ -231,7 +231,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [], "objects": [ @@ -276,7 +277,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "a", @@ -346,7 +348,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/basic.exp.json b/testdata/d2oracle/TestMove/basic.exp.json index 9216171b9..d7e10b17b 100644 --- a/testdata/d2oracle/TestMove/basic.exp.json +++ b/testdata/d2oracle/TestMove/basic.exp.json @@ -47,7 +47,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -92,7 +93,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/basic_nested.exp.json b/testdata/d2oracle/TestMove/basic_nested.exp.json index 5667c2d99..f3f13c6d9 100644 --- a/testdata/d2oracle/TestMove/basic_nested.exp.json +++ b/testdata/d2oracle/TestMove/basic_nested.exp.json @@ -76,7 +76,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -121,7 +122,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "c", @@ -164,7 +166,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/basic_out_of_container.exp.json b/testdata/d2oracle/TestMove/basic_out_of_container.exp.json index e80df6540..98de41076 100644 --- a/testdata/d2oracle/TestMove/basic_out_of_container.exp.json +++ b/testdata/d2oracle/TestMove/basic_out_of_container.exp.json @@ -70,7 +70,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -115,7 +116,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -158,7 +160,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/between_containers.exp.json b/testdata/d2oracle/TestMove/between_containers.exp.json index 5b35c6d5e..73ea7b504 100644 --- a/testdata/d2oracle/TestMove/between_containers.exp.json +++ b/testdata/d2oracle/TestMove/between_containers.exp.json @@ -99,7 +99,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -144,7 +145,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "c", @@ -187,7 +189,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -230,7 +233,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/chain_connected_nested.exp.json b/testdata/d2oracle/TestMove/chain_connected_nested.exp.json index 615332dbd..8e8efaba6 100644 --- a/testdata/d2oracle/TestMove/chain_connected_nested.exp.json +++ b/testdata/d2oracle/TestMove/chain_connected_nested.exp.json @@ -130,7 +130,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -236,7 +237,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "z", @@ -299,7 +301,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "x", @@ -362,7 +365,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json b/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json index 865e6210b..9544fe4ad 100644 --- a/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json +++ b/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json @@ -118,7 +118,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -235,7 +236,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -289,7 +291,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "x", @@ -352,7 +355,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "z", @@ -395,7 +399,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/connected_nested.exp.json b/testdata/d2oracle/TestMove/connected_nested.exp.json index a5792a9d1..a5f227e2b 100644 --- a/testdata/d2oracle/TestMove/connected_nested.exp.json +++ b/testdata/d2oracle/TestMove/connected_nested.exp.json @@ -93,7 +93,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -169,7 +170,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "x", @@ -212,7 +214,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "z", @@ -255,7 +258,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/container_near.exp.json b/testdata/d2oracle/TestMove/container_near.exp.json index 2f8b2384c..5dfb9a53b 100644 --- a/testdata/d2oracle/TestMove/container_near.exp.json +++ b/testdata/d2oracle/TestMove/container_near.exp.json @@ -201,7 +201,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -246,7 +247,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -326,7 +328,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "a", @@ -380,7 +383,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "z", @@ -434,7 +438,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -477,7 +482,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "a", @@ -520,7 +526,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/edge_across_containers.exp.json b/testdata/d2oracle/TestMove/edge_across_containers.exp.json index 6bb4de01d..c4358d20e 100644 --- a/testdata/d2oracle/TestMove/edge_across_containers.exp.json +++ b/testdata/d2oracle/TestMove/edge_across_containers.exp.json @@ -144,7 +144,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -220,7 +221,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "d", @@ -305,7 +307,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -370,7 +373,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "c", @@ -413,7 +417,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/edge_basic.exp.json b/testdata/d2oracle/TestMove/edge_basic.exp.json index 353c67dc1..b4655c65e 100644 --- a/testdata/d2oracle/TestMove/edge_basic.exp.json +++ b/testdata/d2oracle/TestMove/edge_basic.exp.json @@ -70,7 +70,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -146,7 +147,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -189,7 +191,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/edge_chain_basic.exp.json b/testdata/d2oracle/TestMove/edge_chain_basic.exp.json index 03d087ec1..a5dd1ea29 100644 --- a/testdata/d2oracle/TestMove/edge_chain_basic.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_basic.exp.json @@ -107,7 +107,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -213,7 +214,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -276,7 +278,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "c", @@ -319,7 +322,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/edge_chain_circular.exp.json b/testdata/d2oracle/TestMove/edge_chain_circular.exp.json index 5e0fd751c..c02c9febd 100644 --- a/testdata/d2oracle/TestMove/edge_chain_circular.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_circular.exp.json @@ -158,7 +158,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -264,7 +265,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -349,7 +351,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "c", @@ -412,7 +415,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json b/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json index e53bd0bec..848b413e4 100644 --- a/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json @@ -141,7 +141,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -278,7 +279,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "a", @@ -332,7 +334,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -395,7 +398,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "c", @@ -438,7 +442,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json b/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json index 38c443c4a..c05a06c77 100644 --- a/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json @@ -158,7 +158,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -264,7 +265,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -307,7 +309,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "c", @@ -392,7 +395,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "d", @@ -435,7 +439,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/edge_conflict.exp.json b/testdata/d2oracle/TestMove/edge_conflict.exp.json index 62c325c64..e69f7ca5a 100644 --- a/testdata/d2oracle/TestMove/edge_conflict.exp.json +++ b/testdata/d2oracle/TestMove/edge_conflict.exp.json @@ -144,7 +144,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -220,7 +221,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "x", @@ -263,7 +265,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y 2", @@ -348,7 +351,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "a", @@ -402,7 +406,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -456,7 +461,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/edge_into_container.exp.json b/testdata/d2oracle/TestMove/edge_into_container.exp.json index 6218e4fd0..05e6c63b9 100644 --- a/testdata/d2oracle/TestMove/edge_into_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_into_container.exp.json @@ -133,7 +133,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -240,7 +241,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "d", @@ -283,7 +285,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -337,7 +340,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "c", @@ -380,7 +384,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/edge_nested_basic.exp.json b/testdata/d2oracle/TestMove/edge_nested_basic.exp.json index 902b1a123..198776c77 100644 --- a/testdata/d2oracle/TestMove/edge_nested_basic.exp.json +++ b/testdata/d2oracle/TestMove/edge_nested_basic.exp.json @@ -99,7 +99,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -175,7 +176,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "d", @@ -218,7 +220,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "c", @@ -261,7 +264,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/edge_out_of_container.exp.json b/testdata/d2oracle/TestMove/edge_out_of_container.exp.json index 252f57ea1..a1056410f 100644 --- a/testdata/d2oracle/TestMove/edge_out_of_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_out_of_container.exp.json @@ -110,7 +110,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -186,7 +187,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -240,7 +242,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "c", @@ -283,7 +286,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/extend_map.exp.json b/testdata/d2oracle/TestMove/extend_map.exp.json index e1335c7f0..42dd4613c 100644 --- a/testdata/d2oracle/TestMove/extend_map.exp.json +++ b/testdata/d2oracle/TestMove/extend_map.exp.json @@ -157,7 +157,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -222,7 +223,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "e", @@ -265,7 +267,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "c", @@ -308,7 +311,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -351,7 +355,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/extend_stationary_path.exp.json b/testdata/d2oracle/TestMove/extend_stationary_path.exp.json index 5ad3f58bd..8b6c579c7 100644 --- a/testdata/d2oracle/TestMove/extend_stationary_path.exp.json +++ b/testdata/d2oracle/TestMove/extend_stationary_path.exp.json @@ -150,7 +150,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -237,7 +238,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "c", @@ -322,7 +324,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -407,7 +410,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/flat_between_containers.exp.json b/testdata/d2oracle/TestMove/flat_between_containers.exp.json index b62a33065..dbf89a969 100644 --- a/testdata/d2oracle/TestMove/flat_between_containers.exp.json +++ b/testdata/d2oracle/TestMove/flat_between_containers.exp.json @@ -99,7 +99,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -144,7 +145,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "c", @@ -187,7 +189,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -230,7 +233,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/flat_merge.exp.json b/testdata/d2oracle/TestMove/flat_merge.exp.json index 483fdb5ce..77025f91d 100644 --- a/testdata/d2oracle/TestMove/flat_merge.exp.json +++ b/testdata/d2oracle/TestMove/flat_merge.exp.json @@ -132,7 +132,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -177,7 +178,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "c", @@ -220,7 +222,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "d", @@ -263,7 +266,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -306,7 +310,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/flat_middle_container.exp.json b/testdata/d2oracle/TestMove/flat_middle_container.exp.json index a45b71135..f471bbd8f 100644 --- a/testdata/d2oracle/TestMove/flat_middle_container.exp.json +++ b/testdata/d2oracle/TestMove/flat_middle_container.exp.json @@ -110,7 +110,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -166,7 +167,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "c", @@ -220,7 +222,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "d", @@ -263,7 +266,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -306,7 +310,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/flat_nested_merge.exp.json b/testdata/d2oracle/TestMove/flat_nested_merge.exp.json index 737c1a629..3493ce75e 100644 --- a/testdata/d2oracle/TestMove/flat_nested_merge.exp.json +++ b/testdata/d2oracle/TestMove/flat_nested_merge.exp.json @@ -188,7 +188,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -266,7 +267,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -342,7 +344,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "d", @@ -418,7 +421,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "e", @@ -494,7 +498,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "p", @@ -548,7 +553,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "q", @@ -602,7 +608,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -667,7 +674,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "m", @@ -732,7 +740,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "o", @@ -797,7 +806,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "z", @@ -840,7 +850,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json b/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json index 56cde491e..5733538ff 100644 --- a/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json +++ b/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json @@ -286,7 +286,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -426,7 +427,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -575,7 +577,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "c", @@ -724,7 +727,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "d", @@ -767,7 +771,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "e", @@ -810,7 +815,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "f", @@ -853,7 +859,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "g", @@ -896,7 +903,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "q", @@ -972,7 +980,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json b/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json index b5a99a192..52982b85d 100644 --- a/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json +++ b/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json @@ -109,7 +109,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -154,7 +155,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -197,7 +199,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json b/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json index be6599d0a..8a5a8239e 100644 --- a/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json +++ b/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json @@ -150,7 +150,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -195,7 +196,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "c", @@ -238,7 +240,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -281,7 +284,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json b/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json index f4586228d..27e8fdfe2 100644 --- a/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json +++ b/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json @@ -80,7 +80,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -125,7 +126,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -168,7 +170,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/flat_style.exp.json b/testdata/d2oracle/TestMove/flat_style.exp.json index 8e0bcea62..fdeea2244 100644 --- a/testdata/d2oracle/TestMove/flat_style.exp.json +++ b/testdata/d2oracle/TestMove/flat_style.exp.json @@ -159,7 +159,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [], "objects": [ @@ -204,7 +205,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "a", @@ -318,7 +320,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/full_edge_slice.exp.json b/testdata/d2oracle/TestMove/full_edge_slice.exp.json index 238363e12..e175ba309 100644 --- a/testdata/d2oracle/TestMove/full_edge_slice.exp.json +++ b/testdata/d2oracle/TestMove/full_edge_slice.exp.json @@ -213,7 +213,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -350,7 +351,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -393,7 +395,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "c", @@ -487,7 +490,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "d", @@ -561,7 +565,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/full_slice.exp.json b/testdata/d2oracle/TestMove/full_slice.exp.json index b7ffc8ff5..4d5af2a83 100644 --- a/testdata/d2oracle/TestMove/full_slice.exp.json +++ b/testdata/d2oracle/TestMove/full_slice.exp.json @@ -99,7 +99,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -144,7 +145,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -187,7 +189,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "c", @@ -230,7 +233,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/gnarly_1.exp.json b/testdata/d2oracle/TestMove/gnarly_1.exp.json index 0c46d052f..c973f3cc5 100644 --- a/testdata/d2oracle/TestMove/gnarly_1.exp.json +++ b/testdata/d2oracle/TestMove/gnarly_1.exp.json @@ -357,7 +357,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -555,7 +556,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -598,7 +600,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "p", @@ -703,7 +706,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "q", @@ -777,7 +781,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "a", @@ -842,7 +847,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -907,7 +913,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "c", @@ -972,7 +979,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "e", @@ -1037,7 +1045,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "f", @@ -1102,7 +1111,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "p", @@ -1156,7 +1166,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "q", @@ -1210,7 +1221,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "x", @@ -1264,7 +1276,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/hoist_container_children.exp.json b/testdata/d2oracle/TestMove/hoist_container_children.exp.json index 729b716c4..4b16b7db1 100644 --- a/testdata/d2oracle/TestMove/hoist_container_children.exp.json +++ b/testdata/d2oracle/TestMove/hoist_container_children.exp.json @@ -122,7 +122,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -167,7 +168,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "c", @@ -210,7 +212,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "d", @@ -253,7 +256,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "a", @@ -296,7 +300,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/into_container_existing_map.exp.json b/testdata/d2oracle/TestMove/into_container_existing_map.exp.json index cef9f69ca..d1aaa092d 100644 --- a/testdata/d2oracle/TestMove/into_container_existing_map.exp.json +++ b/testdata/d2oracle/TestMove/into_container_existing_map.exp.json @@ -99,7 +99,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -144,7 +145,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -187,7 +189,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "c", @@ -230,7 +233,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json b/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json index be51f69ce..3d6432c7f 100644 --- a/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json +++ b/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json @@ -76,7 +76,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -121,7 +122,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "c", @@ -164,7 +166,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json b/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json index 8fc2045a0..95f3d377f 100644 --- a/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json +++ b/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json @@ -210,7 +210,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [], "objects": [ @@ -255,7 +256,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "c", @@ -308,7 +310,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json b/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json index 493b4cff5..9a7f77427 100644 --- a/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json +++ b/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json @@ -116,7 +116,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [], "objects": [ @@ -165,7 +166,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -208,7 +210,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/map_transplant.exp.json b/testdata/d2oracle/TestMove/map_transplant.exp.json index 0bcc93844..7a89b479d 100644 --- a/testdata/d2oracle/TestMove/map_transplant.exp.json +++ b/testdata/d2oracle/TestMove/map_transplant.exp.json @@ -219,7 +219,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [], "objects": [ @@ -264,7 +265,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "c", @@ -307,7 +309,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "d", @@ -350,7 +353,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "a", @@ -397,7 +401,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/map_with_label.exp.json b/testdata/d2oracle/TestMove/map_with_label.exp.json index 0f55d724b..d8c94db98 100644 --- a/testdata/d2oracle/TestMove/map_with_label.exp.json +++ b/testdata/d2oracle/TestMove/map_with_label.exp.json @@ -109,7 +109,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -154,7 +155,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "d", @@ -197,7 +199,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "a", @@ -240,7 +243,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/merge_nested_maps.exp.json b/testdata/d2oracle/TestMove/merge_nested_maps.exp.json index 4d5eb8c56..9c5cb055f 100644 --- a/testdata/d2oracle/TestMove/merge_nested_maps.exp.json +++ b/testdata/d2oracle/TestMove/merge_nested_maps.exp.json @@ -270,7 +270,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -315,7 +316,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -462,7 +464,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "c", @@ -516,7 +519,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "d", @@ -590,7 +594,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "e", @@ -655,7 +660,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "g", @@ -720,7 +726,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "o", @@ -763,7 +770,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "k", @@ -806,7 +814,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/merge_reserved.exp.json b/testdata/d2oracle/TestMove/merge_reserved.exp.json index 439d97217..0c1698a6b 100644 --- a/testdata/d2oracle/TestMove/merge_reserved.exp.json +++ b/testdata/d2oracle/TestMove/merge_reserved.exp.json @@ -261,7 +261,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -306,7 +307,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -442,7 +444,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "c", @@ -496,7 +499,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "e", @@ -550,7 +554,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "g", @@ -604,7 +609,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "k", @@ -647,7 +653,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/middle_container.exp.json b/testdata/d2oracle/TestMove/middle_container.exp.json index d0dd56f55..7690290ab 100644 --- a/testdata/d2oracle/TestMove/middle_container.exp.json +++ b/testdata/d2oracle/TestMove/middle_container.exp.json @@ -99,7 +99,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -144,7 +145,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "z", @@ -187,7 +189,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -230,7 +233,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/move_container_children.exp.json b/testdata/d2oracle/TestMove/move_container_children.exp.json index f9c22268a..6e0d51a10 100644 --- a/testdata/d2oracle/TestMove/move_container_children.exp.json +++ b/testdata/d2oracle/TestMove/move_container_children.exp.json @@ -145,7 +145,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -190,7 +191,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "q", @@ -233,7 +235,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "a", @@ -276,7 +279,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "d", @@ -319,7 +323,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -362,7 +367,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json b/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json index b8bfb2e10..c962e4e00 100644 --- a/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json +++ b/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json @@ -145,7 +145,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -190,7 +191,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -233,7 +235,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "a", @@ -276,7 +279,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "d", @@ -319,7 +323,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "x", @@ -362,7 +367,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json b/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json index 6002bd77e..bdd4ddc23 100644 --- a/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json +++ b/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json @@ -86,7 +86,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -131,7 +132,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -174,7 +176,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/move_out_of_edge.exp.json b/testdata/d2oracle/TestMove/move_out_of_edge.exp.json index f16251f0c..af0c6e06c 100644 --- a/testdata/d2oracle/TestMove/move_out_of_edge.exp.json +++ b/testdata/d2oracle/TestMove/move_out_of_edge.exp.json @@ -126,7 +126,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -202,7 +203,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "a", @@ -256,7 +258,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "c", @@ -310,7 +313,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "d", @@ -375,7 +379,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "e", @@ -440,7 +445,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "f", @@ -505,7 +511,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json b/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json index 6d69c47a9..a8750a50f 100644 --- a/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json +++ b/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json @@ -166,7 +166,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -295,7 +296,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "e", @@ -391,7 +393,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "q", @@ -434,7 +437,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "a", @@ -488,7 +492,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "c", @@ -542,7 +547,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "f", @@ -607,7 +613,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json b/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json index a75357554..4f3fec310 100644 --- a/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json +++ b/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json @@ -281,7 +281,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -379,7 +380,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -517,7 +519,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "c", @@ -675,7 +678,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "g", @@ -718,7 +722,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "x", @@ -761,7 +766,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "d", @@ -826,7 +832,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "f", @@ -902,7 +909,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/near.exp.json b/testdata/d2oracle/TestMove/near.exp.json index 9ee15fbae..9d49eee57 100644 --- a/testdata/d2oracle/TestMove/near.exp.json +++ b/testdata/d2oracle/TestMove/near.exp.json @@ -109,7 +109,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -180,7 +181,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -223,7 +225,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/nhooyr_one.exp.json b/testdata/d2oracle/TestMove/nhooyr_one.exp.json index a6d7b80b2..28750791f 100644 --- a/testdata/d2oracle/TestMove/nhooyr_one.exp.json +++ b/testdata/d2oracle/TestMove/nhooyr_one.exp.json @@ -128,7 +128,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -173,7 +174,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "c", @@ -216,7 +218,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "d", @@ -259,7 +262,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "q", @@ -302,7 +306,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/nhooyr_two.exp.json b/testdata/d2oracle/TestMove/nhooyr_two.exp.json index e68f72400..f2217588f 100644 --- a/testdata/d2oracle/TestMove/nhooyr_two.exp.json +++ b/testdata/d2oracle/TestMove/nhooyr_two.exp.json @@ -174,7 +174,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -250,7 +251,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "d", @@ -293,7 +295,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "x", @@ -336,7 +339,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -379,7 +383,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "c", @@ -422,7 +427,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "meow", @@ -465,7 +471,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/parentheses.exp.json b/testdata/d2oracle/TestMove/parentheses.exp.json index f2b4b100e..6710249e1 100644 --- a/testdata/d2oracle/TestMove/parentheses.exp.json +++ b/testdata/d2oracle/TestMove/parentheses.exp.json @@ -109,7 +109,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -216,7 +217,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "x", @@ -259,7 +261,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "\"y (z)\"", @@ -313,7 +316,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/partial_edge_slice.exp.json b/testdata/d2oracle/TestMove/partial_edge_slice.exp.json index 6f1e7797f..d88c2e4dd 100644 --- a/testdata/d2oracle/TestMove/partial_edge_slice.exp.json +++ b/testdata/d2oracle/TestMove/partial_edge_slice.exp.json @@ -116,7 +116,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -192,7 +193,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -255,7 +257,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "c", @@ -298,7 +301,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/partial_slice.exp.json b/testdata/d2oracle/TestMove/partial_slice.exp.json index f4978e04f..abaf2b56a 100644 --- a/testdata/d2oracle/TestMove/partial_slice.exp.json +++ b/testdata/d2oracle/TestMove/partial_slice.exp.json @@ -70,7 +70,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -115,7 +116,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -158,7 +160,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/rename_2.exp.json b/testdata/d2oracle/TestMove/rename_2.exp.json index 37d25714b..cc0555ea0 100644 --- a/testdata/d2oracle/TestMove/rename_2.exp.json +++ b/testdata/d2oracle/TestMove/rename_2.exp.json @@ -145,7 +145,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -190,7 +191,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y 2", @@ -233,7 +235,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b 2", @@ -276,7 +279,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "x", @@ -319,7 +323,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "a", @@ -362,7 +367,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/reuse_map.exp.json b/testdata/d2oracle/TestMove/reuse_map.exp.json index e5555dbce..b4cbdcb21 100644 --- a/testdata/d2oracle/TestMove/reuse_map.exp.json +++ b/testdata/d2oracle/TestMove/reuse_map.exp.json @@ -162,7 +162,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -207,7 +208,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -281,7 +283,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "hey", @@ -324,7 +327,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "k", @@ -367,7 +371,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "yo", @@ -421,7 +426,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/slice_style.exp.json b/testdata/d2oracle/TestMove/slice_style.exp.json index 6680653ea..f031cadfa 100644 --- a/testdata/d2oracle/TestMove/slice_style.exp.json +++ b/testdata/d2oracle/TestMove/slice_style.exp.json @@ -114,7 +114,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -159,7 +160,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -245,7 +247,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/underscore_children.exp.json b/testdata/d2oracle/TestMove/underscore_children.exp.json index 5a43f84b3..0b28ee345 100644 --- a/testdata/d2oracle/TestMove/underscore_children.exp.json +++ b/testdata/d2oracle/TestMove/underscore_children.exp.json @@ -110,7 +110,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -155,7 +156,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "c", @@ -229,7 +231,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/underscore_edge_children.exp.json b/testdata/d2oracle/TestMove/underscore_edge_children.exp.json index e1a1fb736..c7d48d56e 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_children.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_children.exp.json @@ -133,7 +133,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -209,7 +210,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "c", @@ -283,7 +285,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "c", @@ -326,7 +329,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json index 8d7d7c159..1b2a293dd 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json @@ -99,7 +99,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -175,7 +176,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -218,7 +220,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "c", @@ -261,7 +264,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json index 0061f2f15..94481d66b 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json @@ -110,7 +110,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -186,7 +187,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "c", @@ -260,7 +262,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -314,7 +317,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json index 42c8f2e8a..6309a8fa6 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json @@ -110,7 +110,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -186,7 +187,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "d", @@ -240,7 +242,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "c", @@ -283,7 +286,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json index 2581b5f76..135f290ef 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json @@ -99,7 +99,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -175,7 +176,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "f", @@ -218,7 +220,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "c", @@ -261,7 +264,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json index 5dd71fb13..85462c11f 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json @@ -132,7 +132,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -208,7 +209,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "c", @@ -304,7 +306,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -369,7 +372,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/underscore_edge_split.exp.json b/testdata/d2oracle/TestMove/underscore_edge_split.exp.json index 21d713554..0d901d1cf 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_split.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_split.exp.json @@ -162,7 +162,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -238,7 +239,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -281,7 +283,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "c", @@ -324,7 +327,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "f", @@ -378,7 +382,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "yo", @@ -421,7 +426,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/underscore_merge.exp.json b/testdata/d2oracle/TestMove/underscore_merge.exp.json index c33d485f2..c2aceec23 100644 --- a/testdata/d2oracle/TestMove/underscore_merge.exp.json +++ b/testdata/d2oracle/TestMove/underscore_merge.exp.json @@ -142,7 +142,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -187,7 +188,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "c", @@ -230,7 +232,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -293,7 +296,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/underscore_split.exp.json b/testdata/d2oracle/TestMove/underscore_split.exp.json index 743a706df..05dd95b78 100644 --- a/testdata/d2oracle/TestMove/underscore_split.exp.json +++ b/testdata/d2oracle/TestMove/underscore_split.exp.json @@ -139,7 +139,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -184,7 +185,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -227,7 +229,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "f", @@ -281,7 +284,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "c", @@ -324,7 +328,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/underscore_split_out.exp.json b/testdata/d2oracle/TestMove/underscore_split_out.exp.json index 7545eb2fc..a25ae8db8 100644 --- a/testdata/d2oracle/TestMove/underscore_split_out.exp.json +++ b/testdata/d2oracle/TestMove/underscore_split_out.exp.json @@ -197,7 +197,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -242,7 +243,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -285,7 +287,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "c", @@ -359,7 +362,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "e", @@ -402,7 +406,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "f", @@ -445,7 +450,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/underscore_transplant.exp.json b/testdata/d2oracle/TestMove/underscore_transplant.exp.json index 5528c035d..0782ff2b7 100644 --- a/testdata/d2oracle/TestMove/underscore_transplant.exp.json +++ b/testdata/d2oracle/TestMove/underscore_transplant.exp.json @@ -99,7 +99,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -144,7 +145,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -187,7 +189,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "c", @@ -230,7 +233,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/unique_name.exp.json b/testdata/d2oracle/TestMove/unique_name.exp.json index 25ba5b6ab..fc2d2f54b 100644 --- a/testdata/d2oracle/TestMove/unique_name.exp.json +++ b/testdata/d2oracle/TestMove/unique_name.exp.json @@ -156,7 +156,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -232,7 +233,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -306,7 +308,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b 2", @@ -349,7 +352,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "c", @@ -392,7 +396,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestMove/unique_name_with_references.exp.json b/testdata/d2oracle/TestMove/unique_name_with_references.exp.json index f0cc05cc2..a030e194b 100644 --- a/testdata/d2oracle/TestMove/unique_name_with_references.exp.json +++ b/testdata/d2oracle/TestMove/unique_name_with_references.exp.json @@ -179,7 +179,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -286,7 +287,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -329,7 +331,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b 2", @@ -403,7 +406,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "c", @@ -446,7 +450,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "d", @@ -489,7 +494,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestRename/arrows.exp.json b/testdata/d2oracle/TestRename/arrows.exp.json index fadc22c55..c14ada92a 100644 --- a/testdata/d2oracle/TestRename/arrows.exp.json +++ b/testdata/d2oracle/TestRename/arrows.exp.json @@ -70,7 +70,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -146,7 +147,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -189,7 +191,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestRename/arrows_chain.exp.json b/testdata/d2oracle/TestRename/arrows_chain.exp.json index a8c899380..47061c9a0 100644 --- a/testdata/d2oracle/TestRename/arrows_chain.exp.json +++ b/testdata/d2oracle/TestRename/arrows_chain.exp.json @@ -144,7 +144,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -280,7 +281,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -343,7 +345,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "z", @@ -406,7 +409,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "q", @@ -449,7 +453,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestRename/arrows_complex.exp.json b/testdata/d2oracle/TestRename/arrows_complex.exp.json index a395eed50..4d113592b 100644 --- a/testdata/d2oracle/TestRename/arrows_complex.exp.json +++ b/testdata/d2oracle/TestRename/arrows_complex.exp.json @@ -124,7 +124,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -211,7 +212,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -265,7 +267,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "x", @@ -308,7 +311,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -351,7 +355,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestRename/arrows_trim_common.exp.json b/testdata/d2oracle/TestRename/arrows_trim_common.exp.json index d5ab00830..08c281377 100644 --- a/testdata/d2oracle/TestRename/arrows_trim_common.exp.json +++ b/testdata/d2oracle/TestRename/arrows_trim_common.exp.json @@ -160,7 +160,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -296,7 +297,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "x", @@ -339,7 +341,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -402,7 +405,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "z", @@ -465,7 +469,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "q", @@ -508,7 +513,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json b/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json index e25cf3fd4..53858420d 100644 --- a/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json +++ b/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json @@ -210,7 +210,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -512,7 +513,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "x", @@ -566,7 +568,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -651,7 +654,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "z", @@ -736,7 +740,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "\"q)\"", @@ -790,7 +795,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestRename/complex_edge_1.exp.json b/testdata/d2oracle/TestRename/complex_edge_1.exp.json index ceedb2f94..1fd5f794a 100644 --- a/testdata/d2oracle/TestRename/complex_edge_1.exp.json +++ b/testdata/d2oracle/TestRename/complex_edge_1.exp.json @@ -124,7 +124,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -211,7 +212,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "ooo", @@ -265,7 +267,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "x", @@ -308,7 +311,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -351,7 +355,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestRename/complex_edge_2.exp.json b/testdata/d2oracle/TestRename/complex_edge_2.exp.json index 663d56cc2..81b016d76 100644 --- a/testdata/d2oracle/TestRename/complex_edge_2.exp.json +++ b/testdata/d2oracle/TestRename/complex_edge_2.exp.json @@ -124,7 +124,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -211,7 +212,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -265,7 +267,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "papa", @@ -308,7 +311,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -351,7 +355,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestRename/conflict.exp.json b/testdata/d2oracle/TestRename/conflict.exp.json index c8dc12220..ebb1d67b7 100644 --- a/testdata/d2oracle/TestRename/conflict.exp.json +++ b/testdata/d2oracle/TestRename/conflict.exp.json @@ -70,7 +70,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -115,7 +116,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "la", @@ -158,7 +160,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestRename/conflict_2.exp.json b/testdata/d2oracle/TestRename/conflict_2.exp.json index 55f6a2df6..04417ce10 100644 --- a/testdata/d2oracle/TestRename/conflict_2.exp.json +++ b/testdata/d2oracle/TestRename/conflict_2.exp.json @@ -121,7 +121,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -188,7 +189,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "2", @@ -253,7 +255,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "3", @@ -318,7 +321,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "5 2", @@ -361,7 +365,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "5", @@ -404,7 +409,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestRename/conflict_with_dots.exp.json b/testdata/d2oracle/TestRename/conflict_with_dots.exp.json index bbae9e6d0..283b1800a 100644 --- a/testdata/d2oracle/TestRename/conflict_with_dots.exp.json +++ b/testdata/d2oracle/TestRename/conflict_with_dots.exp.json @@ -70,7 +70,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -115,7 +116,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "\"a.b 2\"", @@ -158,7 +160,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestRename/container.exp.json b/testdata/d2oracle/TestRename/container.exp.json index 9c5aaa8ca..67b0de0dc 100644 --- a/testdata/d2oracle/TestRename/container.exp.json +++ b/testdata/d2oracle/TestRename/container.exp.json @@ -749,7 +749,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -1249,7 +1250,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "\"\"", @@ -1533,7 +1535,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "z", @@ -1806,7 +1809,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "i", @@ -1849,7 +1853,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "p", @@ -1965,7 +1970,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "k", @@ -2081,7 +2087,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "l", @@ -2166,7 +2173,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "a", @@ -2251,7 +2259,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "q", @@ -2294,7 +2303,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "+", @@ -2357,7 +2367,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "more", @@ -2400,7 +2411,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "ok", @@ -2465,7 +2477,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "q", @@ -2530,7 +2543,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "z", @@ -2595,7 +2609,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "p", @@ -2649,7 +2664,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "k", @@ -2703,7 +2719,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestRename/edges.exp.json b/testdata/d2oracle/TestRename/edges.exp.json index 466d177cb..f24668918 100644 --- a/testdata/d2oracle/TestRename/edges.exp.json +++ b/testdata/d2oracle/TestRename/edges.exp.json @@ -414,7 +414,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -764,7 +765,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "%%%", @@ -951,7 +953,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "p", @@ -1036,7 +1039,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "k", @@ -1121,7 +1125,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "l", @@ -1206,7 +1211,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "a", @@ -1291,7 +1297,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "q", @@ -1334,7 +1341,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "+", @@ -1397,7 +1405,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestRename/flat.exp.json b/testdata/d2oracle/TestRename/flat.exp.json index 7f8875b49..db2d922b5 100644 --- a/testdata/d2oracle/TestRename/flat.exp.json +++ b/testdata/d2oracle/TestRename/flat.exp.json @@ -47,7 +47,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -92,7 +93,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestRename/generated.exp.json b/testdata/d2oracle/TestRename/generated.exp.json index e01f2dc0d..917aa0420 100644 --- a/testdata/d2oracle/TestRename/generated.exp.json +++ b/testdata/d2oracle/TestRename/generated.exp.json @@ -47,7 +47,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -92,7 +93,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestRename/near.exp.json b/testdata/d2oracle/TestRename/near.exp.json index 4f1095f42..22053b802 100644 --- a/testdata/d2oracle/TestRename/near.exp.json +++ b/testdata/d2oracle/TestRename/near.exp.json @@ -109,7 +109,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -169,7 +170,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "z", @@ -212,7 +214,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestRename/nested.exp.json b/testdata/d2oracle/TestRename/nested.exp.json index 37125d75a..635c2dc14 100644 --- a/testdata/d2oracle/TestRename/nested.exp.json +++ b/testdata/d2oracle/TestRename/nested.exp.json @@ -176,7 +176,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -318,7 +319,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -458,7 +460,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "z", @@ -598,7 +601,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "q", @@ -738,7 +742,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "nerve-gift-jingler", @@ -845,7 +850,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestSet/base.exp.json b/testdata/d2oracle/TestSet/base.exp.json index 23a9eb9f4..3a10c1026 100644 --- a/testdata/d2oracle/TestSet/base.exp.json +++ b/testdata/d2oracle/TestSet/base.exp.json @@ -47,7 +47,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -92,7 +93,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestSet/block_string_multiline.exp.json b/testdata/d2oracle/TestSet/block_string_multiline.exp.json index dd4bcff09..a8a6aec03 100644 --- a/testdata/d2oracle/TestSet/block_string_multiline.exp.json +++ b/testdata/d2oracle/TestSet/block_string_multiline.exp.json @@ -54,7 +54,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -100,7 +101,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestSet/block_string_oneline.exp.json b/testdata/d2oracle/TestSet/block_string_oneline.exp.json index 3601a7f2c..0529a2450 100644 --- a/testdata/d2oracle/TestSet/block_string_oneline.exp.json +++ b/testdata/d2oracle/TestSet/block_string_oneline.exp.json @@ -54,7 +54,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -100,7 +101,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestSet/edge.exp.json b/testdata/d2oracle/TestSet/edge.exp.json index bcbd533e2..1d6f8fdef 100644 --- a/testdata/d2oracle/TestSet/edge.exp.json +++ b/testdata/d2oracle/TestSet/edge.exp.json @@ -80,7 +80,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -156,7 +157,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -199,7 +201,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestSet/edge_append_style.exp.json b/testdata/d2oracle/TestSet/edge_append_style.exp.json index bf9784284..f6bd993ac 100644 --- a/testdata/d2oracle/TestSet/edge_append_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_append_style.exp.json @@ -115,7 +115,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -195,7 +196,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -238,7 +240,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestSet/edge_chain.exp.json b/testdata/d2oracle/TestSet/edge_chain.exp.json index 44a7c7de3..4e5bbff23 100644 --- a/testdata/d2oracle/TestSet/edge_chain.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain.exp.json @@ -207,7 +207,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -316,7 +317,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "q", @@ -379,7 +381,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "z", @@ -462,7 +465,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "p", @@ -505,7 +509,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json b/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json index 65b3feb0a..3cb032220 100644 --- a/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json @@ -190,7 +190,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -323,7 +324,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -406,7 +408,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "z", @@ -449,7 +452,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json b/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json index a80e0b0d9..29fdcde50 100644 --- a/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json @@ -274,7 +274,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -393,7 +394,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -496,7 +498,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "z", @@ -579,7 +582,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json b/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json index aaeec05db..cf1588add 100644 --- a/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json @@ -230,7 +230,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -343,7 +344,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "q", @@ -406,7 +408,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "z", @@ -489,7 +492,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "p", @@ -532,7 +536,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestSet/edge_index_case.exp.json b/testdata/d2oracle/TestSet/edge_index_case.exp.json index f3250cd29..e4a0a56cd 100644 --- a/testdata/d2oracle/TestSet/edge_index_case.exp.json +++ b/testdata/d2oracle/TestSet/edge_index_case.exp.json @@ -184,7 +184,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -290,7 +291,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "z", @@ -333,7 +335,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "Square", @@ -376,7 +379,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "Square 2", @@ -419,7 +423,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "x", @@ -462,7 +467,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -505,7 +511,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestSet/edge_index_nested.exp.json b/testdata/d2oracle/TestSet/edge_index_nested.exp.json index b220c23c0..687a27afc 100644 --- a/testdata/d2oracle/TestSet/edge_index_nested.exp.json +++ b/testdata/d2oracle/TestSet/edge_index_nested.exp.json @@ -109,7 +109,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -185,7 +186,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "q", @@ -228,7 +230,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "z", @@ -271,7 +274,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestSet/edge_key_and_key.exp.json b/testdata/d2oracle/TestSet/edge_key_and_key.exp.json index 0fff2fd1f..39c003fda 100644 --- a/testdata/d2oracle/TestSet/edge_key_and_key.exp.json +++ b/testdata/d2oracle/TestSet/edge_key_and_key.exp.json @@ -160,7 +160,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -302,7 +303,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -356,7 +358,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "c", @@ -410,7 +413,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestSet/edge_label.exp.json b/testdata/d2oracle/TestSet/edge_label.exp.json index 3b5f7c6d6..d65005fc5 100644 --- a/testdata/d2oracle/TestSet/edge_label.exp.json +++ b/testdata/d2oracle/TestSet/edge_label.exp.json @@ -125,7 +125,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -205,7 +206,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -248,7 +250,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestSet/edge_merge_style.exp.json b/testdata/d2oracle/TestSet/edge_merge_style.exp.json index 245894900..deaee9b9b 100644 --- a/testdata/d2oracle/TestSet/edge_merge_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_merge_style.exp.json @@ -162,7 +162,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -245,7 +246,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "y", @@ -288,7 +290,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json b/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json index 3ef412b1b..cf741bc63 100644 --- a/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json @@ -109,7 +109,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -185,7 +186,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "q", @@ -228,7 +230,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "z", @@ -271,7 +274,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json b/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json index 134cacd97..27a7c16bd 100644 --- a/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json @@ -155,7 +155,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -235,7 +236,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "q", @@ -278,7 +280,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "z", @@ -321,7 +324,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestSet/expanded_map_style.exp.json b/testdata/d2oracle/TestSet/expanded_map_style.exp.json index 3204495d1..214855b05 100644 --- a/testdata/d2oracle/TestSet/expanded_map_style.exp.json +++ b/testdata/d2oracle/TestSet/expanded_map_style.exp.json @@ -111,7 +111,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [], "objects": [ @@ -160,7 +161,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestSet/icon.exp.json b/testdata/d2oracle/TestSet/icon.exp.json index e432724cd..3e2deb876 100644 --- a/testdata/d2oracle/TestSet/icon.exp.json +++ b/testdata/d2oracle/TestSet/icon.exp.json @@ -86,7 +86,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -143,7 +144,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestSet/inline_style.exp.json b/testdata/d2oracle/TestSet/inline_style.exp.json index d5ffcea3d..07cfb2b0a 100644 --- a/testdata/d2oracle/TestSet/inline_style.exp.json +++ b/testdata/d2oracle/TestSet/inline_style.exp.json @@ -137,7 +137,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [], "objects": [ @@ -189,7 +190,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestSet/label.exp.json b/testdata/d2oracle/TestSet/label.exp.json index 55551022b..4bb414d81 100644 --- a/testdata/d2oracle/TestSet/label.exp.json +++ b/testdata/d2oracle/TestSet/label.exp.json @@ -57,7 +57,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -102,7 +103,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestSet/label_primary.exp.json b/testdata/d2oracle/TestSet/label_primary.exp.json index b14337fd8..0727fd008 100644 --- a/testdata/d2oracle/TestSet/label_primary.exp.json +++ b/testdata/d2oracle/TestSet/label_primary.exp.json @@ -105,7 +105,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -181,7 +182,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "q", @@ -224,7 +226,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "z", @@ -267,7 +270,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestSet/label_replace.exp.json b/testdata/d2oracle/TestSet/label_replace.exp.json index 469fc2b78..84dc9ff85 100644 --- a/testdata/d2oracle/TestSet/label_replace.exp.json +++ b/testdata/d2oracle/TestSet/label_replace.exp.json @@ -57,7 +57,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -102,7 +103,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestSet/label_unset.exp.json b/testdata/d2oracle/TestSet/label_unset.exp.json index 9a2bb4bfb..c33458a70 100644 --- a/testdata/d2oracle/TestSet/label_unset.exp.json +++ b/testdata/d2oracle/TestSet/label_unset.exp.json @@ -47,7 +47,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -92,7 +93,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestSet/map_key_missing.exp.json b/testdata/d2oracle/TestSet/map_key_missing.exp.json index 2b1b0bc02..0fbca9801 100644 --- a/testdata/d2oracle/TestSet/map_key_missing.exp.json +++ b/testdata/d2oracle/TestSet/map_key_missing.exp.json @@ -103,7 +103,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -199,7 +200,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "b", @@ -242,7 +244,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestSet/nested_alex.exp.json b/testdata/d2oracle/TestSet/nested_alex.exp.json index f9bd8b398..bf7036ff8 100644 --- a/testdata/d2oracle/TestSet/nested_alex.exp.json +++ b/testdata/d2oracle/TestSet/nested_alex.exp.json @@ -175,7 +175,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [ { @@ -251,7 +252,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "here", @@ -314,7 +316,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, { "id": "test", @@ -357,7 +360,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestSet/new_style.exp.json b/testdata/d2oracle/TestSet/new_style.exp.json index db5981740..68bb979d7 100644 --- a/testdata/d2oracle/TestSet/new_style.exp.json +++ b/testdata/d2oracle/TestSet/new_style.exp.json @@ -93,7 +93,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [], "objects": [ @@ -142,7 +143,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestSet/replace_shape.exp.json b/testdata/d2oracle/TestSet/replace_shape.exp.json index 2480ec191..d9d8e4fbd 100644 --- a/testdata/d2oracle/TestSet/replace_shape.exp.json +++ b/testdata/d2oracle/TestSet/replace_shape.exp.json @@ -68,7 +68,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -124,7 +125,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestSet/replace_style.exp.json b/testdata/d2oracle/TestSet/replace_style.exp.json index 6b7003fbb..13b0f99ab 100644 --- a/testdata/d2oracle/TestSet/replace_style.exp.json +++ b/testdata/d2oracle/TestSet/replace_style.exp.json @@ -75,7 +75,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [], "objects": [ @@ -146,7 +147,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json b/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json index 6971bee40..3bd10ba4d 100644 --- a/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json +++ b/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json @@ -130,7 +130,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [], "objects": [ @@ -246,7 +247,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestSet/shape.exp.json b/testdata/d2oracle/TestSet/shape.exp.json index 47cb8df98..efe74bad7 100644 --- a/testdata/d2oracle/TestSet/shape.exp.json +++ b/testdata/d2oracle/TestSet/shape.exp.json @@ -86,7 +86,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": null, "objects": [ @@ -131,7 +132,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, diff --git a/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json b/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json index ac8ebe385..ba2fc8ceb 100644 --- a/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json +++ b/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json @@ -93,7 +93,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null }, "edges": [], "objects": [ @@ -142,7 +143,8 @@ "direction": { "value": "" } - } + }, + "renderPriority": null } ] }, From cf527672b1e0f83838dccbfe2f07b76dfc9ccd87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BAlio=20C=C3=A9sar=20Batista?= Date: Tue, 29 Nov 2022 15:42:33 -0800 Subject: [PATCH 03/19] Fix lint --- d2graph/d2graph.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/d2graph/d2graph.go b/d2graph/d2graph.go index b18455682..2397a6a78 100644 --- a/d2graph/d2graph.go +++ b/d2graph/d2graph.go @@ -79,7 +79,7 @@ type Object struct { Attributes Attributes `json:"attributes"` - RenderPriority *int `json:"renderPriority",omitempty` + RenderPriority *int `json:"renderPriority,omitempty"` } type Attributes struct { From 0fc1294ae6b674d317f5e079a57232ab96ab0a05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BAlio=20C=C3=A9sar=20Batista?= Date: Tue, 29 Nov 2022 15:50:18 -0800 Subject: [PATCH 04/19] Rename RenderPriority -> ZIndex --- d2exporter/export.go | 20 +- d2graph/d2graph.go | 4 +- d2renderers/d2svg/d2svg.go | 2 +- d2target/d2target.go | 14 +- .../sanity/1_to_2/dagre/board.exp.json | 10 +- .../testdata/sanity/1_to_2/elk/board.exp.json | 10 +- .../sanity/basic/dagre/board.exp.json | 6 +- .../testdata/sanity/basic/elk/board.exp.json | 6 +- .../child_to_child/dagre/board.exp.json | 10 +- .../sanity/child_to_child/elk/board.exp.json | 10 +- .../connection_label/dagre/board.exp.json | 6 +- .../connection_label/elk/board.exp.json | 6 +- .../stable/all_shapes/dagre/board.exp.json | 56 ++-- .../stable/all_shapes/elk/board.exp.json | 56 ++-- .../all_shapes_multiple/dagre/board.exp.json | 56 ++-- .../all_shapes_multiple/elk/board.exp.json | 56 ++-- .../all_shapes_shadow/dagre/board.exp.json | 56 ++-- .../all_shapes_shadow/elk/board.exp.json | 56 ++-- .../arrowhead_adjustment/dagre/board.exp.json | 18 +- .../arrowhead_adjustment/elk/board.exp.json | 18 +- .../arrowhead_labels/dagre/board.exp.json | 6 +- .../arrowhead_labels/elk/board.exp.json | 6 +- .../stable/binary_tree/dagre/board.exp.json | 58 ++-- .../stable/binary_tree/elk/board.exp.json | 58 ++-- .../stable/chaos1/dagre/board.exp.json | 14 +- .../testdata/stable/chaos1/elk/board.exp.json | 14 +- .../stable/chaos2/dagre/board.exp.json | 52 +-- .../testdata/stable/chaos2/elk/board.exp.json | 52 +-- .../child_parent_edges/dagre/board.exp.json | 14 +- .../child_parent_edges/elk/board.exp.json | 14 +- .../circular_dependency/dagre/board.exp.json | 14 +- .../circular_dependency/elk/board.exp.json | 14 +- .../stable/class/dagre/board.exp.json | 2 +- .../testdata/stable/class/elk/board.exp.json | 2 +- .../stable/code_snippet/dagre/board.exp.json | 10 +- .../stable/code_snippet/elk/board.exp.json | 10 +- .../connected_container/dagre/board.exp.json | 18 +- .../connected_container/elk/board.exp.json | 18 +- .../container_edges/dagre/board.exp.json | 28 +- .../stable/container_edges/elk/board.exp.json | 28 +- .../stable/dense/dagre/board.exp.json | 82 ++--- .../testdata/stable/dense/elk/board.exp.json | 82 ++--- .../different_subgraphs/dagre/board.exp.json | 80 ++--- .../different_subgraphs/elk/board.exp.json | 80 ++--- .../stable/font_colors/dagre/board.exp.json | 6 +- .../stable/font_colors/elk/board.exp.json | 6 +- .../giant_markdown_test/dagre/board.exp.json | 10 +- .../giant_markdown_test/elk/board.exp.json | 10 +- .../testdata/stable/hr/dagre/board.exp.json | 10 +- .../testdata/stable/hr/elk/board.exp.json | 10 +- .../stable/images/dagre/board.exp.json | 6 +- .../testdata/stable/images/elk/board.exp.json | 6 +- .../stable/investigate/dagre/board.exp.json | 114 +++---- .../stable/investigate/elk/board.exp.json | 114 +++---- .../stable/large_arch/dagre/board.exp.json | 104 +++--- .../stable/large_arch/elk/board.exp.json | 104 +++--- .../stable/latex/dagre/board.exp.json | 24 +- .../testdata/stable/latex/elk/board.exp.json | 24 +- .../testdata/stable/li1/dagre/board.exp.json | 10 +- .../testdata/stable/li1/elk/board.exp.json | 10 +- .../testdata/stable/li2/dagre/board.exp.json | 10 +- .../testdata/stable/li2/elk/board.exp.json | 10 +- .../testdata/stable/li3/dagre/board.exp.json | 10 +- .../testdata/stable/li3/elk/board.exp.json | 10 +- .../testdata/stable/li4/dagre/board.exp.json | 10 +- .../testdata/stable/li4/elk/board.exp.json | 10 +- .../stable/lone_h1/dagre/board.exp.json | 10 +- .../stable/lone_h1/elk/board.exp.json | 10 +- .../stable/markdown/dagre/board.exp.json | 10 +- .../stable/markdown/elk/board.exp.json | 10 +- .../md_2space_newline/dagre/board.exp.json | 4 +- .../md_2space_newline/elk/board.exp.json | 4 +- .../md_backslash_newline/dagre/board.exp.json | 4 +- .../md_backslash_newline/elk/board.exp.json | 4 +- .../md_code_block_fenced/dagre/board.exp.json | 10 +- .../md_code_block_fenced/elk/board.exp.json | 10 +- .../dagre/board.exp.json | 10 +- .../md_code_block_indented/elk/board.exp.json | 10 +- .../md_code_inline/dagre/board.exp.json | 10 +- .../stable/md_code_inline/elk/board.exp.json | 10 +- .../multiline_text/dagre/board.exp.json | 2 +- .../stable/multiline_text/elk/board.exp.json | 2 +- .../multiple_trees/dagre/board.exp.json | 90 ++--- .../stable/multiple_trees/elk/board.exp.json | 90 ++--- .../stable/n22_e32/dagre/board.exp.json | 108 +++--- .../stable/n22_e32/elk/board.exp.json | 108 +++--- .../one_container_loop/dagre/board.exp.json | 30 +- .../one_container_loop/elk/board.exp.json | 30 +- .../dagre/board.exp.json | 26 +- .../elk/board.exp.json | 26 +- .../testdata/stable/p/dagre/board.exp.json | 10 +- e2etests/testdata/stable/p/elk/board.exp.json | 10 +- .../testdata/stable/pre/dagre/board.exp.json | 10 +- .../testdata/stable/pre/elk/board.exp.json | 10 +- .../stable/sql_tables/dagre/board.exp.json | 14 +- .../stable/sql_tables/elk/board.exp.json | 14 +- .../stable/square_3d/dagre/board.exp.json | 6 +- .../stable/square_3d/elk/board.exp.json | 6 +- .../dagre/board.exp.json | 74 ++-- .../elk/board.exp.json | 74 ++-- .../stable/stylish/dagre/board.exp.json | 6 +- .../stable/stylish/elk/board.exp.json | 6 +- .../stable/us_map/dagre/board.exp.json | 316 +++++++++--------- .../testdata/stable/us_map/elk/board.exp.json | 316 +++++++++--------- .../container_child_edge/dagre/board.exp.json | 10 +- .../container_child_edge/elk/board.exp.json | 10 +- .../TestCompile/basic_icon.exp.json | 6 +- .../TestCompile/basic_sequence.exp.json | 6 +- .../TestCompile/basic_shape.exp.json | 6 +- .../TestCompile/basic_style.exp.json | 6 +- .../TestCompile/class_paren.exp.json | 6 +- .../TestCompile/class_style.exp.json | 6 +- testdata/d2compiler/TestCompile/edge.exp.json | 9 +- .../edge_arrowhead_fields.exp.json | 9 +- .../TestCompile/edge_chain.exp.json | 12 +- .../TestCompile/edge_chain_map.exp.json | 12 +- .../TestCompile/edge_column_index.exp.json | 9 +- .../TestCompile/edge_exclusive_style.exp.json | 9 +- .../TestCompile/edge_flat_arrowhead.exp.json | 9 +- .../edge_flat_label_arrowhead.exp.json | 9 +- .../TestCompile/edge_in_column.exp.json | 6 +- .../TestCompile/edge_index.exp.json | 9 +- .../TestCompile/edge_index_map.exp.json | 9 +- .../TestCompile/edge_index_nested.exp.json | 12 +- .../edge_index_nested_cross_scope.exp.json | 12 +- .../edge_key_group_flat_nested.exp.json | 12 +- ..._key_group_flat_nested_underscore.exp.json | 12 +- ..._group_map_flat_nested_underscore.exp.json | 12 +- ...e_key_group_map_nested_underscore.exp.json | 12 +- .../TestCompile/edge_label_map.exp.json | 9 +- .../d2compiler/TestCompile/edge_map.exp.json | 9 +- .../TestCompile/edge_map_arrowhead.exp.json | 9 +- .../TestCompile/edge_map_group_flat.exp.json | 9 +- .../edge_map_group_semiflat.exp.json | 9 +- .../TestCompile/edge_map_nested.exp.json | 9 +- .../TestCompile/edge_map_nested_flat.exp.json | 9 +- .../TestCompile/edge_mixed_arrowhead.exp.json | 9 +- .../edge_non_shape_arrowhead.exp.json | 9 +- .../edge_semiflat_arrowhead.exp.json | 9 +- .../TestCompile/escaped_id.exp.json | 6 +- .../TestCompile/image_style.exp.json | 6 +- .../TestCompile/nested_sql.exp.json | 9 +- .../d2compiler/TestCompile/path_link.exp.json | 6 +- .../reserved_icon_near_style.exp.json | 9 +- .../TestCompile/root_sequence.exp.json | 3 +- .../d2compiler/TestCompile/sql_paren.exp.json | 6 +- .../TestCompile/stroke-width.exp.json | 6 +- .../TestCompile/table_style.exp.json | 6 +- .../TestCompile/table_style_map.exp.json | 6 +- .../TestCompile/underscore_edge.exp.json | 9 +- .../underscore_edge_chain.exp.json | 12 +- .../underscore_edge_existing.exp.json | 12 +- .../underscore_edge_index.exp.json | 12 +- .../underscore_edge_nested.exp.json | 12 +- .../underscore_parent_create.exp.json | 9 +- .../underscore_parent_not_root.exp.json | 12 +- .../underscore_parent_preference_1.exp.json | 9 +- .../underscore_parent_preference_2.exp.json | 9 +- .../underscore_parent_squared.exp.json | 12 +- .../d2compiler/TestCompile/url_link.exp.json | 6 +- .../TestExport/connection/arrowhead.exp.json | 6 +- .../TestExport/connection/basic.exp.json | 6 +- .../connection/stroke-dash.exp.json | 6 +- .../connection/theme_stroke-dash.exp.json | 8 +- .../TestExport/label/basic_shape.exp.json | 2 +- .../label/connection_font_color.exp.json | 6 +- .../label/shape_font_color.exp.json | 2 +- .../TestExport/shape/basic.exp.json | 2 +- .../TestExport/shape/border-radius.exp.json | 2 +- .../shape/image_dimensions.exp.json | 2 +- .../TestExport/shape/synonyms.exp.json | 4 +- .../TestExport/shape/text_color.exp.json | 2 +- .../theme/connection_with_bold.exp.json | 6 +- .../theme/connection_with_italic.exp.json | 6 +- .../theme/connection_without_italic.exp.json | 6 +- .../theme/shape_with_italic.exp.json | 2 +- .../theme/shape_without_bold.exp.json | 2 +- testdata/d2oracle/TestCreate/base.exp.json | 6 +- .../d2oracle/TestCreate/container.exp.json | 9 +- .../TestCreate/container_edge.exp.json | 12 +- .../TestCreate/container_edge_label.exp.json | 12 +- testdata/d2oracle/TestCreate/edge.exp.json | 9 +- .../d2oracle/TestCreate/edge_nested.exp.json | 12 +- .../d2oracle/TestCreate/edge_scope.exp.json | 12 +- .../TestCreate/edge_scope_flat.exp.json | 12 +- .../TestCreate/edge_scope_nested.exp.json | 15 +- .../d2oracle/TestCreate/edge_unique.exp.json | 18 +- testdata/d2oracle/TestCreate/gen_key.exp.json | 9 +- .../d2oracle/TestCreate/gen_key_n.exp.json | 45 +-- .../TestCreate/gen_key_nested.exp.json | 18 +- .../TestCreate/gen_key_scope.exp.json | 18 +- .../TestCreate/gen_key_suffix.exp.json | 9 +- .../TestCreate/make_scope_multiline.exp.json | 9 +- .../make_scope_multiline_spacing_1.exp.json | 15 +- .../make_scope_multiline_spacing_2.exp.json | 15 +- testdata/d2oracle/TestCreate/nested.exp.json | 12 +- testdata/d2oracle/TestCreate/scope.exp.json | 15 +- .../TestDelete/breakup_arrowhead.exp.json | 6 +- .../d2oracle/TestDelete/children.exp.json | 12 +- .../TestDelete/children_conflicts.exp.json | 9 +- .../children_edge_conflicts.exp.json | 12 +- .../children_edges_flat_conflicts.exp.json | 18 +- .../children_flat_conflicts.exp.json | 9 +- .../children_multiple_conflicts.exp.json | 15 +- .../children_nested_conflicts.exp.json | 12 +- ...ldren_nested_referenced_conflicts.exp.json | 12 +- .../children_no_self_conflict.exp.json | 6 +- .../TestDelete/children_order.exp.json | 15 +- .../children_referenced_conflicts.exp.json | 9 +- .../TestDelete/children_scope.exp.json | 18 +- .../TestDelete/container_near.exp.json | 12 +- .../d2oracle/TestDelete/delete_icon.exp.json | 9 +- .../d2oracle/TestDelete/delete_link.exp.json | 6 +- .../d2oracle/TestDelete/delete_near.exp.json | 9 +- .../delete_needed_flat_near.exp.json | 9 +- .../delete_redundant_flat_near.exp.json | 9 +- .../TestDelete/delete_tooltip.exp.json | 6 +- .../edge_both_identical_childs.exp.json | 15 +- .../d2oracle/TestDelete/edge_common.exp.json | 9 +- .../TestDelete/edge_common_2.exp.json | 9 +- .../TestDelete/edge_common_3.exp.json | 12 +- .../TestDelete/edge_common_4.exp.json | 12 +- .../TestDelete/edge_conflict.exp.json | 15 +- .../TestDelete/edge_decrement.exp.json | 9 +- .../d2oracle/TestDelete/edge_first.exp.json | 24 +- .../TestDelete/edge_flat_style.exp.json | 6 +- .../TestDelete/edge_identical_child.exp.json | 18 +- .../TestDelete/edge_key_style.exp.json | 9 +- .../d2oracle/TestDelete/edge_last.exp.json | 27 +- .../TestDelete/edge_map_style.exp.json | 9 +- .../d2oracle/TestDelete/edge_middle.exp.json | 27 +- .../d2oracle/TestDelete/empty_map.exp.json | 9 +- testdata/d2oracle/TestDelete/flat.exp.json | 3 +- .../TestDelete/flat_reserved.exp.json | 9 +- .../TestDelete/hoist_children.exp.json | 9 +- .../TestDelete/hoist_edge_children.exp.json | 12 +- .../TestDelete/key_with_edges.exp.json | 12 +- .../TestDelete/key_with_edges_2.exp.json | 9 +- .../TestDelete/key_with_edges_3.exp.json | 9 +- .../TestDelete/key_with_edges_4.exp.json | 12 +- .../d2oracle/TestDelete/multi_near.exp.json | 15 +- .../multi_path_map_conflict.exp.json | 12 +- .../multi_path_map_no_conflict.exp.json | 12 +- .../multiple_flat_middle_container.exp.json | 12 +- .../TestDelete/multiple_flat_style.exp.json | 6 +- .../TestDelete/multiple_map_styles.exp.json | 6 +- testdata/d2oracle/TestDelete/near.exp.json | 6 +- testdata/d2oracle/TestDelete/nested.exp.json | 12 +- .../d2oracle/TestDelete/nested_2.exp.json | 12 +- .../TestDelete/nested_edge_key_style.exp.json | 12 +- .../TestDelete/nested_flat_style.exp.json | 6 +- .../TestDelete/nested_reserved.exp.json | 12 +- .../nested_underscore_update.exp.json | 9 +- .../d2oracle/TestDelete/node_in_edge.exp.json | 21 +- .../TestDelete/node_in_edge_last.exp.json | 24 +- .../only_delete_edge_reserved.exp.json | 9 +- .../only_delete_obj_reserved.exp.json | 9 +- testdata/d2oracle/TestDelete/order_1.exp.json | 12 +- testdata/d2oracle/TestDelete/order_2.exp.json | 9 +- testdata/d2oracle/TestDelete/order_3.exp.json | 9 +- testdata/d2oracle/TestDelete/order_4.exp.json | 6 +- testdata/d2oracle/TestDelete/order_5.exp.json | 18 +- testdata/d2oracle/TestDelete/order_6.exp.json | 15 +- testdata/d2oracle/TestDelete/order_7.exp.json | 18 +- testdata/d2oracle/TestDelete/order_8.exp.json | 18 +- .../d2oracle/TestDelete/shape_class.exp.json | 6 +- .../TestDelete/shape_sql_table.exp.json | 12 +- .../TestDelete/singular_flat_style.exp.json | 6 +- .../TestDelete/singular_map_style.exp.json | 6 +- .../underscore_no_conflict.exp.json | 12 +- .../TestDelete/underscore_remove.exp.json | 18 +- .../TestMove/append_multiple_styles.exp.json | 9 +- testdata/d2oracle/TestMove/basic.exp.json | 6 +- .../d2oracle/TestMove/basic_nested.exp.json | 9 +- .../TestMove/basic_out_of_container.exp.json | 9 +- .../TestMove/between_containers.exp.json | 12 +- .../TestMove/chain_connected_nested.exp.json | 12 +- ..._connected_nested_no_extra_create.exp.json | 15 +- .../TestMove/connected_nested.exp.json | 12 +- .../d2oracle/TestMove/container_near.exp.json | 21 +- .../TestMove/edge_across_containers.exp.json | 15 +- .../d2oracle/TestMove/edge_basic.exp.json | 9 +- .../TestMove/edge_chain_basic.exp.json | 12 +- .../TestMove/edge_chain_circular.exp.json | 12 +- .../edge_chain_into_container.exp.json | 15 +- .../edge_chain_out_container.exp.json | 15 +- .../d2oracle/TestMove/edge_conflict.exp.json | 18 +- .../TestMove/edge_into_container.exp.json | 15 +- .../TestMove/edge_nested_basic.exp.json | 12 +- .../TestMove/edge_out_of_container.exp.json | 12 +- .../d2oracle/TestMove/extend_map.exp.json | 15 +- .../TestMove/extend_stationary_path.exp.json | 12 +- .../TestMove/flat_between_containers.exp.json | 12 +- .../d2oracle/TestMove/flat_merge.exp.json | 15 +- .../TestMove/flat_middle_container.exp.json | 15 +- .../TestMove/flat_nested_merge.exp.json | 33 +- .../flat_nested_merge_multiple_refs.exp.json | 27 +- .../flat_reparent_with_map_value.exp.json | 9 +- ...lat_reparent_with_mixed_map_value.exp.json | 12 +- .../flat_reparent_with_value.exp.json | 9 +- .../d2oracle/TestMove/flat_style.exp.json | 9 +- .../TestMove/full_edge_slice.exp.json | 15 +- .../d2oracle/TestMove/full_slice.exp.json | 12 +- testdata/d2oracle/TestMove/gnarly_1.exp.json | 39 +-- .../hoist_container_children.exp.json | 15 +- .../into_container_existing_map.exp.json | 12 +- .../into_container_nonexisting_map.exp.json | 9 +- .../into_container_with_flat_keys.exp.json | 9 +- .../into_container_with_flat_style.exp.json | 9 +- .../d2oracle/TestMove/map_transplant.exp.json | 15 +- .../d2oracle/TestMove/map_with_label.exp.json | 12 +- .../TestMove/merge_nested_maps.exp.json | 27 +- .../d2oracle/TestMove/merge_reserved.exp.json | 21 +- .../TestMove/middle_container.exp.json | 12 +- .../TestMove/move_container_children.exp.json | 18 +- .../move_container_conflict_children.exp.json | 18 +- .../move_into_key_with_value.exp.json | 9 +- .../TestMove/move_out_of_edge.exp.json | 21 +- .../TestMove/move_out_of_nested_edge.exp.json | 21 +- .../TestMove/multiple_nesting_levels.exp.json | 24 +- testdata/d2oracle/TestMove/near.exp.json | 9 +- .../d2oracle/TestMove/nhooyr_one.exp.json | 15 +- .../d2oracle/TestMove/nhooyr_two.exp.json | 21 +- .../d2oracle/TestMove/parentheses.exp.json | 12 +- .../TestMove/partial_edge_slice.exp.json | 12 +- .../d2oracle/TestMove/partial_slice.exp.json | 9 +- testdata/d2oracle/TestMove/rename_2.exp.json | 18 +- testdata/d2oracle/TestMove/reuse_map.exp.json | 18 +- .../d2oracle/TestMove/slice_style.exp.json | 9 +- .../TestMove/underscore_children.exp.json | 9 +- .../underscore_edge_children.exp.json | 12 +- .../underscore_edge_container_1.exp.json | 12 +- .../underscore_edge_container_2.exp.json | 12 +- .../underscore_edge_container_3.exp.json | 12 +- .../underscore_edge_container_4.exp.json | 12 +- .../underscore_edge_container_5.exp.json | 12 +- .../TestMove/underscore_edge_split.exp.json | 18 +- .../TestMove/underscore_merge.exp.json | 12 +- .../TestMove/underscore_split.exp.json | 15 +- .../TestMove/underscore_split_out.exp.json | 18 +- .../TestMove/underscore_transplant.exp.json | 12 +- .../d2oracle/TestMove/unique_name.exp.json | 15 +- .../unique_name_with_references.exp.json | 18 +- testdata/d2oracle/TestRename/arrows.exp.json | 9 +- .../d2oracle/TestRename/arrows_chain.exp.json | 15 +- .../TestRename/arrows_complex.exp.json | 15 +- .../TestRename/arrows_trim_common.exp.json | 18 +- .../TestRename/arrows_trim_common_2.exp.json | 18 +- .../TestRename/complex_edge_1.exp.json | 15 +- .../TestRename/complex_edge_2.exp.json | 15 +- .../d2oracle/TestRename/conflict.exp.json | 9 +- .../d2oracle/TestRename/conflict_2.exp.json | 18 +- .../TestRename/conflict_with_dots.exp.json | 9 +- .../d2oracle/TestRename/container.exp.json | 51 +-- testdata/d2oracle/TestRename/edges.exp.json | 27 +- testdata/d2oracle/TestRename/flat.exp.json | 6 +- .../d2oracle/TestRename/generated.exp.json | 6 +- testdata/d2oracle/TestRename/near.exp.json | 9 +- testdata/d2oracle/TestRename/nested.exp.json | 18 +- testdata/d2oracle/TestSet/base.exp.json | 6 +- .../TestSet/block_string_multiline.exp.json | 6 +- .../TestSet/block_string_oneline.exp.json | 6 +- testdata/d2oracle/TestSet/edge.exp.json | 9 +- .../TestSet/edge_append_style.exp.json | 9 +- testdata/d2oracle/TestSet/edge_chain.exp.json | 15 +- .../TestSet/edge_chain_append_style.exp.json | 12 +- .../edge_chain_existing_style.exp.json | 12 +- .../TestSet/edge_chain_nested_set.exp.json | 15 +- .../d2oracle/TestSet/edge_index_case.exp.json | 21 +- .../TestSet/edge_index_nested.exp.json | 12 +- .../TestSet/edge_key_and_key.exp.json | 12 +- testdata/d2oracle/TestSet/edge_label.exp.json | 9 +- .../TestSet/edge_merge_style.exp.json | 9 +- .../TestSet/edge_nested_label_set.exp.json | 12 +- .../TestSet/edge_nested_style_set.exp.json | 12 +- .../TestSet/expanded_map_style.exp.json | 6 +- testdata/d2oracle/TestSet/icon.exp.json | 6 +- .../d2oracle/TestSet/inline_style.exp.json | 6 +- testdata/d2oracle/TestSet/label.exp.json | 6 +- .../d2oracle/TestSet/label_primary.exp.json | 12 +- .../d2oracle/TestSet/label_replace.exp.json | 6 +- .../d2oracle/TestSet/label_unset.exp.json | 6 +- .../d2oracle/TestSet/map_key_missing.exp.json | 9 +- .../d2oracle/TestSet/nested_alex.exp.json | 12 +- testdata/d2oracle/TestSet/new_style.exp.json | 6 +- .../d2oracle/TestSet/replace_shape.exp.json | 6 +- .../d2oracle/TestSet/replace_style.exp.json | 6 +- .../TestSet/replace_style_edgecase.exp.json | 6 +- testdata/d2oracle/TestSet/shape.exp.json | 6 +- .../TestSet/shape_nested_style_set.exp.json | 6 +- 390 files changed, 2790 insertions(+), 3855 deletions(-) diff --git a/d2exporter/export.go b/d2exporter/export.go index da15a0424..e93cf659a 100644 --- a/d2exporter/export.go +++ b/d2exporter/export.go @@ -20,13 +20,13 @@ func Export(ctx context.Context, g *d2graph.Graph, themeID int64) (*d2target.Dia highestObjectPriority := 0 for i := range g.Objects { diagram.Shapes[i] = toShape(g.Objects[i], &theme) - highestObjectPriority = go2.IntMax(highestObjectPriority, diagram.Shapes[i].RenderPriority) + highestObjectPriority = go2.IntMax(highestObjectPriority, diagram.Shapes[i].ZIndex) } - edgeDefaultRenderPriority := highestObjectPriority + 1 + edgeDefaultZIndex := highestObjectPriority + 1 diagram.Connections = make([]d2target.Connection, len(g.Edges)) for i := range g.Edges { - diagram.Connections[i] = toConnection(g.Edges[i], &theme, edgeDefaultRenderPriority) + diagram.Connections[i] = toConnection(g.Edges[i], &theme, edgeDefaultZIndex) } return diagram, nil @@ -92,10 +92,10 @@ func toShape(obj *d2graph.Object, theme *d2themes.Theme) d2target.Shape { shape := d2target.BaseShape() shape.SetType(obj.Attributes.Shape.Value) shape.ID = obj.AbsID() - if obj.RenderPriority == nil { - shape.RenderPriority = int(obj.Level()) + if obj.ZIndex == nil { + shape.ZIndex = int(obj.Level()) } else { - shape.RenderPriority = *obj.RenderPriority + shape.ZIndex = *obj.ZIndex } shape.Pos = d2target.NewPoint(int(obj.TopLeft.X), int(obj.TopLeft.Y)) shape.Width = int(obj.Width) @@ -138,13 +138,13 @@ func toShape(obj *d2graph.Object, theme *d2themes.Theme) d2target.Shape { return *shape } -func toConnection(edge *d2graph.Edge, theme *d2themes.Theme, defaultRenderPriotity int) d2target.Connection { +func toConnection(edge *d2graph.Edge, theme *d2themes.Theme, defaultZIndex int) d2target.Connection { connection := d2target.BaseConnection() connection.ID = edge.AbsID() - if edge.RenderPriority == nil { - connection.RenderPriority = defaultRenderPriotity + if edge.ZIndex == nil { + connection.ZIndex = defaultZIndex } else { - connection.RenderPriority = *edge.RenderPriority + connection.ZIndex = *edge.ZIndex } // edge.Edge.ID = go2.StringToIntHash(connection.ID) text := edge.Text() diff --git a/d2graph/d2graph.go b/d2graph/d2graph.go index 2397a6a78..5a00b2b75 100644 --- a/d2graph/d2graph.go +++ b/d2graph/d2graph.go @@ -79,7 +79,7 @@ type Object struct { Attributes Attributes `json:"attributes"` - RenderPriority *int `json:"renderPriority,omitempty"` + ZIndex *int `json:"zIndex,omitempty"` } type Attributes struct { @@ -633,7 +633,7 @@ type Edge struct { References []EdgeReference `json:"references,omitempty"` Attributes Attributes `json:"attributes"` - RenderPriority *int `json:"renderPriority,omitempty"` + ZIndex *int `json:"zIndex,omitempty"` } type EdgeReference struct { diff --git a/d2renderers/d2svg/d2svg.go b/d2renderers/d2svg/d2svg.go index 21f55a077..84bbd2f15 100644 --- a/d2renderers/d2svg/d2svg.go +++ b/d2renderers/d2svg/d2svg.go @@ -994,7 +994,7 @@ func Render(diagram *d2target.Diagram) ([]byte, error) { } sort.SliceStable(allObjects, func(i, j int) bool { - return allObjects[i].GetPriority() < allObjects[j].GetPriority() + return allObjects[i].GetZIndex() < allObjects[j].GetZIndex() }) markers := map[string]struct{}{} diff --git a/d2target/d2target.go b/d2target/d2target.go index 0b25b35fe..2a50a6aa4 100644 --- a/d2target/d2target.go +++ b/d2target/d2target.go @@ -18,7 +18,7 @@ const ( ) type DiagramObject interface { - GetPriority() int + GetZIndex() int } type Diagram struct { @@ -121,7 +121,7 @@ type Shape struct { LabelPosition string `json:"labelPosition,omitempty"` - RenderPriority int `json:"renderPriority"` + ZIndex int `json:"zIndex"` } func (s *Shape) SetType(t string) { @@ -135,8 +135,8 @@ func (s *Shape) SetType(t string) { s.Type = strings.ToLower(t) } -func (s Shape) GetPriority() int { - return s.RenderPriority +func (s Shape) GetZIndex() int { + return s.ZIndex } type Text struct { @@ -193,7 +193,7 @@ type Connection struct { Tooltip string `json:"tooltip"` Icon *url.URL `json:"icon"` - RenderPriority int `json:"renderPriority"` + ZIndex int `json:"zIndex"` } func BaseConnection() *Connection { @@ -221,8 +221,8 @@ func (c *Connection) GetLabelTopLeft() *geo.Point { ) } -func (c Connection) GetPriority() int { - return c.RenderPriority +func (c Connection) GetZIndex() int { + return c.ZIndex } type Arrowhead string diff --git a/e2etests/testdata/sanity/1_to_2/dagre/board.exp.json b/e2etests/testdata/sanity/1_to_2/dagre/board.exp.json index 9d7bafb1e..6f149ad17 100644 --- a/e2etests/testdata/sanity/1_to_2/dagre/board.exp.json +++ b/e2etests/testdata/sanity/1_to_2/dagre/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "b", @@ -75,7 +75,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "c", @@ -113,7 +113,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -163,7 +163,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(a -> c)[0]", @@ -211,7 +211,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/sanity/1_to_2/elk/board.exp.json b/e2etests/testdata/sanity/1_to_2/elk/board.exp.json index 1ff2e7f96..783996f3a 100644 --- a/e2etests/testdata/sanity/1_to_2/elk/board.exp.json +++ b/e2etests/testdata/sanity/1_to_2/elk/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "b", @@ -75,7 +75,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "c", @@ -113,7 +113,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -154,7 +154,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(a -> c)[0]", @@ -201,7 +201,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/sanity/basic/dagre/board.exp.json b/e2etests/testdata/sanity/basic/dagre/board.exp.json index 49f25e27a..f3732823d 100644 --- a/e2etests/testdata/sanity/basic/dagre/board.exp.json +++ b/e2etests/testdata/sanity/basic/dagre/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "b", @@ -75,7 +75,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -125,7 +125,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/sanity/basic/elk/board.exp.json b/e2etests/testdata/sanity/basic/elk/board.exp.json index caf6ed051..66977e1db 100644 --- a/e2etests/testdata/sanity/basic/elk/board.exp.json +++ b/e2etests/testdata/sanity/basic/elk/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "b", @@ -75,7 +75,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -116,7 +116,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/sanity/child_to_child/dagre/board.exp.json b/e2etests/testdata/sanity/child_to_child/dagre/board.exp.json index 54e4d4f5f..e6d74cf50 100644 --- a/e2etests/testdata/sanity/child_to_child/dagre/board.exp.json +++ b/e2etests/testdata/sanity/child_to_child/dagre/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 17, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "a.b", @@ -75,7 +75,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "c", @@ -113,7 +113,7 @@ "labelWidth": 17, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "c.d", @@ -151,7 +151,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 } ], "connections": [ @@ -213,7 +213,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 } ] } diff --git a/e2etests/testdata/sanity/child_to_child/elk/board.exp.json b/e2etests/testdata/sanity/child_to_child/elk/board.exp.json index 8aeadea21..8ad45217d 100644 --- a/e2etests/testdata/sanity/child_to_child/elk/board.exp.json +++ b/e2etests/testdata/sanity/child_to_child/elk/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 17, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "a.b", @@ -75,7 +75,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "c", @@ -113,7 +113,7 @@ "labelWidth": 17, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "c.d", @@ -151,7 +151,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 } ], "connections": [ @@ -192,7 +192,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 } ] } diff --git a/e2etests/testdata/sanity/connection_label/dagre/board.exp.json b/e2etests/testdata/sanity/connection_label/dagre/board.exp.json index 0692526cb..63096a54f 100644 --- a/e2etests/testdata/sanity/connection_label/dagre/board.exp.json +++ b/e2etests/testdata/sanity/connection_label/dagre/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "b", @@ -75,7 +75,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -125,7 +125,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/sanity/connection_label/elk/board.exp.json b/e2etests/testdata/sanity/connection_label/elk/board.exp.json index 9b5235b5a..96c8db885 100644 --- a/e2etests/testdata/sanity/connection_label/elk/board.exp.json +++ b/e2etests/testdata/sanity/connection_label/elk/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "b", @@ -75,7 +75,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -116,7 +116,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/all_shapes/dagre/board.exp.json b/e2etests/testdata/stable/all_shapes/dagre/board.exp.json index 3474b9562..03a60b7e7 100644 --- a/e2etests/testdata/stable/all_shapes/dagre/board.exp.json +++ b/e2etests/testdata/stable/all_shapes/dagre/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 71, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "square", @@ -75,7 +75,7 @@ "labelWidth": 54, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "page", @@ -113,7 +113,7 @@ "labelWidth": 39, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "parallelogram", @@ -151,7 +151,7 @@ "labelWidth": 104, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "document", @@ -189,7 +189,7 @@ "labelWidth": 77, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "cylinder", @@ -227,7 +227,7 @@ "labelWidth": 64, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "queue", @@ -265,7 +265,7 @@ "labelWidth": 49, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "package", @@ -303,7 +303,7 @@ "labelWidth": 63, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "step", @@ -341,7 +341,7 @@ "labelWidth": 36, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "callout", @@ -379,7 +379,7 @@ "labelWidth": 55, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "stored_data", @@ -417,7 +417,7 @@ "labelWidth": 91, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "person", @@ -455,7 +455,7 @@ "labelWidth": 53, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "diamond", @@ -493,7 +493,7 @@ "labelWidth": 68, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "oval", @@ -531,7 +531,7 @@ "labelWidth": 36, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "circle", @@ -569,7 +569,7 @@ "labelWidth": 44, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "hexagon", @@ -607,7 +607,7 @@ "labelWidth": 65, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "cloud", @@ -645,7 +645,7 @@ "labelWidth": 45, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -695,7 +695,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(square -> page)[0]", @@ -743,7 +743,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(parallelogram -> document)[0]", @@ -791,7 +791,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(document -> cylinder)[0]", @@ -839,7 +839,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(queue -> package)[0]", @@ -887,7 +887,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(package -> step)[0]", @@ -935,7 +935,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(callout -> stored_data)[0]", @@ -983,7 +983,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(stored_data -> person)[0]", @@ -1031,7 +1031,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(diamond -> oval)[0]", @@ -1079,7 +1079,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(oval -> circle)[0]", @@ -1127,7 +1127,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(hexagon -> cloud)[0]", @@ -1175,7 +1175,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/all_shapes/elk/board.exp.json b/e2etests/testdata/stable/all_shapes/elk/board.exp.json index 450dd97c6..06e144576 100644 --- a/e2etests/testdata/stable/all_shapes/elk/board.exp.json +++ b/e2etests/testdata/stable/all_shapes/elk/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 71, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "square", @@ -75,7 +75,7 @@ "labelWidth": 54, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "page", @@ -113,7 +113,7 @@ "labelWidth": 39, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "parallelogram", @@ -151,7 +151,7 @@ "labelWidth": 104, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "document", @@ -189,7 +189,7 @@ "labelWidth": 77, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "cylinder", @@ -227,7 +227,7 @@ "labelWidth": 64, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "queue", @@ -265,7 +265,7 @@ "labelWidth": 49, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "package", @@ -303,7 +303,7 @@ "labelWidth": 63, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "step", @@ -341,7 +341,7 @@ "labelWidth": 36, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "callout", @@ -379,7 +379,7 @@ "labelWidth": 55, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "stored_data", @@ -417,7 +417,7 @@ "labelWidth": 91, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "person", @@ -455,7 +455,7 @@ "labelWidth": 53, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "diamond", @@ -493,7 +493,7 @@ "labelWidth": 68, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "oval", @@ -531,7 +531,7 @@ "labelWidth": 36, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "circle", @@ -569,7 +569,7 @@ "labelWidth": 44, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "hexagon", @@ -607,7 +607,7 @@ "labelWidth": 65, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "cloud", @@ -645,7 +645,7 @@ "labelWidth": 45, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -686,7 +686,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(square -> page)[0]", @@ -725,7 +725,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(parallelogram -> document)[0]", @@ -764,7 +764,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(document -> cylinder)[0]", @@ -803,7 +803,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(queue -> package)[0]", @@ -842,7 +842,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(package -> step)[0]", @@ -881,7 +881,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(callout -> stored_data)[0]", @@ -920,7 +920,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(stored_data -> person)[0]", @@ -959,7 +959,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(diamond -> oval)[0]", @@ -998,7 +998,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(oval -> circle)[0]", @@ -1037,7 +1037,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(hexagon -> cloud)[0]", @@ -1076,7 +1076,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } 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 a896471a6..252ade6eb 100644 --- a/e2etests/testdata/stable/all_shapes_multiple/dagre/board.exp.json +++ b/e2etests/testdata/stable/all_shapes_multiple/dagre/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 71, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "square", @@ -75,7 +75,7 @@ "labelWidth": 54, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "page", @@ -113,7 +113,7 @@ "labelWidth": 39, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "parallelogram", @@ -151,7 +151,7 @@ "labelWidth": 104, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "document", @@ -189,7 +189,7 @@ "labelWidth": 77, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "cylinder", @@ -227,7 +227,7 @@ "labelWidth": 64, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "queue", @@ -265,7 +265,7 @@ "labelWidth": 49, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "package", @@ -303,7 +303,7 @@ "labelWidth": 63, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "step", @@ -341,7 +341,7 @@ "labelWidth": 36, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "callout", @@ -379,7 +379,7 @@ "labelWidth": 55, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "stored_data", @@ -417,7 +417,7 @@ "labelWidth": 91, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "person", @@ -455,7 +455,7 @@ "labelWidth": 53, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "diamond", @@ -493,7 +493,7 @@ "labelWidth": 68, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "oval", @@ -531,7 +531,7 @@ "labelWidth": 36, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "circle", @@ -569,7 +569,7 @@ "labelWidth": 44, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "hexagon", @@ -607,7 +607,7 @@ "labelWidth": 65, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "cloud", @@ -645,7 +645,7 @@ "labelWidth": 45, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -695,7 +695,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(square -> page)[0]", @@ -743,7 +743,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(parallelogram -> document)[0]", @@ -791,7 +791,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(document -> cylinder)[0]", @@ -839,7 +839,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(queue -> package)[0]", @@ -887,7 +887,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(package -> step)[0]", @@ -935,7 +935,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(callout -> stored_data)[0]", @@ -983,7 +983,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(stored_data -> person)[0]", @@ -1031,7 +1031,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(diamond -> oval)[0]", @@ -1079,7 +1079,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(oval -> circle)[0]", @@ -1127,7 +1127,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(hexagon -> cloud)[0]", @@ -1175,7 +1175,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } 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 29a117de8..a2d34c1f2 100644 --- a/e2etests/testdata/stable/all_shapes_multiple/elk/board.exp.json +++ b/e2etests/testdata/stable/all_shapes_multiple/elk/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 71, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "square", @@ -75,7 +75,7 @@ "labelWidth": 54, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "page", @@ -113,7 +113,7 @@ "labelWidth": 39, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "parallelogram", @@ -151,7 +151,7 @@ "labelWidth": 104, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "document", @@ -189,7 +189,7 @@ "labelWidth": 77, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "cylinder", @@ -227,7 +227,7 @@ "labelWidth": 64, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "queue", @@ -265,7 +265,7 @@ "labelWidth": 49, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "package", @@ -303,7 +303,7 @@ "labelWidth": 63, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "step", @@ -341,7 +341,7 @@ "labelWidth": 36, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "callout", @@ -379,7 +379,7 @@ "labelWidth": 55, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "stored_data", @@ -417,7 +417,7 @@ "labelWidth": 91, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "person", @@ -455,7 +455,7 @@ "labelWidth": 53, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "diamond", @@ -493,7 +493,7 @@ "labelWidth": 68, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "oval", @@ -531,7 +531,7 @@ "labelWidth": 36, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "circle", @@ -569,7 +569,7 @@ "labelWidth": 44, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "hexagon", @@ -607,7 +607,7 @@ "labelWidth": 65, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "cloud", @@ -645,7 +645,7 @@ "labelWidth": 45, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -686,7 +686,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(square -> page)[0]", @@ -725,7 +725,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(parallelogram -> document)[0]", @@ -764,7 +764,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(document -> cylinder)[0]", @@ -803,7 +803,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(queue -> package)[0]", @@ -842,7 +842,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(package -> step)[0]", @@ -881,7 +881,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(callout -> stored_data)[0]", @@ -920,7 +920,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(stored_data -> person)[0]", @@ -959,7 +959,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(diamond -> oval)[0]", @@ -998,7 +998,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(oval -> circle)[0]", @@ -1037,7 +1037,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(hexagon -> cloud)[0]", @@ -1076,7 +1076,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } 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 751abdf1f..dff2bb210 100644 --- a/e2etests/testdata/stable/all_shapes_shadow/dagre/board.exp.json +++ b/e2etests/testdata/stable/all_shapes_shadow/dagre/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 71, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "square", @@ -75,7 +75,7 @@ "labelWidth": 54, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "page", @@ -113,7 +113,7 @@ "labelWidth": 39, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "parallelogram", @@ -151,7 +151,7 @@ "labelWidth": 104, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "document", @@ -189,7 +189,7 @@ "labelWidth": 77, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "cylinder", @@ -227,7 +227,7 @@ "labelWidth": 64, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "queue", @@ -265,7 +265,7 @@ "labelWidth": 49, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "package", @@ -303,7 +303,7 @@ "labelWidth": 63, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "step", @@ -341,7 +341,7 @@ "labelWidth": 36, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "callout", @@ -379,7 +379,7 @@ "labelWidth": 55, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "stored_data", @@ -417,7 +417,7 @@ "labelWidth": 91, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "person", @@ -455,7 +455,7 @@ "labelWidth": 53, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "diamond", @@ -493,7 +493,7 @@ "labelWidth": 68, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "oval", @@ -531,7 +531,7 @@ "labelWidth": 36, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "circle", @@ -569,7 +569,7 @@ "labelWidth": 44, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "hexagon", @@ -607,7 +607,7 @@ "labelWidth": 65, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "cloud", @@ -645,7 +645,7 @@ "labelWidth": 45, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -695,7 +695,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(square -> page)[0]", @@ -743,7 +743,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(parallelogram -> document)[0]", @@ -791,7 +791,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(document -> cylinder)[0]", @@ -839,7 +839,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(queue -> package)[0]", @@ -887,7 +887,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(package -> step)[0]", @@ -935,7 +935,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(callout -> stored_data)[0]", @@ -983,7 +983,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(stored_data -> person)[0]", @@ -1031,7 +1031,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(diamond -> oval)[0]", @@ -1079,7 +1079,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(oval -> circle)[0]", @@ -1127,7 +1127,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(hexagon -> cloud)[0]", @@ -1175,7 +1175,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } 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 4e0f04fa1..2ea1053e4 100644 --- a/e2etests/testdata/stable/all_shapes_shadow/elk/board.exp.json +++ b/e2etests/testdata/stable/all_shapes_shadow/elk/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 71, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "square", @@ -75,7 +75,7 @@ "labelWidth": 54, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "page", @@ -113,7 +113,7 @@ "labelWidth": 39, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "parallelogram", @@ -151,7 +151,7 @@ "labelWidth": 104, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "document", @@ -189,7 +189,7 @@ "labelWidth": 77, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "cylinder", @@ -227,7 +227,7 @@ "labelWidth": 64, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "queue", @@ -265,7 +265,7 @@ "labelWidth": 49, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "package", @@ -303,7 +303,7 @@ "labelWidth": 63, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "step", @@ -341,7 +341,7 @@ "labelWidth": 36, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "callout", @@ -379,7 +379,7 @@ "labelWidth": 55, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "stored_data", @@ -417,7 +417,7 @@ "labelWidth": 91, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "person", @@ -455,7 +455,7 @@ "labelWidth": 53, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "diamond", @@ -493,7 +493,7 @@ "labelWidth": 68, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "oval", @@ -531,7 +531,7 @@ "labelWidth": 36, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "circle", @@ -569,7 +569,7 @@ "labelWidth": 44, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "hexagon", @@ -607,7 +607,7 @@ "labelWidth": 65, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "cloud", @@ -645,7 +645,7 @@ "labelWidth": 45, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -686,7 +686,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(square -> page)[0]", @@ -725,7 +725,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(parallelogram -> document)[0]", @@ -764,7 +764,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(document -> cylinder)[0]", @@ -803,7 +803,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(queue -> package)[0]", @@ -842,7 +842,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(package -> step)[0]", @@ -881,7 +881,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(callout -> stored_data)[0]", @@ -920,7 +920,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(stored_data -> person)[0]", @@ -959,7 +959,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(diamond -> oval)[0]", @@ -998,7 +998,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(oval -> circle)[0]", @@ -1037,7 +1037,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(hexagon -> cloud)[0]", @@ -1076,7 +1076,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/arrowhead_adjustment/dagre/board.exp.json b/e2etests/testdata/stable/arrowhead_adjustment/dagre/board.exp.json index 4af38b29d..24bd87a2c 100644 --- a/e2etests/testdata/stable/arrowhead_adjustment/dagre/board.exp.json +++ b/e2etests/testdata/stable/arrowhead_adjustment/dagre/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "b", @@ -75,7 +75,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "a", @@ -113,7 +113,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "Oval", @@ -150,7 +150,7 @@ "underline": false, "labelWidth": 0, "labelHeight": 0, - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -200,7 +200,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(c -> b)[0]", @@ -260,7 +260,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(a <-> Oval)[0]", @@ -308,7 +308,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(c -- a)[0]", @@ -356,7 +356,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(Oval <-> c)[0]", @@ -416,7 +416,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/arrowhead_adjustment/elk/board.exp.json b/e2etests/testdata/stable/arrowhead_adjustment/elk/board.exp.json index dce8c385a..cf578c843 100644 --- a/e2etests/testdata/stable/arrowhead_adjustment/elk/board.exp.json +++ b/e2etests/testdata/stable/arrowhead_adjustment/elk/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "b", @@ -75,7 +75,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "a", @@ -113,7 +113,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "Oval", @@ -150,7 +150,7 @@ "underline": false, "labelWidth": 0, "labelHeight": 0, - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -199,7 +199,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(c -> b)[0]", @@ -238,7 +238,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(a <-> Oval)[0]", @@ -277,7 +277,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(c -- a)[0]", @@ -324,7 +324,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(Oval <-> c)[0]", @@ -379,7 +379,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/arrowhead_labels/dagre/board.exp.json b/e2etests/testdata/stable/arrowhead_labels/dagre/board.exp.json index d192fbe0a..5413c61ea 100644 --- a/e2etests/testdata/stable/arrowhead_labels/dagre/board.exp.json +++ b/e2etests/testdata/stable/arrowhead_labels/dagre/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "b", @@ -75,7 +75,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -125,7 +125,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/arrowhead_labels/elk/board.exp.json b/e2etests/testdata/stable/arrowhead_labels/elk/board.exp.json index cb62ff8b9..9d7513d12 100644 --- a/e2etests/testdata/stable/arrowhead_labels/elk/board.exp.json +++ b/e2etests/testdata/stable/arrowhead_labels/elk/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "b", @@ -75,7 +75,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -116,7 +116,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/binary_tree/dagre/board.exp.json b/e2etests/testdata/stable/binary_tree/dagre/board.exp.json index a382b8675..24eb61c49 100644 --- a/e2etests/testdata/stable/binary_tree/dagre/board.exp.json +++ b/e2etests/testdata/stable/binary_tree/dagre/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "b", @@ -75,7 +75,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "c", @@ -113,7 +113,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "d", @@ -151,7 +151,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "e", @@ -189,7 +189,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "f", @@ -227,7 +227,7 @@ "labelWidth": 11, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "g", @@ -265,7 +265,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "h", @@ -303,7 +303,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "i", @@ -341,7 +341,7 @@ "labelWidth": 9, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "j", @@ -379,7 +379,7 @@ "labelWidth": 10, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "k", @@ -417,7 +417,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "l", @@ -455,7 +455,7 @@ "labelWidth": 9, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "m", @@ -493,7 +493,7 @@ "labelWidth": 17, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "n", @@ -531,7 +531,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "o", @@ -569,7 +569,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -619,7 +619,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(a -> c)[0]", @@ -667,7 +667,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(b -> d)[0]", @@ -715,7 +715,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(b -> e)[0]", @@ -763,7 +763,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(c -> f)[0]", @@ -811,7 +811,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(c -> g)[0]", @@ -859,7 +859,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(d -> h)[0]", @@ -907,7 +907,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(d -> i)[0]", @@ -955,7 +955,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(e -> j)[0]", @@ -1003,7 +1003,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(e -> k)[0]", @@ -1051,7 +1051,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(f -> l)[0]", @@ -1099,7 +1099,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(f -> m)[0]", @@ -1147,7 +1147,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(g -> n)[0]", @@ -1195,7 +1195,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(g -> o)[0]", @@ -1243,7 +1243,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/binary_tree/elk/board.exp.json b/e2etests/testdata/stable/binary_tree/elk/board.exp.json index e96bdd115..e182c2abc 100644 --- a/e2etests/testdata/stable/binary_tree/elk/board.exp.json +++ b/e2etests/testdata/stable/binary_tree/elk/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "b", @@ -75,7 +75,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "c", @@ -113,7 +113,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "d", @@ -151,7 +151,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "e", @@ -189,7 +189,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "f", @@ -227,7 +227,7 @@ "labelWidth": 11, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "g", @@ -265,7 +265,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "h", @@ -303,7 +303,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "i", @@ -341,7 +341,7 @@ "labelWidth": 9, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "j", @@ -379,7 +379,7 @@ "labelWidth": 10, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "k", @@ -417,7 +417,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "l", @@ -455,7 +455,7 @@ "labelWidth": 9, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "m", @@ -493,7 +493,7 @@ "labelWidth": 17, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "n", @@ -531,7 +531,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "o", @@ -569,7 +569,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -610,7 +610,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(a -> c)[0]", @@ -657,7 +657,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(b -> d)[0]", @@ -704,7 +704,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(b -> e)[0]", @@ -743,7 +743,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(c -> f)[0]", @@ -790,7 +790,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(c -> g)[0]", @@ -829,7 +829,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(d -> h)[0]", @@ -868,7 +868,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(d -> i)[0]", @@ -915,7 +915,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(e -> j)[0]", @@ -954,7 +954,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(e -> k)[0]", @@ -1001,7 +1001,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(f -> l)[0]", @@ -1040,7 +1040,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(f -> m)[0]", @@ -1087,7 +1087,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(g -> n)[0]", @@ -1134,7 +1134,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(g -> o)[0]", @@ -1173,7 +1173,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/chaos1/dagre/board.exp.json b/e2etests/testdata/stable/chaos1/dagre/board.exp.json index 1e92ed1fa..28e624e90 100644 --- a/e2etests/testdata/stable/chaos1/dagre/board.exp.json +++ b/e2etests/testdata/stable/chaos1/dagre/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 46, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "aaa.bbb", @@ -75,7 +75,7 @@ "labelWidth": 32, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "ddd", @@ -113,7 +113,7 @@ "labelWidth": 33, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "eee", @@ -151,7 +151,7 @@ "labelWidth": 30, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "aaa.ccc", @@ -189,7 +189,7 @@ "labelWidth": 28, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 } ], "connections": [ @@ -239,7 +239,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(eee <- aaa.ccc)[0]", @@ -287,7 +287,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 } ] } diff --git a/e2etests/testdata/stable/chaos1/elk/board.exp.json b/e2etests/testdata/stable/chaos1/elk/board.exp.json index d4ed9e86a..195cfe680 100644 --- a/e2etests/testdata/stable/chaos1/elk/board.exp.json +++ b/e2etests/testdata/stable/chaos1/elk/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 46, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "aaa.bbb", @@ -75,7 +75,7 @@ "labelWidth": 32, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "ddd", @@ -113,7 +113,7 @@ "labelWidth": 33, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "eee", @@ -151,7 +151,7 @@ "labelWidth": 30, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "aaa.ccc", @@ -189,7 +189,7 @@ "labelWidth": 28, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 } ], "connections": [ @@ -230,7 +230,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(eee <- aaa.ccc)[0]", @@ -269,7 +269,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 } ] } diff --git a/e2etests/testdata/stable/chaos2/dagre/board.exp.json b/e2etests/testdata/stable/chaos2/dagre/board.exp.json index da047dac0..2a1cf9a86 100644 --- a/e2etests/testdata/stable/chaos2/dagre/board.exp.json +++ b/e2etests/testdata/stable/chaos2/dagre/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 32, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "aa.bb", @@ -75,7 +75,7 @@ "labelWidth": 31, "labelHeight": 36, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "aa.bb.cc", @@ -113,7 +113,7 @@ "labelWidth": 24, "labelHeight": 31, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 3 + "zIndex": 3 }, { "id": "aa.bb.cc.dd", @@ -151,7 +151,7 @@ "labelWidth": 22, "labelHeight": 26, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 4 + "zIndex": 4 }, { "id": "aa.bb.cc.dd.ee", @@ -188,7 +188,7 @@ "underline": false, "labelWidth": 16, "labelHeight": 24, - "renderPriority": 5 + "zIndex": 5 }, { "id": "aa.bb.cc.dd.ff", @@ -226,7 +226,7 @@ "labelWidth": 17, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 5 + "zIndex": 5 }, { "id": "aa.bb.cc.gg", @@ -263,7 +263,7 @@ "underline": false, "labelWidth": 17, "labelHeight": 24, - "renderPriority": 4 + "zIndex": 4 }, { "id": "aa.bb.cc.hh", @@ -301,7 +301,7 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 4 + "zIndex": 4 }, { "id": "aa.bb.ii", @@ -339,7 +339,7 @@ "labelWidth": 14, "labelHeight": 31, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 3 + "zIndex": 3 }, { "id": "aa.bb.ii.jj", @@ -377,7 +377,7 @@ "labelWidth": 15, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 4 + "zIndex": 4 }, { "id": "aa.bb.kk", @@ -415,7 +415,7 @@ "labelWidth": 22, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 3 + "zIndex": 3 }, { "id": "aa.ll", @@ -453,7 +453,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "aa.mm", @@ -491,7 +491,7 @@ "labelWidth": 31, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "aa.nn", @@ -528,7 +528,7 @@ "underline": false, "labelWidth": 18, "labelHeight": 24, - "renderPriority": 2 + "zIndex": 2 }, { "id": "aa.oo", @@ -566,7 +566,7 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 } ], "connections": [ @@ -616,7 +616,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 6 + "zIndex": 6 }, { "id": "aa.bb.cc.(gg -- hh)[0]", @@ -664,7 +664,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 6 + "zIndex": 6 }, { "id": "aa.bb.(ii -> cc.dd)[0]", @@ -760,7 +760,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 6 + "zIndex": 6 }, { "id": "aa.(ll <-> bb)[0]", @@ -808,7 +808,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 6 + "zIndex": 6 }, { "id": "aa.(mm -> bb.cc)[0]", @@ -868,7 +868,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 6 + "zIndex": 6 }, { "id": "aa.(mm -> ll)[0]", @@ -916,7 +916,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 6 + "zIndex": 6 }, { "id": "aa.(mm <-> bb)[0]", @@ -964,7 +964,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 6 + "zIndex": 6 }, { "id": "aa.(ll <-> bb.cc.gg)[0]", @@ -1060,7 +1060,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 6 + "zIndex": 6 }, { "id": "aa.(mm <- bb.ii)[0]", @@ -1108,7 +1108,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 6 + "zIndex": 6 }, { "id": "aa.(bb.cc <- ll)[0]", @@ -1156,7 +1156,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 6 + "zIndex": 6 }, { "id": "aa.(bb.ii <-> ll)[0]", @@ -1216,7 +1216,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 6 + "zIndex": 6 } ] } diff --git a/e2etests/testdata/stable/chaos2/elk/board.exp.json b/e2etests/testdata/stable/chaos2/elk/board.exp.json index 81bd699b6..a4c77f842 100644 --- a/e2etests/testdata/stable/chaos2/elk/board.exp.json +++ b/e2etests/testdata/stable/chaos2/elk/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 32, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "aa.bb", @@ -75,7 +75,7 @@ "labelWidth": 31, "labelHeight": 36, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "aa.bb.cc", @@ -113,7 +113,7 @@ "labelWidth": 24, "labelHeight": 31, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 3 + "zIndex": 3 }, { "id": "aa.bb.cc.dd", @@ -151,7 +151,7 @@ "labelWidth": 22, "labelHeight": 26, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 4 + "zIndex": 4 }, { "id": "aa.bb.cc.dd.ee", @@ -188,7 +188,7 @@ "underline": false, "labelWidth": 16, "labelHeight": 24, - "renderPriority": 5 + "zIndex": 5 }, { "id": "aa.bb.cc.dd.ff", @@ -226,7 +226,7 @@ "labelWidth": 17, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 5 + "zIndex": 5 }, { "id": "aa.bb.cc.gg", @@ -263,7 +263,7 @@ "underline": false, "labelWidth": 17, "labelHeight": 24, - "renderPriority": 4 + "zIndex": 4 }, { "id": "aa.bb.cc.hh", @@ -301,7 +301,7 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 4 + "zIndex": 4 }, { "id": "aa.bb.ii", @@ -339,7 +339,7 @@ "labelWidth": 14, "labelHeight": 31, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 3 + "zIndex": 3 }, { "id": "aa.bb.ii.jj", @@ -377,7 +377,7 @@ "labelWidth": 15, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 4 + "zIndex": 4 }, { "id": "aa.bb.kk", @@ -415,7 +415,7 @@ "labelWidth": 22, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 3 + "zIndex": 3 }, { "id": "aa.ll", @@ -453,7 +453,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "aa.mm", @@ -491,7 +491,7 @@ "labelWidth": 31, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "aa.nn", @@ -528,7 +528,7 @@ "underline": false, "labelWidth": 18, "labelHeight": 24, - "renderPriority": 2 + "zIndex": 2 }, { "id": "aa.oo", @@ -566,7 +566,7 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 } ], "connections": [ @@ -607,7 +607,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 6 + "zIndex": 6 }, { "id": "aa.bb.cc.(gg -- hh)[0]", @@ -646,7 +646,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 6 + "zIndex": 6 }, { "id": "aa.bb.(ii -> cc.dd)[0]", @@ -693,7 +693,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 6 + "zIndex": 6 }, { "id": "aa.(ll <-> bb)[0]", @@ -748,7 +748,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 6 + "zIndex": 6 }, { "id": "aa.(mm -> bb.cc)[0]", @@ -803,7 +803,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 6 + "zIndex": 6 }, { "id": "aa.(mm -> ll)[0]", @@ -850,7 +850,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 6 + "zIndex": 6 }, { "id": "aa.(mm <-> bb)[0]", @@ -905,7 +905,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 6 + "zIndex": 6 }, { "id": "aa.(ll <-> bb.cc.gg)[0]", @@ -960,7 +960,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 6 + "zIndex": 6 }, { "id": "aa.(mm <- bb.ii)[0]", @@ -1007,7 +1007,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 6 + "zIndex": 6 }, { "id": "aa.(bb.cc <- ll)[0]", @@ -1062,7 +1062,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 6 + "zIndex": 6 }, { "id": "aa.(bb.ii <-> ll)[0]", @@ -1125,7 +1125,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 6 + "zIndex": 6 } ] } diff --git a/e2etests/testdata/stable/child_parent_edges/dagre/board.exp.json b/e2etests/testdata/stable/child_parent_edges/dagre/board.exp.json index 7fca43601..45890126b 100644 --- a/e2etests/testdata/stable/child_parent_edges/dagre/board.exp.json +++ b/e2etests/testdata/stable/child_parent_edges/dagre/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 17, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "a.b", @@ -75,7 +75,7 @@ "labelWidth": 17, "labelHeight": 36, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "a.b.c", @@ -113,7 +113,7 @@ "labelWidth": 14, "labelHeight": 31, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 3 + "zIndex": 3 }, { "id": "a.b.c.d", @@ -151,7 +151,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 4 + "zIndex": 4 } ], "connections": [ @@ -237,7 +237,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 5 + "zIndex": 5 }, { "id": "a.(b -> b.c)[0]", @@ -321,7 +321,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 5 + "zIndex": 5 }, { "id": "a.(b.c.d -> b)[0]", @@ -369,7 +369,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 5 + "zIndex": 5 } ] } diff --git a/e2etests/testdata/stable/child_parent_edges/elk/board.exp.json b/e2etests/testdata/stable/child_parent_edges/elk/board.exp.json index 39671b77e..a85c30982 100644 --- a/e2etests/testdata/stable/child_parent_edges/elk/board.exp.json +++ b/e2etests/testdata/stable/child_parent_edges/elk/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 17, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "a.b", @@ -75,7 +75,7 @@ "labelWidth": 17, "labelHeight": 36, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "a.b.c", @@ -113,7 +113,7 @@ "labelWidth": 14, "labelHeight": 31, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 3 + "zIndex": 3 }, { "id": "a.b.c.d", @@ -151,7 +151,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 4 + "zIndex": 4 } ], "connections": [ @@ -192,7 +192,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 5 + "zIndex": 5 }, { "id": "a.(b -> b.c)[0]", @@ -231,7 +231,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 5 + "zIndex": 5 }, { "id": "a.(b.c.d -> b)[0]", @@ -278,7 +278,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 5 + "zIndex": 5 } ] } diff --git a/e2etests/testdata/stable/circular_dependency/dagre/board.exp.json b/e2etests/testdata/stable/circular_dependency/dagre/board.exp.json index 34f41340e..29ea208e6 100644 --- a/e2etests/testdata/stable/circular_dependency/dagre/board.exp.json +++ b/e2etests/testdata/stable/circular_dependency/dagre/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "b", @@ -75,7 +75,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "c", @@ -113,7 +113,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -163,7 +163,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(b -> c)[0]", @@ -211,7 +211,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(c -> b)[0]", @@ -259,7 +259,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(b -> a)[0]", @@ -307,7 +307,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/circular_dependency/elk/board.exp.json b/e2etests/testdata/stable/circular_dependency/elk/board.exp.json index 789996fdd..73a5d471f 100644 --- a/e2etests/testdata/stable/circular_dependency/elk/board.exp.json +++ b/e2etests/testdata/stable/circular_dependency/elk/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "b", @@ -75,7 +75,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "c", @@ -113,7 +113,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -154,7 +154,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(b -> c)[0]", @@ -193,7 +193,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(c -> b)[0]", @@ -232,7 +232,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(b -> a)[0]", @@ -271,7 +271,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/class/dagre/board.exp.json b/e2etests/testdata/stable/class/dagre/board.exp.json index bcd0af21a..c473b8cfc 100644 --- a/e2etests/testdata/stable/class/dagre/board.exp.json +++ b/e2etests/testdata/stable/class/dagre/board.exp.json @@ -68,7 +68,7 @@ "underline": false, "labelWidth": 150, "labelHeight": 36, - "renderPriority": 1 + "zIndex": 1 } ], "connections": [] diff --git a/e2etests/testdata/stable/class/elk/board.exp.json b/e2etests/testdata/stable/class/elk/board.exp.json index b1b21ae18..7e6c29ddc 100644 --- a/e2etests/testdata/stable/class/elk/board.exp.json +++ b/e2etests/testdata/stable/class/elk/board.exp.json @@ -68,7 +68,7 @@ "underline": false, "labelWidth": 150, "labelHeight": 36, - "renderPriority": 1 + "zIndex": 1 } ], "connections": [] diff --git a/e2etests/testdata/stable/code_snippet/dagre/board.exp.json b/e2etests/testdata/stable/code_snippet/dagre/board.exp.json index 9e17997bb..cd182c555 100644 --- a/e2etests/testdata/stable/code_snippet/dagre/board.exp.json +++ b/e2etests/testdata/stable/code_snippet/dagre/board.exp.json @@ -36,7 +36,7 @@ "underline": false, "labelWidth": 755, "labelHeight": 166, - "renderPriority": 1 + "zIndex": 1 }, { "id": "x", @@ -74,7 +74,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "y", @@ -112,7 +112,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -162,7 +162,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(hey -> y)[0]", @@ -210,7 +210,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/code_snippet/elk/board.exp.json b/e2etests/testdata/stable/code_snippet/elk/board.exp.json index a3c075e00..4dacb85c4 100644 --- a/e2etests/testdata/stable/code_snippet/elk/board.exp.json +++ b/e2etests/testdata/stable/code_snippet/elk/board.exp.json @@ -36,7 +36,7 @@ "underline": false, "labelWidth": 755, "labelHeight": 166, - "renderPriority": 1 + "zIndex": 1 }, { "id": "x", @@ -74,7 +74,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "y", @@ -112,7 +112,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -153,7 +153,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(hey -> y)[0]", @@ -192,7 +192,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/connected_container/dagre/board.exp.json b/e2etests/testdata/stable/connected_container/dagre/board.exp.json index f1beb9a58..8f6a6dfac 100644 --- a/e2etests/testdata/stable/connected_container/dagre/board.exp.json +++ b/e2etests/testdata/stable/connected_container/dagre/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 17, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "a.b", @@ -75,7 +75,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "c", @@ -113,7 +113,7 @@ "labelWidth": 17, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "c.d", @@ -151,7 +151,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "f", @@ -189,7 +189,7 @@ "labelWidth": 14, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "f.h", @@ -227,7 +227,7 @@ "labelWidth": 16, "labelHeight": 36, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "f.h.g", @@ -265,7 +265,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 3 + "zIndex": 3 } ], "connections": [ @@ -327,7 +327,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 4 + "zIndex": 4 }, { "id": "(c.d -> f.h.g)[0]", @@ -399,7 +399,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 4 + "zIndex": 4 } ] } diff --git a/e2etests/testdata/stable/connected_container/elk/board.exp.json b/e2etests/testdata/stable/connected_container/elk/board.exp.json index 5538d2a86..a2270ad4a 100644 --- a/e2etests/testdata/stable/connected_container/elk/board.exp.json +++ b/e2etests/testdata/stable/connected_container/elk/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 17, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "a.b", @@ -75,7 +75,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "c", @@ -113,7 +113,7 @@ "labelWidth": 17, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "c.d", @@ -151,7 +151,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "f", @@ -189,7 +189,7 @@ "labelWidth": 14, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "f.h", @@ -227,7 +227,7 @@ "labelWidth": 16, "labelHeight": 36, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "f.h.g", @@ -265,7 +265,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 3 + "zIndex": 3 } ], "connections": [ @@ -306,7 +306,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 4 + "zIndex": 4 }, { "id": "(c.d -> f.h.g)[0]", @@ -345,7 +345,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 4 + "zIndex": 4 } ] } diff --git a/e2etests/testdata/stable/container_edges/dagre/board.exp.json b/e2etests/testdata/stable/container_edges/dagre/board.exp.json index 8a6a6faf4..9083f817c 100644 --- a/e2etests/testdata/stable/container_edges/dagre/board.exp.json +++ b/e2etests/testdata/stable/container_edges/dagre/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "g", @@ -75,7 +75,7 @@ "labelWidth": 18, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "g.b", @@ -113,7 +113,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "d", @@ -151,7 +151,7 @@ "labelWidth": 18, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "d.h", @@ -189,7 +189,7 @@ "labelWidth": 16, "labelHeight": 36, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "d.h.c", @@ -227,7 +227,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 3 + "zIndex": 3 }, { "id": "g.e", @@ -265,7 +265,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "f", @@ -303,7 +303,7 @@ "labelWidth": 11, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -353,7 +353,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 4 + "zIndex": 4 }, { "id": "(g.b -> d.h.c)[0]", @@ -413,7 +413,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 4 + "zIndex": 4 }, { "id": "(d -> g.e)[0]", @@ -461,7 +461,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 4 + "zIndex": 4 }, { "id": "(g.e -> f)[0]", @@ -509,7 +509,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 4 + "zIndex": 4 }, { "id": "(f -> g)[0]", @@ -557,7 +557,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 4 + "zIndex": 4 }, { "id": "(g -> d.h)[0]", @@ -605,7 +605,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 4 + "zIndex": 4 } ] } diff --git a/e2etests/testdata/stable/container_edges/elk/board.exp.json b/e2etests/testdata/stable/container_edges/elk/board.exp.json index 8dd4c0f0b..396818f4d 100644 --- a/e2etests/testdata/stable/container_edges/elk/board.exp.json +++ b/e2etests/testdata/stable/container_edges/elk/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "g", @@ -75,7 +75,7 @@ "labelWidth": 18, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "g.b", @@ -113,7 +113,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "d", @@ -151,7 +151,7 @@ "labelWidth": 18, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "d.h", @@ -189,7 +189,7 @@ "labelWidth": 16, "labelHeight": 36, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "d.h.c", @@ -227,7 +227,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 3 + "zIndex": 3 }, { "id": "g.e", @@ -265,7 +265,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "f", @@ -303,7 +303,7 @@ "labelWidth": 11, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -344,7 +344,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 4 + "zIndex": 4 }, { "id": "(g.b -> d.h.c)[0]", @@ -383,7 +383,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 4 + "zIndex": 4 }, { "id": "(d -> g.e)[0]", @@ -438,7 +438,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 4 + "zIndex": 4 }, { "id": "(g.e -> f)[0]", @@ -485,7 +485,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 4 + "zIndex": 4 }, { "id": "(f -> g)[0]", @@ -532,7 +532,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 4 + "zIndex": 4 }, { "id": "(g -> d.h)[0]", @@ -571,7 +571,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 4 + "zIndex": 4 } ] } diff --git a/e2etests/testdata/stable/dense/dagre/board.exp.json b/e2etests/testdata/stable/dense/dagre/board.exp.json index 95d37e599..1f047852d 100644 --- a/e2etests/testdata/stable/dense/dagre/board.exp.json +++ b/e2etests/testdata/stable/dense/dagre/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "b", @@ -75,7 +75,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "c", @@ -113,7 +113,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "d", @@ -151,7 +151,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "e", @@ -189,7 +189,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "f", @@ -227,7 +227,7 @@ "labelWidth": 11, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "g", @@ -265,7 +265,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "h", @@ -303,7 +303,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "i", @@ -341,7 +341,7 @@ "labelWidth": 9, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "j", @@ -379,7 +379,7 @@ "labelWidth": 10, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "k", @@ -417,7 +417,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "l", @@ -455,7 +455,7 @@ "labelWidth": 9, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "m", @@ -493,7 +493,7 @@ "labelWidth": 17, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "n", @@ -531,7 +531,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "o", @@ -569,7 +569,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "p", @@ -607,7 +607,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "q", @@ -645,7 +645,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -695,7 +695,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(c -> b)[0]", @@ -755,7 +755,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(d -> e)[0]", @@ -815,7 +815,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(f -> e)[0]", @@ -875,7 +875,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(b -> f)[0]", @@ -935,7 +935,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(b -> g)[0]", @@ -983,7 +983,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(g -> f)[0]", @@ -1031,7 +1031,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(b -> h)[0]", @@ -1079,7 +1079,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(b -> i)[0]", @@ -1187,7 +1187,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(b -> d)[0]", @@ -1247,7 +1247,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(j -> c)[0]", @@ -1295,7 +1295,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(j -> a)[0]", @@ -1355,7 +1355,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(b -> j)[0]", @@ -1403,7 +1403,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(i -> k)[0]", @@ -1451,7 +1451,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(d -> l)[0]", @@ -1499,7 +1499,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(l -> e)[0]", @@ -1547,7 +1547,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(m -> l)[0]", @@ -1595,7 +1595,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(m -> n)[0]", @@ -1643,7 +1643,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(n -> i)[0]", @@ -1691,7 +1691,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(d -> n)[0]", @@ -1739,7 +1739,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(f -> n)[0]", @@ -1787,7 +1787,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(b -> o)[0]", @@ -1835,7 +1835,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(p -> l)[0]", @@ -1883,7 +1883,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(e -> q)[0]", @@ -1931,7 +1931,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/dense/elk/board.exp.json b/e2etests/testdata/stable/dense/elk/board.exp.json index 467b4fef7..45aaf4214 100644 --- a/e2etests/testdata/stable/dense/elk/board.exp.json +++ b/e2etests/testdata/stable/dense/elk/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "b", @@ -75,7 +75,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "c", @@ -113,7 +113,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "d", @@ -151,7 +151,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "e", @@ -189,7 +189,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "f", @@ -227,7 +227,7 @@ "labelWidth": 11, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "g", @@ -265,7 +265,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "h", @@ -303,7 +303,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "i", @@ -341,7 +341,7 @@ "labelWidth": 9, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "j", @@ -379,7 +379,7 @@ "labelWidth": 10, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "k", @@ -417,7 +417,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "l", @@ -455,7 +455,7 @@ "labelWidth": 9, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "m", @@ -493,7 +493,7 @@ "labelWidth": 17, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "n", @@ -531,7 +531,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "o", @@ -569,7 +569,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "p", @@ -607,7 +607,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "q", @@ -645,7 +645,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -686,7 +686,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(c -> b)[0]", @@ -733,7 +733,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(d -> e)[0]", @@ -780,7 +780,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(f -> e)[0]", @@ -827,7 +827,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(b -> f)[0]", @@ -874,7 +874,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(b -> g)[0]", @@ -921,7 +921,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(g -> f)[0]", @@ -968,7 +968,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(b -> h)[0]", @@ -1015,7 +1015,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(b -> i)[0]", @@ -1070,7 +1070,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(b -> d)[0]", @@ -1109,7 +1109,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(j -> c)[0]", @@ -1148,7 +1148,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(j -> a)[0]", @@ -1195,7 +1195,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(b -> j)[0]", @@ -1250,7 +1250,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(i -> k)[0]", @@ -1289,7 +1289,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(d -> l)[0]", @@ -1336,7 +1336,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(l -> e)[0]", @@ -1383,7 +1383,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(m -> l)[0]", @@ -1430,7 +1430,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(m -> n)[0]", @@ -1477,7 +1477,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(n -> i)[0]", @@ -1516,7 +1516,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(d -> n)[0]", @@ -1555,7 +1555,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(f -> n)[0]", @@ -1602,7 +1602,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(b -> o)[0]", @@ -1649,7 +1649,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(p -> l)[0]", @@ -1688,7 +1688,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(e -> q)[0]", @@ -1727,7 +1727,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/different_subgraphs/dagre/board.exp.json b/e2etests/testdata/stable/different_subgraphs/dagre/board.exp.json index 532972a34..dca8ec276 100644 --- a/e2etests/testdata/stable/different_subgraphs/dagre/board.exp.json +++ b/e2etests/testdata/stable/different_subgraphs/dagre/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 77, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "a", @@ -75,7 +75,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "tree", @@ -113,7 +113,7 @@ "labelWidth": 34, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "and", @@ -151,7 +151,7 @@ "labelWidth": 32, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "nodes", @@ -189,7 +189,7 @@ "labelWidth": 47, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "some", @@ -227,7 +227,7 @@ "labelWidth": 43, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "more", @@ -265,7 +265,7 @@ "labelWidth": 41, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "many", @@ -303,7 +303,7 @@ "labelWidth": 45, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "then", @@ -341,7 +341,7 @@ "labelWidth": 38, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "here", @@ -379,7 +379,7 @@ "labelWidth": 36, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "you", @@ -417,7 +417,7 @@ "labelWidth": 32, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "have", @@ -455,7 +455,7 @@ "labelWidth": 38, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "hierarchy", @@ -493,7 +493,7 @@ "labelWidth": 73, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "another", @@ -531,7 +531,7 @@ "labelWidth": 63, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "of", @@ -569,7 +569,7 @@ "labelWidth": 20, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "nesting", @@ -607,7 +607,7 @@ "labelWidth": 58, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "trees", @@ -645,7 +645,7 @@ "labelWidth": 42, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "finally.a", @@ -683,7 +683,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "finally.tree", @@ -721,7 +721,7 @@ "labelWidth": 34, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "finally.inside", @@ -759,7 +759,7 @@ "labelWidth": 48, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "finally.hierarchy", @@ -797,7 +797,7 @@ "labelWidth": 73, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "finally.root", @@ -835,7 +835,7 @@ "labelWidth": 35, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 } ], "connections": [ @@ -885,7 +885,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(a -> and)[0]", @@ -933,7 +933,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(a -> nodes)[0]", @@ -981,7 +981,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(and -> some)[0]", @@ -1029,7 +1029,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(tree -> more)[0]", @@ -1077,7 +1077,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(tree -> many)[0]", @@ -1125,7 +1125,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(then -> here)[0]", @@ -1173,7 +1173,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(here -> you)[0]", @@ -1221,7 +1221,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(have -> hierarchy)[0]", @@ -1269,7 +1269,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(then -> hierarchy)[0]", @@ -1317,7 +1317,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(finally -> another)[0]", @@ -1365,7 +1365,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(another -> of)[0]", @@ -1413,7 +1413,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(nesting -> trees)[0]", @@ -1461,7 +1461,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(finally -> trees)[0]", @@ -1509,7 +1509,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "finally.(a -> tree)[0]", @@ -1557,7 +1557,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "finally.(inside -> a)[0]", @@ -1605,7 +1605,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "finally.(tree -> hierarchy)[0]", @@ -1653,7 +1653,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "finally.(a -> root)[0]", @@ -1701,7 +1701,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 } ] } diff --git a/e2etests/testdata/stable/different_subgraphs/elk/board.exp.json b/e2etests/testdata/stable/different_subgraphs/elk/board.exp.json index 98a4b2393..ea6501360 100644 --- a/e2etests/testdata/stable/different_subgraphs/elk/board.exp.json +++ b/e2etests/testdata/stable/different_subgraphs/elk/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 77, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "a", @@ -75,7 +75,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "tree", @@ -113,7 +113,7 @@ "labelWidth": 34, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "and", @@ -151,7 +151,7 @@ "labelWidth": 32, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "nodes", @@ -189,7 +189,7 @@ "labelWidth": 47, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "some", @@ -227,7 +227,7 @@ "labelWidth": 43, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "more", @@ -265,7 +265,7 @@ "labelWidth": 41, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "many", @@ -303,7 +303,7 @@ "labelWidth": 45, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "then", @@ -341,7 +341,7 @@ "labelWidth": 38, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "here", @@ -379,7 +379,7 @@ "labelWidth": 36, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "you", @@ -417,7 +417,7 @@ "labelWidth": 32, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "have", @@ -455,7 +455,7 @@ "labelWidth": 38, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "hierarchy", @@ -493,7 +493,7 @@ "labelWidth": 73, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "another", @@ -531,7 +531,7 @@ "labelWidth": 63, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "of", @@ -569,7 +569,7 @@ "labelWidth": 20, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "nesting", @@ -607,7 +607,7 @@ "labelWidth": 58, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "trees", @@ -645,7 +645,7 @@ "labelWidth": 42, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "finally.a", @@ -683,7 +683,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "finally.tree", @@ -721,7 +721,7 @@ "labelWidth": 34, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "finally.inside", @@ -759,7 +759,7 @@ "labelWidth": 48, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "finally.hierarchy", @@ -797,7 +797,7 @@ "labelWidth": 73, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "finally.root", @@ -835,7 +835,7 @@ "labelWidth": 35, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 } ], "connections": [ @@ -884,7 +884,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(a -> and)[0]", @@ -931,7 +931,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(a -> nodes)[0]", @@ -970,7 +970,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(and -> some)[0]", @@ -1009,7 +1009,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(tree -> more)[0]", @@ -1048,7 +1048,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(tree -> many)[0]", @@ -1095,7 +1095,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(then -> here)[0]", @@ -1134,7 +1134,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(here -> you)[0]", @@ -1173,7 +1173,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(have -> hierarchy)[0]", @@ -1212,7 +1212,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(then -> hierarchy)[0]", @@ -1259,7 +1259,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(finally -> another)[0]", @@ -1298,7 +1298,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(another -> of)[0]", @@ -1337,7 +1337,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(nesting -> trees)[0]", @@ -1376,7 +1376,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(finally -> trees)[0]", @@ -1423,7 +1423,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "finally.(a -> tree)[0]", @@ -1470,7 +1470,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "finally.(inside -> a)[0]", @@ -1509,7 +1509,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "finally.(tree -> hierarchy)[0]", @@ -1548,7 +1548,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "finally.(a -> root)[0]", @@ -1587,7 +1587,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 } ] } diff --git a/e2etests/testdata/stable/font_colors/dagre/board.exp.json b/e2etests/testdata/stable/font_colors/dagre/board.exp.json index d524acac7..e0499e3ac 100644 --- a/e2etests/testdata/stable/font_colors/dagre/board.exp.json +++ b/e2etests/testdata/stable/font_colors/dagre/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 45, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "beta", @@ -75,7 +75,7 @@ "labelWidth": 36, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -125,7 +125,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/font_colors/elk/board.exp.json b/e2etests/testdata/stable/font_colors/elk/board.exp.json index 97f5ef1e7..3f4ebe78e 100644 --- a/e2etests/testdata/stable/font_colors/elk/board.exp.json +++ b/e2etests/testdata/stable/font_colors/elk/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 45, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "beta", @@ -75,7 +75,7 @@ "labelWidth": 36, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -116,7 +116,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/giant_markdown_test/dagre/board.exp.json b/e2etests/testdata/stable/giant_markdown_test/dagre/board.exp.json index 1a49d7bd3..15f17648d 100644 --- a/e2etests/testdata/stable/giant_markdown_test/dagre/board.exp.json +++ b/e2etests/testdata/stable/giant_markdown_test/dagre/board.exp.json @@ -36,7 +36,7 @@ "underline": false, "labelWidth": 3051, "labelHeight": 4848, - "renderPriority": 1 + "zIndex": 1 }, { "id": "a", @@ -74,7 +74,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "b", @@ -112,7 +112,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -162,7 +162,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(md -> b)[0]", @@ -210,7 +210,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/giant_markdown_test/elk/board.exp.json b/e2etests/testdata/stable/giant_markdown_test/elk/board.exp.json index 2549b36c1..8be889b9d 100644 --- a/e2etests/testdata/stable/giant_markdown_test/elk/board.exp.json +++ b/e2etests/testdata/stable/giant_markdown_test/elk/board.exp.json @@ -36,7 +36,7 @@ "underline": false, "labelWidth": 3051, "labelHeight": 4848, - "renderPriority": 1 + "zIndex": 1 }, { "id": "a", @@ -74,7 +74,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "b", @@ -112,7 +112,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -153,7 +153,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(md -> b)[0]", @@ -192,7 +192,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/hr/dagre/board.exp.json b/e2etests/testdata/stable/hr/dagre/board.exp.json index 3b8e292c5..3b366c266 100644 --- a/e2etests/testdata/stable/hr/dagre/board.exp.json +++ b/e2etests/testdata/stable/hr/dagre/board.exp.json @@ -36,7 +36,7 @@ "underline": false, "labelWidth": 738, "labelHeight": 134, - "renderPriority": 1 + "zIndex": 1 }, { "id": "a", @@ -74,7 +74,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "b", @@ -112,7 +112,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -162,7 +162,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(md -> b)[0]", @@ -210,7 +210,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/hr/elk/board.exp.json b/e2etests/testdata/stable/hr/elk/board.exp.json index 1b72165b7..4ce193770 100644 --- a/e2etests/testdata/stable/hr/elk/board.exp.json +++ b/e2etests/testdata/stable/hr/elk/board.exp.json @@ -36,7 +36,7 @@ "underline": false, "labelWidth": 738, "labelHeight": 134, - "renderPriority": 1 + "zIndex": 1 }, { "id": "a", @@ -74,7 +74,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "b", @@ -112,7 +112,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -153,7 +153,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(md -> b)[0]", @@ -192,7 +192,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/images/dagre/board.exp.json b/e2etests/testdata/stable/images/dagre/board.exp.json index 533f47dc4..29ef1200c 100644 --- a/e2etests/testdata/stable/images/dagre/board.exp.json +++ b/e2etests/testdata/stable/images/dagre/board.exp.json @@ -48,7 +48,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "OUTSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "b", @@ -97,7 +97,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "OUTSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -147,7 +147,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/images/elk/board.exp.json b/e2etests/testdata/stable/images/elk/board.exp.json index 4fe15a290..5ac0e2902 100644 --- a/e2etests/testdata/stable/images/elk/board.exp.json +++ b/e2etests/testdata/stable/images/elk/board.exp.json @@ -48,7 +48,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "OUTSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "b", @@ -97,7 +97,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "OUTSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -138,7 +138,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/investigate/dagre/board.exp.json b/e2etests/testdata/stable/investigate/dagre/board.exp.json index 3bd1b06ea..8a5fa0f5f 100644 --- a/e2etests/testdata/stable/investigate/dagre/board.exp.json +++ b/e2etests/testdata/stable/investigate/dagre/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 22, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "bb", @@ -75,7 +75,7 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "cc", @@ -113,7 +113,7 @@ "labelWidth": 21, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "dd", @@ -151,7 +151,7 @@ "labelWidth": 34, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "dd.ee", @@ -189,7 +189,7 @@ "labelWidth": 22, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "ll", @@ -227,7 +227,7 @@ "labelWidth": 18, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "ll.mm", @@ -265,7 +265,7 @@ "labelWidth": 31, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "ff", @@ -303,7 +303,7 @@ "labelWidth": 23, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "ff.mm", @@ -341,7 +341,7 @@ "labelWidth": 31, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "ff.gg", @@ -379,7 +379,7 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "dd.hh", @@ -417,7 +417,7 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "ww", @@ -466,7 +466,7 @@ "labelWidth": 31, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "yy", @@ -504,7 +504,7 @@ "labelWidth": 32, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "yy.zz", @@ -553,7 +553,7 @@ "labelWidth": 20, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "ad", @@ -591,7 +591,7 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "nn", @@ -629,7 +629,7 @@ "labelWidth": 33, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "ii", @@ -667,7 +667,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "jj", @@ -705,7 +705,7 @@ "labelWidth": 15, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "kk", @@ -743,7 +743,7 @@ "labelWidth": 22, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "nn.oo", @@ -781,7 +781,7 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "ff.pp", @@ -819,7 +819,7 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "ll.qq", @@ -857,7 +857,7 @@ "labelWidth": 24, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "ll.rr", @@ -895,7 +895,7 @@ "labelWidth": 18, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "ss", @@ -933,7 +933,7 @@ "labelWidth": 28, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "ss.tt", @@ -971,7 +971,7 @@ "labelWidth": 18, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "uu", @@ -1009,7 +1009,7 @@ "labelWidth": 32, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "uu.vv", @@ -1047,7 +1047,7 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "rm", @@ -1085,7 +1085,7 @@ "labelWidth": 24, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "nn.xx", @@ -1123,7 +1123,7 @@ "labelWidth": 22, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "yy.ab", @@ -1161,7 +1161,7 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "nn.ac", @@ -1199,7 +1199,7 @@ "labelWidth": 22, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 } ], "connections": [ @@ -1249,7 +1249,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(bb -- cc)[0]", @@ -1297,7 +1297,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(aa -> dd.ee)[0]", @@ -1393,7 +1393,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(bb -> ff.gg)[0]", @@ -1657,7 +1657,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(cc -> dd.hh)[0]", @@ -1705,7 +1705,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(dd.ee -> ii)[0]", @@ -1753,7 +1753,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(ii -- jj)[0]", @@ -1801,7 +1801,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(jj -> kk)[0]", @@ -1861,7 +1861,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(kk -> ff.mm)[0]", @@ -1969,7 +1969,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(ff.mm -> ll.mm)[0]", @@ -2053,7 +2053,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(ll.mm -> nn.oo)[0]", @@ -2185,7 +2185,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "ff.(gg -> pp)[0]", @@ -2233,7 +2233,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(ff.pp -> ll.qq)[0]", @@ -2293,7 +2293,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "ll.(qq -> rr)[0]", @@ -2341,7 +2341,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(dd.hh -> ss.tt)[0]", @@ -2425,7 +2425,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(ss.tt -> uu.vv)[0]", @@ -2485,7 +2485,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(kk -> ww)[0]", @@ -2533,7 +2533,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(uu.vv -> ww)[0]", @@ -2581,7 +2581,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(ww -> rm)[0]", @@ -2725,7 +2725,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(rm -> nn.xx)[0]", @@ -2857,7 +2857,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(ll.rr -> yy.zz)[0]", @@ -2917,7 +2917,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(rm -> yy.zz)[0]", @@ -2977,7 +2977,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "yy.(zz -> ab)[0]", @@ -3025,7 +3025,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(yy.ab -> nn.ac)[0]", @@ -3085,7 +3085,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(nn.ac -> ad)[0]", @@ -3133,7 +3133,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(ww -> ff.gg)[0]", @@ -3181,7 +3181,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 } ] } diff --git a/e2etests/testdata/stable/investigate/elk/board.exp.json b/e2etests/testdata/stable/investigate/elk/board.exp.json index a06755349..45f42987e 100644 --- a/e2etests/testdata/stable/investigate/elk/board.exp.json +++ b/e2etests/testdata/stable/investigate/elk/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 22, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "bb", @@ -75,7 +75,7 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "cc", @@ -113,7 +113,7 @@ "labelWidth": 21, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "dd", @@ -151,7 +151,7 @@ "labelWidth": 34, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "dd.ee", @@ -189,7 +189,7 @@ "labelWidth": 22, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "ll", @@ -227,7 +227,7 @@ "labelWidth": 18, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "ll.mm", @@ -265,7 +265,7 @@ "labelWidth": 31, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "ff", @@ -303,7 +303,7 @@ "labelWidth": 23, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "ff.mm", @@ -341,7 +341,7 @@ "labelWidth": 31, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "ff.gg", @@ -379,7 +379,7 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "dd.hh", @@ -417,7 +417,7 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "ww", @@ -466,7 +466,7 @@ "labelWidth": 31, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "yy", @@ -504,7 +504,7 @@ "labelWidth": 32, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "yy.zz", @@ -553,7 +553,7 @@ "labelWidth": 20, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "ad", @@ -591,7 +591,7 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "nn", @@ -629,7 +629,7 @@ "labelWidth": 33, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "ii", @@ -667,7 +667,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "jj", @@ -705,7 +705,7 @@ "labelWidth": 15, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "kk", @@ -743,7 +743,7 @@ "labelWidth": 22, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "nn.oo", @@ -781,7 +781,7 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "ff.pp", @@ -819,7 +819,7 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "ll.qq", @@ -857,7 +857,7 @@ "labelWidth": 24, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "ll.rr", @@ -895,7 +895,7 @@ "labelWidth": 18, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "ss", @@ -933,7 +933,7 @@ "labelWidth": 28, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "ss.tt", @@ -971,7 +971,7 @@ "labelWidth": 18, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "uu", @@ -1009,7 +1009,7 @@ "labelWidth": 32, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "uu.vv", @@ -1047,7 +1047,7 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "rm", @@ -1085,7 +1085,7 @@ "labelWidth": 24, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "nn.xx", @@ -1123,7 +1123,7 @@ "labelWidth": 22, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "yy.ab", @@ -1161,7 +1161,7 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "nn.ac", @@ -1199,7 +1199,7 @@ "labelWidth": 22, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 } ], "connections": [ @@ -1248,7 +1248,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(bb -- cc)[0]", @@ -1287,7 +1287,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(aa -> dd.ee)[0]", @@ -1326,7 +1326,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(bb -> ff.gg)[0]", @@ -1381,7 +1381,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(cc -> dd.hh)[0]", @@ -1420,7 +1420,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(dd.ee -> ii)[0]", @@ -1459,7 +1459,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(ii -- jj)[0]", @@ -1498,7 +1498,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(jj -> kk)[0]", @@ -1537,7 +1537,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(kk -> ff.mm)[0]", @@ -1576,7 +1576,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(ff.mm -> ll.mm)[0]", @@ -1615,7 +1615,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(ll.mm -> nn.oo)[0]", @@ -1654,7 +1654,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "ff.(gg -> pp)[0]", @@ -1693,7 +1693,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(ff.pp -> ll.qq)[0]", @@ -1732,7 +1732,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "ll.(qq -> rr)[0]", @@ -1771,7 +1771,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(dd.hh -> ss.tt)[0]", @@ -1818,7 +1818,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(ss.tt -> uu.vv)[0]", @@ -1857,7 +1857,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(kk -> ww)[0]", @@ -1904,7 +1904,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(uu.vv -> ww)[0]", @@ -1943,7 +1943,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(ww -> rm)[0]", @@ -1982,7 +1982,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(rm -> nn.xx)[0]", @@ -2037,7 +2037,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(ll.rr -> yy.zz)[0]", @@ -2084,7 +2084,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(rm -> yy.zz)[0]", @@ -2123,7 +2123,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "yy.(zz -> ab)[0]", @@ -2162,7 +2162,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(yy.ab -> nn.ac)[0]", @@ -2209,7 +2209,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(nn.ac -> ad)[0]", @@ -2248,7 +2248,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(ww -> ff.gg)[0]", @@ -2295,7 +2295,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 } ] } diff --git a/e2etests/testdata/stable/large_arch/dagre/board.exp.json b/e2etests/testdata/stable/large_arch/dagre/board.exp.json index 6c3ff8667..f755f3713 100644 --- a/e2etests/testdata/stable/large_arch/dagre/board.exp.json +++ b/e2etests/testdata/stable/large_arch/dagre/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "b", @@ -75,7 +75,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "c", @@ -113,7 +113,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "d", @@ -151,7 +151,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "e", @@ -189,7 +189,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "f", @@ -227,7 +227,7 @@ "labelWidth": 11, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "g", @@ -265,7 +265,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "h", @@ -303,7 +303,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "i", @@ -341,7 +341,7 @@ "labelWidth": 9, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "i.j", @@ -379,7 +379,7 @@ "labelWidth": 11, "labelHeight": 36, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "i.j.k", @@ -417,7 +417,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 3 + "zIndex": 3 }, { "id": "i.j.l", @@ -455,7 +455,7 @@ "labelWidth": 9, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 3 + "zIndex": 3 }, { "id": "i.m", @@ -493,7 +493,7 @@ "labelWidth": 17, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "i.n", @@ -531,7 +531,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "i.o", @@ -569,7 +569,7 @@ "labelWidth": 16, "labelHeight": 36, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "i.o.p", @@ -607,7 +607,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 3 + "zIndex": 3 }, { "id": "q", @@ -645,7 +645,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "r", @@ -683,7 +683,7 @@ "labelWidth": 13, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "r.s", @@ -721,7 +721,7 @@ "labelWidth": 15, "labelHeight": 36, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "r.s.t", @@ -759,7 +759,7 @@ "labelWidth": 11, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 3 + "zIndex": 3 }, { "id": "r.s.u", @@ -797,7 +797,7 @@ "labelWidth": 14, "labelHeight": 31, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 3 + "zIndex": 3 }, { "id": "r.s.u.v", @@ -835,7 +835,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 4 + "zIndex": 4 }, { "id": "r.s.w", @@ -873,7 +873,7 @@ "labelWidth": 18, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 3 + "zIndex": 3 }, { "id": "r.s.x", @@ -911,7 +911,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 3 + "zIndex": 3 }, { "id": "r.s.y", @@ -949,7 +949,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 3 + "zIndex": 3 }, { "id": "r.z", @@ -987,7 +987,7 @@ "labelWidth": 12, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "r.aa", @@ -1025,7 +1025,7 @@ "labelWidth": 22, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "r.bb", @@ -1063,7 +1063,7 @@ "labelWidth": 31, "labelHeight": 36, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "r.bb.cc", @@ -1101,7 +1101,7 @@ "labelWidth": 21, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 3 + "zIndex": 3 }, { "id": "r.bb.dd", @@ -1139,7 +1139,7 @@ "labelWidth": 24, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 3 + "zIndex": 3 }, { "id": "r.ee", @@ -1177,7 +1177,7 @@ "labelWidth": 22, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "r.ff", @@ -1215,7 +1215,7 @@ "labelWidth": 17, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "r.gg", @@ -1253,7 +1253,7 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 } ], "connections": [ @@ -1327,7 +1327,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 5 + "zIndex": 5 }, { "id": "i.(j.l -> o.p)[0]", @@ -1399,7 +1399,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 5 + "zIndex": 5 }, { "id": "(q -> i.m)[0]", @@ -1459,7 +1459,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 5 + "zIndex": 5 }, { "id": "(i.m -> q)[0]", @@ -1519,7 +1519,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 5 + "zIndex": 5 }, { "id": "(i.n -> q)[0]", @@ -1579,7 +1579,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 5 + "zIndex": 5 }, { "id": "(i.m -> c)[0]", @@ -1639,7 +1639,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 5 + "zIndex": 5 }, { "id": "(i.m -> d)[0]", @@ -1699,7 +1699,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 5 + "zIndex": 5 }, { "id": "(i.m -> g)[0]", @@ -1759,7 +1759,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 5 + "zIndex": 5 }, { "id": "(i.m -> f)[0]", @@ -1819,7 +1819,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 5 + "zIndex": 5 }, { "id": "(d -> e)[0]", @@ -1867,7 +1867,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 5 + "zIndex": 5 }, { "id": "r.s.(x -> t)[0]", @@ -1939,7 +1939,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 5 + "zIndex": 5 }, { "id": "r.s.(x -> w)[0]", @@ -2011,7 +2011,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 5 + "zIndex": 5 }, { "id": "r.(gg -> s.t)[0]", @@ -2083,7 +2083,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 5 + "zIndex": 5 }, { "id": "r.(s.u.v -> z)[0]", @@ -2155,7 +2155,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 5 + "zIndex": 5 }, { "id": "r.(aa -> s.t)[0]", @@ -2227,7 +2227,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 5 + "zIndex": 5 }, { "id": "(r.s.w -> i.m)[0]", @@ -2299,7 +2299,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 5 + "zIndex": 5 }, { "id": "(r.s.t -> g)[0]", @@ -2419,7 +2419,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 5 + "zIndex": 5 }, { "id": "(r.s.t -> h)[0]", @@ -2491,7 +2491,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 5 + "zIndex": 5 }, { "id": "r.(ee -> ff)[0]", @@ -2563,7 +2563,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 5 + "zIndex": 5 } ] } diff --git a/e2etests/testdata/stable/large_arch/elk/board.exp.json b/e2etests/testdata/stable/large_arch/elk/board.exp.json index c5890113d..de1cf8958 100644 --- a/e2etests/testdata/stable/large_arch/elk/board.exp.json +++ b/e2etests/testdata/stable/large_arch/elk/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "b", @@ -75,7 +75,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "c", @@ -113,7 +113,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "d", @@ -151,7 +151,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "e", @@ -189,7 +189,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "f", @@ -227,7 +227,7 @@ "labelWidth": 11, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "g", @@ -265,7 +265,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "h", @@ -303,7 +303,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "i", @@ -341,7 +341,7 @@ "labelWidth": 9, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "i.j", @@ -379,7 +379,7 @@ "labelWidth": 11, "labelHeight": 36, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "i.j.k", @@ -417,7 +417,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 3 + "zIndex": 3 }, { "id": "i.j.l", @@ -455,7 +455,7 @@ "labelWidth": 9, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 3 + "zIndex": 3 }, { "id": "i.m", @@ -493,7 +493,7 @@ "labelWidth": 17, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "i.n", @@ -531,7 +531,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "i.o", @@ -569,7 +569,7 @@ "labelWidth": 16, "labelHeight": 36, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "i.o.p", @@ -607,7 +607,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 3 + "zIndex": 3 }, { "id": "q", @@ -645,7 +645,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "r", @@ -683,7 +683,7 @@ "labelWidth": 13, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "r.s", @@ -721,7 +721,7 @@ "labelWidth": 15, "labelHeight": 36, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "r.s.t", @@ -759,7 +759,7 @@ "labelWidth": 11, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 3 + "zIndex": 3 }, { "id": "r.s.u", @@ -797,7 +797,7 @@ "labelWidth": 14, "labelHeight": 31, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 3 + "zIndex": 3 }, { "id": "r.s.u.v", @@ -835,7 +835,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 4 + "zIndex": 4 }, { "id": "r.s.w", @@ -873,7 +873,7 @@ "labelWidth": 18, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 3 + "zIndex": 3 }, { "id": "r.s.x", @@ -911,7 +911,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 3 + "zIndex": 3 }, { "id": "r.s.y", @@ -949,7 +949,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 3 + "zIndex": 3 }, { "id": "r.z", @@ -987,7 +987,7 @@ "labelWidth": 12, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "r.aa", @@ -1025,7 +1025,7 @@ "labelWidth": 22, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "r.bb", @@ -1063,7 +1063,7 @@ "labelWidth": 31, "labelHeight": 36, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "r.bb.cc", @@ -1101,7 +1101,7 @@ "labelWidth": 21, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 3 + "zIndex": 3 }, { "id": "r.bb.dd", @@ -1139,7 +1139,7 @@ "labelWidth": 24, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 3 + "zIndex": 3 }, { "id": "r.ee", @@ -1177,7 +1177,7 @@ "labelWidth": 22, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "r.ff", @@ -1215,7 +1215,7 @@ "labelWidth": 17, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "r.gg", @@ -1253,7 +1253,7 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 } ], "connections": [ @@ -1302,7 +1302,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 5 + "zIndex": 5 }, { "id": "i.(j.l -> o.p)[0]", @@ -1341,7 +1341,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 5 + "zIndex": 5 }, { "id": "(q -> i.m)[0]", @@ -1396,7 +1396,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 5 + "zIndex": 5 }, { "id": "(i.m -> q)[0]", @@ -1443,7 +1443,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 5 + "zIndex": 5 }, { "id": "(i.n -> q)[0]", @@ -1482,7 +1482,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 5 + "zIndex": 5 }, { "id": "(i.m -> c)[0]", @@ -1529,7 +1529,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 5 + "zIndex": 5 }, { "id": "(i.m -> d)[0]", @@ -1576,7 +1576,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 5 + "zIndex": 5 }, { "id": "(i.m -> g)[0]", @@ -1623,7 +1623,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 5 + "zIndex": 5 }, { "id": "(i.m -> f)[0]", @@ -1670,7 +1670,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 5 + "zIndex": 5 }, { "id": "(d -> e)[0]", @@ -1709,7 +1709,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 5 + "zIndex": 5 }, { "id": "r.s.(x -> t)[0]", @@ -1756,7 +1756,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 5 + "zIndex": 5 }, { "id": "r.s.(x -> w)[0]", @@ -1795,7 +1795,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 5 + "zIndex": 5 }, { "id": "r.(gg -> s.t)[0]", @@ -1834,7 +1834,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 5 + "zIndex": 5 }, { "id": "r.(s.u.v -> z)[0]", @@ -1873,7 +1873,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 5 + "zIndex": 5 }, { "id": "r.(aa -> s.t)[0]", @@ -1920,7 +1920,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 5 + "zIndex": 5 }, { "id": "(r.s.w -> i.m)[0]", @@ -1959,7 +1959,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 5 + "zIndex": 5 }, { "id": "(r.s.t -> g)[0]", @@ -2006,7 +2006,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 5 + "zIndex": 5 }, { "id": "(r.s.t -> h)[0]", @@ -2053,7 +2053,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 5 + "zIndex": 5 }, { "id": "r.(ee -> ff)[0]", @@ -2092,7 +2092,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 5 + "zIndex": 5 } ] } diff --git a/e2etests/testdata/stable/latex/dagre/board.exp.json b/e2etests/testdata/stable/latex/dagre/board.exp.json index 625bc1dae..91ede30f7 100644 --- a/e2etests/testdata/stable/latex/dagre/board.exp.json +++ b/e2etests/testdata/stable/latex/dagre/board.exp.json @@ -36,7 +36,7 @@ "underline": false, "labelWidth": 382, "labelHeight": 101, - "renderPriority": 1 + "zIndex": 1 }, { "id": "b", @@ -73,7 +73,7 @@ "underline": false, "labelWidth": 65, "labelHeight": 18, - "renderPriority": 1 + "zIndex": 1 }, { "id": "z", @@ -110,7 +110,7 @@ "underline": false, "labelWidth": 179, "labelHeight": 51, - "renderPriority": 1 + "zIndex": 1 }, { "id": "c", @@ -148,7 +148,7 @@ "labelWidth": 114, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "sugar", @@ -186,7 +186,7 @@ "labelWidth": 46, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "solution", @@ -224,7 +224,7 @@ "labelWidth": 64, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -274,7 +274,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(z -> b)[0]", @@ -322,7 +322,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(a -> c)[0]", @@ -370,7 +370,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(b -> c)[0]", @@ -418,7 +418,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(sugar -> c)[0]", @@ -466,7 +466,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(c -> solution)[0]", @@ -514,7 +514,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/latex/elk/board.exp.json b/e2etests/testdata/stable/latex/elk/board.exp.json index 9aeaa4a30..fcb80157f 100644 --- a/e2etests/testdata/stable/latex/elk/board.exp.json +++ b/e2etests/testdata/stable/latex/elk/board.exp.json @@ -36,7 +36,7 @@ "underline": false, "labelWidth": 382, "labelHeight": 101, - "renderPriority": 1 + "zIndex": 1 }, { "id": "b", @@ -73,7 +73,7 @@ "underline": false, "labelWidth": 65, "labelHeight": 18, - "renderPriority": 1 + "zIndex": 1 }, { "id": "z", @@ -110,7 +110,7 @@ "underline": false, "labelWidth": 179, "labelHeight": 51, - "renderPriority": 1 + "zIndex": 1 }, { "id": "c", @@ -148,7 +148,7 @@ "labelWidth": 114, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "sugar", @@ -186,7 +186,7 @@ "labelWidth": 46, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "solution", @@ -224,7 +224,7 @@ "labelWidth": 64, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -273,7 +273,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(z -> b)[0]", @@ -312,7 +312,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(a -> c)[0]", @@ -359,7 +359,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(b -> c)[0]", @@ -398,7 +398,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(sugar -> c)[0]", @@ -445,7 +445,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(c -> solution)[0]", @@ -484,7 +484,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/li1/dagre/board.exp.json b/e2etests/testdata/stable/li1/dagre/board.exp.json index 5f039fe94..68fbffe76 100644 --- a/e2etests/testdata/stable/li1/dagre/board.exp.json +++ b/e2etests/testdata/stable/li1/dagre/board.exp.json @@ -36,7 +36,7 @@ "underline": false, "labelWidth": 379, "labelHeight": 100, - "renderPriority": 1 + "zIndex": 1 }, { "id": "a", @@ -74,7 +74,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "b", @@ -112,7 +112,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -162,7 +162,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(md -> b)[0]", @@ -210,7 +210,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/li1/elk/board.exp.json b/e2etests/testdata/stable/li1/elk/board.exp.json index c0139e612..28d8511a8 100644 --- a/e2etests/testdata/stable/li1/elk/board.exp.json +++ b/e2etests/testdata/stable/li1/elk/board.exp.json @@ -36,7 +36,7 @@ "underline": false, "labelWidth": 379, "labelHeight": 100, - "renderPriority": 1 + "zIndex": 1 }, { "id": "a", @@ -74,7 +74,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "b", @@ -112,7 +112,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -153,7 +153,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(md -> b)[0]", @@ -192,7 +192,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/li2/dagre/board.exp.json b/e2etests/testdata/stable/li2/dagre/board.exp.json index 879be0a21..d304fb466 100644 --- a/e2etests/testdata/stable/li2/dagre/board.exp.json +++ b/e2etests/testdata/stable/li2/dagre/board.exp.json @@ -36,7 +36,7 @@ "underline": false, "labelWidth": 245, "labelHeight": 76, - "renderPriority": 1 + "zIndex": 1 }, { "id": "a", @@ -74,7 +74,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "b", @@ -112,7 +112,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -162,7 +162,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(md -> b)[0]", @@ -210,7 +210,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/li2/elk/board.exp.json b/e2etests/testdata/stable/li2/elk/board.exp.json index b34fee101..8fd876876 100644 --- a/e2etests/testdata/stable/li2/elk/board.exp.json +++ b/e2etests/testdata/stable/li2/elk/board.exp.json @@ -36,7 +36,7 @@ "underline": false, "labelWidth": 245, "labelHeight": 76, - "renderPriority": 1 + "zIndex": 1 }, { "id": "a", @@ -74,7 +74,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "b", @@ -112,7 +112,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -153,7 +153,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(md -> b)[0]", @@ -192,7 +192,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/li3/dagre/board.exp.json b/e2etests/testdata/stable/li3/dagre/board.exp.json index 49a3d4e95..4febddb15 100644 --- a/e2etests/testdata/stable/li3/dagre/board.exp.json +++ b/e2etests/testdata/stable/li3/dagre/board.exp.json @@ -36,7 +36,7 @@ "underline": false, "labelWidth": 347, "labelHeight": 512, - "renderPriority": 1 + "zIndex": 1 }, { "id": "a", @@ -74,7 +74,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "b", @@ -112,7 +112,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -162,7 +162,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(md -> b)[0]", @@ -210,7 +210,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/li3/elk/board.exp.json b/e2etests/testdata/stable/li3/elk/board.exp.json index 77b744fe7..40385ff75 100644 --- a/e2etests/testdata/stable/li3/elk/board.exp.json +++ b/e2etests/testdata/stable/li3/elk/board.exp.json @@ -36,7 +36,7 @@ "underline": false, "labelWidth": 347, "labelHeight": 512, - "renderPriority": 1 + "zIndex": 1 }, { "id": "a", @@ -74,7 +74,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "b", @@ -112,7 +112,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -153,7 +153,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(md -> b)[0]", @@ -192,7 +192,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/li4/dagre/board.exp.json b/e2etests/testdata/stable/li4/dagre/board.exp.json index c5251df40..28c706f51 100644 --- a/e2etests/testdata/stable/li4/dagre/board.exp.json +++ b/e2etests/testdata/stable/li4/dagre/board.exp.json @@ -36,7 +36,7 @@ "underline": false, "labelWidth": 920, "labelHeight": 376, - "renderPriority": 1 + "zIndex": 1 }, { "id": "a", @@ -74,7 +74,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "b", @@ -112,7 +112,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -162,7 +162,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(md -> b)[0]", @@ -210,7 +210,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/li4/elk/board.exp.json b/e2etests/testdata/stable/li4/elk/board.exp.json index a7b64e572..081393ce3 100644 --- a/e2etests/testdata/stable/li4/elk/board.exp.json +++ b/e2etests/testdata/stable/li4/elk/board.exp.json @@ -36,7 +36,7 @@ "underline": false, "labelWidth": 920, "labelHeight": 376, - "renderPriority": 1 + "zIndex": 1 }, { "id": "a", @@ -74,7 +74,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "b", @@ -112,7 +112,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -153,7 +153,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(md -> b)[0]", @@ -192,7 +192,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/lone_h1/dagre/board.exp.json b/e2etests/testdata/stable/lone_h1/dagre/board.exp.json index cf9e8beac..e8f394122 100644 --- a/e2etests/testdata/stable/lone_h1/dagre/board.exp.json +++ b/e2etests/testdata/stable/lone_h1/dagre/board.exp.json @@ -36,7 +36,7 @@ "underline": false, "labelWidth": 266, "labelHeight": 50, - "renderPriority": 1 + "zIndex": 1 }, { "id": "a", @@ -74,7 +74,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "b", @@ -112,7 +112,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -162,7 +162,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(md -> b)[0]", @@ -210,7 +210,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/lone_h1/elk/board.exp.json b/e2etests/testdata/stable/lone_h1/elk/board.exp.json index fbe7c467c..e72ff8f7a 100644 --- a/e2etests/testdata/stable/lone_h1/elk/board.exp.json +++ b/e2etests/testdata/stable/lone_h1/elk/board.exp.json @@ -36,7 +36,7 @@ "underline": false, "labelWidth": 266, "labelHeight": 50, - "renderPriority": 1 + "zIndex": 1 }, { "id": "a", @@ -74,7 +74,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "b", @@ -112,7 +112,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -153,7 +153,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(md -> b)[0]", @@ -192,7 +192,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/markdown/dagre/board.exp.json b/e2etests/testdata/stable/markdown/dagre/board.exp.json index 77bd71cba..849709fa5 100644 --- a/e2etests/testdata/stable/markdown/dagre/board.exp.json +++ b/e2etests/testdata/stable/markdown/dagre/board.exp.json @@ -36,7 +36,7 @@ "underline": false, "labelWidth": 531, "labelHeight": 186, - "renderPriority": 1 + "zIndex": 1 }, { "id": "x", @@ -74,7 +74,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "y", @@ -112,7 +112,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -162,7 +162,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(hey -> y)[0]", @@ -210,7 +210,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/markdown/elk/board.exp.json b/e2etests/testdata/stable/markdown/elk/board.exp.json index dd83d3f25..53b5c2b45 100644 --- a/e2etests/testdata/stable/markdown/elk/board.exp.json +++ b/e2etests/testdata/stable/markdown/elk/board.exp.json @@ -36,7 +36,7 @@ "underline": false, "labelWidth": 531, "labelHeight": 186, - "renderPriority": 1 + "zIndex": 1 }, { "id": "x", @@ -74,7 +74,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "y", @@ -112,7 +112,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -153,7 +153,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(hey -> y)[0]", @@ -192,7 +192,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/md_2space_newline/dagre/board.exp.json b/e2etests/testdata/stable/md_2space_newline/dagre/board.exp.json index 5c21ada1b..ce04b922f 100644 --- a/e2etests/testdata/stable/md_2space_newline/dagre/board.exp.json +++ b/e2etests/testdata/stable/md_2space_newline/dagre/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 129, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "markdown.md", @@ -74,7 +74,7 @@ "underline": false, "labelWidth": 459, "labelHeight": 48, - "renderPriority": 2 + "zIndex": 2 } ], "connections": [] diff --git a/e2etests/testdata/stable/md_2space_newline/elk/board.exp.json b/e2etests/testdata/stable/md_2space_newline/elk/board.exp.json index 790ab2c6a..8c587a003 100644 --- a/e2etests/testdata/stable/md_2space_newline/elk/board.exp.json +++ b/e2etests/testdata/stable/md_2space_newline/elk/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 129, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "markdown.md", @@ -74,7 +74,7 @@ "underline": false, "labelWidth": 459, "labelHeight": 48, - "renderPriority": 2 + "zIndex": 2 } ], "connections": [] diff --git a/e2etests/testdata/stable/md_backslash_newline/dagre/board.exp.json b/e2etests/testdata/stable/md_backslash_newline/dagre/board.exp.json index 614d6a4b6..f4879d7fc 100644 --- a/e2etests/testdata/stable/md_backslash_newline/dagre/board.exp.json +++ b/e2etests/testdata/stable/md_backslash_newline/dagre/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 129, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "markdown.md", @@ -74,7 +74,7 @@ "underline": false, "labelWidth": 459, "labelHeight": 48, - "renderPriority": 2 + "zIndex": 2 } ], "connections": [] diff --git a/e2etests/testdata/stable/md_backslash_newline/elk/board.exp.json b/e2etests/testdata/stable/md_backslash_newline/elk/board.exp.json index 91387c558..e4a3da091 100644 --- a/e2etests/testdata/stable/md_backslash_newline/elk/board.exp.json +++ b/e2etests/testdata/stable/md_backslash_newline/elk/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 129, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "markdown.md", @@ -74,7 +74,7 @@ "underline": false, "labelWidth": 459, "labelHeight": 48, - "renderPriority": 2 + "zIndex": 2 } ], "connections": [] diff --git a/e2etests/testdata/stable/md_code_block_fenced/dagre/board.exp.json b/e2etests/testdata/stable/md_code_block_fenced/dagre/board.exp.json index 173395e1d..832e07a2c 100644 --- a/e2etests/testdata/stable/md_code_block_fenced/dagre/board.exp.json +++ b/e2etests/testdata/stable/md_code_block_fenced/dagre/board.exp.json @@ -36,7 +36,7 @@ "underline": false, "labelWidth": 196, "labelHeight": 111, - "renderPriority": 1 + "zIndex": 1 }, { "id": "a", @@ -74,7 +74,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "b", @@ -112,7 +112,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -162,7 +162,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(md -> b)[0]", @@ -210,7 +210,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/md_code_block_fenced/elk/board.exp.json b/e2etests/testdata/stable/md_code_block_fenced/elk/board.exp.json index d2537dce7..e0b6a925f 100644 --- a/e2etests/testdata/stable/md_code_block_fenced/elk/board.exp.json +++ b/e2etests/testdata/stable/md_code_block_fenced/elk/board.exp.json @@ -36,7 +36,7 @@ "underline": false, "labelWidth": 196, "labelHeight": 111, - "renderPriority": 1 + "zIndex": 1 }, { "id": "a", @@ -74,7 +74,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "b", @@ -112,7 +112,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -153,7 +153,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(md -> b)[0]", @@ -192,7 +192,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/md_code_block_indented/dagre/board.exp.json b/e2etests/testdata/stable/md_code_block_indented/dagre/board.exp.json index 589f65a09..c47059420 100644 --- a/e2etests/testdata/stable/md_code_block_indented/dagre/board.exp.json +++ b/e2etests/testdata/stable/md_code_block_indented/dagre/board.exp.json @@ -36,7 +36,7 @@ "underline": false, "labelWidth": 212, "labelHeight": 151, - "renderPriority": 1 + "zIndex": 1 }, { "id": "a", @@ -74,7 +74,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "b", @@ -112,7 +112,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -162,7 +162,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(md -> b)[0]", @@ -210,7 +210,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/md_code_block_indented/elk/board.exp.json b/e2etests/testdata/stable/md_code_block_indented/elk/board.exp.json index 19de1d4ab..5bfe119bf 100644 --- a/e2etests/testdata/stable/md_code_block_indented/elk/board.exp.json +++ b/e2etests/testdata/stable/md_code_block_indented/elk/board.exp.json @@ -36,7 +36,7 @@ "underline": false, "labelWidth": 212, "labelHeight": 151, - "renderPriority": 1 + "zIndex": 1 }, { "id": "a", @@ -74,7 +74,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "b", @@ -112,7 +112,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -153,7 +153,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(md -> b)[0]", @@ -192,7 +192,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/md_code_inline/dagre/board.exp.json b/e2etests/testdata/stable/md_code_inline/dagre/board.exp.json index 580a3965d..2215f7b2b 100644 --- a/e2etests/testdata/stable/md_code_inline/dagre/board.exp.json +++ b/e2etests/testdata/stable/md_code_inline/dagre/board.exp.json @@ -36,7 +36,7 @@ "underline": false, "labelWidth": 46, "labelHeight": 24, - "renderPriority": 1 + "zIndex": 1 }, { "id": "a", @@ -74,7 +74,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "b", @@ -112,7 +112,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -162,7 +162,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(md -> b)[0]", @@ -210,7 +210,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/md_code_inline/elk/board.exp.json b/e2etests/testdata/stable/md_code_inline/elk/board.exp.json index 80f2ae836..1badd2e9d 100644 --- a/e2etests/testdata/stable/md_code_inline/elk/board.exp.json +++ b/e2etests/testdata/stable/md_code_inline/elk/board.exp.json @@ -36,7 +36,7 @@ "underline": false, "labelWidth": 46, "labelHeight": 24, - "renderPriority": 1 + "zIndex": 1 }, { "id": "a", @@ -74,7 +74,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "b", @@ -112,7 +112,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -153,7 +153,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(md -> b)[0]", @@ -192,7 +192,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/multiline_text/dagre/board.exp.json b/e2etests/testdata/stable/multiline_text/dagre/board.exp.json index 8588cf436..304cc1cef 100644 --- a/e2etests/testdata/stable/multiline_text/dagre/board.exp.json +++ b/e2etests/testdata/stable/multiline_text/dagre/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 102, "labelHeight": 58, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [] diff --git a/e2etests/testdata/stable/multiline_text/elk/board.exp.json b/e2etests/testdata/stable/multiline_text/elk/board.exp.json index 71715e15e..4fa066c12 100644 --- a/e2etests/testdata/stable/multiline_text/elk/board.exp.json +++ b/e2etests/testdata/stable/multiline_text/elk/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 102, "labelHeight": 58, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [] diff --git a/e2etests/testdata/stable/multiple_trees/dagre/board.exp.json b/e2etests/testdata/stable/multiple_trees/dagre/board.exp.json index 731a2f2d9..7b1d39457 100644 --- a/e2etests/testdata/stable/multiple_trees/dagre/board.exp.json +++ b/e2etests/testdata/stable/multiple_trees/dagre/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "b", @@ -75,7 +75,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "c", @@ -113,7 +113,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "d", @@ -151,7 +151,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "e", @@ -189,7 +189,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "f", @@ -227,7 +227,7 @@ "labelWidth": 11, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "g", @@ -265,7 +265,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "h", @@ -303,7 +303,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "i", @@ -341,7 +341,7 @@ "labelWidth": 9, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "j", @@ -379,7 +379,7 @@ "labelWidth": 10, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "k", @@ -417,7 +417,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "l", @@ -455,7 +455,7 @@ "labelWidth": 9, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "m", @@ -493,7 +493,7 @@ "labelWidth": 17, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "n", @@ -531,7 +531,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "o", @@ -569,7 +569,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "p", @@ -607,7 +607,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "q", @@ -645,7 +645,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "r", @@ -683,7 +683,7 @@ "labelWidth": 11, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "s", @@ -721,7 +721,7 @@ "labelWidth": 12, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "t", @@ -759,7 +759,7 @@ "labelWidth": 11, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "u", @@ -797,7 +797,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "v", @@ -835,7 +835,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "w", @@ -873,7 +873,7 @@ "labelWidth": 18, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -923,7 +923,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(a -> c)[0]", @@ -971,7 +971,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(a -> d)[0]", @@ -1019,7 +1019,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(a -> e)[0]", @@ -1067,7 +1067,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(a -> f)[0]", @@ -1115,7 +1115,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(g -> a)[0]", @@ -1163,7 +1163,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(a -> h)[0]", @@ -1211,7 +1211,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(i -> b)[0]", @@ -1259,7 +1259,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(j -> b)[0]", @@ -1307,7 +1307,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(k -> g)[0]", @@ -1355,7 +1355,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(l -> g)[0]", @@ -1403,7 +1403,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(c -> m)[0]", @@ -1451,7 +1451,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(c -> n)[0]", @@ -1499,7 +1499,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(d -> o)[0]", @@ -1547,7 +1547,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(d -> p)[0]", @@ -1595,7 +1595,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(e -> q)[0]", @@ -1643,7 +1643,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(e -> r)[0]", @@ -1691,7 +1691,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(p -> s)[0]", @@ -1739,7 +1739,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(f -> t)[0]", @@ -1787,7 +1787,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(f -> u)[0]", @@ -1835,7 +1835,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(v -> h)[0]", @@ -1883,7 +1883,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(w -> h)[0]", @@ -1931,7 +1931,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/multiple_trees/elk/board.exp.json b/e2etests/testdata/stable/multiple_trees/elk/board.exp.json index 63102b849..deadaab75 100644 --- a/e2etests/testdata/stable/multiple_trees/elk/board.exp.json +++ b/e2etests/testdata/stable/multiple_trees/elk/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "b", @@ -75,7 +75,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "c", @@ -113,7 +113,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "d", @@ -151,7 +151,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "e", @@ -189,7 +189,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "f", @@ -227,7 +227,7 @@ "labelWidth": 11, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "g", @@ -265,7 +265,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "h", @@ -303,7 +303,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "i", @@ -341,7 +341,7 @@ "labelWidth": 9, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "j", @@ -379,7 +379,7 @@ "labelWidth": 10, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "k", @@ -417,7 +417,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "l", @@ -455,7 +455,7 @@ "labelWidth": 9, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "m", @@ -493,7 +493,7 @@ "labelWidth": 17, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "n", @@ -531,7 +531,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "o", @@ -569,7 +569,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "p", @@ -607,7 +607,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "q", @@ -645,7 +645,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "r", @@ -683,7 +683,7 @@ "labelWidth": 11, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "s", @@ -721,7 +721,7 @@ "labelWidth": 12, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "t", @@ -759,7 +759,7 @@ "labelWidth": 11, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "u", @@ -797,7 +797,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "v", @@ -835,7 +835,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "w", @@ -873,7 +873,7 @@ "labelWidth": 18, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -922,7 +922,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(a -> c)[0]", @@ -969,7 +969,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(a -> d)[0]", @@ -1016,7 +1016,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(a -> e)[0]", @@ -1055,7 +1055,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(a -> f)[0]", @@ -1102,7 +1102,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(g -> a)[0]", @@ -1141,7 +1141,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(a -> h)[0]", @@ -1188,7 +1188,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(i -> b)[0]", @@ -1227,7 +1227,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(j -> b)[0]", @@ -1274,7 +1274,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(k -> g)[0]", @@ -1321,7 +1321,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(l -> g)[0]", @@ -1360,7 +1360,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(c -> m)[0]", @@ -1407,7 +1407,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(c -> n)[0]", @@ -1446,7 +1446,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(d -> o)[0]", @@ -1493,7 +1493,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(d -> p)[0]", @@ -1532,7 +1532,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(e -> q)[0]", @@ -1571,7 +1571,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(e -> r)[0]", @@ -1618,7 +1618,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(p -> s)[0]", @@ -1657,7 +1657,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(f -> t)[0]", @@ -1696,7 +1696,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(f -> u)[0]", @@ -1743,7 +1743,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(v -> h)[0]", @@ -1790,7 +1790,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(w -> h)[0]", @@ -1829,7 +1829,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/n22_e32/dagre/board.exp.json b/e2etests/testdata/stable/n22_e32/dagre/board.exp.json index 2a566b70c..1fd58842a 100644 --- a/e2etests/testdata/stable/n22_e32/dagre/board.exp.json +++ b/e2etests/testdata/stable/n22_e32/dagre/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "b", @@ -75,7 +75,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "c", @@ -113,7 +113,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "d", @@ -151,7 +151,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "e", @@ -189,7 +189,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "f", @@ -227,7 +227,7 @@ "labelWidth": 11, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "g", @@ -265,7 +265,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "h", @@ -303,7 +303,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "i", @@ -341,7 +341,7 @@ "labelWidth": 9, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "j", @@ -379,7 +379,7 @@ "labelWidth": 10, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "k", @@ -417,7 +417,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "l", @@ -455,7 +455,7 @@ "labelWidth": 9, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "m", @@ -493,7 +493,7 @@ "labelWidth": 17, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "n", @@ -531,7 +531,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "o", @@ -569,7 +569,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "p", @@ -607,7 +607,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "q", @@ -645,7 +645,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "r", @@ -683,7 +683,7 @@ "labelWidth": 11, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "s", @@ -721,7 +721,7 @@ "labelWidth": 12, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "t", @@ -759,7 +759,7 @@ "labelWidth": 11, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "u", @@ -797,7 +797,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -859,7 +859,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(c -> a)[0]", @@ -943,7 +943,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(d -> a)[0]", @@ -991,7 +991,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(d -> b)[0]", @@ -1075,7 +1075,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(d -> e)[0]", @@ -1123,7 +1123,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(e -> f)[0]", @@ -1171,7 +1171,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(f -> b)[0]", @@ -1219,7 +1219,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(c -> f)[0]", @@ -1327,7 +1327,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(g -> c)[0]", @@ -1387,7 +1387,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(g -> h)[0]", @@ -1435,7 +1435,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(h -> i)[0]", @@ -1483,7 +1483,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(i -> j)[0]", @@ -1531,7 +1531,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(j -> k)[0]", @@ -1579,7 +1579,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(k -> e)[0]", @@ -1627,7 +1627,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(j -> f)[0]", @@ -1711,7 +1711,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(l -> m)[0]", @@ -1771,7 +1771,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(n -> l)[0]", @@ -1819,7 +1819,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(n -> l)[1]", @@ -1867,7 +1867,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(n -> m)[0]", @@ -1951,7 +1951,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(n -> o)[0]", @@ -1999,7 +1999,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(o -> p)[0]", @@ -2047,7 +2047,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(p -> m)[0]", @@ -2095,7 +2095,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(n -> p)[0]", @@ -2155,7 +2155,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(q -> n)[0]", @@ -2263,7 +2263,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(q -> r)[0]", @@ -2311,7 +2311,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(r -> s)[0]", @@ -2359,7 +2359,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(s -> t)[0]", @@ -2407,7 +2407,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(t -> u)[0]", @@ -2455,7 +2455,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(u -> o)[0]", @@ -2503,7 +2503,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(t -> p)[0]", @@ -2587,7 +2587,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(c -> t)[0]", @@ -2635,7 +2635,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(s -> a)[0]", @@ -2719,7 +2719,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(u -> a)[0]", @@ -2767,7 +2767,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/n22_e32/elk/board.exp.json b/e2etests/testdata/stable/n22_e32/elk/board.exp.json index d64ba8f50..3c92ca593 100644 --- a/e2etests/testdata/stable/n22_e32/elk/board.exp.json +++ b/e2etests/testdata/stable/n22_e32/elk/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "b", @@ -75,7 +75,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "c", @@ -113,7 +113,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "d", @@ -151,7 +151,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "e", @@ -189,7 +189,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "f", @@ -227,7 +227,7 @@ "labelWidth": 11, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "g", @@ -265,7 +265,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "h", @@ -303,7 +303,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "i", @@ -341,7 +341,7 @@ "labelWidth": 9, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "j", @@ -379,7 +379,7 @@ "labelWidth": 10, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "k", @@ -417,7 +417,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "l", @@ -455,7 +455,7 @@ "labelWidth": 9, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "m", @@ -493,7 +493,7 @@ "labelWidth": 17, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "n", @@ -531,7 +531,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "o", @@ -569,7 +569,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "p", @@ -607,7 +607,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "q", @@ -645,7 +645,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "r", @@ -683,7 +683,7 @@ "labelWidth": 11, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "s", @@ -721,7 +721,7 @@ "labelWidth": 12, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "t", @@ -759,7 +759,7 @@ "labelWidth": 11, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "u", @@ -797,7 +797,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -846,7 +846,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(c -> a)[0]", @@ -893,7 +893,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(d -> a)[0]", @@ -940,7 +940,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(d -> b)[0]", @@ -979,7 +979,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(d -> e)[0]", @@ -1026,7 +1026,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(e -> f)[0]", @@ -1065,7 +1065,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(f -> b)[0]", @@ -1112,7 +1112,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(c -> f)[0]", @@ -1167,7 +1167,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(g -> c)[0]", @@ -1206,7 +1206,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(g -> h)[0]", @@ -1253,7 +1253,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(h -> i)[0]", @@ -1292,7 +1292,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(i -> j)[0]", @@ -1331,7 +1331,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(j -> k)[0]", @@ -1370,7 +1370,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(k -> e)[0]", @@ -1409,7 +1409,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(j -> f)[0]", @@ -1464,7 +1464,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(l -> m)[0]", @@ -1511,7 +1511,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(n -> l)[0]", @@ -1558,7 +1558,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(n -> l)[1]", @@ -1597,7 +1597,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(n -> m)[0]", @@ -1644,7 +1644,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(n -> o)[0]", @@ -1691,7 +1691,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(o -> p)[0]", @@ -1730,7 +1730,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(p -> m)[0]", @@ -1777,7 +1777,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(n -> p)[0]", @@ -1832,7 +1832,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(q -> n)[0]", @@ -1871,7 +1871,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(q -> r)[0]", @@ -1918,7 +1918,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(r -> s)[0]", @@ -1957,7 +1957,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(s -> t)[0]", @@ -1996,7 +1996,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(t -> u)[0]", @@ -2035,7 +2035,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(u -> o)[0]", @@ -2074,7 +2074,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(t -> p)[0]", @@ -2129,7 +2129,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(c -> t)[0]", @@ -2176,7 +2176,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(s -> a)[0]", @@ -2231,7 +2231,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(u -> a)[0]", @@ -2278,7 +2278,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/one_container_loop/dagre/board.exp.json b/e2etests/testdata/stable/one_container_loop/dagre/board.exp.json index c4db831dc..13b9125b1 100644 --- a/e2etests/testdata/stable/one_container_loop/dagre/board.exp.json +++ b/e2etests/testdata/stable/one_container_loop/dagre/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 17, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "a.b", @@ -75,7 +75,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "c", @@ -113,7 +113,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "d", @@ -151,7 +151,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "e", @@ -189,7 +189,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "f", @@ -227,7 +227,7 @@ "labelWidth": 11, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "g", @@ -265,7 +265,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "a.h", @@ -303,7 +303,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 } ], "connections": [ @@ -425,7 +425,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(d -> c)[0]", @@ -473,7 +473,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(e -> c)[0]", @@ -521,7 +521,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(f -> d)[0]", @@ -569,7 +569,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(a -> e)[0]", @@ -653,7 +653,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(g -> f)[0]", @@ -701,7 +701,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(a.h -> g)[0]", @@ -749,7 +749,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 } ] } diff --git a/e2etests/testdata/stable/one_container_loop/elk/board.exp.json b/e2etests/testdata/stable/one_container_loop/elk/board.exp.json index e964e8aa3..727b05b40 100644 --- a/e2etests/testdata/stable/one_container_loop/elk/board.exp.json +++ b/e2etests/testdata/stable/one_container_loop/elk/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 17, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "a.b", @@ -75,7 +75,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "c", @@ -113,7 +113,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "d", @@ -151,7 +151,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "e", @@ -189,7 +189,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "f", @@ -227,7 +227,7 @@ "labelWidth": 11, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "g", @@ -265,7 +265,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "a.h", @@ -303,7 +303,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 } ], "connections": [ @@ -360,7 +360,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(d -> c)[0]", @@ -399,7 +399,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(e -> c)[0]", @@ -446,7 +446,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(f -> d)[0]", @@ -485,7 +485,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(a -> e)[0]", @@ -524,7 +524,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(g -> f)[0]", @@ -563,7 +563,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(a.h -> g)[0]", @@ -610,7 +610,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 } ] } diff --git a/e2etests/testdata/stable/one_three_one_container/dagre/board.exp.json b/e2etests/testdata/stable/one_three_one_container/dagre/board.exp.json index 71bee9e25..099dbd554 100644 --- a/e2etests/testdata/stable/one_three_one_container/dagre/board.exp.json +++ b/e2etests/testdata/stable/one_three_one_container/dagre/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 45, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "top.start", @@ -75,7 +75,7 @@ "labelWidth": 40, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "a", @@ -113,7 +113,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "b", @@ -151,7 +151,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "c", @@ -189,7 +189,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "bottom", @@ -227,7 +227,7 @@ "labelWidth": 90, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "bottom.end", @@ -265,7 +265,7 @@ "labelWidth": 32, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 } ], "connections": [ @@ -315,7 +315,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(top.start -> b)[0]", @@ -363,7 +363,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(top.start -> c)[0]", @@ -411,7 +411,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(a -> bottom.end)[0]", @@ -459,7 +459,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(b -> bottom.end)[0]", @@ -507,7 +507,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(c -> bottom.end)[0]", @@ -555,7 +555,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 } ] } diff --git a/e2etests/testdata/stable/one_three_one_container/elk/board.exp.json b/e2etests/testdata/stable/one_three_one_container/elk/board.exp.json index 241f89289..d75375de7 100644 --- a/e2etests/testdata/stable/one_three_one_container/elk/board.exp.json +++ b/e2etests/testdata/stable/one_three_one_container/elk/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 45, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "top.start", @@ -75,7 +75,7 @@ "labelWidth": 40, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "a", @@ -113,7 +113,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "b", @@ -151,7 +151,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "c", @@ -189,7 +189,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "bottom", @@ -227,7 +227,7 @@ "labelWidth": 90, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "bottom.end", @@ -265,7 +265,7 @@ "labelWidth": 32, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 } ], "connections": [ @@ -314,7 +314,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(top.start -> b)[0]", @@ -353,7 +353,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(top.start -> c)[0]", @@ -400,7 +400,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(a -> bottom.end)[0]", @@ -447,7 +447,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(b -> bottom.end)[0]", @@ -494,7 +494,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(c -> bottom.end)[0]", @@ -533,7 +533,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 } ] } diff --git a/e2etests/testdata/stable/p/dagre/board.exp.json b/e2etests/testdata/stable/p/dagre/board.exp.json index aeddaf2aa..d9a4c76d1 100644 --- a/e2etests/testdata/stable/p/dagre/board.exp.json +++ b/e2etests/testdata/stable/p/dagre/board.exp.json @@ -36,7 +36,7 @@ "underline": false, "labelWidth": 1857, "labelHeight": 24, - "renderPriority": 1 + "zIndex": 1 }, { "id": "a", @@ -74,7 +74,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "b", @@ -112,7 +112,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -162,7 +162,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(md -> b)[0]", @@ -210,7 +210,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/p/elk/board.exp.json b/e2etests/testdata/stable/p/elk/board.exp.json index 903c02077..8ee3cb510 100644 --- a/e2etests/testdata/stable/p/elk/board.exp.json +++ b/e2etests/testdata/stable/p/elk/board.exp.json @@ -36,7 +36,7 @@ "underline": false, "labelWidth": 1857, "labelHeight": 24, - "renderPriority": 1 + "zIndex": 1 }, { "id": "a", @@ -74,7 +74,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "b", @@ -112,7 +112,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -153,7 +153,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(md -> b)[0]", @@ -192,7 +192,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/pre/dagre/board.exp.json b/e2etests/testdata/stable/pre/dagre/board.exp.json index 39191a775..b3fcb1221 100644 --- a/e2etests/testdata/stable/pre/dagre/board.exp.json +++ b/e2etests/testdata/stable/pre/dagre/board.exp.json @@ -36,7 +36,7 @@ "underline": false, "labelWidth": 602, "labelHeight": 170, - "renderPriority": 1 + "zIndex": 1 }, { "id": "a", @@ -74,7 +74,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "b", @@ -112,7 +112,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -162,7 +162,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(md -> b)[0]", @@ -210,7 +210,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/pre/elk/board.exp.json b/e2etests/testdata/stable/pre/elk/board.exp.json index d6e712cae..b78f94e70 100644 --- a/e2etests/testdata/stable/pre/elk/board.exp.json +++ b/e2etests/testdata/stable/pre/elk/board.exp.json @@ -36,7 +36,7 @@ "underline": false, "labelWidth": 602, "labelHeight": 170, - "renderPriority": 1 + "zIndex": 1 }, { "id": "a", @@ -74,7 +74,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "b", @@ -112,7 +112,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -153,7 +153,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(md -> b)[0]", @@ -192,7 +192,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/sql_tables/dagre/board.exp.json b/e2etests/testdata/stable/sql_tables/dagre/board.exp.json index fb2a64d31..57c3ee056 100644 --- a/e2etests/testdata/stable/sql_tables/dagre/board.exp.json +++ b/e2etests/testdata/stable/sql_tables/dagre/board.exp.json @@ -67,7 +67,7 @@ "underline": false, "labelWidth": 61, "labelHeight": 36, - "renderPriority": 1 + "zIndex": 1 }, { "id": "products", @@ -129,7 +129,7 @@ "underline": false, "labelWidth": 99, "labelHeight": 36, - "renderPriority": 1 + "zIndex": 1 }, { "id": "orders", @@ -185,7 +185,7 @@ "underline": false, "labelWidth": 74, "labelHeight": 36, - "renderPriority": 1 + "zIndex": 1 }, { "id": "shipments", @@ -247,7 +247,7 @@ "underline": false, "labelWidth": 116, "labelHeight": 36, - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -297,7 +297,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(products <-> orders)[0]", @@ -345,7 +345,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(shipments <-> orders)[0]", @@ -393,7 +393,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/sql_tables/elk/board.exp.json b/e2etests/testdata/stable/sql_tables/elk/board.exp.json index a6545e00d..1ee6d326d 100644 --- a/e2etests/testdata/stable/sql_tables/elk/board.exp.json +++ b/e2etests/testdata/stable/sql_tables/elk/board.exp.json @@ -67,7 +67,7 @@ "underline": false, "labelWidth": 61, "labelHeight": 36, - "renderPriority": 1 + "zIndex": 1 }, { "id": "products", @@ -129,7 +129,7 @@ "underline": false, "labelWidth": 99, "labelHeight": 36, - "renderPriority": 1 + "zIndex": 1 }, { "id": "orders", @@ -185,7 +185,7 @@ "underline": false, "labelWidth": 74, "labelHeight": 36, - "renderPriority": 1 + "zIndex": 1 }, { "id": "shipments", @@ -247,7 +247,7 @@ "underline": false, "labelWidth": 116, "labelHeight": 36, - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -296,7 +296,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(products <-> orders)[0]", @@ -335,7 +335,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(shipments <-> orders)[0]", @@ -382,7 +382,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/square_3d/dagre/board.exp.json b/e2etests/testdata/stable/square_3d/dagre/board.exp.json index 6f5e0886f..d0fe54576 100644 --- a/e2etests/testdata/stable/square_3d/dagre/board.exp.json +++ b/e2etests/testdata/stable/square_3d/dagre/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 71, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "square", @@ -75,7 +75,7 @@ "labelWidth": 54, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -125,7 +125,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/square_3d/elk/board.exp.json b/e2etests/testdata/stable/square_3d/elk/board.exp.json index 8ec99672a..c72c9bcdd 100644 --- a/e2etests/testdata/stable/square_3d/elk/board.exp.json +++ b/e2etests/testdata/stable/square_3d/elk/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 71, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "square", @@ -75,7 +75,7 @@ "labelWidth": 54, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -116,7 +116,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/straight_hierarchy_container/dagre/board.exp.json b/e2etests/testdata/stable/straight_hierarchy_container/dagre/board.exp.json index c433558a2..284bf2e27 100644 --- a/e2etests/testdata/stable/straight_hierarchy_container/dagre/board.exp.json +++ b/e2etests/testdata/stable/straight_hierarchy_container/dagre/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "c", @@ -75,7 +75,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "b", @@ -113,7 +113,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "l1", @@ -151,7 +151,7 @@ "labelWidth": 24, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "l1.b", @@ -189,7 +189,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "l1.a", @@ -227,7 +227,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "l1.c", @@ -265,7 +265,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "l2c1", @@ -303,7 +303,7 @@ "labelWidth": 50, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "l2c1.a", @@ -341,7 +341,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "l2c3", @@ -379,7 +379,7 @@ "labelWidth": 50, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "l2c3.c", @@ -417,7 +417,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "l2c2", @@ -455,7 +455,7 @@ "labelWidth": 50, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "l2c2.b", @@ -493,7 +493,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "l3c1", @@ -531,7 +531,7 @@ "labelWidth": 50, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "l3c1.a", @@ -569,7 +569,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "l3c1.b", @@ -607,7 +607,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "l3c2", @@ -645,7 +645,7 @@ "labelWidth": 50, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "l3c2.c", @@ -683,7 +683,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "l4", @@ -721,7 +721,7 @@ "labelWidth": 25, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "l4.c1", @@ -759,7 +759,7 @@ "labelWidth": 26, "labelHeight": 36, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "l4.c1.a", @@ -797,7 +797,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 3 + "zIndex": 3 }, { "id": "l4.c2", @@ -835,7 +835,7 @@ "labelWidth": 26, "labelHeight": 36, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "l4.c2.b", @@ -873,7 +873,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 3 + "zIndex": 3 }, { "id": "l4.c3", @@ -911,7 +911,7 @@ "labelWidth": 26, "labelHeight": 36, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "l4.c3.c", @@ -949,7 +949,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 3 + "zIndex": 3 } ], "connections": [ @@ -999,7 +999,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 4 + "zIndex": 4 }, { "id": "(a -> l1.a)[0]", @@ -1047,7 +1047,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 4 + "zIndex": 4 }, { "id": "(c -> l1.c)[0]", @@ -1095,7 +1095,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 4 + "zIndex": 4 }, { "id": "(l1.a -> l2c1.a)[0]", @@ -1155,7 +1155,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 4 + "zIndex": 4 }, { "id": "(l1.c -> l2c3.c)[0]", @@ -1215,7 +1215,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 4 + "zIndex": 4 }, { "id": "(l1.b -> l2c2.b)[0]", @@ -1275,7 +1275,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 4 + "zIndex": 4 }, { "id": "(l2c1.a -> l3c1.a)[0]", @@ -1335,7 +1335,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 4 + "zIndex": 4 }, { "id": "(l2c2.b -> l3c1.b)[0]", @@ -1395,7 +1395,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 4 + "zIndex": 4 }, { "id": "(l2c3.c -> l3c2.c)[0]", @@ -1455,7 +1455,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 4 + "zIndex": 4 }, { "id": "(l3c1.a -> l4.c1.a)[0]", @@ -1527,7 +1527,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 4 + "zIndex": 4 }, { "id": "(l3c1.b -> l4.c2.b)[0]", @@ -1599,7 +1599,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 4 + "zIndex": 4 }, { "id": "(l3c2.c -> l4.c3.c)[0]", @@ -1671,7 +1671,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 4 + "zIndex": 4 } ] } diff --git a/e2etests/testdata/stable/straight_hierarchy_container/elk/board.exp.json b/e2etests/testdata/stable/straight_hierarchy_container/elk/board.exp.json index 523f6a77c..aae43f08d 100644 --- a/e2etests/testdata/stable/straight_hierarchy_container/elk/board.exp.json +++ b/e2etests/testdata/stable/straight_hierarchy_container/elk/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "c", @@ -75,7 +75,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "b", @@ -113,7 +113,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "l1", @@ -151,7 +151,7 @@ "labelWidth": 24, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "l1.b", @@ -189,7 +189,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "l1.a", @@ -227,7 +227,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "l1.c", @@ -265,7 +265,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "l2c1", @@ -303,7 +303,7 @@ "labelWidth": 50, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "l2c1.a", @@ -341,7 +341,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "l2c3", @@ -379,7 +379,7 @@ "labelWidth": 50, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "l2c3.c", @@ -417,7 +417,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "l2c2", @@ -455,7 +455,7 @@ "labelWidth": 50, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "l2c2.b", @@ -493,7 +493,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "l3c1", @@ -531,7 +531,7 @@ "labelWidth": 50, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "l3c1.a", @@ -569,7 +569,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "l3c1.b", @@ -607,7 +607,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "l3c2", @@ -645,7 +645,7 @@ "labelWidth": 50, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "l3c2.c", @@ -683,7 +683,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "l4", @@ -721,7 +721,7 @@ "labelWidth": 25, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "l4.c1", @@ -759,7 +759,7 @@ "labelWidth": 26, "labelHeight": 36, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "l4.c1.a", @@ -797,7 +797,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 3 + "zIndex": 3 }, { "id": "l4.c2", @@ -835,7 +835,7 @@ "labelWidth": 26, "labelHeight": 36, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "l4.c2.b", @@ -873,7 +873,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 3 + "zIndex": 3 }, { "id": "l4.c3", @@ -911,7 +911,7 @@ "labelWidth": 26, "labelHeight": 36, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "l4.c3.c", @@ -949,7 +949,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 3 + "zIndex": 3 } ], "connections": [ @@ -990,7 +990,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 4 + "zIndex": 4 }, { "id": "(a -> l1.a)[0]", @@ -1029,7 +1029,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 4 + "zIndex": 4 }, { "id": "(c -> l1.c)[0]", @@ -1068,7 +1068,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 4 + "zIndex": 4 }, { "id": "(l1.a -> l2c1.a)[0]", @@ -1115,7 +1115,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 4 + "zIndex": 4 }, { "id": "(l1.c -> l2c3.c)[0]", @@ -1154,7 +1154,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 4 + "zIndex": 4 }, { "id": "(l1.b -> l2c2.b)[0]", @@ -1201,7 +1201,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 4 + "zIndex": 4 }, { "id": "(l2c1.a -> l3c1.a)[0]", @@ -1240,7 +1240,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 4 + "zIndex": 4 }, { "id": "(l2c2.b -> l3c1.b)[0]", @@ -1287,7 +1287,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 4 + "zIndex": 4 }, { "id": "(l2c3.c -> l3c2.c)[0]", @@ -1326,7 +1326,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 4 + "zIndex": 4 }, { "id": "(l3c1.a -> l4.c1.a)[0]", @@ -1365,7 +1365,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 4 + "zIndex": 4 }, { "id": "(l3c1.b -> l4.c2.b)[0]", @@ -1412,7 +1412,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 4 + "zIndex": 4 }, { "id": "(l3c2.c -> l4.c3.c)[0]", @@ -1451,7 +1451,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 4 + "zIndex": 4 } ] } diff --git a/e2etests/testdata/stable/stylish/dagre/board.exp.json b/e2etests/testdata/stable/stylish/dagre/board.exp.json index f06110cd6..36430db19 100644 --- a/e2etests/testdata/stable/stylish/dagre/board.exp.json +++ b/e2etests/testdata/stable/stylish/dagre/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "y", @@ -75,7 +75,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -125,7 +125,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/stylish/elk/board.exp.json b/e2etests/testdata/stable/stylish/elk/board.exp.json index 242692c39..de71f7b79 100644 --- a/e2etests/testdata/stable/stylish/elk/board.exp.json +++ b/e2etests/testdata/stable/stylish/elk/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "y", @@ -75,7 +75,7 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -116,7 +116,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/us_map/dagre/board.exp.json b/e2etests/testdata/stable/us_map/dagre/board.exp.json index 183821b87..145cbac91 100644 --- a/e2etests/testdata/stable/us_map/dagre/board.exp.json +++ b/e2etests/testdata/stable/us_map/dagre/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 26, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "HI", @@ -75,7 +75,7 @@ "labelWidth": 19, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "AL", @@ -113,7 +113,7 @@ "labelWidth": 24, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "FL", @@ -151,7 +151,7 @@ "labelWidth": 21, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "GA", @@ -189,7 +189,7 @@ "labelWidth": 26, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "MS", @@ -227,7 +227,7 @@ "labelWidth": 26, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "TN", @@ -265,7 +265,7 @@ "labelWidth": 24, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "AZ", @@ -303,7 +303,7 @@ "labelWidth": 25, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "CA", @@ -341,7 +341,7 @@ "labelWidth": 25, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "NV", @@ -379,7 +379,7 @@ "labelWidth": 25, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "NM", @@ -417,7 +417,7 @@ "labelWidth": 26, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "UT", @@ -455,7 +455,7 @@ "labelWidth": 24, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "AR", @@ -493,7 +493,7 @@ "labelWidth": 26, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "LA", @@ -531,7 +531,7 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "MO", @@ -569,7 +569,7 @@ "labelWidth": 28, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "OK", @@ -607,7 +607,7 @@ "labelWidth": 26, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "TX", @@ -645,7 +645,7 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "OR", @@ -683,7 +683,7 @@ "labelWidth": 26, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "CO", @@ -721,7 +721,7 @@ "labelWidth": 26, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "KS", @@ -759,7 +759,7 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "NE", @@ -797,7 +797,7 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "WY", @@ -835,7 +835,7 @@ "labelWidth": 28, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "CT", @@ -873,7 +873,7 @@ "labelWidth": 24, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "MA", @@ -911,7 +911,7 @@ "labelWidth": 27, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "NY", @@ -949,7 +949,7 @@ "labelWidth": 24, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "RI", @@ -987,7 +987,7 @@ "labelWidth": 18, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "DE", @@ -1025,7 +1025,7 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "MD", @@ -1063,7 +1063,7 @@ "labelWidth": 27, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "NJ", @@ -1101,7 +1101,7 @@ "labelWidth": 22, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "PA", @@ -1139,7 +1139,7 @@ "labelWidth": 24, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "NC", @@ -1177,7 +1177,7 @@ "labelWidth": 24, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "SC", @@ -1215,7 +1215,7 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "ID", @@ -1253,7 +1253,7 @@ "labelWidth": 19, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "MT", @@ -1291,7 +1291,7 @@ "labelWidth": 26, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "WA", @@ -1329,7 +1329,7 @@ "labelWidth": 29, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "IL", @@ -1367,7 +1367,7 @@ "labelWidth": 17, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "IN", @@ -1405,7 +1405,7 @@ "labelWidth": 19, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "IA", @@ -1443,7 +1443,7 @@ "labelWidth": 19, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "MI", @@ -1481,7 +1481,7 @@ "labelWidth": 21, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "KY", @@ -1519,7 +1519,7 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "WI", @@ -1557,7 +1557,7 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "OH", @@ -1595,7 +1595,7 @@ "labelWidth": 26, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "MN", @@ -1633,7 +1633,7 @@ "labelWidth": 27, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "SD", @@ -1671,7 +1671,7 @@ "labelWidth": 24, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "VA", @@ -1709,7 +1709,7 @@ "labelWidth": 25, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "WV", @@ -1747,7 +1747,7 @@ "labelWidth": 29, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "ME", @@ -1785,7 +1785,7 @@ "labelWidth": 25, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "NH", @@ -1823,7 +1823,7 @@ "labelWidth": 25, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "VT", @@ -1861,7 +1861,7 @@ "labelWidth": 24, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "ND", @@ -1899,7 +1899,7 @@ "labelWidth": 25, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -1949,7 +1949,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(FL -- GA)[0]", @@ -1997,7 +1997,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(GA -- MS)[0]", @@ -2045,7 +2045,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(MS -- TN)[0]", @@ -2177,7 +2177,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(AZ -- CA)[0]", @@ -2225,7 +2225,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(CA -- NV)[0]", @@ -2273,7 +2273,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(NV -- NM)[0]", @@ -2321,7 +2321,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(NM -- UT)[0]", @@ -2381,7 +2381,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(AR -- LA)[0]", @@ -2429,7 +2429,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(LA -- MS)[0]", @@ -2477,7 +2477,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(MS -- MO)[0]", @@ -2525,7 +2525,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(MO -- OK)[0]", @@ -2609,7 +2609,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(OK -- TN)[0]", @@ -2657,7 +2657,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(TN -- TX)[0]", @@ -2705,7 +2705,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(CA -- NV)[1]", @@ -2753,7 +2753,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(NV -- OR)[0]", @@ -2813,7 +2813,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(CO -- KS)[0]", @@ -2861,7 +2861,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(KS -- NE)[0]", @@ -2921,7 +2921,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(NE -- NM)[0]", @@ -2969,7 +2969,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(NM -- OK)[0]", @@ -3017,7 +3017,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(OK -- UT)[0]", @@ -3065,7 +3065,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(UT -- WY)[0]", @@ -3125,7 +3125,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(CT -- MA)[0]", @@ -3173,7 +3173,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(MA -- NY)[0]", @@ -3233,7 +3233,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(NY -- RI)[0]", @@ -3293,7 +3293,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(DE -- MD)[0]", @@ -3341,7 +3341,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(MD -- NJ)[0]", @@ -3389,7 +3389,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(NJ -- PA)[0]", @@ -3449,7 +3449,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(FL -- GA)[1]", @@ -3497,7 +3497,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(GA -- NC)[0]", @@ -3605,7 +3605,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(NC -- SC)[0]", @@ -3653,7 +3653,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(SC -- TN)[0]", @@ -3701,7 +3701,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(ID -- MT)[0]", @@ -3749,7 +3749,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(MT -- NV)[0]", @@ -3797,7 +3797,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(NV -- OR)[1]", @@ -3857,7 +3857,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(OR -- UT)[0]", @@ -3905,7 +3905,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(UT -- WA)[0]", @@ -3953,7 +3953,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(WA -- WY)[0]", @@ -4001,7 +4001,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(IL -- IN)[0]", @@ -4049,7 +4049,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(IN -- IA)[0]", @@ -4097,7 +4097,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(IA -- MI)[0]", @@ -4145,7 +4145,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(MI -- KY)[0]", @@ -4193,7 +4193,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(KY -- MO)[0]", @@ -4241,7 +4241,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(MO -- WI)[0]", @@ -4325,7 +4325,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(IN -- KY)[0]", @@ -4409,7 +4409,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(KY -- MI)[0]", @@ -4457,7 +4457,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(MI -- OH)[0]", @@ -4565,7 +4565,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(IA -- MN)[0]", @@ -4625,7 +4625,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(MN -- MO)[0]", @@ -4673,7 +4673,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(MO -- NE)[0]", @@ -4721,7 +4721,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(NE -- SD)[0]", @@ -4769,7 +4769,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(SD -- WI)[0]", @@ -4817,7 +4817,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(KS -- MO)[0]", @@ -4865,7 +4865,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(MO -- NE)[1]", @@ -4913,7 +4913,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(NE -- OK)[0]", @@ -4973,7 +4973,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(KY -- MO)[1]", @@ -5021,7 +5021,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(MO -- OH)[0]", @@ -5081,7 +5081,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(OH -- TN)[0]", @@ -5141,7 +5141,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(TN -- VA)[0]", @@ -5189,7 +5189,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(VA -- WV)[0]", @@ -5237,7 +5237,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(LA -- MS)[1]", @@ -5285,7 +5285,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(MS -- TX)[0]", @@ -5441,7 +5441,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(ME -- NH)[0]", @@ -5489,7 +5489,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(MD -- PA)[0]", @@ -5573,7 +5573,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(PA -- VA)[0]", @@ -5621,7 +5621,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(VA -- WV)[1]", @@ -5669,7 +5669,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(MA -- NH)[0]", @@ -5717,7 +5717,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(NH -- NY)[0]", @@ -5765,7 +5765,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(NY -- RI)[1]", @@ -5825,7 +5825,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(RI -- VT)[0]", @@ -5873,7 +5873,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(MI -- MN)[0]", @@ -5921,7 +5921,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(MN -- OH)[0]", @@ -6005,7 +6005,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(OH -- WI)[0]", @@ -6053,7 +6053,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(MN -- ND)[0]", @@ -6113,7 +6113,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(ND -- SD)[0]", @@ -6161,7 +6161,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(SD -- WI)[1]", @@ -6209,7 +6209,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(MS -- TN)[1]", @@ -6341,7 +6341,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(MO -- NE)[2]", @@ -6389,7 +6389,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(NE -- OK)[1]", @@ -6449,7 +6449,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(OK -- TN)[1]", @@ -6497,7 +6497,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(MT -- ND)[0]", @@ -6545,7 +6545,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(ND -- SD)[1]", @@ -6593,7 +6593,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(SD -- WY)[0]", @@ -6701,7 +6701,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(NE -- SD)[1]", @@ -6749,7 +6749,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(SD -- WY)[1]", @@ -6857,7 +6857,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(NV -- OR)[2]", @@ -6917,7 +6917,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(OR -- UT)[1]", @@ -6965,7 +6965,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(NH -- VT)[0]", @@ -7073,7 +7073,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(NJ -- NY)[0]", @@ -7121,7 +7121,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(NY -- PA)[0]", @@ -7169,7 +7169,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(NM -- OK)[1]", @@ -7217,7 +7217,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(OK -- TX)[0]", @@ -7277,7 +7277,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(NY -- PA)[1]", @@ -7325,7 +7325,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(PA -- RI)[0]", @@ -7373,7 +7373,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(RI -- VT)[1]", @@ -7421,7 +7421,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(NC -- SC)[1]", @@ -7469,7 +7469,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(SC -- TN)[1]", @@ -7517,7 +7517,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(TN -- VA)[1]", @@ -7565,7 +7565,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(ND -- SD)[2]", @@ -7613,7 +7613,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(OH -- PA)[0]", @@ -7673,7 +7673,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(PA -- WV)[0]", @@ -7733,7 +7733,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(OK -- TX)[1]", @@ -7793,7 +7793,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(OR -- WA)[0]", @@ -7853,7 +7853,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(PA -- WV)[1]", @@ -7913,7 +7913,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(SD -- WY)[2]", @@ -8021,7 +8021,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(TN -- VA)[2]", @@ -8069,7 +8069,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(UT -- WY)[1]", @@ -8129,7 +8129,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(VA -- WV)[2]", @@ -8177,7 +8177,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/us_map/elk/board.exp.json b/e2etests/testdata/stable/us_map/elk/board.exp.json index dfd4d1b13..08b090faf 100644 --- a/e2etests/testdata/stable/us_map/elk/board.exp.json +++ b/e2etests/testdata/stable/us_map/elk/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 26, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "HI", @@ -75,7 +75,7 @@ "labelWidth": 19, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "AL", @@ -113,7 +113,7 @@ "labelWidth": 24, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "FL", @@ -151,7 +151,7 @@ "labelWidth": 21, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "GA", @@ -189,7 +189,7 @@ "labelWidth": 26, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "MS", @@ -227,7 +227,7 @@ "labelWidth": 26, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "TN", @@ -265,7 +265,7 @@ "labelWidth": 24, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "AZ", @@ -303,7 +303,7 @@ "labelWidth": 25, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "CA", @@ -341,7 +341,7 @@ "labelWidth": 25, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "NV", @@ -379,7 +379,7 @@ "labelWidth": 25, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "NM", @@ -417,7 +417,7 @@ "labelWidth": 26, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "UT", @@ -455,7 +455,7 @@ "labelWidth": 24, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "AR", @@ -493,7 +493,7 @@ "labelWidth": 26, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "LA", @@ -531,7 +531,7 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "MO", @@ -569,7 +569,7 @@ "labelWidth": 28, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "OK", @@ -607,7 +607,7 @@ "labelWidth": 26, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "TX", @@ -645,7 +645,7 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "OR", @@ -683,7 +683,7 @@ "labelWidth": 26, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "CO", @@ -721,7 +721,7 @@ "labelWidth": 26, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "KS", @@ -759,7 +759,7 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "NE", @@ -797,7 +797,7 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "WY", @@ -835,7 +835,7 @@ "labelWidth": 28, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "CT", @@ -873,7 +873,7 @@ "labelWidth": 24, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "MA", @@ -911,7 +911,7 @@ "labelWidth": 27, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "NY", @@ -949,7 +949,7 @@ "labelWidth": 24, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "RI", @@ -987,7 +987,7 @@ "labelWidth": 18, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "DE", @@ -1025,7 +1025,7 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "MD", @@ -1063,7 +1063,7 @@ "labelWidth": 27, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "NJ", @@ -1101,7 +1101,7 @@ "labelWidth": 22, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "PA", @@ -1139,7 +1139,7 @@ "labelWidth": 24, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "NC", @@ -1177,7 +1177,7 @@ "labelWidth": 24, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "SC", @@ -1215,7 +1215,7 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "ID", @@ -1253,7 +1253,7 @@ "labelWidth": 19, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "MT", @@ -1291,7 +1291,7 @@ "labelWidth": 26, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "WA", @@ -1329,7 +1329,7 @@ "labelWidth": 29, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "IL", @@ -1367,7 +1367,7 @@ "labelWidth": 17, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "IN", @@ -1405,7 +1405,7 @@ "labelWidth": 19, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "IA", @@ -1443,7 +1443,7 @@ "labelWidth": 19, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "MI", @@ -1481,7 +1481,7 @@ "labelWidth": 21, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "KY", @@ -1519,7 +1519,7 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "WI", @@ -1557,7 +1557,7 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "OH", @@ -1595,7 +1595,7 @@ "labelWidth": 26, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "MN", @@ -1633,7 +1633,7 @@ "labelWidth": 27, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "SD", @@ -1671,7 +1671,7 @@ "labelWidth": 24, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "VA", @@ -1709,7 +1709,7 @@ "labelWidth": 25, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "WV", @@ -1747,7 +1747,7 @@ "labelWidth": 29, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "ME", @@ -1785,7 +1785,7 @@ "labelWidth": 25, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "NH", @@ -1823,7 +1823,7 @@ "labelWidth": 25, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "VT", @@ -1861,7 +1861,7 @@ "labelWidth": 24, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "ND", @@ -1899,7 +1899,7 @@ "labelWidth": 25, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -1940,7 +1940,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(FL -- GA)[0]", @@ -1979,7 +1979,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(GA -- MS)[0]", @@ -2018,7 +2018,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(MS -- TN)[0]", @@ -2073,7 +2073,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(AZ -- CA)[0]", @@ -2112,7 +2112,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(CA -- NV)[0]", @@ -2151,7 +2151,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(NV -- NM)[0]", @@ -2198,7 +2198,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(NM -- UT)[0]", @@ -2245,7 +2245,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(AR -- LA)[0]", @@ -2284,7 +2284,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(LA -- MS)[0]", @@ -2331,7 +2331,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(MS -- MO)[0]", @@ -2378,7 +2378,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(MO -- OK)[0]", @@ -2433,7 +2433,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(OK -- TN)[0]", @@ -2480,7 +2480,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(TN -- TX)[0]", @@ -2527,7 +2527,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(CA -- NV)[1]", @@ -2574,7 +2574,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(NV -- OR)[0]", @@ -2613,7 +2613,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(CO -- KS)[0]", @@ -2652,7 +2652,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(KS -- NE)[0]", @@ -2691,7 +2691,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(NE -- NM)[0]", @@ -2730,7 +2730,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(NM -- OK)[0]", @@ -2769,7 +2769,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(OK -- UT)[0]", @@ -2816,7 +2816,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(UT -- WY)[0]", @@ -2871,7 +2871,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(CT -- MA)[0]", @@ -2910,7 +2910,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(MA -- NY)[0]", @@ -2949,7 +2949,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(NY -- RI)[0]", @@ -2996,7 +2996,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(DE -- MD)[0]", @@ -3035,7 +3035,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(MD -- NJ)[0]", @@ -3074,7 +3074,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(NJ -- PA)[0]", @@ -3121,7 +3121,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(FL -- GA)[1]", @@ -3168,7 +3168,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(GA -- NC)[0]", @@ -3223,7 +3223,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(NC -- SC)[0]", @@ -3262,7 +3262,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(SC -- TN)[0]", @@ -3301,7 +3301,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(ID -- MT)[0]", @@ -3340,7 +3340,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(MT -- NV)[0]", @@ -3387,7 +3387,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(NV -- OR)[1]", @@ -3434,7 +3434,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(OR -- UT)[0]", @@ -3481,7 +3481,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(UT -- WA)[0]", @@ -3528,7 +3528,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(WA -- WY)[0]", @@ -3567,7 +3567,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(IL -- IN)[0]", @@ -3606,7 +3606,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(IN -- IA)[0]", @@ -3653,7 +3653,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(IA -- MI)[0]", @@ -3692,7 +3692,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(MI -- KY)[0]", @@ -3739,7 +3739,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(KY -- MO)[0]", @@ -3778,7 +3778,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(MO -- WI)[0]", @@ -3825,7 +3825,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(IN -- KY)[0]", @@ -3864,7 +3864,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(KY -- MI)[0]", @@ -3911,7 +3911,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(MI -- OH)[0]", @@ -3958,7 +3958,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(IA -- MN)[0]", @@ -4013,7 +4013,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(MN -- MO)[0]", @@ -4060,7 +4060,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(MO -- NE)[0]", @@ -4107,7 +4107,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(NE -- SD)[0]", @@ -4154,7 +4154,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(SD -- WI)[0]", @@ -4201,7 +4201,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(KS -- MO)[0]", @@ -4248,7 +4248,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(MO -- NE)[1]", @@ -4295,7 +4295,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(NE -- OK)[0]", @@ -4350,7 +4350,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(KY -- MO)[1]", @@ -4397,7 +4397,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(MO -- OH)[0]", @@ -4444,7 +4444,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(OH -- TN)[0]", @@ -4491,7 +4491,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(TN -- VA)[0]", @@ -4538,7 +4538,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(VA -- WV)[0]", @@ -4585,7 +4585,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(LA -- MS)[1]", @@ -4632,7 +4632,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(MS -- TX)[0]", @@ -4687,7 +4687,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(ME -- NH)[0]", @@ -4726,7 +4726,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(MD -- PA)[0]", @@ -4781,7 +4781,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(PA -- VA)[0]", @@ -4828,7 +4828,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(VA -- WV)[1]", @@ -4867,7 +4867,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(MA -- NH)[0]", @@ -4914,7 +4914,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(NH -- NY)[0]", @@ -4961,7 +4961,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(NY -- RI)[1]", @@ -5008,7 +5008,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(RI -- VT)[0]", @@ -5055,7 +5055,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(MI -- MN)[0]", @@ -5094,7 +5094,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(MN -- OH)[0]", @@ -5141,7 +5141,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(OH -- WI)[0]", @@ -5196,7 +5196,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(MN -- ND)[0]", @@ -5251,7 +5251,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(ND -- SD)[0]", @@ -5298,7 +5298,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(SD -- WI)[1]", @@ -5345,7 +5345,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(MS -- TN)[1]", @@ -5400,7 +5400,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(MO -- NE)[2]", @@ -5447,7 +5447,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(NE -- OK)[1]", @@ -5502,7 +5502,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(OK -- TN)[1]", @@ -5549,7 +5549,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(MT -- ND)[0]", @@ -5588,7 +5588,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(ND -- SD)[1]", @@ -5627,7 +5627,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(SD -- WY)[0]", @@ -5682,7 +5682,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(NE -- SD)[1]", @@ -5729,7 +5729,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(SD -- WY)[1]", @@ -5784,7 +5784,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(NV -- OR)[2]", @@ -5831,7 +5831,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(OR -- UT)[1]", @@ -5870,7 +5870,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(NH -- VT)[0]", @@ -5917,7 +5917,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(NJ -- NY)[0]", @@ -5964,7 +5964,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(NY -- PA)[0]", @@ -6011,7 +6011,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(NM -- OK)[1]", @@ -6058,7 +6058,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(OK -- TX)[0]", @@ -6105,7 +6105,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(NY -- PA)[1]", @@ -6152,7 +6152,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(PA -- RI)[0]", @@ -6199,7 +6199,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(RI -- VT)[1]", @@ -6246,7 +6246,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(NC -- SC)[1]", @@ -6293,7 +6293,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(SC -- TN)[1]", @@ -6340,7 +6340,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(TN -- VA)[1]", @@ -6379,7 +6379,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(ND -- SD)[2]", @@ -6426,7 +6426,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(OH -- PA)[0]", @@ -6473,7 +6473,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(PA -- WV)[0]", @@ -6520,7 +6520,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(OK -- TX)[1]", @@ -6567,7 +6567,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(OR -- WA)[0]", @@ -6614,7 +6614,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(PA -- WV)[1]", @@ -6669,7 +6669,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(SD -- WY)[2]", @@ -6716,7 +6716,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(TN -- VA)[2]", @@ -6763,7 +6763,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(UT -- WY)[1]", @@ -6810,7 +6810,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(VA -- WV)[2]", @@ -6857,7 +6857,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/todo/container_child_edge/dagre/board.exp.json b/e2etests/testdata/todo/container_child_edge/dagre/board.exp.json index 57d723e04..2b91f71c9 100644 --- a/e2etests/testdata/todo/container_child_edge/dagre/board.exp.json +++ b/e2etests/testdata/todo/container_child_edge/dagre/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 117, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "container.first", @@ -75,7 +75,7 @@ "labelWidth": 35, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "container.second", @@ -113,7 +113,7 @@ "labelWidth": 55, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 } ], "connections": [ @@ -163,7 +163,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(container -> container.second)[0]", @@ -211,7 +211,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 } ] } diff --git a/e2etests/testdata/todo/container_child_edge/elk/board.exp.json b/e2etests/testdata/todo/container_child_edge/elk/board.exp.json index 76499a1f5..be1f60856 100644 --- a/e2etests/testdata/todo/container_child_edge/elk/board.exp.json +++ b/e2etests/testdata/todo/container_child_edge/elk/board.exp.json @@ -37,7 +37,7 @@ "labelWidth": 117, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "renderPriority": 1 + "zIndex": 1 }, { "id": "container.first", @@ -75,7 +75,7 @@ "labelWidth": 35, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 }, { "id": "container.second", @@ -113,7 +113,7 @@ "labelWidth": 55, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "renderPriority": 2 + "zIndex": 2 } ], "connections": [ @@ -154,7 +154,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 }, { "id": "(container -> container.second)[0]", @@ -201,7 +201,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 3 + "zIndex": 3 } ] } diff --git a/testdata/d2compiler/TestCompile/basic_icon.exp.json b/testdata/d2compiler/TestCompile/basic_icon.exp.json index 7c4c944bc..25b5f7093 100644 --- a/testdata/d2compiler/TestCompile/basic_icon.exp.json +++ b/testdata/d2compiler/TestCompile/basic_icon.exp.json @@ -91,8 +91,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -149,8 +148,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2compiler/TestCompile/basic_sequence.exp.json b/testdata/d2compiler/TestCompile/basic_sequence.exp.json index 7baa4d61e..072abeff2 100644 --- a/testdata/d2compiler/TestCompile/basic_sequence.exp.json +++ b/testdata/d2compiler/TestCompile/basic_sequence.exp.json @@ -86,8 +86,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -132,8 +131,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2compiler/TestCompile/basic_shape.exp.json b/testdata/d2compiler/TestCompile/basic_shape.exp.json index 0f0be1707..55a75ce1c 100644 --- a/testdata/d2compiler/TestCompile/basic_shape.exp.json +++ b/testdata/d2compiler/TestCompile/basic_shape.exp.json @@ -86,8 +86,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -132,8 +131,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2compiler/TestCompile/basic_style.exp.json b/testdata/d2compiler/TestCompile/basic_style.exp.json index 4fbb48ecd..1e2df17f0 100644 --- a/testdata/d2compiler/TestCompile/basic_style.exp.json +++ b/testdata/d2compiler/TestCompile/basic_style.exp.json @@ -93,8 +93,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [], "objects": [ @@ -143,8 +142,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2compiler/TestCompile/class_paren.exp.json b/testdata/d2compiler/TestCompile/class_paren.exp.json index b173f1700..c86f7f020 100644 --- a/testdata/d2compiler/TestCompile/class_paren.exp.json +++ b/testdata/d2compiler/TestCompile/class_paren.exp.json @@ -185,8 +185,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [], "objects": [ @@ -252,8 +251,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2compiler/TestCompile/class_style.exp.json b/testdata/d2compiler/TestCompile/class_style.exp.json index 3f722271d..0b411d650 100644 --- a/testdata/d2compiler/TestCompile/class_style.exp.json +++ b/testdata/d2compiler/TestCompile/class_style.exp.json @@ -159,8 +159,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [], "objects": [ @@ -219,8 +218,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2compiler/TestCompile/edge.exp.json b/testdata/d2compiler/TestCompile/edge.exp.json index 2dcea2883..09e4428ef 100644 --- a/testdata/d2compiler/TestCompile/edge.exp.json +++ b/testdata/d2compiler/TestCompile/edge.exp.json @@ -70,8 +70,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -147,8 +146,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -191,8 +189,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json b/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json index 8fdadb831..bf32e2e02 100644 --- a/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json +++ b/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json @@ -249,8 +249,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -356,8 +355,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -400,8 +398,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_chain.exp.json b/testdata/d2compiler/TestCompile/edge_chain.exp.json index 9462e68a6..4aa8282e0 100644 --- a/testdata/d2compiler/TestCompile/edge_chain.exp.json +++ b/testdata/d2compiler/TestCompile/edge_chain.exp.json @@ -117,8 +117,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -224,8 +223,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -288,8 +286,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "z", @@ -332,8 +329,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_chain_map.exp.json b/testdata/d2compiler/TestCompile/edge_chain_map.exp.json index 234bb27b2..6c49a5af8 100644 --- a/testdata/d2compiler/TestCompile/edge_chain_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_chain_map.exp.json @@ -146,8 +146,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -253,8 +252,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -317,8 +315,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "z", @@ -361,8 +358,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_column_index.exp.json b/testdata/d2compiler/TestCompile/edge_column_index.exp.json index 307bbf42a..c3cf797ee 100644 --- a/testdata/d2compiler/TestCompile/edge_column_index.exp.json +++ b/testdata/d2compiler/TestCompile/edge_column_index.exp.json @@ -348,8 +348,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -474,8 +473,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "dst", @@ -565,8 +563,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json b/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json index 2ef0fe280..b6b3c1a0d 100644 --- a/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json +++ b/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json @@ -115,8 +115,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -196,8 +195,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -240,8 +238,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json index 1ef459b9d..d0220923f 100644 --- a/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json @@ -158,8 +158,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -271,8 +270,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -335,8 +333,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json index 5b8dcfc16..4b56270c3 100644 --- a/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json @@ -126,8 +126,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -216,8 +215,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -260,8 +258,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_in_column.exp.json b/testdata/d2compiler/TestCompile/edge_in_column.exp.json index 11e7303ff..05c4e1e69 100644 --- a/testdata/d2compiler/TestCompile/edge_in_column.exp.json +++ b/testdata/d2compiler/TestCompile/edge_in_column.exp.json @@ -161,8 +161,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [], "objects": [ @@ -217,8 +216,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_index.exp.json b/testdata/d2compiler/TestCompile/edge_index.exp.json index 298a710de..1dab7db6a 100644 --- a/testdata/d2compiler/TestCompile/edge_index.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index.exp.json @@ -141,8 +141,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -241,8 +240,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -305,8 +303,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_index_map.exp.json b/testdata/d2compiler/TestCompile/edge_index_map.exp.json index f98889700..1e1a5ff30 100644 --- a/testdata/d2compiler/TestCompile/edge_index_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index_map.exp.json @@ -160,8 +160,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -260,8 +259,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -324,8 +322,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_index_nested.exp.json b/testdata/d2compiler/TestCompile/edge_index_nested.exp.json index 13e1a0b9c..9f77b4f31 100644 --- a/testdata/d2compiler/TestCompile/edge_index_nested.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index_nested.exp.json @@ -170,8 +170,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -250,8 +249,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "x", @@ -314,8 +312,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -378,8 +375,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json b/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json index 6f6d027e9..2be418922 100644 --- a/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json @@ -186,8 +186,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -286,8 +285,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "x", @@ -350,8 +348,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -414,8 +411,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json index d086a4ec2..3ace9b870 100644 --- a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json +++ b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json @@ -199,8 +199,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -303,8 +302,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "a", @@ -367,8 +365,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -431,8 +428,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json index d53713bb3..34560630d 100644 --- a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json +++ b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json @@ -205,8 +205,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -289,8 +288,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "a", @@ -364,8 +362,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -439,8 +436,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json index 92f716025..d1be6a904 100644 --- a/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json +++ b/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json @@ -218,8 +218,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -302,8 +301,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "a", @@ -377,8 +375,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -452,8 +449,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json index 40da04b16..8373caa0b 100644 --- a/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json +++ b/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json @@ -236,8 +236,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -320,8 +319,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "a", @@ -395,8 +393,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -470,8 +467,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_label_map.exp.json b/testdata/d2compiler/TestCompile/edge_label_map.exp.json index 0ae1360ba..e728aeb38 100644 --- a/testdata/d2compiler/TestCompile/edge_label_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_label_map.exp.json @@ -126,8 +126,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -207,8 +206,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "qwer", @@ -251,8 +249,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_map.exp.json b/testdata/d2compiler/TestCompile/edge_map.exp.json index 466ad9742..c314961d7 100644 --- a/testdata/d2compiler/TestCompile/edge_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map.exp.json @@ -109,8 +109,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -186,8 +185,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -230,8 +228,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json index f2a3b1b67..961ff5094 100644 --- a/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json @@ -138,8 +138,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -228,8 +227,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -272,8 +270,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json b/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json index acf1b4c10..25c0db906 100644 --- a/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json @@ -154,8 +154,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -258,8 +257,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -322,8 +320,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json b/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json index bd4b388f4..46422a6fe 100644 --- a/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json @@ -172,8 +172,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -276,8 +275,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -340,8 +338,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_map_nested.exp.json b/testdata/d2compiler/TestCompile/edge_map_nested.exp.json index 770fbb54b..2097718a6 100644 --- a/testdata/d2compiler/TestCompile/edge_map_nested.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_nested.exp.json @@ -134,8 +134,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -215,8 +214,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -259,8 +257,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json b/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json index adc3e1726..017d5dfc8 100644 --- a/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json @@ -116,8 +116,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -197,8 +196,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -241,8 +239,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json index 0f5ce7b39..9a50c75ff 100644 --- a/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json @@ -226,8 +226,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -352,8 +351,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -416,8 +414,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json index 501d0e20d..5142f8595 100644 --- a/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json @@ -120,8 +120,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -210,8 +209,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -254,8 +252,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json index e6c04e50c..cd8446a1e 100644 --- a/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json @@ -176,8 +176,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -289,8 +288,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -353,8 +351,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2compiler/TestCompile/escaped_id.exp.json b/testdata/d2compiler/TestCompile/escaped_id.exp.json index dfcbc3297..af200618f 100644 --- a/testdata/d2compiler/TestCompile/escaped_id.exp.json +++ b/testdata/d2compiler/TestCompile/escaped_id.exp.json @@ -47,8 +47,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -93,8 +92,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2compiler/TestCompile/image_style.exp.json b/testdata/d2compiler/TestCompile/image_style.exp.json index 19ef7af05..997030792 100644 --- a/testdata/d2compiler/TestCompile/image_style.exp.json +++ b/testdata/d2compiler/TestCompile/image_style.exp.json @@ -168,8 +168,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [], "objects": [ @@ -230,8 +229,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2compiler/TestCompile/nested_sql.exp.json b/testdata/d2compiler/TestCompile/nested_sql.exp.json index bbbc784dd..69e2f421c 100644 --- a/testdata/d2compiler/TestCompile/nested_sql.exp.json +++ b/testdata/d2compiler/TestCompile/nested_sql.exp.json @@ -181,8 +181,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [], "objects": [ @@ -227,8 +226,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "table", @@ -287,8 +285,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2compiler/TestCompile/path_link.exp.json b/testdata/d2compiler/TestCompile/path_link.exp.json index b81b11e4f..300cfe06f 100644 --- a/testdata/d2compiler/TestCompile/path_link.exp.json +++ b/testdata/d2compiler/TestCompile/path_link.exp.json @@ -86,8 +86,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -133,8 +132,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json b/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json index 97e668c4f..69651a4a9 100644 --- a/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json +++ b/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json @@ -281,8 +281,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [], "objects": [ @@ -395,8 +394,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -439,8 +437,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2compiler/TestCompile/root_sequence.exp.json b/testdata/d2compiler/TestCompile/root_sequence.exp.json index 0e5e10565..7ee72472d 100644 --- a/testdata/d2compiler/TestCompile/root_sequence.exp.json +++ b/testdata/d2compiler/TestCompile/root_sequence.exp.json @@ -57,8 +57,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": null diff --git a/testdata/d2compiler/TestCompile/sql_paren.exp.json b/testdata/d2compiler/TestCompile/sql_paren.exp.json index c19f71a7a..13eff1ae6 100644 --- a/testdata/d2compiler/TestCompile/sql_paren.exp.json +++ b/testdata/d2compiler/TestCompile/sql_paren.exp.json @@ -162,8 +162,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [], "objects": [ @@ -224,8 +223,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2compiler/TestCompile/stroke-width.exp.json b/testdata/d2compiler/TestCompile/stroke-width.exp.json index cda5fddaa..b947b14a2 100644 --- a/testdata/d2compiler/TestCompile/stroke-width.exp.json +++ b/testdata/d2compiler/TestCompile/stroke-width.exp.json @@ -93,8 +93,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [], "objects": [ @@ -143,8 +142,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2compiler/TestCompile/table_style.exp.json b/testdata/d2compiler/TestCompile/table_style.exp.json index 58b9dddbf..f44f416b4 100644 --- a/testdata/d2compiler/TestCompile/table_style.exp.json +++ b/testdata/d2compiler/TestCompile/table_style.exp.json @@ -159,8 +159,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [], "objects": [ @@ -219,8 +218,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2compiler/TestCompile/table_style_map.exp.json b/testdata/d2compiler/TestCompile/table_style_map.exp.json index 866f01926..4b150db68 100644 --- a/testdata/d2compiler/TestCompile/table_style_map.exp.json +++ b/testdata/d2compiler/TestCompile/table_style_map.exp.json @@ -210,8 +210,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [], "objects": [ @@ -270,8 +269,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2compiler/TestCompile/underscore_edge.exp.json b/testdata/d2compiler/TestCompile/underscore_edge.exp.json index fefb12e87..84d29cf9c 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge.exp.json @@ -121,8 +121,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -229,8 +228,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -284,8 +282,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json index e5ee50012..c9eb30378 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json @@ -180,8 +180,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -349,8 +348,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -404,8 +402,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "z", @@ -459,8 +456,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json index 5aec2ef74..4a3d687fe 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json @@ -187,8 +187,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -294,8 +293,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "a", @@ -369,8 +367,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -444,8 +441,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json index eda805cd6..705d516f8 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json @@ -192,8 +192,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -272,8 +271,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "a", @@ -347,8 +345,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -422,8 +419,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json index decb6d5ea..7d1942adb 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json @@ -161,8 +161,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -238,8 +237,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -313,8 +311,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "z", @@ -379,8 +376,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json index 7551e9485..830a09082 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json @@ -87,8 +87,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -133,8 +132,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -188,8 +186,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json index 02226e45e..7ca34f0e3 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json @@ -116,8 +116,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -162,8 +161,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -206,8 +204,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "z", @@ -261,8 +258,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json index 19dbddc92..69b1b036e 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json @@ -130,8 +130,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -176,8 +175,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -251,8 +249,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json index 8aae38057..00824907e 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json @@ -130,8 +130,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -207,8 +206,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "x", @@ -251,8 +249,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json index d99856cb7..1b9272a22 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json @@ -127,8 +127,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -173,8 +172,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -217,8 +215,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "z", @@ -283,8 +280,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2compiler/TestCompile/url_link.exp.json b/testdata/d2compiler/TestCompile/url_link.exp.json index 084a87867..ee7b7a06e 100644 --- a/testdata/d2compiler/TestCompile/url_link.exp.json +++ b/testdata/d2compiler/TestCompile/url_link.exp.json @@ -86,8 +86,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -133,8 +132,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2exporter/TestExport/connection/arrowhead.exp.json b/testdata/d2exporter/TestExport/connection/arrowhead.exp.json index 329c0e39c..50853c66c 100644 --- a/testdata/d2exporter/TestExport/connection/arrowhead.exp.json +++ b/testdata/d2exporter/TestExport/connection/arrowhead.exp.json @@ -36,7 +36,7 @@ "underline": false, "labelWidth": 0, "labelHeight": 0, - "renderPriority": 1 + "zIndex": 1 }, { "id": "y", @@ -73,7 +73,7 @@ "underline": false, "labelWidth": 0, "labelHeight": 0, - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -106,7 +106,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/testdata/d2exporter/TestExport/connection/basic.exp.json b/testdata/d2exporter/TestExport/connection/basic.exp.json index 81577fbf7..08955be89 100644 --- a/testdata/d2exporter/TestExport/connection/basic.exp.json +++ b/testdata/d2exporter/TestExport/connection/basic.exp.json @@ -36,7 +36,7 @@ "underline": false, "labelWidth": 0, "labelHeight": 0, - "renderPriority": 1 + "zIndex": 1 }, { "id": "y", @@ -73,7 +73,7 @@ "underline": false, "labelWidth": 0, "labelHeight": 0, - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -106,7 +106,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/testdata/d2exporter/TestExport/connection/stroke-dash.exp.json b/testdata/d2exporter/TestExport/connection/stroke-dash.exp.json index 8baa06de4..a0dc6acb0 100644 --- a/testdata/d2exporter/TestExport/connection/stroke-dash.exp.json +++ b/testdata/d2exporter/TestExport/connection/stroke-dash.exp.json @@ -36,7 +36,7 @@ "underline": false, "labelWidth": 0, "labelHeight": 0, - "renderPriority": 1 + "zIndex": 1 }, { "id": "y", @@ -73,7 +73,7 @@ "underline": false, "labelWidth": 0, "labelHeight": 0, - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -106,7 +106,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/testdata/d2exporter/TestExport/connection/theme_stroke-dash.exp.json b/testdata/d2exporter/TestExport/connection/theme_stroke-dash.exp.json index 6219c0366..524a496d8 100644 --- a/testdata/d2exporter/TestExport/connection/theme_stroke-dash.exp.json +++ b/testdata/d2exporter/TestExport/connection/theme_stroke-dash.exp.json @@ -36,7 +36,7 @@ "underline": false, "labelWidth": 0, "labelHeight": 0, - "renderPriority": 1 + "zIndex": 1 }, { "id": "y", @@ -73,7 +73,7 @@ "underline": false, "labelWidth": 0, "labelHeight": 0, - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -106,7 +106,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 }, { "id": "(x -> y)[1]", @@ -137,7 +137,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/testdata/d2exporter/TestExport/label/basic_shape.exp.json b/testdata/d2exporter/TestExport/label/basic_shape.exp.json index ace44bfb5..6593e9910 100644 --- a/testdata/d2exporter/TestExport/label/basic_shape.exp.json +++ b/testdata/d2exporter/TestExport/label/basic_shape.exp.json @@ -36,7 +36,7 @@ "underline": false, "labelWidth": 0, "labelHeight": 0, - "renderPriority": 1 + "zIndex": 1 } ], "connections": [] diff --git a/testdata/d2exporter/TestExport/label/connection_font_color.exp.json b/testdata/d2exporter/TestExport/label/connection_font_color.exp.json index 743214d12..93a48c163 100644 --- a/testdata/d2exporter/TestExport/label/connection_font_color.exp.json +++ b/testdata/d2exporter/TestExport/label/connection_font_color.exp.json @@ -36,7 +36,7 @@ "underline": false, "labelWidth": 0, "labelHeight": 0, - "renderPriority": 1 + "zIndex": 1 }, { "id": "y", @@ -73,7 +73,7 @@ "underline": false, "labelWidth": 0, "labelHeight": 0, - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -106,7 +106,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/testdata/d2exporter/TestExport/label/shape_font_color.exp.json b/testdata/d2exporter/TestExport/label/shape_font_color.exp.json index 053b98420..81ff5951f 100644 --- a/testdata/d2exporter/TestExport/label/shape_font_color.exp.json +++ b/testdata/d2exporter/TestExport/label/shape_font_color.exp.json @@ -36,7 +36,7 @@ "underline": false, "labelWidth": 0, "labelHeight": 0, - "renderPriority": 1 + "zIndex": 1 } ], "connections": [] diff --git a/testdata/d2exporter/TestExport/shape/basic.exp.json b/testdata/d2exporter/TestExport/shape/basic.exp.json index 38166cb0f..188372eb7 100644 --- a/testdata/d2exporter/TestExport/shape/basic.exp.json +++ b/testdata/d2exporter/TestExport/shape/basic.exp.json @@ -36,7 +36,7 @@ "underline": false, "labelWidth": 0, "labelHeight": 0, - "renderPriority": 1 + "zIndex": 1 } ], "connections": [] diff --git a/testdata/d2exporter/TestExport/shape/border-radius.exp.json b/testdata/d2exporter/TestExport/shape/border-radius.exp.json index c11fae3cf..fedf87d54 100644 --- a/testdata/d2exporter/TestExport/shape/border-radius.exp.json +++ b/testdata/d2exporter/TestExport/shape/border-radius.exp.json @@ -36,7 +36,7 @@ "underline": false, "labelWidth": 0, "labelHeight": 0, - "renderPriority": 1 + "zIndex": 1 } ], "connections": [] diff --git a/testdata/d2exporter/TestExport/shape/image_dimensions.exp.json b/testdata/d2exporter/TestExport/shape/image_dimensions.exp.json index 4bdf44aa4..63b7d95cc 100644 --- a/testdata/d2exporter/TestExport/shape/image_dimensions.exp.json +++ b/testdata/d2exporter/TestExport/shape/image_dimensions.exp.json @@ -47,7 +47,7 @@ "underline": false, "labelWidth": 0, "labelHeight": 0, - "renderPriority": 1 + "zIndex": 1 } ], "connections": [] diff --git a/testdata/d2exporter/TestExport/shape/synonyms.exp.json b/testdata/d2exporter/TestExport/shape/synonyms.exp.json index 8643832f1..075174b0c 100644 --- a/testdata/d2exporter/TestExport/shape/synonyms.exp.json +++ b/testdata/d2exporter/TestExport/shape/synonyms.exp.json @@ -36,7 +36,7 @@ "underline": false, "labelWidth": 0, "labelHeight": 0, - "renderPriority": 1 + "zIndex": 1 }, { "id": "y", @@ -73,7 +73,7 @@ "underline": false, "labelWidth": 0, "labelHeight": 0, - "renderPriority": 1 + "zIndex": 1 } ], "connections": [] diff --git a/testdata/d2exporter/TestExport/shape/text_color.exp.json b/testdata/d2exporter/TestExport/shape/text_color.exp.json index 16b5218ed..e30872ec3 100644 --- a/testdata/d2exporter/TestExport/shape/text_color.exp.json +++ b/testdata/d2exporter/TestExport/shape/text_color.exp.json @@ -36,7 +36,7 @@ "underline": false, "labelWidth": 0, "labelHeight": 0, - "renderPriority": 1 + "zIndex": 1 } ], "connections": [] diff --git a/testdata/d2exporter/TestExport/theme/connection_with_bold.exp.json b/testdata/d2exporter/TestExport/theme/connection_with_bold.exp.json index 050dc5912..a8765da4e 100644 --- a/testdata/d2exporter/TestExport/theme/connection_with_bold.exp.json +++ b/testdata/d2exporter/TestExport/theme/connection_with_bold.exp.json @@ -36,7 +36,7 @@ "underline": false, "labelWidth": 0, "labelHeight": 0, - "renderPriority": 1 + "zIndex": 1 }, { "id": "y", @@ -73,7 +73,7 @@ "underline": false, "labelWidth": 0, "labelHeight": 0, - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -106,7 +106,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/testdata/d2exporter/TestExport/theme/connection_with_italic.exp.json b/testdata/d2exporter/TestExport/theme/connection_with_italic.exp.json index dbc729f84..8fd82f679 100644 --- a/testdata/d2exporter/TestExport/theme/connection_with_italic.exp.json +++ b/testdata/d2exporter/TestExport/theme/connection_with_italic.exp.json @@ -36,7 +36,7 @@ "underline": false, "labelWidth": 0, "labelHeight": 0, - "renderPriority": 1 + "zIndex": 1 }, { "id": "y", @@ -73,7 +73,7 @@ "underline": false, "labelWidth": 0, "labelHeight": 0, - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -106,7 +106,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/testdata/d2exporter/TestExport/theme/connection_without_italic.exp.json b/testdata/d2exporter/TestExport/theme/connection_without_italic.exp.json index 453384688..8b0690825 100644 --- a/testdata/d2exporter/TestExport/theme/connection_without_italic.exp.json +++ b/testdata/d2exporter/TestExport/theme/connection_without_italic.exp.json @@ -36,7 +36,7 @@ "underline": false, "labelWidth": 0, "labelHeight": 0, - "renderPriority": 1 + "zIndex": 1 }, { "id": "y", @@ -73,7 +73,7 @@ "underline": false, "labelWidth": 0, "labelHeight": 0, - "renderPriority": 1 + "zIndex": 1 } ], "connections": [ @@ -106,7 +106,7 @@ "animated": false, "tooltip": "", "icon": null, - "renderPriority": 2 + "zIndex": 2 } ] } diff --git a/testdata/d2exporter/TestExport/theme/shape_with_italic.exp.json b/testdata/d2exporter/TestExport/theme/shape_with_italic.exp.json index 9d244d492..5d647a1f6 100644 --- a/testdata/d2exporter/TestExport/theme/shape_with_italic.exp.json +++ b/testdata/d2exporter/TestExport/theme/shape_with_italic.exp.json @@ -36,7 +36,7 @@ "underline": false, "labelWidth": 0, "labelHeight": 0, - "renderPriority": 1 + "zIndex": 1 } ], "connections": [] diff --git a/testdata/d2exporter/TestExport/theme/shape_without_bold.exp.json b/testdata/d2exporter/TestExport/theme/shape_without_bold.exp.json index 2f704f889..855735fdb 100644 --- a/testdata/d2exporter/TestExport/theme/shape_without_bold.exp.json +++ b/testdata/d2exporter/TestExport/theme/shape_without_bold.exp.json @@ -36,7 +36,7 @@ "underline": false, "labelWidth": 0, "labelHeight": 0, - "renderPriority": 1 + "zIndex": 1 } ], "connections": [] diff --git a/testdata/d2oracle/TestCreate/base.exp.json b/testdata/d2oracle/TestCreate/base.exp.json index 2be3eab89..a7ac1c375 100644 --- a/testdata/d2oracle/TestCreate/base.exp.json +++ b/testdata/d2oracle/TestCreate/base.exp.json @@ -47,8 +47,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -93,8 +92,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestCreate/container.exp.json b/testdata/d2oracle/TestCreate/container.exp.json index 1038bff6b..dc7bbf8f1 100644 --- a/testdata/d2oracle/TestCreate/container.exp.json +++ b/testdata/d2oracle/TestCreate/container.exp.json @@ -76,8 +76,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -122,8 +121,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "q", @@ -166,8 +164,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestCreate/container_edge.exp.json b/testdata/d2oracle/TestCreate/container_edge.exp.json index 775fe0d8e..21565478e 100644 --- a/testdata/d2oracle/TestCreate/container_edge.exp.json +++ b/testdata/d2oracle/TestCreate/container_edge.exp.json @@ -99,8 +99,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -176,8 +175,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "x", @@ -220,8 +218,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -264,8 +261,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestCreate/container_edge_label.exp.json b/testdata/d2oracle/TestCreate/container_edge_label.exp.json index 4180265ec..77f7b9a48 100644 --- a/testdata/d2oracle/TestCreate/container_edge_label.exp.json +++ b/testdata/d2oracle/TestCreate/container_edge_label.exp.json @@ -109,8 +109,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -186,8 +185,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "x", @@ -230,8 +228,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -274,8 +271,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestCreate/edge.exp.json b/testdata/d2oracle/TestCreate/edge.exp.json index 2137f8d1e..ec2ec4313 100644 --- a/testdata/d2oracle/TestCreate/edge.exp.json +++ b/testdata/d2oracle/TestCreate/edge.exp.json @@ -70,8 +70,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -147,8 +146,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -191,8 +189,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestCreate/edge_nested.exp.json b/testdata/d2oracle/TestCreate/edge_nested.exp.json index 623835012..5d8ed4b19 100644 --- a/testdata/d2oracle/TestCreate/edge_nested.exp.json +++ b/testdata/d2oracle/TestCreate/edge_nested.exp.json @@ -86,8 +86,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -163,8 +162,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "x", @@ -207,8 +205,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -251,8 +248,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestCreate/edge_scope.exp.json b/testdata/d2oracle/TestCreate/edge_scope.exp.json index f0a310e6e..2ff35f256 100644 --- a/testdata/d2oracle/TestCreate/edge_scope.exp.json +++ b/testdata/d2oracle/TestCreate/edge_scope.exp.json @@ -99,8 +99,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -176,8 +175,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "x", @@ -220,8 +218,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -264,8 +261,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json b/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json index d69769e7d..fa3474290 100644 --- a/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json +++ b/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json @@ -99,8 +99,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -176,8 +175,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "x", @@ -220,8 +218,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -264,8 +261,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json b/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json index 928ec1363..32b0a3db0 100644 --- a/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json +++ b/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json @@ -110,8 +110,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -198,8 +197,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -253,8 +251,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "z", @@ -297,8 +294,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "q", @@ -341,8 +337,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestCreate/edge_unique.exp.json b/testdata/d2oracle/TestCreate/edge_unique.exp.json index 7fd29e1f7..68eb01b49 100644 --- a/testdata/d2oracle/TestCreate/edge_unique.exp.json +++ b/testdata/d2oracle/TestCreate/edge_unique.exp.json @@ -256,8 +256,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -423,8 +422,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -467,8 +465,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "hello", @@ -551,8 +548,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "x", @@ -635,8 +631,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -719,8 +714,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestCreate/gen_key.exp.json b/testdata/d2oracle/TestCreate/gen_key.exp.json index 8ce54edf9..ee6032e00 100644 --- a/testdata/d2oracle/TestCreate/gen_key.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key.exp.json @@ -70,8 +70,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -116,8 +115,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "square 2", @@ -160,8 +158,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestCreate/gen_key_n.exp.json b/testdata/d2oracle/TestCreate/gen_key_n.exp.json index d4f66c90c..66a55f903 100644 --- a/testdata/d2oracle/TestCreate/gen_key_n.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key_n.exp.json @@ -328,8 +328,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -396,8 +395,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -462,8 +460,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "z", @@ -528,8 +525,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "square", @@ -572,8 +568,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "square 2", @@ -616,8 +611,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "square 3", @@ -660,8 +654,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "square 4", @@ -704,8 +697,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "square 5", @@ -748,8 +740,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "square 6", @@ -792,8 +783,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "square 7", @@ -836,8 +826,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "square 8", @@ -880,8 +869,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "square 9", @@ -924,8 +912,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "square 10", @@ -968,8 +955,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "square 11", @@ -1012,8 +998,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestCreate/gen_key_nested.exp.json b/testdata/d2oracle/TestCreate/gen_key_nested.exp.json index 0cce893e3..ab99bdedd 100644 --- a/testdata/d2oracle/TestCreate/gen_key_nested.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key_nested.exp.json @@ -136,8 +136,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -268,8 +267,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -398,8 +396,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "z", @@ -528,8 +525,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "square", @@ -605,8 +601,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "square 2", @@ -682,8 +677,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestCreate/gen_key_scope.exp.json b/testdata/d2oracle/TestCreate/gen_key_scope.exp.json index f62a11fc7..e429b1605 100644 --- a/testdata/d2oracle/TestCreate/gen_key_scope.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key_scope.exp.json @@ -121,8 +121,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -189,8 +188,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -255,8 +253,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "z", @@ -321,8 +318,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "square", @@ -365,8 +361,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "square 2", @@ -409,8 +404,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json b/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json index 02aef8fa2..4e34daf68 100644 --- a/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json @@ -70,8 +70,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -116,8 +115,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "x 2", @@ -160,8 +158,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json b/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json index 9aeb2d0e3..c2d340411 100644 --- a/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json +++ b/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json @@ -109,8 +109,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -155,8 +154,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "orange", @@ -199,8 +197,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json index b456104f9..73f6f3626 100644 --- a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json +++ b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json @@ -155,8 +155,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -201,8 +200,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "rawr", @@ -245,8 +243,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "orange", @@ -289,8 +286,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "after", @@ -333,8 +329,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json index bf9f264f4..edaeba937 100644 --- a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json +++ b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json @@ -155,8 +155,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -201,8 +200,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "rawr", @@ -245,8 +243,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "orange", @@ -289,8 +286,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "after", @@ -333,8 +329,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestCreate/nested.exp.json b/testdata/d2oracle/TestCreate/nested.exp.json index 2abb6239e..2ba4dcb6f 100644 --- a/testdata/d2oracle/TestCreate/nested.exp.json +++ b/testdata/d2oracle/TestCreate/nested.exp.json @@ -69,8 +69,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -137,8 +136,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "c", @@ -203,8 +201,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "square", @@ -269,8 +266,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestCreate/scope.exp.json b/testdata/d2oracle/TestCreate/scope.exp.json index 7ccc83418..56bce7e52 100644 --- a/testdata/d2oracle/TestCreate/scope.exp.json +++ b/testdata/d2oracle/TestCreate/scope.exp.json @@ -98,8 +98,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -166,8 +165,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -232,8 +230,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "z", @@ -298,8 +295,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "square", @@ -342,8 +338,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json b/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json index 2c346a43a..404e508c0 100644 --- a/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json +++ b/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json @@ -47,8 +47,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -93,8 +92,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/children.exp.json b/testdata/d2oracle/TestDelete/children.exp.json index 4417b0b6f..4d7148816 100644 --- a/testdata/d2oracle/TestDelete/children.exp.json +++ b/testdata/d2oracle/TestDelete/children.exp.json @@ -93,8 +93,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -170,8 +169,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "x", @@ -214,8 +212,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -258,8 +255,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/children_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_conflicts.exp.json index b92b264a6..8c9d70638 100644 --- a/testdata/d2oracle/TestDelete/children_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_conflicts.exp.json @@ -70,8 +70,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -116,8 +115,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "x", @@ -160,8 +158,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json index aaf510380..0f45cbe4c 100644 --- a/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json @@ -126,8 +126,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -203,8 +202,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "x 2", @@ -267,8 +265,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -311,8 +308,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json index cd777527e..368b8310d 100644 --- a/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json @@ -219,8 +219,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -326,8 +325,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "z", @@ -370,8 +368,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "x 2", @@ -434,8 +431,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "z 2", @@ -498,8 +494,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -562,8 +557,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json index 4d13d98e0..74f50700a 100644 --- a/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json @@ -103,8 +103,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -169,8 +168,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "x", @@ -213,8 +211,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json index 70b5de565..c49fc91ba 100644 --- a/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json @@ -195,8 +195,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -312,8 +311,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y 2", @@ -376,8 +374,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "x", @@ -420,8 +417,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -464,8 +460,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json index cb5f1f72f..313097061 100644 --- a/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json @@ -99,8 +99,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -145,8 +144,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -189,8 +187,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "x", @@ -233,8 +230,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json index cf46e105e..725a50f18 100644 --- a/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json @@ -158,8 +158,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -266,8 +265,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -352,8 +350,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "x", @@ -396,8 +393,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json b/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json index bb05a94f4..91f74c667 100644 --- a/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json @@ -47,8 +47,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -93,8 +92,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/children_order.exp.json b/testdata/d2oracle/TestDelete/children_order.exp.json index f70786ab5..ace7a8b31 100644 --- a/testdata/d2oracle/TestDelete/children_order.exp.json +++ b/testdata/d2oracle/TestDelete/children_order.exp.json @@ -122,8 +122,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -168,8 +167,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "before", @@ -212,8 +210,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "congo", @@ -256,8 +253,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "after", @@ -300,8 +296,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json index a6ae7aa51..668543222 100644 --- a/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json @@ -103,8 +103,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -169,8 +168,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "x", @@ -213,8 +211,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/children_scope.exp.json b/testdata/d2oracle/TestDelete/children_scope.exp.json index 14f17521a..7bd1b5112 100644 --- a/testdata/d2oracle/TestDelete/children_scope.exp.json +++ b/testdata/d2oracle/TestDelete/children_scope.exp.json @@ -133,8 +133,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -221,8 +220,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "q", @@ -276,8 +274,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "\"what's up\"", @@ -320,8 +317,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "x", @@ -364,8 +360,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -408,8 +403,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/container_near.exp.json b/testdata/d2oracle/TestDelete/container_near.exp.json index 2c10a5b4f..704202b70 100644 --- a/testdata/d2oracle/TestDelete/container_near.exp.json +++ b/testdata/d2oracle/TestDelete/container_near.exp.json @@ -171,8 +171,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -232,8 +231,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "z", @@ -276,8 +274,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "a", @@ -335,8 +332,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/delete_icon.exp.json b/testdata/d2oracle/TestDelete/delete_icon.exp.json index ee9834538..9a370a688 100644 --- a/testdata/d2oracle/TestDelete/delete_icon.exp.json +++ b/testdata/d2oracle/TestDelete/delete_icon.exp.json @@ -97,8 +97,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -154,8 +153,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "x", @@ -210,8 +208,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/delete_link.exp.json b/testdata/d2oracle/TestDelete/delete_link.exp.json index d4de685b7..bd4a60f19 100644 --- a/testdata/d2oracle/TestDelete/delete_link.exp.json +++ b/testdata/d2oracle/TestDelete/delete_link.exp.json @@ -47,8 +47,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -93,8 +92,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/delete_near.exp.json b/testdata/d2oracle/TestDelete/delete_near.exp.json index 3bd28fc81..5ec43d9a8 100644 --- a/testdata/d2oracle/TestDelete/delete_near.exp.json +++ b/testdata/d2oracle/TestDelete/delete_near.exp.json @@ -70,8 +70,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -116,8 +115,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -160,8 +158,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json b/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json index 1b62b5b0e..1fe0d5f5c 100644 --- a/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json +++ b/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json @@ -70,8 +70,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -116,8 +115,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -160,8 +158,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json b/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json index 9790fed2a..e7e41216f 100644 --- a/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json +++ b/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json @@ -70,8 +70,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -116,8 +115,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -160,8 +158,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/delete_tooltip.exp.json b/testdata/d2oracle/TestDelete/delete_tooltip.exp.json index 2048cb372..cddd7377e 100644 --- a/testdata/d2oracle/TestDelete/delete_tooltip.exp.json +++ b/testdata/d2oracle/TestDelete/delete_tooltip.exp.json @@ -47,8 +47,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -93,8 +92,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json b/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json index e3c978fe3..c8c0b2a8f 100644 --- a/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json +++ b/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json @@ -103,8 +103,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -233,8 +232,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -299,8 +297,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "z", @@ -365,8 +362,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -420,8 +416,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/edge_common.exp.json b/testdata/d2oracle/TestDelete/edge_common.exp.json index 4df49dc12..f268c4258 100644 --- a/testdata/d2oracle/TestDelete/edge_common.exp.json +++ b/testdata/d2oracle/TestDelete/edge_common.exp.json @@ -70,8 +70,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -147,8 +146,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -191,8 +189,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/edge_common_2.exp.json b/testdata/d2oracle/TestDelete/edge_common_2.exp.json index 1b5745d9e..81c153998 100644 --- a/testdata/d2oracle/TestDelete/edge_common_2.exp.json +++ b/testdata/d2oracle/TestDelete/edge_common_2.exp.json @@ -70,8 +70,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -147,8 +146,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -191,8 +189,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/edge_common_3.exp.json b/testdata/d2oracle/TestDelete/edge_common_3.exp.json index 3acfeba89..884567505 100644 --- a/testdata/d2oracle/TestDelete/edge_common_3.exp.json +++ b/testdata/d2oracle/TestDelete/edge_common_3.exp.json @@ -92,8 +92,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -180,8 +179,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "a", @@ -235,8 +233,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -290,8 +287,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/edge_common_4.exp.json b/testdata/d2oracle/TestDelete/edge_common_4.exp.json index c14e7c239..b17687cc0 100644 --- a/testdata/d2oracle/TestDelete/edge_common_4.exp.json +++ b/testdata/d2oracle/TestDelete/edge_common_4.exp.json @@ -92,8 +92,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -180,8 +179,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "a", @@ -235,8 +233,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -290,8 +287,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/edge_conflict.exp.json b/testdata/d2oracle/TestDelete/edge_conflict.exp.json index 14e15eb5a..151e6a69a 100644 --- a/testdata/d2oracle/TestDelete/edge_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/edge_conflict.exp.json @@ -115,8 +115,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -192,8 +191,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y 2", @@ -278,8 +276,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "a", @@ -333,8 +330,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -388,8 +384,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/edge_decrement.exp.json b/testdata/d2oracle/TestDelete/edge_decrement.exp.json index 32b8cac47..7e8cd36b0 100644 --- a/testdata/d2oracle/TestDelete/edge_decrement.exp.json +++ b/testdata/d2oracle/TestDelete/edge_decrement.exp.json @@ -452,8 +452,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -771,8 +770,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -955,8 +953,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/edge_first.exp.json b/testdata/d2oracle/TestDelete/edge_first.exp.json index 7f3ac442d..ff36efa04 100644 --- a/testdata/d2oracle/TestDelete/edge_first.exp.json +++ b/testdata/d2oracle/TestDelete/edge_first.exp.json @@ -181,8 +181,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -310,8 +309,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "p", @@ -376,8 +374,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "d", @@ -442,8 +439,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "x", @@ -486,8 +482,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "p", @@ -530,8 +525,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -594,8 +588,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "z", @@ -638,8 +631,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/edge_flat_style.exp.json b/testdata/d2oracle/TestDelete/edge_flat_style.exp.json index 89f8fffc9..305e6a4aa 100644 --- a/testdata/d2oracle/TestDelete/edge_flat_style.exp.json +++ b/testdata/d2oracle/TestDelete/edge_flat_style.exp.json @@ -47,8 +47,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -93,8 +92,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/edge_identical_child.exp.json b/testdata/d2oracle/TestDelete/edge_identical_child.exp.json index 6740b6e25..eb781b86d 100644 --- a/testdata/d2oracle/TestDelete/edge_identical_child.exp.json +++ b/testdata/d2oracle/TestDelete/edge_identical_child.exp.json @@ -103,8 +103,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -202,8 +201,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -268,8 +266,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "z", @@ -334,8 +331,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -389,8 +385,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -444,8 +439,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/edge_key_style.exp.json b/testdata/d2oracle/TestDelete/edge_key_style.exp.json index 1d37dbb6b..7562e03e2 100644 --- a/testdata/d2oracle/TestDelete/edge_key_style.exp.json +++ b/testdata/d2oracle/TestDelete/edge_key_style.exp.json @@ -70,8 +70,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -147,8 +146,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -191,8 +189,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/edge_last.exp.json b/testdata/d2oracle/TestDelete/edge_last.exp.json index 8134f3cfa..ba877e571 100644 --- a/testdata/d2oracle/TestDelete/edge_last.exp.json +++ b/testdata/d2oracle/TestDelete/edge_last.exp.json @@ -218,8 +218,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -377,8 +376,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "p", @@ -443,8 +441,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "d", @@ -509,8 +506,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "p", @@ -553,8 +549,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "x", @@ -597,8 +592,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -661,8 +655,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "z", @@ -725,8 +718,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "q", @@ -769,8 +761,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/edge_map_style.exp.json b/testdata/d2oracle/TestDelete/edge_map_style.exp.json index 10775542d..9ff8ae11c 100644 --- a/testdata/d2oracle/TestDelete/edge_map_style.exp.json +++ b/testdata/d2oracle/TestDelete/edge_map_style.exp.json @@ -70,8 +70,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -147,8 +146,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -191,8 +189,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/edge_middle.exp.json b/testdata/d2oracle/TestDelete/edge_middle.exp.json index 76697ba6b..91b14b60f 100644 --- a/testdata/d2oracle/TestDelete/edge_middle.exp.json +++ b/testdata/d2oracle/TestDelete/edge_middle.exp.json @@ -204,8 +204,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -363,8 +362,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "p", @@ -429,8 +427,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "d", @@ -495,8 +492,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "x", @@ -539,8 +535,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -603,8 +598,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "z", @@ -647,8 +641,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "q", @@ -691,8 +684,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "p", @@ -735,8 +727,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/empty_map.exp.json b/testdata/d2oracle/TestDelete/empty_map.exp.json index 67daa1dbf..2acea4509 100644 --- a/testdata/d2oracle/TestDelete/empty_map.exp.json +++ b/testdata/d2oracle/TestDelete/empty_map.exp.json @@ -76,8 +76,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -122,8 +121,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -166,8 +164,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/flat.exp.json b/testdata/d2oracle/TestDelete/flat.exp.json index 6989c6fe4..3f6f4cf3f 100644 --- a/testdata/d2oracle/TestDelete/flat.exp.json +++ b/testdata/d2oracle/TestDelete/flat.exp.json @@ -23,8 +23,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": null diff --git a/testdata/d2oracle/TestDelete/flat_reserved.exp.json b/testdata/d2oracle/TestDelete/flat_reserved.exp.json index d45648d53..601cb3246 100644 --- a/testdata/d2oracle/TestDelete/flat_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/flat_reserved.exp.json @@ -70,8 +70,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -147,8 +146,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "B", @@ -191,8 +189,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/hoist_children.exp.json b/testdata/d2oracle/TestDelete/hoist_children.exp.json index 730278ef3..6ef96aeff 100644 --- a/testdata/d2oracle/TestDelete/hoist_children.exp.json +++ b/testdata/d2oracle/TestDelete/hoist_children.exp.json @@ -76,8 +76,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -122,8 +121,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "c", @@ -166,8 +164,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json b/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json index c162b8356..26f1c0df6 100644 --- a/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json +++ b/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json @@ -93,8 +93,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -170,8 +169,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "c", @@ -214,8 +212,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "d", @@ -258,8 +255,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/key_with_edges.exp.json b/testdata/d2oracle/TestDelete/key_with_edges.exp.json index 3e3b4a2da..92d07ef4d 100644 --- a/testdata/d2oracle/TestDelete/key_with_edges.exp.json +++ b/testdata/d2oracle/TestDelete/key_with_edges.exp.json @@ -92,8 +92,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -180,8 +179,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "meow", @@ -235,8 +233,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "bark", @@ -290,8 +287,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json b/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json index 561da5ef5..1a050b474 100644 --- a/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json +++ b/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json @@ -58,8 +58,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -115,8 +114,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "bark", @@ -170,8 +168,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json b/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json index 09f9f5f45..972602ab8 100644 --- a/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json +++ b/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json @@ -58,8 +58,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -115,8 +114,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "bark", @@ -170,8 +168,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json b/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json index 891ac2070..54537c67c 100644 --- a/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json +++ b/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json @@ -92,8 +92,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -180,8 +179,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "meow", @@ -235,8 +233,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "bark", @@ -290,8 +287,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/multi_near.exp.json b/testdata/d2oracle/TestDelete/multi_near.exp.json index cba5f597e..52e790bd6 100644 --- a/testdata/d2oracle/TestDelete/multi_near.exp.json +++ b/testdata/d2oracle/TestDelete/multi_near.exp.json @@ -194,8 +194,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -240,8 +239,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "Bluefish", @@ -299,8 +297,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "Yo", @@ -358,8 +355,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "Blah", @@ -402,8 +398,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json b/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json index d80e57ef8..512dee2e2 100644 --- a/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json @@ -128,8 +128,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -194,8 +193,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "z 2", @@ -238,8 +236,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "z", @@ -282,8 +279,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json b/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json index f4757cca1..fe559c369 100644 --- a/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json @@ -99,8 +99,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -145,8 +144,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "z", @@ -189,8 +187,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "z", @@ -233,8 +230,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json b/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json index eeeff7108..c649b5ac0 100644 --- a/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json +++ b/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json @@ -92,8 +92,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -180,8 +179,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "c", @@ -235,8 +233,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "d", @@ -290,8 +287,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json b/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json index 8d3f7ab18..247e72c2f 100644 --- a/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json +++ b/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json @@ -75,8 +75,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [], "objects": [ @@ -147,8 +146,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json b/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json index cdaf8faa6..cfa33cab0 100644 --- a/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json +++ b/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json @@ -111,8 +111,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [], "objects": [ @@ -161,8 +160,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/near.exp.json b/testdata/d2oracle/TestDelete/near.exp.json index c310382ac..6991d9d32 100644 --- a/testdata/d2oracle/TestDelete/near.exp.json +++ b/testdata/d2oracle/TestDelete/near.exp.json @@ -47,8 +47,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -93,8 +92,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/nested.exp.json b/testdata/d2oracle/TestDelete/nested.exp.json index 622f2272b..df80511e7 100644 --- a/testdata/d2oracle/TestDelete/nested.exp.json +++ b/testdata/d2oracle/TestDelete/nested.exp.json @@ -69,8 +69,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -137,8 +136,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "c", @@ -203,8 +201,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "d", @@ -269,8 +266,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/nested_2.exp.json b/testdata/d2oracle/TestDelete/nested_2.exp.json index 7fda03e84..8279fda83 100644 --- a/testdata/d2oracle/TestDelete/nested_2.exp.json +++ b/testdata/d2oracle/TestDelete/nested_2.exp.json @@ -69,8 +69,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -137,8 +136,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -203,8 +201,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "c", @@ -269,8 +266,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json b/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json index b7d2a38cf..c37eda91d 100644 --- a/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json +++ b/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json @@ -99,8 +99,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -176,8 +175,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "x", @@ -220,8 +218,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -264,8 +261,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/nested_flat_style.exp.json b/testdata/d2oracle/TestDelete/nested_flat_style.exp.json index d8ccfe995..168b2d4b9 100644 --- a/testdata/d2oracle/TestDelete/nested_flat_style.exp.json +++ b/testdata/d2oracle/TestDelete/nested_flat_style.exp.json @@ -47,8 +47,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -93,8 +92,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/nested_reserved.exp.json b/testdata/d2oracle/TestDelete/nested_reserved.exp.json index be279b8c0..3795fe11d 100644 --- a/testdata/d2oracle/TestDelete/nested_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/nested_reserved.exp.json @@ -103,8 +103,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -202,8 +201,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -299,8 +297,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "jingle", @@ -365,8 +362,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json b/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json index 4e84d247e..23921a096 100644 --- a/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json +++ b/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json @@ -87,8 +87,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -133,8 +132,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "pipe", @@ -188,8 +186,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/node_in_edge.exp.json b/testdata/d2oracle/TestDelete/node_in_edge.exp.json index a877e9765..d56558fd8 100644 --- a/testdata/d2oracle/TestDelete/node_in_edge.exp.json +++ b/testdata/d2oracle/TestDelete/node_in_edge.exp.json @@ -168,8 +168,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -275,8 +274,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "\"what's up\"", @@ -319,8 +317,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "x", @@ -363,8 +360,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -407,8 +403,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "q", @@ -451,8 +446,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "p", @@ -495,8 +489,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json b/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json index 114905028..dd1456fcf 100644 --- a/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json +++ b/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json @@ -207,8 +207,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -355,8 +354,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -410,8 +408,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "\"what's up\"", @@ -454,8 +451,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "x", @@ -498,8 +494,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -562,8 +557,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "z", @@ -626,8 +620,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "q", @@ -670,8 +663,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json b/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json index 76a90a937..47a45ceaa 100644 --- a/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json @@ -166,8 +166,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -267,8 +266,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "B", @@ -331,8 +329,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json b/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json index e272bd4c7..61f9dcdee 100644 --- a/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json @@ -166,8 +166,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -267,8 +266,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "B", @@ -331,8 +329,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/order_1.exp.json b/testdata/d2oracle/TestDelete/order_1.exp.json index 2ffe70df9..c83f093cc 100644 --- a/testdata/d2oracle/TestDelete/order_1.exp.json +++ b/testdata/d2oracle/TestDelete/order_1.exp.json @@ -93,8 +93,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -170,8 +169,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -214,8 +212,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "z", @@ -258,8 +255,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/order_2.exp.json b/testdata/d2oracle/TestDelete/order_2.exp.json index f3159d273..71042a674 100644 --- a/testdata/d2oracle/TestDelete/order_2.exp.json +++ b/testdata/d2oracle/TestDelete/order_2.exp.json @@ -70,8 +70,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -116,8 +115,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "z", @@ -160,8 +158,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/order_3.exp.json b/testdata/d2oracle/TestDelete/order_3.exp.json index 15efbb349..7c75321f9 100644 --- a/testdata/d2oracle/TestDelete/order_3.exp.json +++ b/testdata/d2oracle/TestDelete/order_3.exp.json @@ -70,8 +70,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -116,8 +115,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "z", @@ -160,8 +158,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/order_4.exp.json b/testdata/d2oracle/TestDelete/order_4.exp.json index 7bbf3ecea..ab41da5d0 100644 --- a/testdata/d2oracle/TestDelete/order_4.exp.json +++ b/testdata/d2oracle/TestDelete/order_4.exp.json @@ -47,8 +47,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -93,8 +92,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/order_5.exp.json b/testdata/d2oracle/TestDelete/order_5.exp.json index 208e77fbe..c3336c5dd 100644 --- a/testdata/d2oracle/TestDelete/order_5.exp.json +++ b/testdata/d2oracle/TestDelete/order_5.exp.json @@ -145,8 +145,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -252,8 +251,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -296,8 +294,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "c", @@ -340,8 +337,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "q", @@ -384,8 +380,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "p", @@ -428,8 +423,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/order_6.exp.json b/testdata/d2oracle/TestDelete/order_6.exp.json index 959addd8e..3f2e88242 100644 --- a/testdata/d2oracle/TestDelete/order_6.exp.json +++ b/testdata/d2oracle/TestDelete/order_6.exp.json @@ -121,8 +121,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -209,8 +208,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "lol", @@ -253,8 +251,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "p", @@ -319,8 +316,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "q", @@ -385,8 +381,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/order_7.exp.json b/testdata/d2oracle/TestDelete/order_7.exp.json index ae5aa7222..d6744ebb7 100644 --- a/testdata/d2oracle/TestDelete/order_7.exp.json +++ b/testdata/d2oracle/TestDelete/order_7.exp.json @@ -132,8 +132,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -231,8 +230,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "lol", @@ -275,8 +273,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "p", @@ -352,8 +349,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "q", @@ -429,8 +425,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "more", @@ -506,8 +501,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/order_8.exp.json b/testdata/d2oracle/TestDelete/order_8.exp.json index f18ba1800..735aad526 100644 --- a/testdata/d2oracle/TestDelete/order_8.exp.json +++ b/testdata/d2oracle/TestDelete/order_8.exp.json @@ -139,8 +139,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -185,8 +184,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -229,8 +227,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "zebra", @@ -273,8 +270,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "q", @@ -317,8 +313,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "kang", @@ -361,8 +356,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/shape_class.exp.json b/testdata/d2oracle/TestDelete/shape_class.exp.json index 4005b3a52..ed1e50f18 100644 --- a/testdata/d2oracle/TestDelete/shape_class.exp.json +++ b/testdata/d2oracle/TestDelete/shape_class.exp.json @@ -47,8 +47,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -93,8 +92,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/shape_sql_table.exp.json b/testdata/d2oracle/TestDelete/shape_sql_table.exp.json index 95693c309..419ea072a 100644 --- a/testdata/d2oracle/TestDelete/shape_sql_table.exp.json +++ b/testdata/d2oracle/TestDelete/shape_sql_table.exp.json @@ -267,8 +267,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -344,8 +343,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "disks", @@ -449,8 +447,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "AWS S3 Vancouver", @@ -493,8 +490,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/singular_flat_style.exp.json b/testdata/d2oracle/TestDelete/singular_flat_style.exp.json index 0b2225cc4..442097e70 100644 --- a/testdata/d2oracle/TestDelete/singular_flat_style.exp.json +++ b/testdata/d2oracle/TestDelete/singular_flat_style.exp.json @@ -47,8 +47,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -93,8 +92,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/singular_map_style.exp.json b/testdata/d2oracle/TestDelete/singular_map_style.exp.json index 2ff0d70fc..b75f55c35 100644 --- a/testdata/d2oracle/TestDelete/singular_map_style.exp.json +++ b/testdata/d2oracle/TestDelete/singular_map_style.exp.json @@ -47,8 +47,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -93,8 +92,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json b/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json index 38f31be51..a19da74fe 100644 --- a/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json @@ -110,8 +110,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -156,8 +155,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "z", @@ -211,8 +209,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "z", @@ -255,8 +252,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestDelete/underscore_remove.exp.json b/testdata/d2oracle/TestDelete/underscore_remove.exp.json index ed625965a..dd78e801c 100644 --- a/testdata/d2oracle/TestDelete/underscore_remove.exp.json +++ b/testdata/d2oracle/TestDelete/underscore_remove.exp.json @@ -139,8 +139,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -246,8 +245,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "a", @@ -290,8 +288,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -334,8 +331,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "c", @@ -378,8 +374,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "d", @@ -422,8 +417,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/append_multiple_styles.exp.json b/testdata/d2oracle/TestMove/append_multiple_styles.exp.json index ab5015156..5693019db 100644 --- a/testdata/d2oracle/TestMove/append_multiple_styles.exp.json +++ b/testdata/d2oracle/TestMove/append_multiple_styles.exp.json @@ -231,8 +231,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [], "objects": [ @@ -277,8 +276,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "a", @@ -348,8 +346,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/basic.exp.json b/testdata/d2oracle/TestMove/basic.exp.json index d7e10b17b..9216171b9 100644 --- a/testdata/d2oracle/TestMove/basic.exp.json +++ b/testdata/d2oracle/TestMove/basic.exp.json @@ -47,8 +47,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -93,8 +92,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/basic_nested.exp.json b/testdata/d2oracle/TestMove/basic_nested.exp.json index f3f13c6d9..5667c2d99 100644 --- a/testdata/d2oracle/TestMove/basic_nested.exp.json +++ b/testdata/d2oracle/TestMove/basic_nested.exp.json @@ -76,8 +76,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -122,8 +121,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "c", @@ -166,8 +164,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/basic_out_of_container.exp.json b/testdata/d2oracle/TestMove/basic_out_of_container.exp.json index 98de41076..e80df6540 100644 --- a/testdata/d2oracle/TestMove/basic_out_of_container.exp.json +++ b/testdata/d2oracle/TestMove/basic_out_of_container.exp.json @@ -70,8 +70,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -116,8 +115,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -160,8 +158,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/between_containers.exp.json b/testdata/d2oracle/TestMove/between_containers.exp.json index 73ea7b504..5b35c6d5e 100644 --- a/testdata/d2oracle/TestMove/between_containers.exp.json +++ b/testdata/d2oracle/TestMove/between_containers.exp.json @@ -99,8 +99,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -145,8 +144,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "c", @@ -189,8 +187,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -233,8 +230,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/chain_connected_nested.exp.json b/testdata/d2oracle/TestMove/chain_connected_nested.exp.json index 8e8efaba6..615332dbd 100644 --- a/testdata/d2oracle/TestMove/chain_connected_nested.exp.json +++ b/testdata/d2oracle/TestMove/chain_connected_nested.exp.json @@ -130,8 +130,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -237,8 +236,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "z", @@ -301,8 +299,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "x", @@ -365,8 +362,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json b/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json index 9544fe4ad..865e6210b 100644 --- a/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json +++ b/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json @@ -118,8 +118,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -236,8 +235,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -291,8 +289,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "x", @@ -355,8 +352,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "z", @@ -399,8 +395,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/connected_nested.exp.json b/testdata/d2oracle/TestMove/connected_nested.exp.json index a5f227e2b..a5792a9d1 100644 --- a/testdata/d2oracle/TestMove/connected_nested.exp.json +++ b/testdata/d2oracle/TestMove/connected_nested.exp.json @@ -93,8 +93,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -170,8 +169,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "x", @@ -214,8 +212,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "z", @@ -258,8 +255,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/container_near.exp.json b/testdata/d2oracle/TestMove/container_near.exp.json index 5dfb9a53b..2f8b2384c 100644 --- a/testdata/d2oracle/TestMove/container_near.exp.json +++ b/testdata/d2oracle/TestMove/container_near.exp.json @@ -201,8 +201,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -247,8 +246,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -328,8 +326,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "a", @@ -383,8 +380,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "z", @@ -438,8 +434,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -482,8 +477,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "a", @@ -526,8 +520,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/edge_across_containers.exp.json b/testdata/d2oracle/TestMove/edge_across_containers.exp.json index c4358d20e..6bb4de01d 100644 --- a/testdata/d2oracle/TestMove/edge_across_containers.exp.json +++ b/testdata/d2oracle/TestMove/edge_across_containers.exp.json @@ -144,8 +144,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -221,8 +220,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "d", @@ -307,8 +305,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -373,8 +370,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "c", @@ -417,8 +413,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/edge_basic.exp.json b/testdata/d2oracle/TestMove/edge_basic.exp.json index b4655c65e..353c67dc1 100644 --- a/testdata/d2oracle/TestMove/edge_basic.exp.json +++ b/testdata/d2oracle/TestMove/edge_basic.exp.json @@ -70,8 +70,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -147,8 +146,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -191,8 +189,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/edge_chain_basic.exp.json b/testdata/d2oracle/TestMove/edge_chain_basic.exp.json index a5dd1ea29..03d087ec1 100644 --- a/testdata/d2oracle/TestMove/edge_chain_basic.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_basic.exp.json @@ -107,8 +107,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -214,8 +213,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -278,8 +276,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "c", @@ -322,8 +319,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/edge_chain_circular.exp.json b/testdata/d2oracle/TestMove/edge_chain_circular.exp.json index c02c9febd..5e0fd751c 100644 --- a/testdata/d2oracle/TestMove/edge_chain_circular.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_circular.exp.json @@ -158,8 +158,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -265,8 +264,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -351,8 +349,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "c", @@ -415,8 +412,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json b/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json index 848b413e4..e53bd0bec 100644 --- a/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json @@ -141,8 +141,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -279,8 +278,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "a", @@ -334,8 +332,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -398,8 +395,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "c", @@ -442,8 +438,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json b/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json index c05a06c77..38c443c4a 100644 --- a/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json @@ -158,8 +158,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -265,8 +264,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -309,8 +307,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "c", @@ -395,8 +392,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "d", @@ -439,8 +435,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/edge_conflict.exp.json b/testdata/d2oracle/TestMove/edge_conflict.exp.json index e69f7ca5a..62c325c64 100644 --- a/testdata/d2oracle/TestMove/edge_conflict.exp.json +++ b/testdata/d2oracle/TestMove/edge_conflict.exp.json @@ -144,8 +144,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -221,8 +220,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "x", @@ -265,8 +263,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y 2", @@ -351,8 +348,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "a", @@ -406,8 +402,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -461,8 +456,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/edge_into_container.exp.json b/testdata/d2oracle/TestMove/edge_into_container.exp.json index 05e6c63b9..6218e4fd0 100644 --- a/testdata/d2oracle/TestMove/edge_into_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_into_container.exp.json @@ -133,8 +133,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -241,8 +240,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "d", @@ -285,8 +283,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -340,8 +337,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "c", @@ -384,8 +380,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/edge_nested_basic.exp.json b/testdata/d2oracle/TestMove/edge_nested_basic.exp.json index 198776c77..902b1a123 100644 --- a/testdata/d2oracle/TestMove/edge_nested_basic.exp.json +++ b/testdata/d2oracle/TestMove/edge_nested_basic.exp.json @@ -99,8 +99,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -176,8 +175,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "d", @@ -220,8 +218,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "c", @@ -264,8 +261,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/edge_out_of_container.exp.json b/testdata/d2oracle/TestMove/edge_out_of_container.exp.json index a1056410f..252f57ea1 100644 --- a/testdata/d2oracle/TestMove/edge_out_of_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_out_of_container.exp.json @@ -110,8 +110,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -187,8 +186,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -242,8 +240,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "c", @@ -286,8 +283,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/extend_map.exp.json b/testdata/d2oracle/TestMove/extend_map.exp.json index 42dd4613c..e1335c7f0 100644 --- a/testdata/d2oracle/TestMove/extend_map.exp.json +++ b/testdata/d2oracle/TestMove/extend_map.exp.json @@ -157,8 +157,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -223,8 +222,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "e", @@ -267,8 +265,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "c", @@ -311,8 +308,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -355,8 +351,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/extend_stationary_path.exp.json b/testdata/d2oracle/TestMove/extend_stationary_path.exp.json index 8b6c579c7..5ad3f58bd 100644 --- a/testdata/d2oracle/TestMove/extend_stationary_path.exp.json +++ b/testdata/d2oracle/TestMove/extend_stationary_path.exp.json @@ -150,8 +150,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -238,8 +237,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "c", @@ -324,8 +322,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -410,8 +407,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/flat_between_containers.exp.json b/testdata/d2oracle/TestMove/flat_between_containers.exp.json index dbf89a969..b62a33065 100644 --- a/testdata/d2oracle/TestMove/flat_between_containers.exp.json +++ b/testdata/d2oracle/TestMove/flat_between_containers.exp.json @@ -99,8 +99,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -145,8 +144,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "c", @@ -189,8 +187,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -233,8 +230,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/flat_merge.exp.json b/testdata/d2oracle/TestMove/flat_merge.exp.json index 77025f91d..483fdb5ce 100644 --- a/testdata/d2oracle/TestMove/flat_merge.exp.json +++ b/testdata/d2oracle/TestMove/flat_merge.exp.json @@ -132,8 +132,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -178,8 +177,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "c", @@ -222,8 +220,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "d", @@ -266,8 +263,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -310,8 +306,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/flat_middle_container.exp.json b/testdata/d2oracle/TestMove/flat_middle_container.exp.json index f471bbd8f..a45b71135 100644 --- a/testdata/d2oracle/TestMove/flat_middle_container.exp.json +++ b/testdata/d2oracle/TestMove/flat_middle_container.exp.json @@ -110,8 +110,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -167,8 +166,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "c", @@ -222,8 +220,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "d", @@ -266,8 +263,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -310,8 +306,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/flat_nested_merge.exp.json b/testdata/d2oracle/TestMove/flat_nested_merge.exp.json index 3493ce75e..737c1a629 100644 --- a/testdata/d2oracle/TestMove/flat_nested_merge.exp.json +++ b/testdata/d2oracle/TestMove/flat_nested_merge.exp.json @@ -188,8 +188,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -267,8 +266,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -344,8 +342,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "d", @@ -421,8 +418,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "e", @@ -498,8 +494,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "p", @@ -553,8 +548,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "q", @@ -608,8 +602,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -674,8 +667,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "m", @@ -740,8 +732,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "o", @@ -806,8 +797,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "z", @@ -850,8 +840,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json b/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json index 5733538ff..56cde491e 100644 --- a/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json +++ b/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json @@ -286,8 +286,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -427,8 +426,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -577,8 +575,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "c", @@ -727,8 +724,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "d", @@ -771,8 +767,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "e", @@ -815,8 +810,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "f", @@ -859,8 +853,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "g", @@ -903,8 +896,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "q", @@ -980,8 +972,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json b/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json index 52982b85d..b5a99a192 100644 --- a/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json +++ b/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json @@ -109,8 +109,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -155,8 +154,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -199,8 +197,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json b/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json index 8a5a8239e..be6599d0a 100644 --- a/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json +++ b/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json @@ -150,8 +150,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -196,8 +195,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "c", @@ -240,8 +238,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -284,8 +281,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json b/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json index 27e8fdfe2..f4586228d 100644 --- a/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json +++ b/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json @@ -80,8 +80,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -126,8 +125,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -170,8 +168,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/flat_style.exp.json b/testdata/d2oracle/TestMove/flat_style.exp.json index fdeea2244..8e0bcea62 100644 --- a/testdata/d2oracle/TestMove/flat_style.exp.json +++ b/testdata/d2oracle/TestMove/flat_style.exp.json @@ -159,8 +159,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [], "objects": [ @@ -205,8 +204,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "a", @@ -320,8 +318,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/full_edge_slice.exp.json b/testdata/d2oracle/TestMove/full_edge_slice.exp.json index e175ba309..238363e12 100644 --- a/testdata/d2oracle/TestMove/full_edge_slice.exp.json +++ b/testdata/d2oracle/TestMove/full_edge_slice.exp.json @@ -213,8 +213,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -351,8 +350,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -395,8 +393,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "c", @@ -490,8 +487,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "d", @@ -565,8 +561,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/full_slice.exp.json b/testdata/d2oracle/TestMove/full_slice.exp.json index 4d5af2a83..b7ffc8ff5 100644 --- a/testdata/d2oracle/TestMove/full_slice.exp.json +++ b/testdata/d2oracle/TestMove/full_slice.exp.json @@ -99,8 +99,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -145,8 +144,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -189,8 +187,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "c", @@ -233,8 +230,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/gnarly_1.exp.json b/testdata/d2oracle/TestMove/gnarly_1.exp.json index c973f3cc5..0c46d052f 100644 --- a/testdata/d2oracle/TestMove/gnarly_1.exp.json +++ b/testdata/d2oracle/TestMove/gnarly_1.exp.json @@ -357,8 +357,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -556,8 +555,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -600,8 +598,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "p", @@ -706,8 +703,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "q", @@ -781,8 +777,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "a", @@ -847,8 +842,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -913,8 +907,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "c", @@ -979,8 +972,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "e", @@ -1045,8 +1037,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "f", @@ -1111,8 +1102,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "p", @@ -1166,8 +1156,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "q", @@ -1221,8 +1210,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "x", @@ -1276,8 +1264,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/hoist_container_children.exp.json b/testdata/d2oracle/TestMove/hoist_container_children.exp.json index 4b16b7db1..729b716c4 100644 --- a/testdata/d2oracle/TestMove/hoist_container_children.exp.json +++ b/testdata/d2oracle/TestMove/hoist_container_children.exp.json @@ -122,8 +122,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -168,8 +167,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "c", @@ -212,8 +210,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "d", @@ -256,8 +253,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "a", @@ -300,8 +296,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/into_container_existing_map.exp.json b/testdata/d2oracle/TestMove/into_container_existing_map.exp.json index d1aaa092d..cef9f69ca 100644 --- a/testdata/d2oracle/TestMove/into_container_existing_map.exp.json +++ b/testdata/d2oracle/TestMove/into_container_existing_map.exp.json @@ -99,8 +99,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -145,8 +144,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -189,8 +187,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "c", @@ -233,8 +230,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json b/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json index 3d6432c7f..be51f69ce 100644 --- a/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json +++ b/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json @@ -76,8 +76,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -122,8 +121,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "c", @@ -166,8 +164,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json b/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json index 95f3d377f..8fc2045a0 100644 --- a/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json +++ b/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json @@ -210,8 +210,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [], "objects": [ @@ -256,8 +255,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "c", @@ -310,8 +308,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json b/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json index 9a7f77427..493b4cff5 100644 --- a/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json +++ b/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json @@ -116,8 +116,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [], "objects": [ @@ -166,8 +165,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -210,8 +208,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/map_transplant.exp.json b/testdata/d2oracle/TestMove/map_transplant.exp.json index 7a89b479d..0bcc93844 100644 --- a/testdata/d2oracle/TestMove/map_transplant.exp.json +++ b/testdata/d2oracle/TestMove/map_transplant.exp.json @@ -219,8 +219,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [], "objects": [ @@ -265,8 +264,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "c", @@ -309,8 +307,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "d", @@ -353,8 +350,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "a", @@ -401,8 +397,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/map_with_label.exp.json b/testdata/d2oracle/TestMove/map_with_label.exp.json index d8c94db98..0f55d724b 100644 --- a/testdata/d2oracle/TestMove/map_with_label.exp.json +++ b/testdata/d2oracle/TestMove/map_with_label.exp.json @@ -109,8 +109,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -155,8 +154,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "d", @@ -199,8 +197,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "a", @@ -243,8 +240,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/merge_nested_maps.exp.json b/testdata/d2oracle/TestMove/merge_nested_maps.exp.json index 9c5cb055f..4d5eb8c56 100644 --- a/testdata/d2oracle/TestMove/merge_nested_maps.exp.json +++ b/testdata/d2oracle/TestMove/merge_nested_maps.exp.json @@ -270,8 +270,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -316,8 +315,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -464,8 +462,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "c", @@ -519,8 +516,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "d", @@ -594,8 +590,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "e", @@ -660,8 +655,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "g", @@ -726,8 +720,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "o", @@ -770,8 +763,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "k", @@ -814,8 +806,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/merge_reserved.exp.json b/testdata/d2oracle/TestMove/merge_reserved.exp.json index 0c1698a6b..439d97217 100644 --- a/testdata/d2oracle/TestMove/merge_reserved.exp.json +++ b/testdata/d2oracle/TestMove/merge_reserved.exp.json @@ -261,8 +261,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -307,8 +306,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -444,8 +442,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "c", @@ -499,8 +496,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "e", @@ -554,8 +550,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "g", @@ -609,8 +604,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "k", @@ -653,8 +647,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/middle_container.exp.json b/testdata/d2oracle/TestMove/middle_container.exp.json index 7690290ab..d0dd56f55 100644 --- a/testdata/d2oracle/TestMove/middle_container.exp.json +++ b/testdata/d2oracle/TestMove/middle_container.exp.json @@ -99,8 +99,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -145,8 +144,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "z", @@ -189,8 +187,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -233,8 +230,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/move_container_children.exp.json b/testdata/d2oracle/TestMove/move_container_children.exp.json index 6e0d51a10..f9c22268a 100644 --- a/testdata/d2oracle/TestMove/move_container_children.exp.json +++ b/testdata/d2oracle/TestMove/move_container_children.exp.json @@ -145,8 +145,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -191,8 +190,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "q", @@ -235,8 +233,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "a", @@ -279,8 +276,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "d", @@ -323,8 +319,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -367,8 +362,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json b/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json index c962e4e00..b8bfb2e10 100644 --- a/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json +++ b/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json @@ -145,8 +145,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -191,8 +190,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -235,8 +233,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "a", @@ -279,8 +276,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "d", @@ -323,8 +319,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "x", @@ -367,8 +362,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json b/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json index bdd4ddc23..6002bd77e 100644 --- a/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json +++ b/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json @@ -86,8 +86,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -132,8 +131,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -176,8 +174,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/move_out_of_edge.exp.json b/testdata/d2oracle/TestMove/move_out_of_edge.exp.json index af0c6e06c..f16251f0c 100644 --- a/testdata/d2oracle/TestMove/move_out_of_edge.exp.json +++ b/testdata/d2oracle/TestMove/move_out_of_edge.exp.json @@ -126,8 +126,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -203,8 +202,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "a", @@ -258,8 +256,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "c", @@ -313,8 +310,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "d", @@ -379,8 +375,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "e", @@ -445,8 +440,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "f", @@ -511,8 +505,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json b/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json index a8750a50f..6d69c47a9 100644 --- a/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json +++ b/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json @@ -166,8 +166,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -296,8 +295,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "e", @@ -393,8 +391,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "q", @@ -437,8 +434,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "a", @@ -492,8 +488,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "c", @@ -547,8 +542,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "f", @@ -613,8 +607,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json b/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json index 4f3fec310..a75357554 100644 --- a/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json +++ b/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json @@ -281,8 +281,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -380,8 +379,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -519,8 +517,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "c", @@ -678,8 +675,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "g", @@ -722,8 +718,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "x", @@ -766,8 +761,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "d", @@ -832,8 +826,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "f", @@ -909,8 +902,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/near.exp.json b/testdata/d2oracle/TestMove/near.exp.json index 9d49eee57..9ee15fbae 100644 --- a/testdata/d2oracle/TestMove/near.exp.json +++ b/testdata/d2oracle/TestMove/near.exp.json @@ -109,8 +109,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -181,8 +180,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -225,8 +223,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/nhooyr_one.exp.json b/testdata/d2oracle/TestMove/nhooyr_one.exp.json index 28750791f..a6d7b80b2 100644 --- a/testdata/d2oracle/TestMove/nhooyr_one.exp.json +++ b/testdata/d2oracle/TestMove/nhooyr_one.exp.json @@ -128,8 +128,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -174,8 +173,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "c", @@ -218,8 +216,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "d", @@ -262,8 +259,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "q", @@ -306,8 +302,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/nhooyr_two.exp.json b/testdata/d2oracle/TestMove/nhooyr_two.exp.json index f2217588f..e68f72400 100644 --- a/testdata/d2oracle/TestMove/nhooyr_two.exp.json +++ b/testdata/d2oracle/TestMove/nhooyr_two.exp.json @@ -174,8 +174,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -251,8 +250,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "d", @@ -295,8 +293,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "x", @@ -339,8 +336,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -383,8 +379,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "c", @@ -427,8 +422,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "meow", @@ -471,8 +465,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/parentheses.exp.json b/testdata/d2oracle/TestMove/parentheses.exp.json index 6710249e1..f2b4b100e 100644 --- a/testdata/d2oracle/TestMove/parentheses.exp.json +++ b/testdata/d2oracle/TestMove/parentheses.exp.json @@ -109,8 +109,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -217,8 +216,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "x", @@ -261,8 +259,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "\"y (z)\"", @@ -316,8 +313,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/partial_edge_slice.exp.json b/testdata/d2oracle/TestMove/partial_edge_slice.exp.json index d88c2e4dd..6f1e7797f 100644 --- a/testdata/d2oracle/TestMove/partial_edge_slice.exp.json +++ b/testdata/d2oracle/TestMove/partial_edge_slice.exp.json @@ -116,8 +116,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -193,8 +192,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -257,8 +255,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "c", @@ -301,8 +298,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/partial_slice.exp.json b/testdata/d2oracle/TestMove/partial_slice.exp.json index abaf2b56a..f4978e04f 100644 --- a/testdata/d2oracle/TestMove/partial_slice.exp.json +++ b/testdata/d2oracle/TestMove/partial_slice.exp.json @@ -70,8 +70,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -116,8 +115,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -160,8 +158,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/rename_2.exp.json b/testdata/d2oracle/TestMove/rename_2.exp.json index cc0555ea0..37d25714b 100644 --- a/testdata/d2oracle/TestMove/rename_2.exp.json +++ b/testdata/d2oracle/TestMove/rename_2.exp.json @@ -145,8 +145,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -191,8 +190,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y 2", @@ -235,8 +233,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b 2", @@ -279,8 +276,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "x", @@ -323,8 +319,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "a", @@ -367,8 +362,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/reuse_map.exp.json b/testdata/d2oracle/TestMove/reuse_map.exp.json index b4cbdcb21..e5555dbce 100644 --- a/testdata/d2oracle/TestMove/reuse_map.exp.json +++ b/testdata/d2oracle/TestMove/reuse_map.exp.json @@ -162,8 +162,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -208,8 +207,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -283,8 +281,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "hey", @@ -327,8 +324,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "k", @@ -371,8 +367,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "yo", @@ -426,8 +421,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/slice_style.exp.json b/testdata/d2oracle/TestMove/slice_style.exp.json index f031cadfa..6680653ea 100644 --- a/testdata/d2oracle/TestMove/slice_style.exp.json +++ b/testdata/d2oracle/TestMove/slice_style.exp.json @@ -114,8 +114,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -160,8 +159,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -247,8 +245,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/underscore_children.exp.json b/testdata/d2oracle/TestMove/underscore_children.exp.json index 0b28ee345..5a43f84b3 100644 --- a/testdata/d2oracle/TestMove/underscore_children.exp.json +++ b/testdata/d2oracle/TestMove/underscore_children.exp.json @@ -110,8 +110,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -156,8 +155,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "c", @@ -231,8 +229,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/underscore_edge_children.exp.json b/testdata/d2oracle/TestMove/underscore_edge_children.exp.json index c7d48d56e..e1a1fb736 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_children.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_children.exp.json @@ -133,8 +133,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -210,8 +209,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "c", @@ -285,8 +283,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "c", @@ -329,8 +326,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json index 1b2a293dd..8d7d7c159 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json @@ -99,8 +99,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -176,8 +175,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -220,8 +218,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "c", @@ -264,8 +261,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json index 94481d66b..0061f2f15 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json @@ -110,8 +110,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -187,8 +186,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "c", @@ -262,8 +260,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -317,8 +314,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json index 6309a8fa6..42c8f2e8a 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json @@ -110,8 +110,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -187,8 +186,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "d", @@ -242,8 +240,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "c", @@ -286,8 +283,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json index 135f290ef..2581b5f76 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json @@ -99,8 +99,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -176,8 +175,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "f", @@ -220,8 +218,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "c", @@ -264,8 +261,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json index 85462c11f..5dd71fb13 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json @@ -132,8 +132,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -209,8 +208,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "c", @@ -306,8 +304,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -372,8 +369,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/underscore_edge_split.exp.json b/testdata/d2oracle/TestMove/underscore_edge_split.exp.json index 0d901d1cf..21d713554 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_split.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_split.exp.json @@ -162,8 +162,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -239,8 +238,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -283,8 +281,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "c", @@ -327,8 +324,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "f", @@ -382,8 +378,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "yo", @@ -426,8 +421,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/underscore_merge.exp.json b/testdata/d2oracle/TestMove/underscore_merge.exp.json index c2aceec23..c33d485f2 100644 --- a/testdata/d2oracle/TestMove/underscore_merge.exp.json +++ b/testdata/d2oracle/TestMove/underscore_merge.exp.json @@ -142,8 +142,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -188,8 +187,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "c", @@ -232,8 +230,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -296,8 +293,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/underscore_split.exp.json b/testdata/d2oracle/TestMove/underscore_split.exp.json index 05dd95b78..743a706df 100644 --- a/testdata/d2oracle/TestMove/underscore_split.exp.json +++ b/testdata/d2oracle/TestMove/underscore_split.exp.json @@ -139,8 +139,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -185,8 +184,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -229,8 +227,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "f", @@ -284,8 +281,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "c", @@ -328,8 +324,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/underscore_split_out.exp.json b/testdata/d2oracle/TestMove/underscore_split_out.exp.json index a25ae8db8..7545eb2fc 100644 --- a/testdata/d2oracle/TestMove/underscore_split_out.exp.json +++ b/testdata/d2oracle/TestMove/underscore_split_out.exp.json @@ -197,8 +197,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -243,8 +242,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -287,8 +285,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "c", @@ -362,8 +359,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "e", @@ -406,8 +402,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "f", @@ -450,8 +445,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/underscore_transplant.exp.json b/testdata/d2oracle/TestMove/underscore_transplant.exp.json index 0782ff2b7..5528c035d 100644 --- a/testdata/d2oracle/TestMove/underscore_transplant.exp.json +++ b/testdata/d2oracle/TestMove/underscore_transplant.exp.json @@ -99,8 +99,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -145,8 +144,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -189,8 +187,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "c", @@ -233,8 +230,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/unique_name.exp.json b/testdata/d2oracle/TestMove/unique_name.exp.json index fc2d2f54b..25ba5b6ab 100644 --- a/testdata/d2oracle/TestMove/unique_name.exp.json +++ b/testdata/d2oracle/TestMove/unique_name.exp.json @@ -156,8 +156,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -233,8 +232,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -308,8 +306,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b 2", @@ -352,8 +349,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "c", @@ -396,8 +392,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestMove/unique_name_with_references.exp.json b/testdata/d2oracle/TestMove/unique_name_with_references.exp.json index a030e194b..f0cc05cc2 100644 --- a/testdata/d2oracle/TestMove/unique_name_with_references.exp.json +++ b/testdata/d2oracle/TestMove/unique_name_with_references.exp.json @@ -179,8 +179,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -287,8 +286,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -331,8 +329,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b 2", @@ -406,8 +403,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "c", @@ -450,8 +446,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "d", @@ -494,8 +489,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestRename/arrows.exp.json b/testdata/d2oracle/TestRename/arrows.exp.json index c14ada92a..fadc22c55 100644 --- a/testdata/d2oracle/TestRename/arrows.exp.json +++ b/testdata/d2oracle/TestRename/arrows.exp.json @@ -70,8 +70,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -147,8 +146,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -191,8 +189,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestRename/arrows_chain.exp.json b/testdata/d2oracle/TestRename/arrows_chain.exp.json index 47061c9a0..a8c899380 100644 --- a/testdata/d2oracle/TestRename/arrows_chain.exp.json +++ b/testdata/d2oracle/TestRename/arrows_chain.exp.json @@ -144,8 +144,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -281,8 +280,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -345,8 +343,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "z", @@ -409,8 +406,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "q", @@ -453,8 +449,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestRename/arrows_complex.exp.json b/testdata/d2oracle/TestRename/arrows_complex.exp.json index 4d113592b..a395eed50 100644 --- a/testdata/d2oracle/TestRename/arrows_complex.exp.json +++ b/testdata/d2oracle/TestRename/arrows_complex.exp.json @@ -124,8 +124,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -212,8 +211,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -267,8 +265,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "x", @@ -311,8 +308,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -355,8 +351,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestRename/arrows_trim_common.exp.json b/testdata/d2oracle/TestRename/arrows_trim_common.exp.json index 08c281377..d5ab00830 100644 --- a/testdata/d2oracle/TestRename/arrows_trim_common.exp.json +++ b/testdata/d2oracle/TestRename/arrows_trim_common.exp.json @@ -160,8 +160,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -297,8 +296,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "x", @@ -341,8 +339,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -405,8 +402,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "z", @@ -469,8 +465,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "q", @@ -513,8 +508,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json b/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json index 53858420d..e25cf3fd4 100644 --- a/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json +++ b/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json @@ -210,8 +210,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -513,8 +512,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "x", @@ -568,8 +566,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -654,8 +651,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "z", @@ -740,8 +736,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "\"q)\"", @@ -795,8 +790,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestRename/complex_edge_1.exp.json b/testdata/d2oracle/TestRename/complex_edge_1.exp.json index 1fd5f794a..ceedb2f94 100644 --- a/testdata/d2oracle/TestRename/complex_edge_1.exp.json +++ b/testdata/d2oracle/TestRename/complex_edge_1.exp.json @@ -124,8 +124,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -212,8 +211,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "ooo", @@ -267,8 +265,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "x", @@ -311,8 +308,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -355,8 +351,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestRename/complex_edge_2.exp.json b/testdata/d2oracle/TestRename/complex_edge_2.exp.json index 81b016d76..663d56cc2 100644 --- a/testdata/d2oracle/TestRename/complex_edge_2.exp.json +++ b/testdata/d2oracle/TestRename/complex_edge_2.exp.json @@ -124,8 +124,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -212,8 +211,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -267,8 +265,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "papa", @@ -311,8 +308,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -355,8 +351,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestRename/conflict.exp.json b/testdata/d2oracle/TestRename/conflict.exp.json index ebb1d67b7..c8dc12220 100644 --- a/testdata/d2oracle/TestRename/conflict.exp.json +++ b/testdata/d2oracle/TestRename/conflict.exp.json @@ -70,8 +70,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -116,8 +115,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "la", @@ -160,8 +158,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestRename/conflict_2.exp.json b/testdata/d2oracle/TestRename/conflict_2.exp.json index 04417ce10..55f6a2df6 100644 --- a/testdata/d2oracle/TestRename/conflict_2.exp.json +++ b/testdata/d2oracle/TestRename/conflict_2.exp.json @@ -121,8 +121,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -189,8 +188,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "2", @@ -255,8 +253,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "3", @@ -321,8 +318,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "5 2", @@ -365,8 +361,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "5", @@ -409,8 +404,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestRename/conflict_with_dots.exp.json b/testdata/d2oracle/TestRename/conflict_with_dots.exp.json index 283b1800a..bbae9e6d0 100644 --- a/testdata/d2oracle/TestRename/conflict_with_dots.exp.json +++ b/testdata/d2oracle/TestRename/conflict_with_dots.exp.json @@ -70,8 +70,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -116,8 +115,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "\"a.b 2\"", @@ -160,8 +158,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestRename/container.exp.json b/testdata/d2oracle/TestRename/container.exp.json index 67b0de0dc..9c5aaa8ca 100644 --- a/testdata/d2oracle/TestRename/container.exp.json +++ b/testdata/d2oracle/TestRename/container.exp.json @@ -749,8 +749,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -1250,8 +1249,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "\"\"", @@ -1535,8 +1533,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "z", @@ -1809,8 +1806,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "i", @@ -1853,8 +1849,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "p", @@ -1970,8 +1965,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "k", @@ -2087,8 +2081,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "l", @@ -2173,8 +2166,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "a", @@ -2259,8 +2251,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "q", @@ -2303,8 +2294,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "+", @@ -2367,8 +2357,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "more", @@ -2411,8 +2400,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "ok", @@ -2477,8 +2465,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "q", @@ -2543,8 +2530,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "z", @@ -2609,8 +2595,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "p", @@ -2664,8 +2649,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "k", @@ -2719,8 +2703,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestRename/edges.exp.json b/testdata/d2oracle/TestRename/edges.exp.json index f24668918..466d177cb 100644 --- a/testdata/d2oracle/TestRename/edges.exp.json +++ b/testdata/d2oracle/TestRename/edges.exp.json @@ -414,8 +414,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -765,8 +764,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "%%%", @@ -953,8 +951,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "p", @@ -1039,8 +1036,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "k", @@ -1125,8 +1121,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "l", @@ -1211,8 +1206,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "a", @@ -1297,8 +1291,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "q", @@ -1341,8 +1334,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "+", @@ -1405,8 +1397,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestRename/flat.exp.json b/testdata/d2oracle/TestRename/flat.exp.json index db2d922b5..7f8875b49 100644 --- a/testdata/d2oracle/TestRename/flat.exp.json +++ b/testdata/d2oracle/TestRename/flat.exp.json @@ -47,8 +47,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -93,8 +92,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestRename/generated.exp.json b/testdata/d2oracle/TestRename/generated.exp.json index 917aa0420..e01f2dc0d 100644 --- a/testdata/d2oracle/TestRename/generated.exp.json +++ b/testdata/d2oracle/TestRename/generated.exp.json @@ -47,8 +47,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -93,8 +92,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestRename/near.exp.json b/testdata/d2oracle/TestRename/near.exp.json index 22053b802..4f1095f42 100644 --- a/testdata/d2oracle/TestRename/near.exp.json +++ b/testdata/d2oracle/TestRename/near.exp.json @@ -109,8 +109,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -170,8 +169,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "z", @@ -214,8 +212,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestRename/nested.exp.json b/testdata/d2oracle/TestRename/nested.exp.json index 635c2dc14..37125d75a 100644 --- a/testdata/d2oracle/TestRename/nested.exp.json +++ b/testdata/d2oracle/TestRename/nested.exp.json @@ -176,8 +176,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -319,8 +318,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -460,8 +458,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "z", @@ -601,8 +598,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "q", @@ -742,8 +738,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "nerve-gift-jingler", @@ -850,8 +845,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestSet/base.exp.json b/testdata/d2oracle/TestSet/base.exp.json index 3a10c1026..23a9eb9f4 100644 --- a/testdata/d2oracle/TestSet/base.exp.json +++ b/testdata/d2oracle/TestSet/base.exp.json @@ -47,8 +47,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -93,8 +92,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestSet/block_string_multiline.exp.json b/testdata/d2oracle/TestSet/block_string_multiline.exp.json index a8a6aec03..dd4bcff09 100644 --- a/testdata/d2oracle/TestSet/block_string_multiline.exp.json +++ b/testdata/d2oracle/TestSet/block_string_multiline.exp.json @@ -54,8 +54,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -101,8 +100,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestSet/block_string_oneline.exp.json b/testdata/d2oracle/TestSet/block_string_oneline.exp.json index 0529a2450..3601a7f2c 100644 --- a/testdata/d2oracle/TestSet/block_string_oneline.exp.json +++ b/testdata/d2oracle/TestSet/block_string_oneline.exp.json @@ -54,8 +54,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -101,8 +100,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestSet/edge.exp.json b/testdata/d2oracle/TestSet/edge.exp.json index 1d6f8fdef..bcbd533e2 100644 --- a/testdata/d2oracle/TestSet/edge.exp.json +++ b/testdata/d2oracle/TestSet/edge.exp.json @@ -80,8 +80,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -157,8 +156,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -201,8 +199,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestSet/edge_append_style.exp.json b/testdata/d2oracle/TestSet/edge_append_style.exp.json index f6bd993ac..bf9784284 100644 --- a/testdata/d2oracle/TestSet/edge_append_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_append_style.exp.json @@ -115,8 +115,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -196,8 +195,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -240,8 +238,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestSet/edge_chain.exp.json b/testdata/d2oracle/TestSet/edge_chain.exp.json index 4e5bbff23..44a7c7de3 100644 --- a/testdata/d2oracle/TestSet/edge_chain.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain.exp.json @@ -207,8 +207,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -317,8 +316,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "q", @@ -381,8 +379,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "z", @@ -465,8 +462,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "p", @@ -509,8 +505,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json b/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json index 3cb032220..65b3feb0a 100644 --- a/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json @@ -190,8 +190,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -324,8 +323,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -408,8 +406,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "z", @@ -452,8 +449,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json b/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json index 29fdcde50..a80e0b0d9 100644 --- a/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json @@ -274,8 +274,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -394,8 +393,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -498,8 +496,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "z", @@ -582,8 +579,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json b/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json index cf1588add..aaeec05db 100644 --- a/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json @@ -230,8 +230,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -344,8 +343,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "q", @@ -408,8 +406,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "z", @@ -492,8 +489,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "p", @@ -536,8 +532,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestSet/edge_index_case.exp.json b/testdata/d2oracle/TestSet/edge_index_case.exp.json index e4a0a56cd..f3250cd29 100644 --- a/testdata/d2oracle/TestSet/edge_index_case.exp.json +++ b/testdata/d2oracle/TestSet/edge_index_case.exp.json @@ -184,8 +184,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -291,8 +290,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "z", @@ -335,8 +333,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "Square", @@ -379,8 +376,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "Square 2", @@ -423,8 +419,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "x", @@ -467,8 +462,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -511,8 +505,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestSet/edge_index_nested.exp.json b/testdata/d2oracle/TestSet/edge_index_nested.exp.json index 687a27afc..b220c23c0 100644 --- a/testdata/d2oracle/TestSet/edge_index_nested.exp.json +++ b/testdata/d2oracle/TestSet/edge_index_nested.exp.json @@ -109,8 +109,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -186,8 +185,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "q", @@ -230,8 +228,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "z", @@ -274,8 +271,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestSet/edge_key_and_key.exp.json b/testdata/d2oracle/TestSet/edge_key_and_key.exp.json index 39c003fda..0fff2fd1f 100644 --- a/testdata/d2oracle/TestSet/edge_key_and_key.exp.json +++ b/testdata/d2oracle/TestSet/edge_key_and_key.exp.json @@ -160,8 +160,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -303,8 +302,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -358,8 +356,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "c", @@ -413,8 +410,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestSet/edge_label.exp.json b/testdata/d2oracle/TestSet/edge_label.exp.json index d65005fc5..3b5f7c6d6 100644 --- a/testdata/d2oracle/TestSet/edge_label.exp.json +++ b/testdata/d2oracle/TestSet/edge_label.exp.json @@ -125,8 +125,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -206,8 +205,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -250,8 +248,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestSet/edge_merge_style.exp.json b/testdata/d2oracle/TestSet/edge_merge_style.exp.json index deaee9b9b..245894900 100644 --- a/testdata/d2oracle/TestSet/edge_merge_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_merge_style.exp.json @@ -162,8 +162,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -246,8 +245,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "y", @@ -290,8 +288,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json b/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json index cf741bc63..3ef412b1b 100644 --- a/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json @@ -109,8 +109,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -186,8 +185,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "q", @@ -230,8 +228,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "z", @@ -274,8 +271,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json b/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json index 27a7c16bd..134cacd97 100644 --- a/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json @@ -155,8 +155,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -236,8 +235,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "q", @@ -280,8 +278,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "z", @@ -324,8 +321,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestSet/expanded_map_style.exp.json b/testdata/d2oracle/TestSet/expanded_map_style.exp.json index 214855b05..3204495d1 100644 --- a/testdata/d2oracle/TestSet/expanded_map_style.exp.json +++ b/testdata/d2oracle/TestSet/expanded_map_style.exp.json @@ -111,8 +111,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [], "objects": [ @@ -161,8 +160,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestSet/icon.exp.json b/testdata/d2oracle/TestSet/icon.exp.json index 3e2deb876..e432724cd 100644 --- a/testdata/d2oracle/TestSet/icon.exp.json +++ b/testdata/d2oracle/TestSet/icon.exp.json @@ -86,8 +86,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -144,8 +143,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestSet/inline_style.exp.json b/testdata/d2oracle/TestSet/inline_style.exp.json index 07cfb2b0a..d5ffcea3d 100644 --- a/testdata/d2oracle/TestSet/inline_style.exp.json +++ b/testdata/d2oracle/TestSet/inline_style.exp.json @@ -137,8 +137,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [], "objects": [ @@ -190,8 +189,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestSet/label.exp.json b/testdata/d2oracle/TestSet/label.exp.json index 4bb414d81..55551022b 100644 --- a/testdata/d2oracle/TestSet/label.exp.json +++ b/testdata/d2oracle/TestSet/label.exp.json @@ -57,8 +57,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -103,8 +102,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestSet/label_primary.exp.json b/testdata/d2oracle/TestSet/label_primary.exp.json index 0727fd008..b14337fd8 100644 --- a/testdata/d2oracle/TestSet/label_primary.exp.json +++ b/testdata/d2oracle/TestSet/label_primary.exp.json @@ -105,8 +105,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -182,8 +181,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "q", @@ -226,8 +224,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "z", @@ -270,8 +267,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestSet/label_replace.exp.json b/testdata/d2oracle/TestSet/label_replace.exp.json index 84dc9ff85..469fc2b78 100644 --- a/testdata/d2oracle/TestSet/label_replace.exp.json +++ b/testdata/d2oracle/TestSet/label_replace.exp.json @@ -57,8 +57,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -103,8 +102,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestSet/label_unset.exp.json b/testdata/d2oracle/TestSet/label_unset.exp.json index c33458a70..9a2bb4bfb 100644 --- a/testdata/d2oracle/TestSet/label_unset.exp.json +++ b/testdata/d2oracle/TestSet/label_unset.exp.json @@ -47,8 +47,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -93,8 +92,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestSet/map_key_missing.exp.json b/testdata/d2oracle/TestSet/map_key_missing.exp.json index 0fbca9801..2b1b0bc02 100644 --- a/testdata/d2oracle/TestSet/map_key_missing.exp.json +++ b/testdata/d2oracle/TestSet/map_key_missing.exp.json @@ -103,8 +103,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -200,8 +199,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "b", @@ -244,8 +242,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestSet/nested_alex.exp.json b/testdata/d2oracle/TestSet/nested_alex.exp.json index bf7036ff8..f9bd8b398 100644 --- a/testdata/d2oracle/TestSet/nested_alex.exp.json +++ b/testdata/d2oracle/TestSet/nested_alex.exp.json @@ -175,8 +175,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [ { @@ -252,8 +251,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "here", @@ -316,8 +314,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, { "id": "test", @@ -360,8 +357,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestSet/new_style.exp.json b/testdata/d2oracle/TestSet/new_style.exp.json index 68bb979d7..db5981740 100644 --- a/testdata/d2oracle/TestSet/new_style.exp.json +++ b/testdata/d2oracle/TestSet/new_style.exp.json @@ -93,8 +93,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [], "objects": [ @@ -143,8 +142,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestSet/replace_shape.exp.json b/testdata/d2oracle/TestSet/replace_shape.exp.json index d9d8e4fbd..2480ec191 100644 --- a/testdata/d2oracle/TestSet/replace_shape.exp.json +++ b/testdata/d2oracle/TestSet/replace_shape.exp.json @@ -68,8 +68,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -125,8 +124,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestSet/replace_style.exp.json b/testdata/d2oracle/TestSet/replace_style.exp.json index 13b0f99ab..6b7003fbb 100644 --- a/testdata/d2oracle/TestSet/replace_style.exp.json +++ b/testdata/d2oracle/TestSet/replace_style.exp.json @@ -75,8 +75,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [], "objects": [ @@ -147,8 +146,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json b/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json index 3bd10ba4d..6971bee40 100644 --- a/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json +++ b/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json @@ -130,8 +130,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [], "objects": [ @@ -247,8 +246,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestSet/shape.exp.json b/testdata/d2oracle/TestSet/shape.exp.json index efe74bad7..47cb8df98 100644 --- a/testdata/d2oracle/TestSet/shape.exp.json +++ b/testdata/d2oracle/TestSet/shape.exp.json @@ -86,8 +86,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": null, "objects": [ @@ -132,8 +131,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, diff --git a/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json b/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json index ba2fc8ceb..ac8ebe385 100644 --- a/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json +++ b/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json @@ -93,8 +93,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } }, "edges": [], "objects": [ @@ -143,8 +142,7 @@ "direction": { "value": "" } - }, - "renderPriority": null + } } ] }, From a5943d505b643854bad23daa55e35e4d92fda556 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BAlio=20C=C3=A9sar=20Batista?= Date: Tue, 29 Nov 2022 21:36:19 -0800 Subject: [PATCH 05/19] Rename to maxObjectZIndex --- d2exporter/export.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/d2exporter/export.go b/d2exporter/export.go index e93cf659a..8f9331263 100644 --- a/d2exporter/export.go +++ b/d2exporter/export.go @@ -17,13 +17,13 @@ func Export(ctx context.Context, g *d2graph.Graph, themeID int64) (*d2target.Dia diagram := d2target.NewDiagram() diagram.Shapes = make([]d2target.Shape, len(g.Objects)) - highestObjectPriority := 0 + maxObjectZIndex := 0 for i := range g.Objects { diagram.Shapes[i] = toShape(g.Objects[i], &theme) - highestObjectPriority = go2.IntMax(highestObjectPriority, diagram.Shapes[i].ZIndex) + maxObjectZIndex = go2.IntMax(maxObjectZIndex, diagram.Shapes[i].ZIndex) } - edgeDefaultZIndex := highestObjectPriority + 1 + edgeDefaultZIndex := maxObjectZIndex + 1 diagram.Connections = make([]d2target.Connection, len(g.Edges)) for i := range g.Edges { diagram.Connections[i] = toConnection(g.Edges[i], &theme, edgeDefaultZIndex) From 399b96ca0e13c8ac7de25801dee61a51e1ba2ec7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BAlio=20C=C3=A9sar=20Batista?= Date: Tue, 29 Nov 2022 21:43:01 -0800 Subject: [PATCH 06/19] Update tests --- .../testdata/stable/chaos1/elk/board.exp.json | 40 +- .../testdata/stable/chaos2/elk/board.exp.json | 288 ++++++------ .../child_parent_edges/elk/board.exp.json | 40 +- .../connected_container/elk/board.exp.json | 48 +- .../stable/container_edges/elk/board.exp.json | 120 ++--- .../different_subgraphs/elk/board.exp.json | 284 ++++++------ .../stable/direction/dagre/board.exp.json | 96 ++-- .../stable/direction/elk/board.exp.json | 96 ++-- .../stable/investigate/elk/board.exp.json | 434 +++++++++--------- .../stable/large_arch/elk/board.exp.json | 396 ++++++++-------- .../one_container_loop/elk/board.exp.json | 116 ++--- .../elk/board.exp.json | 240 +++++----- .../transparent_3d/dagre/board.exp.json | 4 +- .../stable/transparent_3d/elk/board.exp.json | 4 +- .../container_child_edge/elk/board.exp.json | 36 +- 15 files changed, 1133 insertions(+), 1109 deletions(-) diff --git a/e2etests/testdata/stable/chaos1/elk/board.exp.json b/e2etests/testdata/stable/chaos1/elk/board.exp.json index 195cfe680..9b4a92ab8 100644 --- a/e2etests/testdata/stable/chaos1/elk/board.exp.json +++ b/e2etests/testdata/stable/chaos1/elk/board.exp.json @@ -5,11 +5,11 @@ "id": "aaa", "type": "", "pos": { - "x": 375, - "y": 12 + "x": 12, + "y": 364 }, - "width": 325, - "height": 422, + "width": 430, + "height": 317, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -43,8 +43,8 @@ "id": "aaa.bbb", "type": "callout", "pos": { - "x": 450, - "y": 87 + "x": 87, + "y": 439 }, "width": 132, "height": 126, @@ -81,8 +81,8 @@ "id": "ddd", "type": "cylinder", "pos": { - "x": 12, - "y": 87 + "x": 85, + "y": 12 }, "width": 133, "height": 126, @@ -119,8 +119,8 @@ "id": "eee", "type": "document", "pos": { - "x": 15, - "y": 233 + "x": 238, + "y": 12 }, "width": 130, "height": 126, @@ -157,8 +157,8 @@ "id": "aaa.ccc", "type": "", "pos": { - "x": 452, - "y": 233 + "x": 239, + "y": 439 }, "width": 128, "height": 126, @@ -219,12 +219,12 @@ "labelPercentage": 0, "route": [ { - "x": 580, - "y": 296 + "x": 303, + "y": 565 }, { - "x": 700, - "y": 296 + "x": 303, + "y": 681 } ], "animated": false, @@ -258,12 +258,12 @@ "labelPercentage": 0, "route": [ { - "x": 145, - "y": 296 + "x": 303, + "y": 138 }, { - "x": 452, - "y": 296 + "x": 303, + "y": 439 } ], "animated": false, diff --git a/e2etests/testdata/stable/chaos2/elk/board.exp.json b/e2etests/testdata/stable/chaos2/elk/board.exp.json index a4c77f842..f001ad2b1 100644 --- a/e2etests/testdata/stable/chaos2/elk/board.exp.json +++ b/e2etests/testdata/stable/chaos2/elk/board.exp.json @@ -8,8 +8,8 @@ "x": 12, "y": 12 }, - "width": 1656, - "height": 897, + "width": 892, + "height": 1707, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -43,11 +43,11 @@ "id": "aa.bb", "type": "", "pos": { - "x": 434, - "y": 132 + "x": 144, + "y": 445 }, - "width": 1134, - "height": 702, + "width": 685, + "height": 1174, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -81,11 +81,11 @@ "id": "aa.bb.cc", "type": "", "pos": { - "x": 819, - "y": 278 + "x": 290, + "y": 841 }, - "width": 674, - "height": 481, + "width": 464, + "height": 703, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -119,11 +119,11 @@ "id": "aa.bb.cc.dd", "type": "rectangle", "pos": { - "x": 894, - "y": 364 + "x": 376, + "y": 916 }, - "width": 267, - "height": 320, + "width": 303, + "height": 276, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -157,8 +157,8 @@ "id": "aa.bb.cc.dd.ee", "type": "text", "pos": { - "x": 1070, - "y": 585 + "x": 588, + "y": 1093 }, "width": 16, "height": 24, @@ -194,8 +194,8 @@ "id": "aa.bb.cc.dd.ff", "type": "", "pos": { - "x": 969, - "y": 439 + "x": 451, + "y": 991 }, "width": 117, "height": 126, @@ -232,8 +232,8 @@ "id": "aa.bb.cc.gg", "type": "text", "pos": { - "x": 1221, - "y": 581 + "x": 585, + "y": 1258 }, "width": 17, "height": 24, @@ -269,8 +269,8 @@ "id": "aa.bb.cc.hh", "type": "", "pos": { - "x": 1295, - "y": 530 + "x": 532, + "y": 1343 }, "width": 123, "height": 126, @@ -307,8 +307,8 @@ "id": "aa.bb.ii", "type": "package", "pos": { - "x": 509, - "y": 364 + "x": 376, + "y": 520 }, "width": 265, "height": 276, @@ -345,8 +345,8 @@ "id": "aa.bb.ii.jj", "type": "diamond", "pos": { - "x": 584, - "y": 439 + "x": 451, + "y": 595 }, "width": 115, "height": 126, @@ -383,8 +383,8 @@ "id": "aa.bb.kk", "type": "oval", "pos": { - "x": 579, - "y": 207 + "x": 219, + "y": 595 }, "width": 126, "height": 126, @@ -421,8 +421,8 @@ "id": "aa.ll", "type": "", "pos": { - "x": 238, - "y": 356 + "x": 357, + "y": 233 }, "width": 114, "height": 126, @@ -459,8 +459,8 @@ "id": "aa.mm", "type": "cylinder", "pos": { - "x": 87, - "y": 471 + "x": 462, + "y": 87 }, "width": 131, "height": 126, @@ -497,8 +497,8 @@ "id": "aa.nn", "type": "text", "pos": { - "x": 144, - "y": 427 + "x": 424, + "y": 138 }, "width": 18, "height": 24, @@ -534,8 +534,8 @@ "id": "aa.oo", "type": "", "pos": { - "x": 91, - "y": 617 + "x": 613, + "y": 87 }, "width": 123, "height": 126, @@ -596,12 +596,12 @@ "labelPercentage": 0, "route": [ { - "x": 1086, - "y": 597 + "x": 596, + "y": 1117 }, { - "x": 1221, - "y": 597 + "x": 596, + "y": 1258 } ], "animated": false, @@ -635,12 +635,12 @@ "labelPercentage": 0, "route": [ { - "x": 1238, - "y": 593 + "x": 593.1666666666666, + "y": 1282 }, { - "x": 1295, - "y": 593 + "x": 593.1666666666666, + "y": 1343 } ], "animated": false, @@ -674,20 +674,20 @@ "labelPercentage": 0, "route": [ { - "x": 774, - "y": 548 + "x": 552.6666666666666, + "y": 796 }, { - "x": 794, - "y": 548 + "x": 552.6666666666666, + "y": 816 }, { - "x": 794, - "y": 439 + "x": 451, + "y": 816 }, { - "x": 894, - "y": 439 + "x": 451, + "y": 916 } ], "animated": false, @@ -721,28 +721,20 @@ "labelPercentage": 0, "route": [ { - "x": 352, - "y": 431.6 + "x": 424.9000000000001, + "y": 359 }, { - "x": 362, - "y": 431.6 + "x": 424.9000000000001, + "y": 420 }, { - "x": 362, - "y": 421.80000000000007 + "x": 345.00000000000006, + "y": 420 }, { - "x": 409, - "y": 421.80000000000007 - }, - { - "x": 409, - "y": 333.00000000000006 - }, - { - "x": 434, - "y": 333.00000000000006 + "x": 345.00000000000006, + "y": 445 } ], "animated": false, @@ -776,28 +768,28 @@ "labelPercentage": 0, "route": [ { - "x": 218, - "y": 572 + "x": 566.5, + "y": 213 }, { - "x": 409, - "y": 572 + "x": 566.5, + "y": 420 }, { - "x": 409, - "y": 650 + "x": 651, + "y": 420 }, { - "x": 804, - "y": 650 + "x": 651, + "y": 826 }, { - "x": 804, - "y": 449.00000000000006 + "x": 461.00000000000006, + "y": 826 }, { - "x": 819, - "y": 449.00000000000006 + "x": 461.00000000000006, + "y": 841 } ], "animated": false, @@ -831,20 +823,20 @@ "labelPercentage": 0, "route": [ { - "x": 218, - "y": 496.40000000000003 + "x": 487.90000000000003, + "y": 213 }, { - "x": 228, - "y": 496.40000000000003 + "x": 487.90000000000003, + "y": 223 }, { - "x": 228, - "y": 419.00000000000006 + "x": 413.50000000000006, + "y": 223 }, { - "x": 238, - "y": 419.00000000000006 + "x": 413.50000000000006, + "y": 233 } ], "animated": false, @@ -878,28 +870,28 @@ "labelPercentage": 0, "route": [ { - "x": 218, - "y": 546.8000000000001 + "x": 540.3000000000001, + "y": 213 }, { - "x": 228, - "y": 546.8000000000001 + "x": 540.3000000000001, + "y": 223 }, { - "x": 228, - "y": 537 + "x": 537.5, + "y": 223 }, { - "x": 409, - "y": 537 + "x": 537.5, + "y": 420 }, { - "x": 409, - "y": 512 + "x": 518.5, + "y": 420 }, { - "x": 434, - "y": 512 + "x": 518.5, + "y": 445 } ], "animated": false, @@ -933,28 +925,28 @@ "labelPercentage": 0, "route": [ { - "x": 352, - "y": 456.80000000000007 + "x": 447.70000000000005, + "y": 359 }, { - "x": 419, - "y": 456.80000000000007 + "x": 447.70000000000005, + "y": 430 }, { - "x": 419, - "y": 353.00000000000006 + "x": 365.00000000000006, + "y": 430 }, { - "x": 1211, - "y": 353.00000000000006 + "x": 365.00000000000006, + "y": 1248 }, { - "x": 1211, - "y": 589 + "x": 590.3333333333334, + "y": 1248 }, { - "x": 1221, - "y": 589 + "x": 590.3333333333334, + "y": 1258 } ], "animated": false, @@ -988,20 +980,20 @@ "labelPercentage": 0, "route": [ { - "x": 218, - "y": 521.6 + "x": 514.1, + "y": 213 }, { - "x": 228, - "y": 521.6 + "x": 514.1, + "y": 223 }, { - "x": 228, - "y": 502.00000000000006 + "x": 508.50000000000006, + "y": 223 }, { - "x": 509, - "y": 502.00000000000006 + "x": 508.50000000000006, + "y": 520 } ], "animated": false, @@ -1035,28 +1027,28 @@ "labelPercentage": 0, "route": [ { - "x": 1493, - "y": 449.00000000000006 + "x": 461.00000000000006, + "y": 1544 }, { - "x": 1593, - "y": 449.0000000000001 + "x": 461.0000000000001, + "y": 1644 }, { - "x": 1593, - "y": 87.00000000000006 + "x": 105.00000000000006, + "y": 1644 }, { - "x": 362, - "y": 87.00000000000006 + "x": 105.00000000000006, + "y": 369 }, { - "x": 362, - "y": 381.2000000000001 + "x": 379.3000000000001, + "y": 369 }, { - "x": 352, - "y": 381.2000000000001 + "x": 379.3000000000001, + "y": 359 } ], "animated": false, @@ -1090,36 +1082,36 @@ "labelPercentage": 0, "route": [ { - "x": 774, - "y": 456.00000000000006 + "x": 464.33333333333337, + "y": 796 }, { - "x": 784, - "y": 456.00000000000006 + "x": 464.33333333333337, + "y": 806 }, { - "x": 784, - "y": 267.00000000000006 + "x": 279.00000000000006, + "y": 806 }, { - "x": 1583, - "y": 267.0000000000001 + "x": 279.0000000000001, + "y": 1634 }, { - "x": 1583, - "y": 122.00000000000011 + "x": 134.0000000000001, + "y": 1634 }, { - "x": 372, - "y": 122.00000000000011 + "x": 134.0000000000001, + "y": 379 }, { - "x": 372, - "y": 406.4000000000001 + "x": 402.10000000000014, + "y": 379 }, { - "x": 352, - "y": 406.4000000000001 + "x": 402.10000000000014, + "y": 359 } ], "animated": false, diff --git a/e2etests/testdata/stable/child_parent_edges/elk/board.exp.json b/e2etests/testdata/stable/child_parent_edges/elk/board.exp.json index a85c30982..af4faba6a 100644 --- a/e2etests/testdata/stable/child_parent_edges/elk/board.exp.json +++ b/e2etests/testdata/stable/child_parent_edges/elk/board.exp.json @@ -8,8 +8,8 @@ "x": 12, "y": 12 }, - "width": 589, - "height": 586, + "width": 574, + "height": 601, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -46,8 +46,8 @@ "x": 87, "y": 87 }, - "width": 439, - "height": 436, + "width": 424, + "height": 451, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -181,12 +181,12 @@ "labelPercentage": 0, "route": [ { - "x": 526, - "y": 162 + "x": 162, + "y": 538 }, { - "x": 601, - "y": 162 + "x": 162, + "y": 613 } ], "animated": false, @@ -220,12 +220,12 @@ "labelPercentage": 0, "route": [ { - "x": 87, - "y": 237 + "x": 237, + "y": 87 }, { - "x": 162, - "y": 237 + "x": 237, + "y": 162 } ], "animated": false, @@ -259,20 +259,20 @@ "labelPercentage": 0, "route": [ { - "x": 351, - "y": 300 + "x": 294, + "y": 363 }, { - "x": 441, - "y": 300 + "x": 294, + "y": 453 }, { - "x": 441, - "y": 448 + "x": 436, + "y": 453 }, { - "x": 87, - "y": 448 + "x": 436, + "y": 87 } ], "animated": false, diff --git a/e2etests/testdata/stable/connected_container/elk/board.exp.json b/e2etests/testdata/stable/connected_container/elk/board.exp.json index a2270ad4a..a59e14196 100644 --- a/e2etests/testdata/stable/connected_container/elk/board.exp.json +++ b/e2etests/testdata/stable/connected_container/elk/board.exp.json @@ -5,8 +5,8 @@ "id": "a", "type": "", "pos": { - "x": 12, - "y": 87 + "x": 88, + "y": 12 }, "width": 263, "height": 276, @@ -43,8 +43,8 @@ "id": "a.b", "type": "", "pos": { - "x": 87, - "y": 162 + "x": 163, + "y": 87 }, "width": 113, "height": 126, @@ -81,8 +81,8 @@ "id": "c", "type": "", "pos": { - "x": 385, - "y": 87 + "x": 87, + "y": 398 }, "width": 264, "height": 276, @@ -119,8 +119,8 @@ "id": "c.d", "type": "", "pos": { - "x": 460, - "y": 162 + "x": 162, + "y": 473 }, "width": 114, "height": 126, @@ -157,11 +157,11 @@ "id": "f", "type": "", "pos": { - "x": 759, - "y": 12 + "x": 12, + "y": 784 }, - "width": 419, - "height": 426, + "width": 414, + "height": 431, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -195,8 +195,8 @@ "id": "f.h", "type": "", "pos": { - "x": 839, - "y": 87 + "x": 87, + "y": 864 }, "width": 264, "height": 276, @@ -233,8 +233,8 @@ "id": "f.h.g", "type": "", "pos": { - "x": 914, - "y": 162 + "x": 162, + "y": 939 }, "width": 114, "height": 126, @@ -295,12 +295,12 @@ "labelPercentage": 0, "route": [ { - "x": 200, - "y": 225 + "x": 219, + "y": 213 }, { - "x": 460, - "y": 225 + "x": 219, + "y": 473 } ], "animated": false, @@ -334,12 +334,12 @@ "labelPercentage": 0, "route": [ { - "x": 574, - "y": 225 + "x": 219, + "y": 599 }, { - "x": 914, - "y": 225 + "x": 219, + "y": 939 } ], "animated": false, diff --git a/e2etests/testdata/stable/container_edges/elk/board.exp.json b/e2etests/testdata/stable/container_edges/elk/board.exp.json index 396818f4d..6e9dba901 100644 --- a/e2etests/testdata/stable/container_edges/elk/board.exp.json +++ b/e2etests/testdata/stable/container_edges/elk/board.exp.json @@ -5,8 +5,8 @@ "id": "a", "type": "", "pos": { - "x": 12, - "y": 162 + "x": 162, + "y": 12 }, "width": 113, "height": 126, @@ -43,11 +43,11 @@ "id": "g", "type": "", "pos": { - "x": 240, - "y": 87 + "x": 87, + "y": 253 }, - "width": 263, - "height": 422, + "width": 396, + "height": 276, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -81,8 +81,8 @@ "id": "g.b", "type": "", "pos": { - "x": 315, - "y": 162 + "x": 162, + "y": 328 }, "width": 113, "height": 126, @@ -119,11 +119,11 @@ "id": "d", "type": "", "pos": { - "x": 613, - "y": 12 + "x": 12, + "y": 639 }, - "width": 418, - "height": 426, + "width": 413, + "height": 431, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -157,8 +157,8 @@ "id": "d.h", "type": "", "pos": { - "x": 693, - "y": 87 + "x": 87, + "y": 719 }, "width": 263, "height": 276, @@ -195,8 +195,8 @@ "id": "d.h.c", "type": "", "pos": { - "x": 768, - "y": 162 + "x": 162, + "y": 794 }, "width": 113, "height": 126, @@ -233,8 +233,8 @@ "id": "g.e", "type": "", "pos": { - "x": 315, - "y": 308 + "x": 295, + "y": 328 }, "width": 113, "height": 126, @@ -271,8 +271,8 @@ "id": "f", "type": "", "pos": { - "x": 613, - "y": 458 + "x": 445, + "y": 639 }, "width": 111, "height": 126, @@ -333,12 +333,12 @@ "labelPercentage": 0, "route": [ { - "x": 125, - "y": 225 + "x": 218.5, + "y": 138 }, { - "x": 315, - "y": 225 + "x": 218.5, + "y": 328 } ], "animated": false, @@ -372,12 +372,12 @@ "labelPercentage": 0, "route": [ { - "x": 428, - "y": 225 + "x": 218.5, + "y": 454 }, { - "x": 768, - "y": 225 + "x": 218.5, + "y": 794 } ], "animated": false, @@ -411,28 +411,28 @@ "labelPercentage": 0, "route": [ { - "x": 1031, - "y": 87 + "x": 87, + "y": 1070 }, { - "x": 1081, - "y": 87 + "x": 87, + "y": 1120 }, { - "x": 1081, - "y": 594 + "x": 566, + "y": 1120 }, { - "x": 175, - "y": 594 + "x": 566, + "y": 188 }, { - "x": 175, - "y": 371 + "x": 351.5, + "y": 188 }, { - "x": 315, - "y": 371 + "x": 351.5, + "y": 328 } ], "animated": false, @@ -466,20 +466,20 @@ "labelPercentage": 0, "route": [ { - "x": 428, - "y": 371 + "x": 351.5, + "y": 454 }, { - "x": 558, - "y": 371 + "x": 351.5, + "y": 584 }, { - "x": 558, - "y": 500 + "x": 482, + "y": 584 }, { - "x": 613, - "y": 500 + "x": 482, + "y": 639 } ], "animated": false, @@ -513,20 +513,20 @@ "labelPercentage": 0, "route": [ { - "x": 613, - "y": 542 + "x": 519, + "y": 639 }, { - "x": 185, - "y": 542 + "x": 519, + "y": 198 }, { - "x": 185, - "y": 381 + "x": 361.5, + "y": 198 }, { - "x": 240, - "y": 381 + "x": 361.5, + "y": 253 } ], "animated": false, @@ -560,12 +560,12 @@ "labelPercentage": 0, "route": [ { - "x": 503, - "y": 235 + "x": 228.5, + "y": 529 }, { - "x": 693, - "y": 235 + "x": 228.5, + "y": 719 } ], "animated": false, diff --git a/e2etests/testdata/stable/different_subgraphs/elk/board.exp.json b/e2etests/testdata/stable/different_subgraphs/elk/board.exp.json index ea6501360..595dbd557 100644 --- a/e2etests/testdata/stable/different_subgraphs/elk/board.exp.json +++ b/e2etests/testdata/stable/different_subgraphs/elk/board.exp.json @@ -5,11 +5,11 @@ "id": "finally", "type": "", "pos": { - "x": 12, - "y": 742 + "x": 843, + "y": 12 }, - "width": 779, - "height": 422, + "width": 458, + "height": 714, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -43,8 +43,8 @@ "id": "a", "type": "", "pos": { - "x": 678, - "y": 44 + "x": 57, + "y": 600 }, "width": 113, "height": 126, @@ -81,8 +81,8 @@ "id": "tree", "type": "", "pos": { - "x": 927, - "y": 325 + "x": 362, + "y": 836 }, "width": 134, "height": 126, @@ -119,8 +119,8 @@ "id": "and", "type": "", "pos": { - "x": 922, - "y": 158 + "x": 179, + "y": 836 }, "width": 132, "height": 126, @@ -157,8 +157,8 @@ "id": "nodes", "type": "", "pos": { - "x": 901, - "y": 12 + "x": 12, + "y": 836 }, "width": 147, "height": 126, @@ -195,8 +195,8 @@ "id": "some", "type": "", "pos": { - "x": 1174, - "y": 158 + "x": 174, + "y": 1062 }, "width": 143, "height": 126, @@ -233,8 +233,8 @@ "id": "more", "type": "", "pos": { - "x": 1174, - "y": 304 + "x": 337, + "y": 1062 }, "width": 141, "height": 126, @@ -271,8 +271,8 @@ "id": "many", "type": "", "pos": { - "x": 1174, - "y": 450 + "x": 498, + "y": 1062 }, "width": 145, "height": 126, @@ -309,8 +309,8 @@ "id": "then", "type": "", "pos": { - "x": 653, - "y": 596 + "x": 685, + "y": 600 }, "width": 138, "height": 126, @@ -347,8 +347,8 @@ "id": "here", "type": "", "pos": { - "x": 920, - "y": 617 + "x": 709, + "y": 836 }, "width": 136, "height": 126, @@ -385,8 +385,8 @@ "id": "you", "type": "", "pos": { - "x": 1174, - "y": 617 + "x": 711, + "y": 1062 }, "width": 132, "height": 126, @@ -423,8 +423,8 @@ "id": "have", "type": "", "pos": { - "x": 653, - "y": 450 + "x": 505, + "y": 600 }, "width": 138, "height": 126, @@ -461,8 +461,8 @@ "id": "hierarchy", "type": "", "pos": { - "x": 901, - "y": 471 + "x": 516, + "y": 836 }, "width": 173, "height": 126, @@ -499,8 +499,8 @@ "id": "another", "type": "", "pos": { - "x": 906, - "y": 820 + "x": 915, + "y": 836 }, "width": 163, "height": 126, @@ -537,8 +537,8 @@ "id": "of", "type": "", "pos": { - "x": 1174, - "y": 820 + "x": 936, + "y": 1062 }, "width": 120, "height": 126, @@ -575,8 +575,8 @@ "id": "nesting", "type": "", "pos": { - "x": 633, - "y": 1184 + "x": 1322, + "y": 600 }, "width": 158, "height": 126, @@ -613,8 +613,8 @@ "id": "trees", "type": "", "pos": { - "x": 901, - "y": 1163 + "x": 1306, + "y": 836 }, "width": 142, "height": 126, @@ -651,8 +651,8 @@ "id": "finally.a", "type": "", "pos": { - "x": 255, - "y": 838 + "x": 948, + "y": 233 }, "width": 113, "height": 126, @@ -689,8 +689,8 @@ "id": "finally.tree", "type": "", "pos": { - "x": 389, - "y": 963 + "x": 1073, + "y": 379 }, "width": 134, "height": 126, @@ -727,8 +727,8 @@ "id": "finally.inside", "type": "", "pos": { - "x": 87, - "y": 838 + "x": 930, + "y": 87 }, "width": 148, "height": 126, @@ -765,8 +765,8 @@ "id": "finally.hierarchy", "type": "", "pos": { - "x": 543, - "y": 963 + "x": 1054, + "y": 525 }, "width": 173, "height": 126, @@ -803,8 +803,8 @@ "id": "finally.root", "type": "", "pos": { - "x": 388, - "y": 817 + "x": 918, + "y": 379 }, "width": 135, "height": 126, @@ -865,20 +865,20 @@ "labelPercentage": 0, "route": [ { - "x": 791, - "y": 138 + "x": 142, + "y": 726 }, { - "x": 841, - "y": 138 + "x": 142, + "y": 776 }, { - "x": 841, - "y": 388 + "x": 429.3333333333333, + "y": 776 }, { - "x": 927, - "y": 388 + "x": 429.3333333333333, + "y": 836 } ], "animated": false, @@ -912,20 +912,20 @@ "labelPercentage": 0, "route": [ { - "x": 791, - "y": 106.5 + "x": 113.75, + "y": 726 }, { - "x": 851, - "y": 106.5 + "x": 113.75, + "y": 786 }, { - "x": 851, - "y": 221 + "x": 245, + "y": 786 }, { - "x": 921.5, - "y": 221 + "x": 245, + "y": 836 } ], "animated": false, @@ -959,12 +959,12 @@ "labelPercentage": 0, "route": [ { - "x": 791, - "y": 75 + "x": 85.5, + "y": 726 }, { - "x": 901, - "y": 75 + "x": 85.5, + "y": 836 } ], "animated": false, @@ -998,12 +998,12 @@ "labelPercentage": 0, "route": [ { - "x": 1053.5, - "y": 221 + "x": 245, + "y": 962 }, { - "x": 1174, - "y": 221 + "x": 245, + "y": 1062 } ], "animated": false, @@ -1037,12 +1037,12 @@ "labelPercentage": 0, "route": [ { - "x": 1061, - "y": 367 + "x": 407, + "y": 962 }, { - "x": 1174, - "y": 367 + "x": 407, + "y": 1062 } ], "animated": false, @@ -1076,20 +1076,20 @@ "labelPercentage": 0, "route": [ { - "x": 1061, - "y": 409 + "x": 451.66666666666663, + "y": 962 }, { - "x": 1124, - "y": 409 + "x": 451.66666666666663, + "y": 1012 }, { - "x": 1124, - "y": 513 + "x": 570, + "y": 1012 }, { - "x": 1174, - "y": 513 + "x": 570, + "y": 1062 } ], "animated": false, @@ -1123,12 +1123,12 @@ "labelPercentage": 0, "route": [ { - "x": 791, - "y": 680 + "x": 777.3333333333333, + "y": 726 }, { - "x": 919.5, - "y": 680 + "x": 777.3333333333333, + "y": 836 } ], "animated": false, @@ -1162,12 +1162,12 @@ "labelPercentage": 0, "route": [ { - "x": 1055.5, - "y": 680 + "x": 777.3333333333333, + "y": 962 }, { - "x": 1174, - "y": 680 + "x": 777.3333333333333, + "y": 1062 } ], "animated": false, @@ -1201,12 +1201,12 @@ "labelPercentage": 0, "route": [ { - "x": 791, - "y": 513 + "x": 574, + "y": 726 }, { - "x": 901, - "y": 513 + "x": 574, + "y": 836 } ], "animated": false, @@ -1240,20 +1240,20 @@ "labelPercentage": 0, "route": [ { - "x": 791, - "y": 638 + "x": 731.3333333333333, + "y": 726 }, { - "x": 841, - "y": 638 + "x": 731.3333333333333, + "y": 776 }, { - "x": 841, - "y": 555 + "x": 631.6666666666666, + "y": 776 }, { - "x": 901, - "y": 555 + "x": 631.6666666666666, + "y": 836 } ], "animated": false, @@ -1287,12 +1287,12 @@ "labelPercentage": 0, "route": [ { - "x": 791, - "y": 882.6666666666666 + "x": 996.1666666666666, + "y": 726 }, { - "x": 906, - "y": 882.6666666666666 + "x": 996.1666666666666, + "y": 836 } ], "animated": false, @@ -1326,12 +1326,12 @@ "labelPercentage": 0, "route": [ { - "x": 1069, - "y": 882.6666666666666 + "x": 996.1666666666666, + "y": 962 }, { - "x": 1174, - "y": 882.6666666666666 + "x": 996.1666666666666, + "y": 1062 } ], "animated": false, @@ -1365,12 +1365,12 @@ "labelPercentage": 0, "route": [ { - "x": 791, - "y": 1247 + "x": 1400.8333333333333, + "y": 726 }, { - "x": 901, - "y": 1247 + "x": 1400.8333333333333, + "y": 836 } ], "animated": false, @@ -1404,20 +1404,20 @@ "labelPercentage": 0, "route": [ { - "x": 791, - "y": 1023.3333333333333 + "x": 1149, + "y": 726 }, { - "x": 841, - "y": 1023.3333333333333 + "x": 1149, + "y": 776 }, { - "x": 841, - "y": 1205 + "x": 1353.4999999999998, + "y": 776 }, { - "x": 901, - "y": 1205 + "x": 1353.4999999999998, + "y": 836 } ], "animated": false, @@ -1451,20 +1451,20 @@ "labelPercentage": 0, "route": [ { - "x": 368, - "y": 922 + "x": 1023.1666666666667, + "y": 359 }, { - "x": 378, - "y": 922 + "x": 1023.1666666666667, + "y": 369 }, { - "x": 378, - "y": 1026 + "x": 1140, + "y": 369 }, { - "x": 388.5, - "y": 1026 + "x": 1140, + "y": 379 } ], "animated": false, @@ -1498,12 +1498,12 @@ "labelPercentage": 0, "route": [ { - "x": 235, - "y": 901 + "x": 1004.3333333333333, + "y": 213 }, { - "x": 255, - "y": 901 + "x": 1004.3333333333333, + "y": 233 } ], "animated": false, @@ -1537,12 +1537,12 @@ "labelPercentage": 0, "route": [ { - "x": 522.5, - "y": 1026 + "x": 1140, + "y": 505 }, { - "x": 543, - "y": 1026 + "x": 1140, + "y": 525 } ], "animated": false, @@ -1576,12 +1576,12 @@ "labelPercentage": 0, "route": [ { - "x": 368, - "y": 880 + "x": 985.5, + "y": 359 }, { - "x": 388, - "y": 880 + "x": 985.5, + "y": 379 } ], "animated": false, diff --git a/e2etests/testdata/stable/direction/dagre/board.exp.json b/e2etests/testdata/stable/direction/dagre/board.exp.json index cc01c3fae..821680267 100644 --- a/e2etests/testdata/stable/direction/dagre/board.exp.json +++ b/e2etests/testdata/stable/direction/dagre/board.exp.json @@ -10,7 +10,6 @@ }, "width": 494, "height": 1456, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 18, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 1 }, { "id": "b.2", @@ -48,7 +48,6 @@ }, "width": 240, "height": 1130, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -75,7 +74,8 @@ "underline": false, "labelWidth": 16, "labelHeight": 36, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 2 }, { "id": "a", @@ -86,7 +86,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -113,7 +112,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 1 }, { "id": "c", @@ -124,7 +124,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -151,7 +150,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 1 }, { "id": "d", @@ -162,7 +162,6 @@ }, "width": 114, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -189,7 +188,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 1 }, { "id": "e", @@ -200,7 +200,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -227,7 +226,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 1 }, { "id": "b.1", @@ -238,7 +238,6 @@ }, "width": 112, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -265,7 +264,8 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 2 }, { "id": "b.3", @@ -276,7 +276,6 @@ }, "width": 113, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -303,7 +302,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 2 }, { "id": "b.4", @@ -314,7 +314,6 @@ }, "width": 114, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -341,7 +340,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 2 }, { "id": "b.5", @@ -352,7 +352,6 @@ }, "width": 113, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -379,7 +378,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 2 }, { "id": "b.2.a", @@ -390,7 +390,6 @@ }, "width": 113, "height": 126, - "level": 3, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -417,7 +416,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 3 }, { "id": "b.2.b", @@ -428,7 +428,6 @@ }, "width": 113, "height": 126, - "level": 3, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -455,7 +454,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 3 }, { "id": "b.2.c", @@ -466,7 +466,6 @@ }, "width": 113, "height": 126, - "level": 3, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -493,7 +492,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 3 }, { "id": "b.2.d", @@ -504,7 +504,6 @@ }, "width": 114, "height": 126, - "level": 3, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -531,7 +530,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 3 }, { "id": "b.2.e", @@ -542,7 +542,6 @@ }, "width": 113, "height": 126, - "level": 3, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -569,7 +568,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 3 } ], "connections": [ @@ -618,7 +618,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "zIndex": 4 }, { "id": "(b -> c)[0]", @@ -665,7 +666,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "zIndex": 4 }, { "id": "(c -> d)[0]", @@ -712,7 +714,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "zIndex": 4 }, { "id": "(d -> e)[0]", @@ -759,7 +762,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "zIndex": 4 }, { "id": "b.(1 -> 2)[0]", @@ -806,7 +810,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "zIndex": 4 }, { "id": "b.(2 -> 3)[0]", @@ -853,7 +858,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "zIndex": 4 }, { "id": "b.(3 -> 4)[0]", @@ -900,7 +906,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "zIndex": 4 }, { "id": "b.(4 -> 5)[0]", @@ -947,7 +954,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "zIndex": 4 }, { "id": "b.2.(a -> b)[0]", @@ -994,7 +1002,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "zIndex": 4 }, { "id": "b.2.(b -> c)[0]", @@ -1041,7 +1050,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "zIndex": 4 }, { "id": "b.2.(c -> d)[0]", @@ -1088,7 +1098,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "zIndex": 4 }, { "id": "b.2.(d -> e)[0]", @@ -1135,7 +1146,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "zIndex": 4 } ] } diff --git a/e2etests/testdata/stable/direction/elk/board.exp.json b/e2etests/testdata/stable/direction/elk/board.exp.json index 37051403b..c6a1c80a1 100644 --- a/e2etests/testdata/stable/direction/elk/board.exp.json +++ b/e2etests/testdata/stable/direction/elk/board.exp.json @@ -10,7 +10,6 @@ }, "width": 414, "height": 1594, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 18, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 1 }, { "id": "b.2", @@ -48,7 +48,6 @@ }, "width": 264, "height": 860, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -75,7 +74,8 @@ "underline": false, "labelWidth": 16, "labelHeight": 36, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 2 }, { "id": "a", @@ -86,7 +86,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -113,7 +112,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 1 }, { "id": "c", @@ -124,7 +124,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -151,7 +150,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 1 }, { "id": "d", @@ -162,7 +162,6 @@ }, "width": 114, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -189,7 +188,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 1 }, { "id": "e", @@ -200,7 +200,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -227,7 +226,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 1 }, { "id": "b.1", @@ -238,7 +238,6 @@ }, "width": 112, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -265,7 +264,8 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 2 }, { "id": "b.3", @@ -276,7 +276,6 @@ }, "width": 113, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -303,7 +302,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 2 }, { "id": "b.4", @@ -314,7 +314,6 @@ }, "width": 114, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -341,7 +340,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 2 }, { "id": "b.5", @@ -352,7 +352,6 @@ }, "width": 113, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -379,7 +378,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 2 }, { "id": "b.2.a", @@ -390,7 +390,6 @@ }, "width": 113, "height": 126, - "level": 3, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -417,7 +416,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 3 }, { "id": "b.2.b", @@ -428,7 +428,6 @@ }, "width": 113, "height": 126, - "level": 3, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -455,7 +454,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 3 }, { "id": "b.2.c", @@ -466,7 +466,6 @@ }, "width": 113, "height": 126, - "level": 3, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -493,7 +492,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 3 }, { "id": "b.2.d", @@ -504,7 +504,6 @@ }, "width": 114, "height": 126, - "level": 3, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -531,7 +530,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 3 }, { "id": "b.2.e", @@ -542,7 +542,6 @@ }, "width": 113, "height": 126, - "level": 3, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -569,7 +568,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 3 } ], "connections": [ @@ -609,7 +609,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "zIndex": 4 }, { "id": "(b -> c)[0]", @@ -647,7 +648,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "zIndex": 4 }, { "id": "(c -> d)[0]", @@ -685,7 +687,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "zIndex": 4 }, { "id": "(d -> e)[0]", @@ -723,7 +726,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "zIndex": 4 }, { "id": "b.(1 -> 2)[0]", @@ -761,7 +765,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "zIndex": 4 }, { "id": "b.(2 -> 3)[0]", @@ -799,7 +804,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "zIndex": 4 }, { "id": "b.(3 -> 4)[0]", @@ -837,7 +843,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "zIndex": 4 }, { "id": "b.(4 -> 5)[0]", @@ -875,7 +882,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "zIndex": 4 }, { "id": "b.2.(a -> b)[0]", @@ -913,7 +921,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "zIndex": 4 }, { "id": "b.2.(b -> c)[0]", @@ -951,7 +960,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "zIndex": 4 }, { "id": "b.2.(c -> d)[0]", @@ -989,7 +999,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "zIndex": 4 }, { "id": "b.2.(d -> e)[0]", @@ -1027,7 +1038,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "zIndex": 4 } ] } diff --git a/e2etests/testdata/stable/investigate/elk/board.exp.json b/e2etests/testdata/stable/investigate/elk/board.exp.json index 45f42987e..24f934439 100644 --- a/e2etests/testdata/stable/investigate/elk/board.exp.json +++ b/e2etests/testdata/stable/investigate/elk/board.exp.json @@ -5,8 +5,8 @@ "id": "aa", "type": "step", "pos": { - "x": 12, - "y": 450 + "x": 435, + "y": 12 }, "width": 122, "height": 126, @@ -43,8 +43,8 @@ "id": "bb", "type": "step", "pos": { - "x": 234, - "y": 304 + "x": 292, + "y": 238 }, "width": 123, "height": 126, @@ -81,8 +81,8 @@ "id": "cc", "type": "step", "pos": { - "x": 457, - "y": 325 + "x": 314, + "y": 464 }, "width": 121, "height": 126, @@ -119,11 +119,11 @@ "id": "dd", "type": "", "pos": { - "x": 792, - "y": 250 + "x": 238, + "y": 816 }, - "width": 273, - "height": 422, + "width": 415, + "height": 276, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -157,8 +157,8 @@ "id": "dd.ee", "type": "diamond", "pos": { - "x": 868, - "y": 471 + "x": 456, + "y": 891 }, "width": 122, "height": 126, @@ -195,10 +195,10 @@ "id": "ll", "type": "", "pos": { - "x": 3033, - "y": 268 + "x": 253, + "y": 3094 }, - "width": 419, + "width": 425, "height": 427, "opacity": 1, "strokeDash": 0, @@ -233,8 +233,8 @@ "id": "ll.mm", "type": "oval", "pos": { - "x": 3108, - "y": 489 + "x": 472, + "y": 3169 }, "width": 131, "height": 131, @@ -271,8 +271,8 @@ "id": "ff", "type": "", "pos": { - "x": 2391, - "y": 268 + "x": 254, + "y": 2436 }, "width": 424, "height": 427, @@ -309,8 +309,8 @@ "id": "ff.mm", "type": "oval", "pos": { - "x": 2466, - "y": 489 + "x": 472, + "y": 2511 }, "width": 131, "height": 131, @@ -347,8 +347,8 @@ "id": "ff.gg", "type": "diamond", "pos": { - "x": 2469, - "y": 343 + "x": 329, + "y": 2513 }, "width": 123, "height": 126, @@ -385,8 +385,8 @@ "id": "dd.hh", "type": "diamond", "pos": { - "x": 867, - "y": 325 + "x": 313, + "y": 891 }, "width": 123, "height": 126, @@ -423,8 +423,8 @@ "id": "ww", "type": "queue", "pos": { - "x": 2145, - "y": 143 + "x": 127, + "y": 2195 }, "width": 131, "height": 126, @@ -472,11 +472,11 @@ "id": "yy", "type": "", "pos": { - "x": 3562, - "y": 89 + "x": 75, + "y": 3631 }, - "width": 413, - "height": 276, + "width": 273, + "height": 422, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -510,8 +510,8 @@ "id": "yy.zz", "type": "queue", "pos": { - "x": 3637, - "y": 164 + "x": 152, + "y": 3706 }, "width": 120, "height": 126, @@ -559,8 +559,8 @@ "id": "ad", "type": "parallelogram", "pos": { - "x": 4473, - "y": 346 + "x": 333, + "y": 4554 }, "width": 123, "height": 126, @@ -597,11 +597,11 @@ "id": "nn", "type": "cylinder", "pos": { - "x": 4095, - "y": 125 + "x": 117, + "y": 4173 }, - "width": 273, - "height": 568, + "width": 557, + "height": 276, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -635,8 +635,8 @@ "id": "ii", "type": "", "pos": { - "x": 1170, - "y": 471 + "x": 460, + "y": 1197 }, "width": 114, "height": 126, @@ -673,8 +673,8 @@ "id": "jj", "type": "", "pos": { - "x": 1466, - "y": 471 + "x": 459, + "y": 1503 }, "width": 115, "height": 126, @@ -711,8 +711,8 @@ "id": "kk", "type": "", "pos": { - "x": 1868, - "y": 471 + "x": 456, + "y": 1914 }, "width": 122, "height": 126, @@ -749,8 +749,8 @@ "id": "nn.oo", "type": "", "pos": { - "x": 4170, - "y": 492 + "x": 476, + "y": 4248 }, "width": 123, "height": 126, @@ -787,8 +787,8 @@ "id": "ff.pp", "type": "", "pos": { - "x": 2617, - "y": 343 + "x": 329, + "y": 2662 }, "width": 123, "height": 126, @@ -825,8 +825,8 @@ "id": "ll.qq", "type": "", "pos": { - "x": 3112, - "y": 343 + "x": 328, + "y": 3172 }, "width": 124, "height": 126, @@ -863,8 +863,8 @@ "id": "ll.rr", "type": "", "pos": { - "x": 3259, - "y": 343 + "x": 331, + "y": 3320 }, "width": 118, "height": 126, @@ -901,8 +901,8 @@ "id": "ss", "type": "", "pos": { - "x": 1389, - "y": 47 + "x": 37, + "y": 1428 }, "width": 268, "height": 276, @@ -939,8 +939,8 @@ "id": "ss.tt", "type": "", "pos": { - "x": 1464, - "y": 122 + "x": 112, + "y": 1503 }, "width": 118, "height": 126, @@ -977,8 +977,8 @@ "id": "uu", "type": "", "pos": { - "x": 1767, - "y": 47 + "x": 34, + "y": 1814 }, "width": 273, "height": 276, @@ -1015,8 +1015,8 @@ "id": "uu.vv", "type": "", "pos": { - "x": 1842, - "y": 122 + "x": 109, + "y": 1889 }, "width": 123, "height": 126, @@ -1053,8 +1053,8 @@ "id": "rm", "type": "", "pos": { - "x": 3230, - "y": 122 + "x": 109, + "y": 3295 }, "width": 124, "height": 126, @@ -1091,8 +1091,8 @@ "id": "nn.xx", "type": "", "pos": { - "x": 4170, - "y": 200 + "x": 192, + "y": 4248 }, "width": 122, "height": 126, @@ -1129,8 +1129,8 @@ "id": "yy.ab", "type": "", "pos": { - "x": 3777, - "y": 164 + "x": 150, + "y": 3852 }, "width": 123, "height": 126, @@ -1167,8 +1167,8 @@ "id": "nn.ac", "type": "", "pos": { - "x": 4171, - "y": 346 + "x": 334, + "y": 4248 }, "width": 122, "height": 126, @@ -1229,20 +1229,20 @@ "labelPercentage": 0, "route": [ { - "x": 134, - "y": 491.5 + "x": 476, + "y": 138 }, { - "x": 184, - "y": 491.5 + "x": 476, + "y": 188 }, { - "x": 184, - "y": 366.5 + "x": 353.66666666666663, + "y": 188 }, { - "x": 234, - "y": 366.5 + "x": 353.66666666666663, + "y": 238 } ], "animated": false, @@ -1276,12 +1276,12 @@ "labelPercentage": 0, "route": [ { - "x": 357, - "y": 387.5 + "x": 374.16666666666663, + "y": 364 }, { - "x": 457, - "y": 387.5 + "x": 374.16666666666663, + "y": 464 } ], "animated": false, @@ -1315,12 +1315,12 @@ "labelPercentage": 0, "route": [ { - "x": 134, - "y": 533.5 + "x": 516.6666666666666, + "y": 138 }, { - "x": 867.5, - "y": 533.5 + "x": 516.6666666666666, + "y": 891 } ], "animated": false, @@ -1354,28 +1354,28 @@ "labelPercentage": 0, "route": [ { - "x": 357, - "y": 345.5 + "x": 333.16666666666663, + "y": 364 }, { - "x": 407, - "y": 345.5 + "x": 333.16666666666663, + "y": 414 }, { - "x": 407, - "y": 36 + "x": 23, + "y": 414 }, { - "x": 2336, - "y": 36 + "x": 23, + "y": 2381 }, { - "x": 2336, - "y": 385 + "x": 369.5, + "y": 2381 }, { - "x": 2468.6666666666665, - "y": 385 + "x": 369.5, + "y": 2512.6666666666665 } ], "animated": false, @@ -1409,12 +1409,12 @@ "labelPercentage": 0, "route": [ { - "x": 578, - "y": 387.5 + "x": 374.16666666666663, + "y": 590 }, { - "x": 867, - "y": 387.5 + "x": 374.16666666666663, + "y": 891 } ], "animated": false, @@ -1448,12 +1448,12 @@ "labelPercentage": 0, "route": [ { - "x": 989.5, - "y": 533.5 + "x": 516.6666666666666, + "y": 1017 }, { - "x": 1170, - "y": 533.5 + "x": 516.6666666666666, + "y": 1197 } ], "animated": false, @@ -1487,12 +1487,12 @@ "labelPercentage": 0, "route": [ { - "x": 1284, - "y": 533.5 + "x": 516.6666666666666, + "y": 1323 }, { - "x": 1465.5, - "y": 533.5 + "x": 516.6666666666666, + "y": 1503 } ], "animated": false, @@ -1526,12 +1526,12 @@ "labelPercentage": 0, "route": [ { - "x": 1580.5, - "y": 533.5 + "x": 516.6666666666666, + "y": 1629 }, { - "x": 1867.6666666666667, - "y": 533.5 + "x": 516.6666666666666, + "y": 1914 } ], "animated": false, @@ -1565,12 +1565,12 @@ "labelPercentage": 0, "route": [ { - "x": 1989.6666666666667, - "y": 554.5 + "x": 537, + "y": 2040 }, { - "x": 2466, - "y": 554.5 + "x": 537, + "y": 2511 } ], "animated": false, @@ -1604,12 +1604,12 @@ "labelPercentage": 0, "route": [ { - "x": 2597, - "y": 554.5 + "x": 537, + "y": 2642 }, { - "x": 3108, - "y": 554.5 + "x": 537, + "y": 3169 } ], "animated": false, @@ -1643,12 +1643,12 @@ "labelPercentage": 0, "route": [ { - "x": 3239, - "y": 554.5 + "x": 537, + "y": 3300 }, { - "x": 4170, - "y": 554.5 + "x": 537, + "y": 4248 } ], "animated": false, @@ -1682,12 +1682,12 @@ "labelPercentage": 0, "route": [ { - "x": 2591.6666666666665, - "y": 406 + "x": 390.5, + "y": 2638.6666666666665 }, { - "x": 2617, - "y": 406 + "x": 390.5, + "y": 2662 } ], "animated": false, @@ -1721,12 +1721,20 @@ "labelPercentage": 0, "route": [ { - "x": 2740, - "y": 406 + "x": 390, + "y": 2788 }, { - "x": 3111.5, - "y": 406 + "x": 390, + "y": 2918 + }, + { + "x": 389.5, + "y": 2918 + }, + { + "x": 389.5, + "y": 3171.5 } ], "animated": false, @@ -1760,12 +1768,12 @@ "labelPercentage": 0, "route": [ { - "x": 3235.5, - "y": 406 + "x": 390, + "y": 3297.5 }, { - "x": 3259, - "y": 406 + "x": 390, + "y": 3320 } ], "animated": false, @@ -1799,20 +1807,20 @@ "labelPercentage": 0, "route": [ { - "x": 990, - "y": 387.5 + "x": 374.16666666666663, + "y": 1017 }, { - "x": 1120, - "y": 387.5 + "x": 374.16666666666663, + "y": 1147 }, { - "x": 1120, - "y": 185 + "x": 170.49999999999997, + "y": 1147 }, { - "x": 1464, - "y": 185 + "x": 170.49999999999997, + "y": 1503 } ], "animated": false, @@ -1846,12 +1854,12 @@ "labelPercentage": 0, "route": [ { - "x": 1582, - "y": 185 + "x": 170.5, + "y": 1629 }, { - "x": 1842, - "y": 185 + "x": 170.5, + "y": 1889 } ], "animated": false, @@ -1885,20 +1893,20 @@ "labelPercentage": 0, "route": [ { - "x": 1989.6666666666667, - "y": 512.5 + "x": 496.3333333333333, + "y": 2040 }, { - "x": 2095, - "y": 512.5 + "x": 496.3333333333333, + "y": 2145 }, { - "x": 2095, - "y": 227 + "x": 214.16666666666669, + "y": 2145 }, { - "x": 2145, - "y": 227 + "x": 214.16666666666669, + "y": 2195 } ], "animated": false, @@ -1932,12 +1940,12 @@ "labelPercentage": 0, "route": [ { - "x": 1965, - "y": 185 + "x": 170.5, + "y": 2015 }, { - "x": 2145, - "y": 185 + "x": 170.5, + "y": 2195 } ], "animated": false, @@ -1971,12 +1979,12 @@ "labelPercentage": 0, "route": [ { - "x": 2276, - "y": 185 + "x": 170.5, + "y": 2321 }, { - "x": 3229.6666666666665, - "y": 185 + "x": 170.5, + "y": 3294.6666666666665 } ], "animated": false, @@ -2010,28 +2018,28 @@ "labelPercentage": 0, "route": [ { - "x": 3353.6666666666665, - "y": 164 + "x": 149.83333333333331, + "y": 3420.6666666666665 }, { - "x": 3507, - "y": 164 + "x": 149.83333333333331, + "y": 3576 }, { - "x": 3507, - "y": 78 + "x": 63.666666666666664, + "y": 3576 }, { - "x": 4040, - "y": 78 + "x": 63.666666666666664, + "y": 4118 }, { - "x": 4040, - "y": 262.5 + "x": 252.5, + "y": 4118 }, { - "x": 4170, - "y": 262.5 + "x": 252.5, + "y": 4248 } ], "animated": false, @@ -2065,20 +2073,20 @@ "labelPercentage": 0, "route": [ { - "x": 3377, - "y": 406 + "x": 389.5, + "y": 3446 }, { - "x": 3507, - "y": 406 + "x": 389.5, + "y": 3576 }, { - "x": 3507, - "y": 248 + "x": 231.16666666666666, + "y": 3576 }, { - "x": 3637, - "y": 248 + "x": 231.16666666666666, + "y": 3706 } ], "animated": false, @@ -2112,12 +2120,12 @@ "labelPercentage": 0, "route": [ { - "x": 3353.6666666666665, - "y": 206 + "x": 191.16666666666666, + "y": 3420.6666666666665 }, { - "x": 3637, - "y": 206 + "x": 191.16666666666666, + "y": 3706 } ], "animated": false, @@ -2151,12 +2159,12 @@ "labelPercentage": 0, "route": [ { - "x": 3757, - "y": 227 + "x": 211.5, + "y": 3832 }, { - "x": 3777, - "y": 227 + "x": 211.5, + "y": 3852 } ], "animated": false, @@ -2190,20 +2198,20 @@ "labelPercentage": 0, "route": [ { - "x": 3900, - "y": 227 + "x": 211.16666666666666, + "y": 3978 }, { - "x": 4030, - "y": 227 + "x": 211.16666666666666, + "y": 4108 }, { - "x": 4030, - "y": 408.5 + "x": 394.5, + "y": 4108 }, { - "x": 4170.5, - "y": 408.5 + "x": 394.5, + "y": 4248 } ], "animated": false, @@ -2237,12 +2245,12 @@ "labelPercentage": 0, "route": [ { - "x": 4292.5, - "y": 408.5 + "x": 394.5, + "y": 4374 }, { - "x": 4473, - "y": 408.5 + "x": 394.5, + "y": 4554 } ], "animated": false, @@ -2276,20 +2284,20 @@ "labelPercentage": 0, "route": [ { - "x": 2276, - "y": 227 + "x": 214.16666666666669, + "y": 2321 }, { - "x": 2326, - "y": 227 + "x": 214.16666666666669, + "y": 2371 }, { - "x": 2326, - "y": 427 + "x": 410.5, + "y": 2371 }, { - "x": 2468.6666666666665, - "y": 427 + "x": 410.5, + "y": 2512.6666666666665 } ], "animated": false, diff --git a/e2etests/testdata/stable/large_arch/elk/board.exp.json b/e2etests/testdata/stable/large_arch/elk/board.exp.json index de1cf8958..84336e7e1 100644 --- a/e2etests/testdata/stable/large_arch/elk/board.exp.json +++ b/e2etests/testdata/stable/large_arch/elk/board.exp.json @@ -5,8 +5,8 @@ "id": "a", "type": "", "pos": { - "x": 528, - "y": 1728 + "x": 1657, + "y": 541 }, "width": 113, "height": 126, @@ -43,8 +43,8 @@ "id": "b", "type": "", "pos": { - "x": 528, - "y": 1582 + "x": 1524, + "y": 541 }, "width": 113, "height": 126, @@ -81,8 +81,8 @@ "id": "c", "type": "", "pos": { - "x": 2112, - "y": 604 + "x": 578, + "y": 2178 }, "width": 113, "height": 126, @@ -119,8 +119,8 @@ "id": "d", "type": "", "pos": { - "x": 2112, - "y": 750 + "x": 711, + "y": 2178 }, "width": 114, "height": 126, @@ -157,8 +157,8 @@ "id": "e", "type": "", "pos": { - "x": 2326, - "y": 750 + "x": 712, + "y": 2404 }, "width": 113, "height": 126, @@ -195,8 +195,8 @@ "id": "f", "type": "", "pos": { - "x": 2112, - "y": 458 + "x": 447, + "y": 2178 }, "width": 111, "height": 126, @@ -233,8 +233,8 @@ "id": "g", "type": "", "pos": { - "x": 2112, - "y": 955 + "x": 919, + "y": 2178 }, "width": 114, "height": 126, @@ -271,8 +271,8 @@ "id": "h", "type": "", "pos": { - "x": 1271, - "y": 1050 + "x": 1006, + "y": 1311 }, "width": 113, "height": 126, @@ -309,11 +309,11 @@ "id": "i", "type": "", "pos": { - "x": 1271, - "y": 237 + "x": 239, + "y": 1311 }, - "width": 706, - "height": 792, + "width": 746, + "height": 732, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -347,11 +347,11 @@ "id": "i.j", "type": "", "pos": { - "x": 1346, - "y": 532 + "x": 517, + "y": 1386 }, - "width": 263, - "height": 422, + "width": 392, + "height": 276, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -385,8 +385,8 @@ "id": "i.j.k", "type": "", "pos": { - "x": 1421, - "y": 607 + "x": 592, + "y": 1461 }, "width": 113, "height": 126, @@ -423,8 +423,8 @@ "id": "i.j.l", "type": "", "pos": { - "x": 1425, - "y": 753 + "x": 725, + "y": 1461 }, "width": 109, "height": 126, @@ -461,8 +461,8 @@ "id": "i.m", "type": "", "pos": { - "x": 1728, - "y": 458 + "x": 447, + "y": 1784 }, "width": 117, "height": 126, @@ -499,8 +499,8 @@ "id": "i.n", "type": "", "pos": { - "x": 1789, - "y": 312 + "x": 314, + "y": 1842 }, "width": 113, "height": 126, @@ -537,8 +537,8 @@ "id": "i.o", "type": "", "pos": { - "x": 1639, - "y": 678 + "x": 648, + "y": 1692 }, "width": 263, "height": 276, @@ -575,8 +575,8 @@ "id": "i.o.p", "type": "", "pos": { - "x": 1714, - "y": 753 + "x": 723, + "y": 1767 }, "width": 113, "height": 126, @@ -613,8 +613,8 @@ "id": "q", "type": "", "pos": { - "x": 2112, - "y": 312 + "x": 313, + "y": 2178 }, "width": 114, "height": 126, @@ -654,8 +654,8 @@ "x": 12, "y": 12 }, - "width": 1139, - "height": 1550, + "width": 1492, + "height": 1179, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -689,11 +689,11 @@ "id": "r.s", "type": "", "pos": { - "x": 386, - "y": 87 + "x": 87, + "y": 388 }, - "width": 553, - "height": 812, + "width": 767, + "height": 577, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -727,8 +727,8 @@ "id": "r.s.t", "type": "", "pos": { - "x": 658, - "y": 698 + "x": 669, + "y": 671 }, "width": 111, "height": 126, @@ -765,8 +765,8 @@ "id": "r.s.u", "type": "", "pos": { - "x": 595, - "y": 162 + "x": 162, + "y": 609 }, "width": 264, "height": 276, @@ -803,8 +803,8 @@ "id": "r.s.u.v", "type": "", "pos": { - "x": 670, - "y": 237 + "x": 237, + "y": 684 }, "width": 114, "height": 126, @@ -841,8 +841,8 @@ "id": "r.s.w", "type": "", "pos": { - "x": 671, - "y": 458 + "x": 446, + "y": 687 }, "width": 118, "height": 126, @@ -879,8 +879,8 @@ "id": "r.s.x", "type": "", "pos": { - "x": 462, - "y": 479 + "x": 467, + "y": 463 }, "width": 113, "height": 126, @@ -917,8 +917,8 @@ "id": "r.s.y", "type": "", "pos": { - "x": 461, - "y": 625 + "x": 600, + "y": 463 }, "width": 114, "height": 126, @@ -955,8 +955,8 @@ "id": "r.z", "type": "", "pos": { - "x": 964, - "y": 237 + "x": 238, + "y": 990 }, "width": 112, "height": 126, @@ -993,8 +993,8 @@ "id": "r.aa", "type": "", "pos": { - "x": 239, - "y": 584 + "x": 549, + "y": 237 }, "width": 122, "height": 126, @@ -1031,11 +1031,11 @@ "id": "r.bb", "type": "", "pos": { - "x": 87, - "y": 1065 + "x": 1014, + "y": 87 }, - "width": 274, - "height": 422, + "width": 415, + "height": 276, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1069,8 +1069,8 @@ "id": "r.bb.cc", "type": "", "pos": { - "x": 164, - "y": 1140 + "x": 1089, + "y": 162 }, "width": 121, "height": 126, @@ -1107,8 +1107,8 @@ "id": "r.bb.dd", "type": "", "pos": { - "x": 162, - "y": 1286 + "x": 1230, + "y": 162 }, "width": 124, "height": 126, @@ -1145,8 +1145,8 @@ "id": "r.ee", "type": "", "pos": { - "x": 239, - "y": 919 + "x": 872, + "y": 237 }, "width": 122, "height": 126, @@ -1183,8 +1183,8 @@ "id": "r.ff", "type": "", "pos": { - "x": 386, - "y": 919 + "x": 875, + "y": 388 }, "width": 117, "height": 126, @@ -1221,8 +1221,8 @@ "id": "r.gg", "type": "", "pos": { - "x": 238, - "y": 730 + "x": 691, + "y": 237 }, "width": 123, "height": 126, @@ -1283,20 +1283,20 @@ "labelPercentage": 0, "route": [ { - "x": 1534, - "y": 670 + "x": 648, + "y": 1587 }, { - "x": 1624, - "y": 670 + "x": 648, + "y": 1677 }, { - "x": 1624, - "y": 552.5 + "x": 534.75, + "y": 1677 }, { - "x": 1728.375, - "y": 552.5 + "x": 534.75, + "y": 1783.875 } ], "animated": false, @@ -1330,12 +1330,12 @@ "labelPercentage": 0, "route": [ { - "x": 1534, - "y": 816 + "x": 779, + "y": 1587 }, { - "x": 1714, - "y": 816 + "x": 779, + "y": 1767 } ], "animated": false, @@ -1369,28 +1369,28 @@ "labelPercentage": 0, "route": [ { - "x": 2112, - "y": 343.5 + "x": 341.5, + "y": 2178 }, { - "x": 2032, - "y": 343.5 + "x": 341.5, + "y": 2098 }, { - "x": 2032, - "y": 227 + "x": 228.5, + "y": 2098 }, { - "x": 1216, - "y": 227 + "x": 228.5, + "y": 1256 }, { - "x": 1216, - "y": 489.5 + "x": 475.75, + "y": 1256 }, { - "x": 1728.375, - "y": 489.5 + "x": 475.75, + "y": 1783.875 } ], "animated": false, @@ -1424,20 +1424,20 @@ "labelPercentage": 0, "route": [ { - "x": 1845.375, - "y": 479 + "x": 466, + "y": 1909.875 }, { - "x": 2032, - "y": 479 + "x": 466, + "y": 2098 }, { - "x": 2032, - "y": 406.5 + "x": 398.5, + "y": 2098 }, { - "x": 2112, - "y": 406.5 + "x": 398.5, + "y": 2178 } ], "animated": false, @@ -1471,12 +1471,12 @@ "labelPercentage": 0, "route": [ { - "x": 1902, - "y": 375 + "x": 370, + "y": 1968 }, { - "x": 2112, - "y": 375 + "x": 370, + "y": 2178 } ], "animated": false, @@ -1510,20 +1510,20 @@ "labelPercentage": 0, "route": [ { - "x": 1845.375, - "y": 521 + "x": 505, + "y": 1909.875 }, { - "x": 2052, - "y": 521 + "x": 505, + "y": 2118 }, { - "x": 2052, - "y": 667 + "x": 634.5, + "y": 2118 }, { - "x": 2112, - "y": 667 + "x": 634.5, + "y": 2178 } ], "animated": false, @@ -1557,20 +1557,20 @@ "labelPercentage": 0, "route": [ { - "x": 1845.375, - "y": 542 + "x": 524.5, + "y": 1909.875 }, { - "x": 2042, - "y": 542 + "x": 524.5, + "y": 2108 }, { - "x": 2042, - "y": 813 + "x": 768, + "y": 2108 }, { - "x": 2112, - "y": 813 + "x": 768, + "y": 2178 } ], "animated": false, @@ -1604,20 +1604,20 @@ "labelPercentage": 0, "route": [ { - "x": 1845.375, - "y": 563 + "x": 544, + "y": 1909.875 }, { - "x": 2032, - "y": 563 + "x": 544, + "y": 2098 }, { - "x": 2032, - "y": 997 + "x": 957, + "y": 2098 }, { - "x": 2112, - "y": 997 + "x": 957, + "y": 2178 } ], "animated": false, @@ -1651,20 +1651,20 @@ "labelPercentage": 0, "route": [ { - "x": 1845.375, - "y": 500 + "x": 485.5, + "y": 1909.875 }, { - "x": 2062, - "y": 500 + "x": 485.5, + "y": 2128 }, { - "x": 2062, - "y": 521 + "x": 502.5, + "y": 2128 }, { - "x": 2112, - "y": 521 + "x": 502.5, + "y": 2178 } ], "animated": false, @@ -1698,12 +1698,12 @@ "labelPercentage": 0, "route": [ { - "x": 2226, - "y": 813 + "x": 768, + "y": 2304 }, { - "x": 2326, - "y": 813 + "x": 768, + "y": 2404 } ], "animated": false, @@ -1737,20 +1737,20 @@ "labelPercentage": 0, "route": [ { - "x": 575, - "y": 563 + "x": 542.6666666666666, + "y": 589 }, { - "x": 585, - "y": 563 + "x": 542.6666666666666, + "y": 599 }, { - "x": 585, - "y": 729.5 + "x": 696.5833333333333, + "y": 599 }, { - "x": 658.2, - "y": 729.5 + "x": 696.5833333333333, + "y": 671 } ], "animated": false, @@ -1784,12 +1784,12 @@ "labelPercentage": 0, "route": [ { - "x": 575, - "y": 521 + "x": 505, + "y": 589 }, { - "x": 670.5, - "y": 521 + "x": 505, + "y": 686.5 } ], "animated": false, @@ -1823,12 +1823,12 @@ "labelPercentage": 0, "route": [ { - "x": 361, - "y": 792.5 + "x": 752.0833333333333, + "y": 363 }, { - "x": 658.2, - "y": 792.5 + "x": 752.0833333333333, + "y": 671 } ], "animated": false, @@ -1862,12 +1862,12 @@ "labelPercentage": 0, "route": [ { - "x": 784, - "y": 300 + "x": 294, + "y": 810 }, { - "x": 964, - "y": 300 + "x": 294, + "y": 990 } ], "animated": false, @@ -1901,20 +1901,20 @@ "labelPercentage": 0, "route": [ { - "x": 361, - "y": 646.5 + "x": 609.5833333333333, + "y": 363 }, { - "x": 371, - "y": 646.5 + "x": 609.5833333333333, + "y": 373 }, { - "x": 371, - "y": 761 + "x": 724.3333333333333, + "y": 373 }, { - "x": 658.2, - "y": 761 + "x": 724.3333333333333, + "y": 671 } ], "animated": false, @@ -1948,12 +1948,12 @@ "labelPercentage": 0, "route": [ { - "x": 788.5, - "y": 521 + "x": 505, + "y": 812.5 }, { - "x": 1728.375, - "y": 521 + "x": 505, + "y": 1783.875 } ], "animated": false, @@ -1987,20 +1987,20 @@ "labelPercentage": 0, "route": [ { - "x": 769.2, - "y": 740 + "x": 705.8333333333333, + "y": 797 }, { - "x": 1216, - "y": 740 + "x": 705.8333333333333, + "y": 1256 }, { - "x": 1216, - "y": 1039 + "x": 995, + "y": 1256 }, { - "x": 2112, - "y": 1039 + "x": 995, + "y": 2178 } ], "animated": false, @@ -2034,20 +2034,20 @@ "labelPercentage": 0, "route": [ { - "x": 769.2, - "y": 782 + "x": 742.8333333333333, + "y": 797 }, { - "x": 1206, - "y": 782 + "x": 742.8333333333333, + "y": 1246 }, { - "x": 1206, - "y": 1113 + "x": 1062.5, + "y": 1246 }, { - "x": 1271, - "y": 1113 + "x": 1062.5, + "y": 1311 } ], "animated": false, @@ -2081,12 +2081,12 @@ "labelPercentage": 0, "route": [ { - "x": 361, - "y": 982 + "x": 933.3333333333333, + "y": 363 }, { - "x": 386, - "y": 982 + "x": 933.3333333333333, + "y": 388 } ], "animated": false, diff --git a/e2etests/testdata/stable/one_container_loop/elk/board.exp.json b/e2etests/testdata/stable/one_container_loop/elk/board.exp.json index 727b05b40..2004579dd 100644 --- a/e2etests/testdata/stable/one_container_loop/elk/board.exp.json +++ b/e2etests/testdata/stable/one_container_loop/elk/board.exp.json @@ -8,8 +8,8 @@ "x": 12, "y": 12 }, - "width": 263, - "height": 422, + "width": 396, + "height": 276, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -43,8 +43,8 @@ "id": "a.b", "type": "", "pos": { - "x": 87, - "y": 233 + "x": 220, + "y": 87 }, "width": 113, "height": 126, @@ -81,8 +81,8 @@ "id": "c", "type": "", "pos": { - "x": 1021, - "y": 223 + "x": 209, + "y": 1071 }, "width": 113, "height": 126, @@ -119,8 +119,8 @@ "id": "d", "type": "", "pos": { - "x": 807, - "y": 223 + "x": 209, + "y": 845 }, "width": 114, "height": 126, @@ -157,8 +157,8 @@ "id": "e", "type": "", "pos": { - "x": 594, - "y": 77 + "x": 77, + "y": 619 }, "width": 113, "height": 126, @@ -195,8 +195,8 @@ "id": "f", "type": "", "pos": { - "x": 595, - "y": 223 + "x": 210, + "y": 619 }, "width": 111, "height": 126, @@ -233,8 +233,8 @@ "id": "g", "type": "", "pos": { - "x": 380, - "y": 223 + "x": 209, + "y": 393 }, "width": 114, "height": 126, @@ -333,28 +333,28 @@ "labelPercentage": 0, "route": [ { - "x": 200, - "y": 296 + "x": 276.5, + "y": 213 }, { - "x": 330, - "y": 296 + "x": 276.5, + "y": 343 }, { - "x": 330, - "y": 359 + "x": 332.5, + "y": 343 }, { - "x": 971, - "y": 359 + "x": 332.5, + "y": 1021 }, { - "x": 971, - "y": 317.5 + "x": 293.75, + "y": 1021 }, { - "x": 1021, - "y": 317.5 + "x": 293.75, + "y": 1071 } ], "animated": false, @@ -388,12 +388,12 @@ "labelPercentage": 0, "route": [ { - "x": 921, - "y": 286 + "x": 265.5, + "y": 971 }, { - "x": 1021, - "y": 286 + "x": 265.5, + "y": 1071 } ], "animated": false, @@ -427,20 +427,20 @@ "labelPercentage": 0, "route": [ { - "x": 707, - "y": 140 + "x": 133.5, + "y": 745 }, { - "x": 971, - "y": 140 + "x": 133.5, + "y": 1021 }, { - "x": 971, - "y": 254.5 + "x": 237.25, + "y": 1021 }, { - "x": 1021, - "y": 254.5 + "x": 237.25, + "y": 1071 } ], "animated": false, @@ -474,12 +474,12 @@ "labelPercentage": 0, "route": [ { - "x": 706, - "y": 286 + "x": 265.5, + "y": 745 }, { - "x": 807, - "y": 286 + "x": 265.5, + "y": 845 } ], "animated": false, @@ -513,12 +513,12 @@ "labelPercentage": 0, "route": [ { - "x": 275, - "y": 140 + "x": 133.5, + "y": 288 }, { - "x": 594, - "y": 140 + "x": 133.5, + "y": 619 } ], "animated": false, @@ -552,12 +552,12 @@ "labelPercentage": 0, "route": [ { - "x": 494, - "y": 286 + "x": 265.5, + "y": 519 }, { - "x": 595, - "y": 286 + "x": 265.5, + "y": 619 } ], "animated": false, @@ -591,20 +591,20 @@ "labelPercentage": 0, "route": [ { - "x": 200, - "y": 150 + "x": 143.5, + "y": 213 }, { - "x": 330, - "y": 150 + "x": 143.5, + "y": 343 }, { - "x": 330, - "y": 286 + "x": 265.5, + "y": 343 }, { - "x": 380, - "y": 286 + "x": 265.5, + "y": 393 } ], "animated": false, diff --git a/e2etests/testdata/stable/straight_hierarchy_container/elk/board.exp.json b/e2etests/testdata/stable/straight_hierarchy_container/elk/board.exp.json index aae43f08d..f2ff75d3d 100644 --- a/e2etests/testdata/stable/straight_hierarchy_container/elk/board.exp.json +++ b/e2etests/testdata/stable/straight_hierarchy_container/elk/board.exp.json @@ -5,8 +5,8 @@ "id": "a", "type": "", "pos": { - "x": 12, - "y": 308 + "x": 295, + "y": 12 }, "width": 113, "height": 126, @@ -43,8 +43,8 @@ "id": "c", "type": "", "pos": { - "x": 12, - "y": 162 + "x": 162, + "y": 12 }, "width": 113, "height": 126, @@ -81,8 +81,8 @@ "id": "b", "type": "", "pos": { - "x": 12, - "y": 454 + "x": 428, + "y": 12 }, "width": 113, "height": 126, @@ -119,11 +119,11 @@ "id": "l1", "type": "", "pos": { - "x": 230, - "y": 87 + "x": 87, + "y": 243 }, - "width": 263, - "height": 568, + "width": 529, + "height": 276, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -157,8 +157,8 @@ "id": "l1.b", "type": "", "pos": { - "x": 305, - "y": 454 + "x": 428, + "y": 318 }, "width": 113, "height": 126, @@ -195,8 +195,8 @@ "id": "l1.a", "type": "", "pos": { - "x": 305, - "y": 308 + "x": 295, + "y": 318 }, "width": 113, "height": 126, @@ -233,8 +233,8 @@ "id": "l1.c", "type": "", "pos": { - "x": 305, - "y": 162 + "x": 162, + "y": 318 }, "width": 113, "height": 126, @@ -271,8 +271,8 @@ "id": "l2c1", "type": "", "pos": { - "x": 613, - "y": 383 + "x": 370, + "y": 639 }, "width": 263, "height": 276, @@ -309,8 +309,8 @@ "id": "l2c1.a", "type": "", "pos": { - "x": 688, - "y": 458 + "x": 445, + "y": 714 }, "width": 113, "height": 126, @@ -347,8 +347,8 @@ "id": "l2c3", "type": "", "pos": { - "x": 613, - "y": 87 + "x": 87, + "y": 639 }, "width": 263, "height": 276, @@ -385,8 +385,8 @@ "id": "l2c3.c", "type": "", "pos": { - "x": 688, - "y": 162 + "x": 162, + "y": 714 }, "width": 113, "height": 126, @@ -423,8 +423,8 @@ "id": "l2c2", "type": "", "pos": { - "x": 613, - "y": 679 + "x": 653, + "y": 639 }, "width": 263, "height": 276, @@ -461,8 +461,8 @@ "id": "l2c2.b", "type": "", "pos": { - "x": 688, - "y": 754 + "x": 728, + "y": 714 }, "width": 113, "height": 126, @@ -499,11 +499,11 @@ "id": "l3c1", "type": "", "pos": { - "x": 986, - "y": 383 + "x": 370, + "y": 1025 }, - "width": 263, - "height": 422, + "width": 396, + "height": 276, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -537,8 +537,8 @@ "id": "l3c1.a", "type": "", "pos": { - "x": 1061, - "y": 458 + "x": 445, + "y": 1100 }, "width": 113, "height": 126, @@ -575,8 +575,8 @@ "id": "l3c1.b", "type": "", "pos": { - "x": 1061, - "y": 604 + "x": 578, + "y": 1100 }, "width": 113, "height": 126, @@ -613,8 +613,8 @@ "id": "l3c2", "type": "", "pos": { - "x": 986, - "y": 87 + "x": 87, + "y": 1025 }, "width": 263, "height": 276, @@ -651,8 +651,8 @@ "id": "l3c2.c", "type": "", "pos": { - "x": 1061, - "y": 162 + "x": 162, + "y": 1100 }, "width": 113, "height": 126, @@ -689,11 +689,11 @@ "id": "l4", "type": "", "pos": { - "x": 1359, - "y": 12 + "x": 12, + "y": 1411 }, - "width": 418, - "height": 1018, + "width": 979, + "height": 431, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -727,8 +727,8 @@ "id": "l4.c1", "type": "", "pos": { - "x": 1439, - "y": 383 + "x": 370, + "y": 1491 }, "width": 263, "height": 276, @@ -765,8 +765,8 @@ "id": "l4.c1.a", "type": "", "pos": { - "x": 1514, - "y": 458 + "x": 445, + "y": 1566 }, "width": 113, "height": 126, @@ -803,8 +803,8 @@ "id": "l4.c2", "type": "", "pos": { - "x": 1439, - "y": 679 + "x": 653, + "y": 1491 }, "width": 263, "height": 276, @@ -841,8 +841,8 @@ "id": "l4.c2.b", "type": "", "pos": { - "x": 1514, - "y": 754 + "x": 728, + "y": 1566 }, "width": 113, "height": 126, @@ -879,8 +879,8 @@ "id": "l4.c3", "type": "", "pos": { - "x": 1439, - "y": 87 + "x": 87, + "y": 1491 }, "width": 263, "height": 276, @@ -917,8 +917,8 @@ "id": "l4.c3.c", "type": "", "pos": { - "x": 1514, - "y": 162 + "x": 162, + "y": 1566 }, "width": 113, "height": 126, @@ -979,12 +979,12 @@ "labelPercentage": 0, "route": [ { - "x": 125, - "y": 517 + "x": 484.5, + "y": 138 }, { - "x": 305, - "y": 517 + "x": 484.5, + "y": 318 } ], "animated": false, @@ -1018,12 +1018,12 @@ "labelPercentage": 0, "route": [ { - "x": 125, - "y": 371 + "x": 351.5, + "y": 138 }, { - "x": 305, - "y": 371 + "x": 351.5, + "y": 318 } ], "animated": false, @@ -1057,12 +1057,12 @@ "labelPercentage": 0, "route": [ { - "x": 125, - "y": 225 + "x": 218.5, + "y": 138 }, { - "x": 305, - "y": 225 + "x": 218.5, + "y": 318 } ], "animated": false, @@ -1096,20 +1096,20 @@ "labelPercentage": 0, "route": [ { - "x": 418, - "y": 371 + "x": 351.5, + "y": 444 }, { - "x": 558, - "y": 371 + "x": 351.5, + "y": 584 }, { - "x": 558, - "y": 521 + "x": 501.5, + "y": 584 }, { - "x": 688, - "y": 521 + "x": 501.5, + "y": 714 } ], "animated": false, @@ -1143,12 +1143,12 @@ "labelPercentage": 0, "route": [ { - "x": 418, - "y": 225 + "x": 218.5, + "y": 444 }, { - "x": 688, - "y": 225 + "x": 218.5, + "y": 714 } ], "animated": false, @@ -1182,20 +1182,20 @@ "labelPercentage": 0, "route": [ { - "x": 418, - "y": 517 + "x": 484.5, + "y": 444 }, { - "x": 548, - "y": 517 + "x": 484.5, + "y": 574 }, { - "x": 548, - "y": 817 + "x": 784.5, + "y": 574 }, { - "x": 688, - "y": 817 + "x": 784.5, + "y": 714 } ], "animated": false, @@ -1229,12 +1229,12 @@ "labelPercentage": 0, "route": [ { - "x": 801, - "y": 521 + "x": 501.5, + "y": 840 }, { - "x": 1061, - "y": 521 + "x": 501.5, + "y": 1100 } ], "animated": false, @@ -1268,20 +1268,20 @@ "labelPercentage": 0, "route": [ { - "x": 801, - "y": 817 + "x": 784.5, + "y": 840 }, { - "x": 931, - "y": 817 + "x": 784.5, + "y": 970 }, { - "x": 931, - "y": 667 + "x": 634.5, + "y": 970 }, { - "x": 1061, - "y": 667 + "x": 634.5, + "y": 1100 } ], "animated": false, @@ -1315,12 +1315,12 @@ "labelPercentage": 0, "route": [ { - "x": 801, - "y": 225 + "x": 218.5, + "y": 840 }, { - "x": 1061, - "y": 225 + "x": 218.5, + "y": 1100 } ], "animated": false, @@ -1354,12 +1354,12 @@ "labelPercentage": 0, "route": [ { - "x": 1174, - "y": 521 + "x": 501.5, + "y": 1226 }, { - "x": 1514, - "y": 521 + "x": 501.5, + "y": 1566 } ], "animated": false, @@ -1393,20 +1393,20 @@ "labelPercentage": 0, "route": [ { - "x": 1174, - "y": 667 + "x": 634.5, + "y": 1226 }, { - "x": 1304, - "y": 667 + "x": 634.5, + "y": 1356 }, { - "x": 1304, - "y": 817 + "x": 784.5, + "y": 1356 }, { - "x": 1514, - "y": 817 + "x": 784.5, + "y": 1566 } ], "animated": false, @@ -1440,12 +1440,12 @@ "labelPercentage": 0, "route": [ { - "x": 1174, - "y": 225 + "x": 218.5, + "y": 1226 }, { - "x": 1514, - "y": 225 + "x": 218.5, + "y": 1566 } ], "animated": false, diff --git a/e2etests/testdata/stable/transparent_3d/dagre/board.exp.json b/e2etests/testdata/stable/transparent_3d/dagre/board.exp.json index ce7e26c0c..5e26d64b9 100644 --- a/e2etests/testdata/stable/transparent_3d/dagre/board.exp.json +++ b/e2etests/testdata/stable/transparent_3d/dagre/board.exp.json @@ -10,7 +10,6 @@ }, "width": 139, "height": 126, - "level": 1, "opacity": 0.5, "strokeDash": 0, "strokeWidth": 7, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 39, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 1 } ], "connections": [] diff --git a/e2etests/testdata/stable/transparent_3d/elk/board.exp.json b/e2etests/testdata/stable/transparent_3d/elk/board.exp.json index af5b43a50..f44e41856 100644 --- a/e2etests/testdata/stable/transparent_3d/elk/board.exp.json +++ b/e2etests/testdata/stable/transparent_3d/elk/board.exp.json @@ -10,7 +10,6 @@ }, "width": 139, "height": 126, - "level": 1, "opacity": 0.5, "strokeDash": 0, "strokeWidth": 7, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 39, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 1 } ], "connections": [] diff --git a/e2etests/testdata/todo/container_child_edge/elk/board.exp.json b/e2etests/testdata/todo/container_child_edge/elk/board.exp.json index be1f60856..76ea3356d 100644 --- a/e2etests/testdata/todo/container_child_edge/elk/board.exp.json +++ b/e2etests/testdata/todo/container_child_edge/elk/board.exp.json @@ -8,8 +8,8 @@ "x": 12, "y": 12 }, - "width": 509, - "height": 321, + "width": 336, + "height": 463, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -43,8 +43,8 @@ "id": "container.first", "type": "", "pos": { - "x": 87, - "y": 132 + "x": 138, + "y": 87 }, "width": 135, "height": 126, @@ -81,8 +81,8 @@ "id": "container.second", "type": "", "pos": { - "x": 291, - "y": 111 + "x": 102, + "y": 274 }, "width": 155, "height": 126, @@ -143,12 +143,12 @@ "labelPercentage": 0, "route": [ { - "x": 222, - "y": 195 + "x": 205.5, + "y": 213 }, { - "x": 291, - "y": 195 + "x": 205.5, + "y": 274 } ], "animated": false, @@ -182,20 +182,20 @@ "labelPercentage": 0, "route": [ { - "x": 12, - "y": 111 + "x": 117, + "y": 12 }, { - "x": 281, - "y": 111 + "x": 117, + "y": 264 }, { - "x": 281, - "y": 153 + "x": 153.83333333333334, + "y": 264 }, { - "x": 291, - "y": 153 + "x": 153.83333333333334, + "y": 274 } ], "animated": false, From 684b72eb5aa700af78ecc378b76079b1fdaf0272 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BAlio=20C=C3=A9sar=20Batista?= Date: Wed, 30 Nov 2022 11:22:43 -0800 Subject: [PATCH 07/19] Change sorting order to be multi level --- d2exporter/export.go | 21 +++------ d2graph/d2graph.go | 4 +- d2renderers/d2svg/d2svg.go | 32 +++++++++++-- d2renderers/d2svg/d2svg_test.go | 79 +++++++++++++++++++++++++++++++++ d2target/d2target.go | 10 +++++ 5 files changed, 125 insertions(+), 21 deletions(-) create mode 100644 d2renderers/d2svg/d2svg_test.go diff --git a/d2exporter/export.go b/d2exporter/export.go index 8f9331263..3a1274f89 100644 --- a/d2exporter/export.go +++ b/d2exporter/export.go @@ -8,7 +8,6 @@ import ( "oss.terrastruct.com/d2/d2target" "oss.terrastruct.com/d2/d2themes" "oss.terrastruct.com/d2/d2themes/d2themescatalog" - "oss.terrastruct.com/d2/lib/go2" ) func Export(ctx context.Context, g *d2graph.Graph, themeID int64) (*d2target.Diagram, error) { @@ -17,16 +16,13 @@ func Export(ctx context.Context, g *d2graph.Graph, themeID int64) (*d2target.Dia diagram := d2target.NewDiagram() diagram.Shapes = make([]d2target.Shape, len(g.Objects)) - maxObjectZIndex := 0 for i := range g.Objects { diagram.Shapes[i] = toShape(g.Objects[i], &theme) - maxObjectZIndex = go2.IntMax(maxObjectZIndex, diagram.Shapes[i].ZIndex) } - edgeDefaultZIndex := maxObjectZIndex + 1 diagram.Connections = make([]d2target.Connection, len(g.Edges)) for i := range g.Edges { - diagram.Connections[i] = toConnection(g.Edges[i], &theme, edgeDefaultZIndex) + diagram.Connections[i] = toConnection(g.Edges[i], &theme) } return diagram, nil @@ -92,11 +88,8 @@ func toShape(obj *d2graph.Object, theme *d2themes.Theme) d2target.Shape { shape := d2target.BaseShape() shape.SetType(obj.Attributes.Shape.Value) shape.ID = obj.AbsID() - if obj.ZIndex == nil { - shape.ZIndex = int(obj.Level()) - } else { - shape.ZIndex = *obj.ZIndex - } + shape.ZIndex = obj.ZIndex + shape.Level = int(obj.Level()) shape.Pos = d2target.NewPoint(int(obj.TopLeft.X), int(obj.TopLeft.Y)) shape.Width = int(obj.Width) shape.Height = int(obj.Height) @@ -138,14 +131,10 @@ func toShape(obj *d2graph.Object, theme *d2themes.Theme) d2target.Shape { return *shape } -func toConnection(edge *d2graph.Edge, theme *d2themes.Theme, defaultZIndex int) d2target.Connection { +func toConnection(edge *d2graph.Edge, theme *d2themes.Theme) d2target.Connection { connection := d2target.BaseConnection() connection.ID = edge.AbsID() - if edge.ZIndex == nil { - connection.ZIndex = defaultZIndex - } else { - connection.ZIndex = *edge.ZIndex - } + connection.ZIndex = edge.ZIndex // edge.Edge.ID = go2.StringToIntHash(connection.ID) text := edge.Text() diff --git a/d2graph/d2graph.go b/d2graph/d2graph.go index 5a00b2b75..c8f50330b 100644 --- a/d2graph/d2graph.go +++ b/d2graph/d2graph.go @@ -79,7 +79,7 @@ type Object struct { Attributes Attributes `json:"attributes"` - ZIndex *int `json:"zIndex,omitempty"` + ZIndex int `json:"zIndex"` } type Attributes struct { @@ -633,7 +633,7 @@ type Edge struct { References []EdgeReference `json:"references,omitempty"` Attributes Attributes `json:"attributes"` - ZIndex *int `json:"zIndex,omitempty"` + ZIndex int `json:"zIndex"` } type EdgeReference struct { diff --git a/d2renderers/d2svg/d2svg.go b/d2renderers/d2svg/d2svg.go index 84bbd2f15..c81a75f81 100644 --- a/d2renderers/d2svg/d2svg.go +++ b/d2renderers/d2svg/d2svg.go @@ -993,9 +993,7 @@ func Render(diagram *d2target.Diagram) ([]byte, error) { allObjects = append(allObjects, c) } - sort.SliceStable(allObjects, func(i, j int) bool { - return allObjects[i].GetZIndex() < allObjects[j].GetZIndex() - }) + sortObjects(allObjects) markers := map[string]struct{}{} for _, obj := range allObjects { @@ -1017,6 +1015,34 @@ func Render(diagram *d2target.Diagram) ([]byte, error) { return buf.Bytes(), nil } +// sortObjects sorts all diagrams objects (shapes and connections) in the desired drawing order +// the sorting criteria is: +// 1. zIndex, lower comes first +// 2. two shapes with the same zIndex are sorted by their level (container nesting), containers come first +// 3. two shapes with the same zIndex and same level, are sorted in the order they were exported +// 4. shape and edge, shapes come first +func sortObjects(allObjects []d2target.DiagramObject) { + sort.SliceStable(allObjects, func(i, j int) bool { + // first sort by zIndex + iZIndex := allObjects[i].GetZIndex() + jZIndex := allObjects[j].GetZIndex() + if iZIndex != jZIndex { + return iZIndex < jZIndex + } + + // then, if both are shapes, the containers come first + iShape, iIsShape := allObjects[i].(d2target.Shape) + jShape, jIsShape := allObjects[j].(d2target.Shape) + if iIsShape && jIsShape { + return iShape.Level < jShape.Level + } + + // then, shapes come before connections + _, jIsConnection := allObjects[j].(d2target.Connection) + return iIsShape && jIsConnection + }) +} + func hash(s string) string { const secret = "lalalas" h := fnv.New32a() diff --git a/d2renderers/d2svg/d2svg_test.go b/d2renderers/d2svg/d2svg_test.go new file mode 100644 index 000000000..8e6ed0277 --- /dev/null +++ b/d2renderers/d2svg/d2svg_test.go @@ -0,0 +1,79 @@ +package d2svg + +import ( + "testing" + + "oss.terrastruct.com/d2/d2target" +) + +func TestSortObjects(t *testing.T) { + allObjects := []d2target.DiagramObject{ + // same zIndex and level, should keep in this order + d2target.Shape{ + ID: "0", + ZIndex: 0, + Level: 0, + }, + d2target.Shape{ + ID: "1", + ZIndex: 0, + Level: 0, + }, + // same zIndex, different level, should be swapped + d2target.Shape{ + ID: "2", + ZIndex: 0, + Level: 1, + }, + d2target.Shape{ + ID: "3", + ZIndex: 0, + Level: 0, + }, + // different zIndex, should come after connections + d2target.Shape{ + ID: "4", + ZIndex: 1, + Level: 0, + }, + // connections come after shapes + d2target.Connection{ + ID: "5", + ZIndex: 0, + }, + d2target.Connection{ + ID: "6", + ZIndex: 0, + }, + // this should be last object + d2target.Connection{ + ID: "7", + ZIndex: 2, + }, + // this should be the first object + d2target.Connection{ + ID: "8", + ZIndex: -1, + }, + } + + expectedOrder := []d2target.DiagramObject{ + allObjects[8], + allObjects[0], + allObjects[1], + allObjects[3], + allObjects[2], + allObjects[5], + allObjects[6], + allObjects[4], + allObjects[7], + } + + sortObjects(allObjects) + + for i := 0; i < len(allObjects); i++ { + if allObjects[i].GetID() != expectedOrder[i].GetID() { + t.Fatalf("object order differs at index %d, got '%s' expected '%s'", i, allObjects[i].GetID(), expectedOrder[i].GetID()) + } + } +} diff --git a/d2target/d2target.go b/d2target/d2target.go index 2a50a6aa4..dd386c72d 100644 --- a/d2target/d2target.go +++ b/d2target/d2target.go @@ -18,6 +18,7 @@ const ( ) type DiagramObject interface { + GetID() string GetZIndex() int } @@ -122,6 +123,7 @@ type Shape struct { LabelPosition string `json:"labelPosition,omitempty"` ZIndex int `json:"zIndex"` + Level int `json:"level"` } func (s *Shape) SetType(t string) { @@ -139,6 +141,10 @@ func (s Shape) GetZIndex() int { return s.ZIndex } +func (s Shape) GetID() string { + return s.ID +} + type Text struct { Label string `json:"label"` FontSize int `json:"fontSize"` @@ -225,6 +231,10 @@ func (c Connection) GetZIndex() int { return c.ZIndex } +func (c Connection) GetID() string { + return c.ID +} + type Arrowhead string const ( From abcfa7cb2456ae0e0a79c7adcde90b37359bc6b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BAlio=20C=C3=A9sar=20Batista?= Date: Wed, 30 Nov 2022 11:23:30 -0800 Subject: [PATCH 08/19] Update tests --- .../sanity/1_to_2/dagre/board.exp.json | 13 +- .../testdata/sanity/1_to_2/elk/board.exp.json | 13 +- .../sanity/basic/dagre/board.exp.json | 8 +- .../testdata/sanity/basic/elk/board.exp.json | 8 +- .../child_to_child/dagre/board.exp.json | 14 +- .../sanity/child_to_child/elk/board.exp.json | 14 +- .../connection_label/dagre/board.exp.json | 8 +- .../connection_label/elk/board.exp.json | 8 +- .../stable/all_shapes/dagre/board.exp.json | 73 ++-- .../stable/all_shapes/elk/board.exp.json | 73 ++-- .../all_shapes_multiple/dagre/board.exp.json | 73 ++-- .../all_shapes_multiple/elk/board.exp.json | 73 ++-- .../all_shapes_shadow/dagre/board.exp.json | 73 ++-- .../all_shapes_shadow/elk/board.exp.json | 73 ++-- .../arrowhead_adjustment/dagre/board.exp.json | 22 +- .../arrowhead_adjustment/elk/board.exp.json | 22 +- .../arrowhead_labels/dagre/board.exp.json | 8 +- .../arrowhead_labels/elk/board.exp.json | 8 +- .../stable/binary_tree/dagre/board.exp.json | 73 ++-- .../stable/binary_tree/elk/board.exp.json | 73 ++-- .../stable/chaos1/dagre/board.exp.json | 19 +- .../testdata/stable/chaos1/elk/board.exp.json | 19 +- .../stable/chaos2/dagre/board.exp.json | 67 ++-- .../testdata/stable/chaos2/elk/board.exp.json | 67 ++-- .../child_parent_edges/dagre/board.exp.json | 18 +- .../child_parent_edges/elk/board.exp.json | 18 +- .../circular_dependency/dagre/board.exp.json | 17 +- .../circular_dependency/elk/board.exp.json | 17 +- .../stable/class/dagre/board.exp.json | 3 +- .../testdata/stable/class/elk/board.exp.json | 3 +- .../stable/code_snippet/dagre/board.exp.json | 13 +- .../stable/code_snippet/elk/board.exp.json | 13 +- .../connected_container/dagre/board.exp.json | 25 +- .../connected_container/elk/board.exp.json | 25 +- .../container_edges/dagre/board.exp.json | 36 +- .../stable/container_edges/elk/board.exp.json | 36 +- .../stable/dense/dagre/board.exp.json | 99 +++-- .../testdata/stable/dense/elk/board.exp.json | 99 +++-- .../different_subgraphs/dagre/board.exp.json | 102 +++-- .../different_subgraphs/elk/board.exp.json | 102 +++-- .../stable/direction/dagre/board.exp.json | 69 ++-- .../stable/direction/elk/board.exp.json | 69 ++-- .../stable/font_colors/dagre/board.exp.json | 8 +- .../stable/font_colors/elk/board.exp.json | 8 +- .../giant_markdown_test/dagre/board.exp.json | 13 +- .../giant_markdown_test/elk/board.exp.json | 13 +- .../testdata/stable/hr/dagre/board.exp.json | 13 +- .../testdata/stable/hr/elk/board.exp.json | 13 +- .../stable/images/dagre/board.exp.json | 8 +- .../testdata/stable/images/elk/board.exp.json | 8 +- .../stable/investigate/dagre/board.exp.json | 145 ++++--- .../stable/investigate/elk/board.exp.json | 145 ++++--- .../stable/large_arch/dagre/board.exp.json | 137 ++++--- .../stable/large_arch/elk/board.exp.json | 137 ++++--- .../stable/latex/dagre/board.exp.json | 30 +- .../testdata/stable/latex/elk/board.exp.json | 30 +- .../testdata/stable/li1/dagre/board.exp.json | 13 +- .../testdata/stable/li1/elk/board.exp.json | 13 +- .../testdata/stable/li2/dagre/board.exp.json | 13 +- .../testdata/stable/li2/elk/board.exp.json | 13 +- .../testdata/stable/li3/dagre/board.exp.json | 13 +- .../testdata/stable/li3/elk/board.exp.json | 13 +- .../testdata/stable/li4/dagre/board.exp.json | 13 +- .../testdata/stable/li4/elk/board.exp.json | 13 +- .../stable/lone_h1/dagre/board.exp.json | 13 +- .../stable/lone_h1/elk/board.exp.json | 13 +- .../stable/markdown/dagre/board.exp.json | 13 +- .../stable/markdown/elk/board.exp.json | 13 +- .../md_2space_newline/dagre/board.exp.json | 6 +- .../md_2space_newline/elk/board.exp.json | 6 +- .../md_backslash_newline/dagre/board.exp.json | 6 +- .../md_backslash_newline/elk/board.exp.json | 6 +- .../md_code_block_fenced/dagre/board.exp.json | 13 +- .../md_code_block_fenced/elk/board.exp.json | 13 +- .../dagre/board.exp.json | 13 +- .../md_code_block_indented/elk/board.exp.json | 13 +- .../md_code_inline/dagre/board.exp.json | 13 +- .../stable/md_code_inline/elk/board.exp.json | 13 +- .../multiline_text/dagre/board.exp.json | 3 +- .../stable/multiline_text/elk/board.exp.json | 3 +- .../multiple_trees/dagre/board.exp.json | 113 +++--- .../stable/multiple_trees/elk/board.exp.json | 113 +++--- .../stable/n22_e32/dagre/board.exp.json | 129 +++--- .../stable/n22_e32/elk/board.exp.json | 129 +++--- .../one_container_loop/dagre/board.exp.json | 38 +- .../one_container_loop/elk/board.exp.json | 38 +- .../dagre/board.exp.json | 33 +- .../elk/board.exp.json | 33 +- .../testdata/stable/p/dagre/board.exp.json | 13 +- e2etests/testdata/stable/p/elk/board.exp.json | 13 +- .../testdata/stable/pre/dagre/board.exp.json | 13 +- .../testdata/stable/pre/elk/board.exp.json | 13 +- .../stable/sql_tables/dagre/board.exp.json | 18 +- .../stable/sql_tables/elk/board.exp.json | 18 +- .../stable/square_3d/dagre/board.exp.json | 8 +- .../stable/square_3d/elk/board.exp.json | 8 +- .../dagre/board.exp.json | 99 +++-- .../elk/board.exp.json | 99 +++-- .../stable/stylish/dagre/board.exp.json | 8 +- .../stable/stylish/elk/board.exp.json | 8 +- .../transparent_3d/dagre/board.exp.json | 3 +- .../stable/transparent_3d/elk/board.exp.json | 3 +- .../stable/us_map/dagre/board.exp.json | 366 ++++++++++-------- .../testdata/stable/us_map/elk/board.exp.json | 366 ++++++++++-------- .../container_child_edge/dagre/board.exp.json | 13 +- .../container_child_edge/elk/board.exp.json | 13 +- .../TestCompile/basic_icon.exp.json | 6 +- .../TestCompile/basic_sequence.exp.json | 6 +- .../TestCompile/basic_shape.exp.json | 6 +- .../TestCompile/basic_style.exp.json | 6 +- .../TestCompile/class_paren.exp.json | 6 +- .../TestCompile/class_style.exp.json | 6 +- .../TestCompile/default_direction.exp.json | 6 +- testdata/d2compiler/TestCompile/edge.exp.json | 12 +- .../edge_arrowhead_fields.exp.json | 12 +- .../TestCompile/edge_chain.exp.json | 18 +- .../TestCompile/edge_chain_map.exp.json | 18 +- .../TestCompile/edge_column_index.exp.json | 12 +- .../TestCompile/edge_exclusive_style.exp.json | 12 +- .../TestCompile/edge_flat_arrowhead.exp.json | 12 +- .../edge_flat_label_arrowhead.exp.json | 12 +- .../TestCompile/edge_in_column.exp.json | 6 +- .../TestCompile/edge_index.exp.json | 12 +- .../TestCompile/edge_index_map.exp.json | 12 +- .../TestCompile/edge_index_nested.exp.json | 15 +- .../edge_index_nested_cross_scope.exp.json | 15 +- .../edge_key_group_flat_nested.exp.json | 15 +- ..._key_group_flat_nested_underscore.exp.json | 15 +- ..._group_map_flat_nested_underscore.exp.json | 15 +- ...e_key_group_map_nested_underscore.exp.json | 15 +- .../TestCompile/edge_label_map.exp.json | 12 +- .../d2compiler/TestCompile/edge_map.exp.json | 12 +- .../TestCompile/edge_map_arrowhead.exp.json | 12 +- .../TestCompile/edge_map_group_flat.exp.json | 12 +- .../edge_map_group_semiflat.exp.json | 12 +- .../TestCompile/edge_map_nested.exp.json | 12 +- .../TestCompile/edge_map_nested_flat.exp.json | 12 +- .../TestCompile/edge_mixed_arrowhead.exp.json | 12 +- .../edge_non_shape_arrowhead.exp.json | 12 +- .../edge_semiflat_arrowhead.exp.json | 12 +- .../TestCompile/escaped_id.exp.json | 6 +- .../TestCompile/image_style.exp.json | 6 +- .../TestCompile/nested_sql.exp.json | 9 +- .../d2compiler/TestCompile/path_link.exp.json | 6 +- .../reserved_icon_near_style.exp.json | 9 +- .../TestCompile/root_direction.exp.json | 3 +- .../TestCompile/root_sequence.exp.json | 3 +- .../TestCompile/set_direction.exp.json | 6 +- .../d2compiler/TestCompile/sql_paren.exp.json | 6 +- .../TestCompile/stroke-width.exp.json | 6 +- .../TestCompile/table_style.exp.json | 6 +- .../TestCompile/table_style_map.exp.json | 6 +- .../TestCompile/underscore_edge.exp.json | 12 +- .../underscore_edge_chain.exp.json | 18 +- .../underscore_edge_existing.exp.json | 18 +- .../underscore_edge_index.exp.json | 15 +- .../underscore_edge_nested.exp.json | 15 +- .../underscore_parent_create.exp.json | 9 +- .../underscore_parent_not_root.exp.json | 12 +- .../underscore_parent_preference_1.exp.json | 9 +- .../underscore_parent_preference_2.exp.json | 9 +- .../underscore_parent_squared.exp.json | 12 +- .../d2compiler/TestCompile/url_link.exp.json | 6 +- .../TestExport/connection/arrowhead.exp.json | 8 +- .../TestExport/connection/basic.exp.json | 8 +- .../connection/stroke-dash.exp.json | 8 +- .../connection/theme_stroke-dash.exp.json | 10 +- .../TestExport/label/basic_shape.exp.json | 3 +- .../label/connection_font_color.exp.json | 8 +- .../label/shape_font_color.exp.json | 3 +- .../TestExport/shape/basic.exp.json | 3 +- .../TestExport/shape/border-radius.exp.json | 3 +- .../shape/image_dimensions.exp.json | 3 +- .../TestExport/shape/synonyms.exp.json | 6 +- .../TestExport/shape/text_color.exp.json | 3 +- .../theme/connection_with_bold.exp.json | 8 +- .../theme/connection_with_italic.exp.json | 8 +- .../theme/connection_without_italic.exp.json | 8 +- .../theme/shape_with_italic.exp.json | 3 +- .../theme/shape_without_bold.exp.json | 3 +- testdata/d2oracle/TestCreate/base.exp.json | 6 +- .../d2oracle/TestCreate/container.exp.json | 9 +- .../TestCreate/container_edge.exp.json | 15 +- .../TestCreate/container_edge_label.exp.json | 15 +- testdata/d2oracle/TestCreate/edge.exp.json | 12 +- .../d2oracle/TestCreate/edge_nested.exp.json | 15 +- .../d2oracle/TestCreate/edge_scope.exp.json | 15 +- .../TestCreate/edge_scope_flat.exp.json | 15 +- .../TestCreate/edge_scope_nested.exp.json | 18 +- .../d2oracle/TestCreate/edge_unique.exp.json | 30 +- testdata/d2oracle/TestCreate/gen_key.exp.json | 9 +- .../d2oracle/TestCreate/gen_key_n.exp.json | 45 ++- .../TestCreate/gen_key_nested.exp.json | 18 +- .../TestCreate/gen_key_scope.exp.json | 18 +- .../TestCreate/gen_key_suffix.exp.json | 9 +- .../TestCreate/make_scope_multiline.exp.json | 9 +- .../make_scope_multiline_spacing_1.exp.json | 15 +- .../make_scope_multiline_spacing_2.exp.json | 15 +- testdata/d2oracle/TestCreate/nested.exp.json | 12 +- testdata/d2oracle/TestCreate/scope.exp.json | 15 +- .../TestDelete/breakup_arrowhead.exp.json | 6 +- .../d2oracle/TestDelete/children.exp.json | 15 +- .../TestDelete/children_conflicts.exp.json | 9 +- .../children_edge_conflicts.exp.json | 15 +- .../children_edges_flat_conflicts.exp.json | 24 +- .../children_flat_conflicts.exp.json | 9 +- .../children_multiple_conflicts.exp.json | 18 +- .../children_nested_conflicts.exp.json | 12 +- ...ldren_nested_referenced_conflicts.exp.json | 12 +- .../children_no_self_conflict.exp.json | 6 +- .../TestDelete/children_order.exp.json | 15 +- .../children_referenced_conflicts.exp.json | 9 +- .../TestDelete/children_scope.exp.json | 21 +- .../TestDelete/container_near.exp.json | 12 +- .../d2oracle/TestDelete/delete_icon.exp.json | 9 +- .../d2oracle/TestDelete/delete_link.exp.json | 6 +- .../d2oracle/TestDelete/delete_near.exp.json | 9 +- .../delete_needed_flat_near.exp.json | 9 +- .../delete_redundant_flat_near.exp.json | 9 +- .../TestDelete/delete_tooltip.exp.json | 6 +- .../edge_both_identical_childs.exp.json | 18 +- .../d2oracle/TestDelete/edge_common.exp.json | 12 +- .../TestDelete/edge_common_2.exp.json | 12 +- .../TestDelete/edge_common_3.exp.json | 12 +- .../TestDelete/edge_common_4.exp.json | 12 +- .../TestDelete/edge_conflict.exp.json | 18 +- .../TestDelete/edge_decrement.exp.json | 21 +- .../d2oracle/TestDelete/edge_first.exp.json | 30 +- .../TestDelete/edge_flat_style.exp.json | 6 +- .../TestDelete/edge_identical_child.exp.json | 21 +- .../TestDelete/edge_key_style.exp.json | 12 +- .../d2oracle/TestDelete/edge_last.exp.json | 36 +- .../TestDelete/edge_map_style.exp.json | 12 +- .../d2oracle/TestDelete/edge_middle.exp.json | 36 +- .../d2oracle/TestDelete/empty_map.exp.json | 9 +- testdata/d2oracle/TestDelete/flat.exp.json | 3 +- .../TestDelete/flat_reserved.exp.json | 12 +- .../TestDelete/hoist_children.exp.json | 9 +- .../TestDelete/hoist_edge_children.exp.json | 15 +- .../TestDelete/key_with_edges.exp.json | 12 +- .../TestDelete/key_with_edges_2.exp.json | 9 +- .../TestDelete/key_with_edges_3.exp.json | 9 +- .../TestDelete/key_with_edges_4.exp.json | 12 +- .../d2oracle/TestDelete/multi_near.exp.json | 15 +- .../multi_path_map_conflict.exp.json | 12 +- .../multi_path_map_no_conflict.exp.json | 12 +- .../multiple_flat_middle_container.exp.json | 12 +- .../TestDelete/multiple_flat_style.exp.json | 6 +- .../TestDelete/multiple_map_styles.exp.json | 6 +- testdata/d2oracle/TestDelete/near.exp.json | 6 +- testdata/d2oracle/TestDelete/nested.exp.json | 12 +- .../d2oracle/TestDelete/nested_2.exp.json | 12 +- .../TestDelete/nested_edge_key_style.exp.json | 15 +- .../TestDelete/nested_flat_style.exp.json | 6 +- .../TestDelete/nested_reserved.exp.json | 12 +- .../nested_underscore_update.exp.json | 9 +- .../d2oracle/TestDelete/node_in_edge.exp.json | 27 +- .../TestDelete/node_in_edge_last.exp.json | 33 +- .../only_delete_edge_reserved.exp.json | 12 +- .../only_delete_obj_reserved.exp.json | 12 +- testdata/d2oracle/TestDelete/order_1.exp.json | 15 +- testdata/d2oracle/TestDelete/order_2.exp.json | 9 +- testdata/d2oracle/TestDelete/order_3.exp.json | 9 +- testdata/d2oracle/TestDelete/order_4.exp.json | 6 +- testdata/d2oracle/TestDelete/order_5.exp.json | 24 +- testdata/d2oracle/TestDelete/order_6.exp.json | 15 +- testdata/d2oracle/TestDelete/order_7.exp.json | 18 +- testdata/d2oracle/TestDelete/order_8.exp.json | 18 +- .../d2oracle/TestDelete/shape_class.exp.json | 6 +- .../TestDelete/shape_sql_table.exp.json | 15 +- .../TestDelete/singular_flat_style.exp.json | 6 +- .../TestDelete/singular_map_style.exp.json | 6 +- .../underscore_no_conflict.exp.json | 12 +- .../TestDelete/underscore_remove.exp.json | 24 +- .../TestMove/append_multiple_styles.exp.json | 9 +- testdata/d2oracle/TestMove/basic.exp.json | 6 +- .../d2oracle/TestMove/basic_nested.exp.json | 9 +- .../TestMove/basic_out_of_container.exp.json | 9 +- .../TestMove/between_containers.exp.json | 12 +- .../TestMove/chain_connected_nested.exp.json | 18 +- ..._connected_nested_no_extra_create.exp.json | 21 +- .../TestMove/connected_nested.exp.json | 15 +- .../d2oracle/TestMove/container_near.exp.json | 21 +- .../TestMove/edge_across_containers.exp.json | 18 +- .../d2oracle/TestMove/edge_basic.exp.json | 12 +- .../TestMove/edge_chain_basic.exp.json | 18 +- .../TestMove/edge_chain_circular.exp.json | 18 +- .../edge_chain_into_container.exp.json | 21 +- .../edge_chain_out_container.exp.json | 21 +- .../d2oracle/TestMove/edge_conflict.exp.json | 21 +- .../TestMove/edge_into_container.exp.json | 18 +- .../TestMove/edge_nested_basic.exp.json | 15 +- .../TestMove/edge_out_of_container.exp.json | 15 +- .../d2oracle/TestMove/extend_map.exp.json | 15 +- .../TestMove/extend_stationary_path.exp.json | 12 +- .../TestMove/flat_between_containers.exp.json | 12 +- .../d2oracle/TestMove/flat_merge.exp.json | 15 +- .../TestMove/flat_middle_container.exp.json | 15 +- .../TestMove/flat_nested_merge.exp.json | 33 +- .../flat_nested_merge_multiple_refs.exp.json | 27 +- .../flat_reparent_with_map_value.exp.json | 9 +- ...lat_reparent_with_mixed_map_value.exp.json | 12 +- .../flat_reparent_with_value.exp.json | 9 +- .../d2oracle/TestMove/flat_style.exp.json | 9 +- .../TestMove/full_edge_slice.exp.json | 21 +- .../d2oracle/TestMove/full_slice.exp.json | 12 +- testdata/d2oracle/TestMove/gnarly_1.exp.json | 48 ++- .../hoist_container_children.exp.json | 15 +- .../into_container_existing_map.exp.json | 12 +- .../into_container_nonexisting_map.exp.json | 9 +- .../into_container_with_flat_keys.exp.json | 9 +- .../into_container_with_flat_style.exp.json | 9 +- .../d2oracle/TestMove/map_transplant.exp.json | 15 +- .../d2oracle/TestMove/map_with_label.exp.json | 12 +- .../TestMove/merge_nested_maps.exp.json | 27 +- .../d2oracle/TestMove/merge_reserved.exp.json | 21 +- .../TestMove/middle_container.exp.json | 12 +- .../TestMove/move_container_children.exp.json | 18 +- .../move_container_conflict_children.exp.json | 18 +- .../move_into_key_with_value.exp.json | 9 +- .../TestMove/move_out_of_edge.exp.json | 24 +- .../TestMove/move_out_of_nested_edge.exp.json | 24 +- .../TestMove/multiple_nesting_levels.exp.json | 24 +- testdata/d2oracle/TestMove/near.exp.json | 9 +- .../d2oracle/TestMove/nhooyr_one.exp.json | 15 +- .../d2oracle/TestMove/nhooyr_two.exp.json | 24 +- .../d2oracle/TestMove/parentheses.exp.json | 15 +- .../TestMove/partial_edge_slice.exp.json | 15 +- .../d2oracle/TestMove/partial_slice.exp.json | 9 +- testdata/d2oracle/TestMove/rename_2.exp.json | 18 +- testdata/d2oracle/TestMove/reuse_map.exp.json | 18 +- .../d2oracle/TestMove/slice_style.exp.json | 9 +- .../TestMove/underscore_children.exp.json | 9 +- .../underscore_edge_children.exp.json | 15 +- .../underscore_edge_container_1.exp.json | 15 +- .../underscore_edge_container_2.exp.json | 15 +- .../underscore_edge_container_3.exp.json | 15 +- .../underscore_edge_container_4.exp.json | 15 +- .../underscore_edge_container_5.exp.json | 15 +- .../TestMove/underscore_edge_split.exp.json | 21 +- .../TestMove/underscore_merge.exp.json | 12 +- .../TestMove/underscore_split.exp.json | 15 +- .../TestMove/underscore_split_out.exp.json | 18 +- .../TestMove/underscore_transplant.exp.json | 12 +- .../d2oracle/TestMove/unique_name.exp.json | 15 +- .../unique_name_with_references.exp.json | 21 +- testdata/d2oracle/TestRename/arrows.exp.json | 12 +- .../d2oracle/TestRename/arrows_chain.exp.json | 24 +- .../TestRename/arrows_complex.exp.json | 18 +- .../TestRename/arrows_trim_common.exp.json | 27 +- .../TestRename/arrows_trim_common_2.exp.json | 27 +- .../TestRename/complex_edge_1.exp.json | 18 +- .../TestRename/complex_edge_2.exp.json | 18 +- .../d2oracle/TestRename/conflict.exp.json | 9 +- .../d2oracle/TestRename/conflict_2.exp.json | 18 +- .../TestRename/conflict_with_dots.exp.json | 9 +- .../d2oracle/TestRename/container.exp.json | 72 ++-- testdata/d2oracle/TestRename/edges.exp.json | 45 ++- testdata/d2oracle/TestRename/flat.exp.json | 6 +- .../d2oracle/TestRename/generated.exp.json | 6 +- testdata/d2oracle/TestRename/near.exp.json | 9 +- testdata/d2oracle/TestRename/nested.exp.json | 18 +- testdata/d2oracle/TestSet/base.exp.json | 6 +- .../TestSet/block_string_multiline.exp.json | 6 +- .../TestSet/block_string_oneline.exp.json | 6 +- testdata/d2oracle/TestSet/edge.exp.json | 12 +- .../TestSet/edge_append_style.exp.json | 12 +- testdata/d2oracle/TestSet/edge_chain.exp.json | 21 +- .../TestSet/edge_chain_append_style.exp.json | 18 +- .../edge_chain_existing_style.exp.json | 18 +- .../TestSet/edge_chain_nested_set.exp.json | 21 +- .../d2oracle/TestSet/edge_index_case.exp.json | 27 +- .../TestSet/edge_index_nested.exp.json | 15 +- .../TestSet/edge_key_and_key.exp.json | 15 +- testdata/d2oracle/TestSet/edge_label.exp.json | 12 +- .../TestSet/edge_merge_style.exp.json | 12 +- .../TestSet/edge_nested_label_set.exp.json | 15 +- .../TestSet/edge_nested_style_set.exp.json | 15 +- .../TestSet/expanded_map_style.exp.json | 6 +- testdata/d2oracle/TestSet/icon.exp.json | 6 +- .../d2oracle/TestSet/inline_style.exp.json | 6 +- testdata/d2oracle/TestSet/label.exp.json | 6 +- .../d2oracle/TestSet/label_primary.exp.json | 15 +- .../d2oracle/TestSet/label_replace.exp.json | 6 +- .../d2oracle/TestSet/label_unset.exp.json | 6 +- .../d2oracle/TestSet/map_key_missing.exp.json | 12 +- .../d2oracle/TestSet/nested_alex.exp.json | 15 +- testdata/d2oracle/TestSet/new_style.exp.json | 6 +- .../d2oracle/TestSet/replace_shape.exp.json | 6 +- .../d2oracle/TestSet/replace_style.exp.json | 6 +- .../TestSet/replace_style_edgecase.exp.json | 6 +- testdata/d2oracle/TestSet/shape.exp.json | 6 +- .../TestSet/shape_nested_style_set.exp.json | 6 +- 393 files changed, 5163 insertions(+), 3002 deletions(-) diff --git a/e2etests/testdata/sanity/1_to_2/dagre/board.exp.json b/e2etests/testdata/sanity/1_to_2/dagre/board.exp.json index 6f149ad17..7649f1aa0 100644 --- a/e2etests/testdata/sanity/1_to_2/dagre/board.exp.json +++ b/e2etests/testdata/sanity/1_to_2/dagre/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "b", @@ -75,7 +76,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "c", @@ -113,7 +115,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -163,7 +166,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(a -> c)[0]", @@ -211,7 +214,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/sanity/1_to_2/elk/board.exp.json b/e2etests/testdata/sanity/1_to_2/elk/board.exp.json index 783996f3a..e00047008 100644 --- a/e2etests/testdata/sanity/1_to_2/elk/board.exp.json +++ b/e2etests/testdata/sanity/1_to_2/elk/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "b", @@ -75,7 +76,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "c", @@ -113,7 +115,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -154,7 +157,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(a -> c)[0]", @@ -201,7 +204,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/sanity/basic/dagre/board.exp.json b/e2etests/testdata/sanity/basic/dagre/board.exp.json index f3732823d..7f1b084a1 100644 --- a/e2etests/testdata/sanity/basic/dagre/board.exp.json +++ b/e2etests/testdata/sanity/basic/dagre/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "b", @@ -75,7 +76,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -125,7 +127,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/sanity/basic/elk/board.exp.json b/e2etests/testdata/sanity/basic/elk/board.exp.json index 66977e1db..6ad182635 100644 --- a/e2etests/testdata/sanity/basic/elk/board.exp.json +++ b/e2etests/testdata/sanity/basic/elk/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "b", @@ -75,7 +76,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -116,7 +118,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/sanity/child_to_child/dagre/board.exp.json b/e2etests/testdata/sanity/child_to_child/dagre/board.exp.json index e6d74cf50..6e06f2f68 100644 --- a/e2etests/testdata/sanity/child_to_child/dagre/board.exp.json +++ b/e2etests/testdata/sanity/child_to_child/dagre/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 17, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "a.b", @@ -75,7 +76,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "c", @@ -113,7 +115,8 @@ "labelWidth": 17, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "c.d", @@ -151,7 +154,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 } ], "connections": [ @@ -213,7 +217,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/sanity/child_to_child/elk/board.exp.json b/e2etests/testdata/sanity/child_to_child/elk/board.exp.json index 8ad45217d..1235bf60f 100644 --- a/e2etests/testdata/sanity/child_to_child/elk/board.exp.json +++ b/e2etests/testdata/sanity/child_to_child/elk/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 17, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "a.b", @@ -75,7 +76,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "c", @@ -113,7 +115,8 @@ "labelWidth": 17, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "c.d", @@ -151,7 +154,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 } ], "connections": [ @@ -192,7 +196,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/sanity/connection_label/dagre/board.exp.json b/e2etests/testdata/sanity/connection_label/dagre/board.exp.json index 63096a54f..dae192a6e 100644 --- a/e2etests/testdata/sanity/connection_label/dagre/board.exp.json +++ b/e2etests/testdata/sanity/connection_label/dagre/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "b", @@ -75,7 +76,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -125,7 +127,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/sanity/connection_label/elk/board.exp.json b/e2etests/testdata/sanity/connection_label/elk/board.exp.json index 96c8db885..2680db2b1 100644 --- a/e2etests/testdata/sanity/connection_label/elk/board.exp.json +++ b/e2etests/testdata/sanity/connection_label/elk/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "b", @@ -75,7 +76,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -116,7 +118,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/all_shapes/dagre/board.exp.json b/e2etests/testdata/stable/all_shapes/dagre/board.exp.json index 03a60b7e7..a86e092db 100644 --- a/e2etests/testdata/stable/all_shapes/dagre/board.exp.json +++ b/e2etests/testdata/stable/all_shapes/dagre/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 71, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "square", @@ -75,7 +76,8 @@ "labelWidth": 54, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "page", @@ -113,7 +115,8 @@ "labelWidth": 39, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "parallelogram", @@ -151,7 +154,8 @@ "labelWidth": 104, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "document", @@ -189,7 +193,8 @@ "labelWidth": 77, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "cylinder", @@ -227,7 +232,8 @@ "labelWidth": 64, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "queue", @@ -265,7 +271,8 @@ "labelWidth": 49, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "package", @@ -303,7 +310,8 @@ "labelWidth": 63, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "step", @@ -341,7 +349,8 @@ "labelWidth": 36, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "callout", @@ -379,7 +388,8 @@ "labelWidth": 55, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "stored_data", @@ -417,7 +427,8 @@ "labelWidth": 91, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "person", @@ -455,7 +466,8 @@ "labelWidth": 53, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "diamond", @@ -493,7 +505,8 @@ "labelWidth": 68, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "oval", @@ -531,7 +544,8 @@ "labelWidth": 36, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "circle", @@ -569,7 +583,8 @@ "labelWidth": 44, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "hexagon", @@ -607,7 +622,8 @@ "labelWidth": 65, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "cloud", @@ -645,7 +661,8 @@ "labelWidth": 45, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -695,7 +712,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(square -> page)[0]", @@ -743,7 +760,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(parallelogram -> document)[0]", @@ -791,7 +808,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(document -> cylinder)[0]", @@ -839,7 +856,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(queue -> package)[0]", @@ -887,7 +904,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(package -> step)[0]", @@ -935,7 +952,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(callout -> stored_data)[0]", @@ -983,7 +1000,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(stored_data -> person)[0]", @@ -1031,7 +1048,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(diamond -> oval)[0]", @@ -1079,7 +1096,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(oval -> circle)[0]", @@ -1127,7 +1144,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(hexagon -> cloud)[0]", @@ -1175,7 +1192,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/all_shapes/elk/board.exp.json b/e2etests/testdata/stable/all_shapes/elk/board.exp.json index 06e144576..cf413393a 100644 --- a/e2etests/testdata/stable/all_shapes/elk/board.exp.json +++ b/e2etests/testdata/stable/all_shapes/elk/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 71, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "square", @@ -75,7 +76,8 @@ "labelWidth": 54, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "page", @@ -113,7 +115,8 @@ "labelWidth": 39, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "parallelogram", @@ -151,7 +154,8 @@ "labelWidth": 104, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "document", @@ -189,7 +193,8 @@ "labelWidth": 77, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "cylinder", @@ -227,7 +232,8 @@ "labelWidth": 64, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "queue", @@ -265,7 +271,8 @@ "labelWidth": 49, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "package", @@ -303,7 +310,8 @@ "labelWidth": 63, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "step", @@ -341,7 +349,8 @@ "labelWidth": 36, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "callout", @@ -379,7 +388,8 @@ "labelWidth": 55, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "stored_data", @@ -417,7 +427,8 @@ "labelWidth": 91, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "person", @@ -455,7 +466,8 @@ "labelWidth": 53, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "diamond", @@ -493,7 +505,8 @@ "labelWidth": 68, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "oval", @@ -531,7 +544,8 @@ "labelWidth": 36, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "circle", @@ -569,7 +583,8 @@ "labelWidth": 44, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "hexagon", @@ -607,7 +622,8 @@ "labelWidth": 65, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "cloud", @@ -645,7 +661,8 @@ "labelWidth": 45, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -686,7 +703,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(square -> page)[0]", @@ -725,7 +742,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(parallelogram -> document)[0]", @@ -764,7 +781,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(document -> cylinder)[0]", @@ -803,7 +820,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(queue -> package)[0]", @@ -842,7 +859,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(package -> step)[0]", @@ -881,7 +898,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(callout -> stored_data)[0]", @@ -920,7 +937,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(stored_data -> person)[0]", @@ -959,7 +976,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(diamond -> oval)[0]", @@ -998,7 +1015,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(oval -> circle)[0]", @@ -1037,7 +1054,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(hexagon -> cloud)[0]", @@ -1076,7 +1093,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } 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 252ade6eb..fbc808da0 100644 --- a/e2etests/testdata/stable/all_shapes_multiple/dagre/board.exp.json +++ b/e2etests/testdata/stable/all_shapes_multiple/dagre/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 71, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "square", @@ -75,7 +76,8 @@ "labelWidth": 54, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "page", @@ -113,7 +115,8 @@ "labelWidth": 39, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "parallelogram", @@ -151,7 +154,8 @@ "labelWidth": 104, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "document", @@ -189,7 +193,8 @@ "labelWidth": 77, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "cylinder", @@ -227,7 +232,8 @@ "labelWidth": 64, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "queue", @@ -265,7 +271,8 @@ "labelWidth": 49, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "package", @@ -303,7 +310,8 @@ "labelWidth": 63, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "step", @@ -341,7 +349,8 @@ "labelWidth": 36, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "callout", @@ -379,7 +388,8 @@ "labelWidth": 55, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "stored_data", @@ -417,7 +427,8 @@ "labelWidth": 91, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "person", @@ -455,7 +466,8 @@ "labelWidth": 53, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "diamond", @@ -493,7 +505,8 @@ "labelWidth": 68, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "oval", @@ -531,7 +544,8 @@ "labelWidth": 36, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "circle", @@ -569,7 +583,8 @@ "labelWidth": 44, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "hexagon", @@ -607,7 +622,8 @@ "labelWidth": 65, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "cloud", @@ -645,7 +661,8 @@ "labelWidth": 45, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -695,7 +712,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(square -> page)[0]", @@ -743,7 +760,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(parallelogram -> document)[0]", @@ -791,7 +808,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(document -> cylinder)[0]", @@ -839,7 +856,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(queue -> package)[0]", @@ -887,7 +904,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(package -> step)[0]", @@ -935,7 +952,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(callout -> stored_data)[0]", @@ -983,7 +1000,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(stored_data -> person)[0]", @@ -1031,7 +1048,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(diamond -> oval)[0]", @@ -1079,7 +1096,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(oval -> circle)[0]", @@ -1127,7 +1144,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(hexagon -> cloud)[0]", @@ -1175,7 +1192,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } 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 a2d34c1f2..fc778ada3 100644 --- a/e2etests/testdata/stable/all_shapes_multiple/elk/board.exp.json +++ b/e2etests/testdata/stable/all_shapes_multiple/elk/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 71, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "square", @@ -75,7 +76,8 @@ "labelWidth": 54, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "page", @@ -113,7 +115,8 @@ "labelWidth": 39, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "parallelogram", @@ -151,7 +154,8 @@ "labelWidth": 104, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "document", @@ -189,7 +193,8 @@ "labelWidth": 77, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "cylinder", @@ -227,7 +232,8 @@ "labelWidth": 64, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "queue", @@ -265,7 +271,8 @@ "labelWidth": 49, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "package", @@ -303,7 +310,8 @@ "labelWidth": 63, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "step", @@ -341,7 +349,8 @@ "labelWidth": 36, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "callout", @@ -379,7 +388,8 @@ "labelWidth": 55, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "stored_data", @@ -417,7 +427,8 @@ "labelWidth": 91, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "person", @@ -455,7 +466,8 @@ "labelWidth": 53, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "diamond", @@ -493,7 +505,8 @@ "labelWidth": 68, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "oval", @@ -531,7 +544,8 @@ "labelWidth": 36, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "circle", @@ -569,7 +583,8 @@ "labelWidth": 44, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "hexagon", @@ -607,7 +622,8 @@ "labelWidth": 65, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "cloud", @@ -645,7 +661,8 @@ "labelWidth": 45, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -686,7 +703,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(square -> page)[0]", @@ -725,7 +742,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(parallelogram -> document)[0]", @@ -764,7 +781,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(document -> cylinder)[0]", @@ -803,7 +820,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(queue -> package)[0]", @@ -842,7 +859,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(package -> step)[0]", @@ -881,7 +898,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(callout -> stored_data)[0]", @@ -920,7 +937,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(stored_data -> person)[0]", @@ -959,7 +976,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(diamond -> oval)[0]", @@ -998,7 +1015,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(oval -> circle)[0]", @@ -1037,7 +1054,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(hexagon -> cloud)[0]", @@ -1076,7 +1093,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } 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 dff2bb210..505c071a4 100644 --- a/e2etests/testdata/stable/all_shapes_shadow/dagre/board.exp.json +++ b/e2etests/testdata/stable/all_shapes_shadow/dagre/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 71, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "square", @@ -75,7 +76,8 @@ "labelWidth": 54, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "page", @@ -113,7 +115,8 @@ "labelWidth": 39, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "parallelogram", @@ -151,7 +154,8 @@ "labelWidth": 104, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "document", @@ -189,7 +193,8 @@ "labelWidth": 77, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "cylinder", @@ -227,7 +232,8 @@ "labelWidth": 64, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "queue", @@ -265,7 +271,8 @@ "labelWidth": 49, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "package", @@ -303,7 +310,8 @@ "labelWidth": 63, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "step", @@ -341,7 +349,8 @@ "labelWidth": 36, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "callout", @@ -379,7 +388,8 @@ "labelWidth": 55, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "stored_data", @@ -417,7 +427,8 @@ "labelWidth": 91, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "person", @@ -455,7 +466,8 @@ "labelWidth": 53, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "diamond", @@ -493,7 +505,8 @@ "labelWidth": 68, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "oval", @@ -531,7 +544,8 @@ "labelWidth": 36, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "circle", @@ -569,7 +583,8 @@ "labelWidth": 44, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "hexagon", @@ -607,7 +622,8 @@ "labelWidth": 65, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "cloud", @@ -645,7 +661,8 @@ "labelWidth": 45, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -695,7 +712,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(square -> page)[0]", @@ -743,7 +760,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(parallelogram -> document)[0]", @@ -791,7 +808,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(document -> cylinder)[0]", @@ -839,7 +856,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(queue -> package)[0]", @@ -887,7 +904,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(package -> step)[0]", @@ -935,7 +952,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(callout -> stored_data)[0]", @@ -983,7 +1000,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(stored_data -> person)[0]", @@ -1031,7 +1048,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(diamond -> oval)[0]", @@ -1079,7 +1096,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(oval -> circle)[0]", @@ -1127,7 +1144,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(hexagon -> cloud)[0]", @@ -1175,7 +1192,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } 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 2ea1053e4..4ed2ccd1d 100644 --- a/e2etests/testdata/stable/all_shapes_shadow/elk/board.exp.json +++ b/e2etests/testdata/stable/all_shapes_shadow/elk/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 71, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "square", @@ -75,7 +76,8 @@ "labelWidth": 54, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "page", @@ -113,7 +115,8 @@ "labelWidth": 39, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "parallelogram", @@ -151,7 +154,8 @@ "labelWidth": 104, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "document", @@ -189,7 +193,8 @@ "labelWidth": 77, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "cylinder", @@ -227,7 +232,8 @@ "labelWidth": 64, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "queue", @@ -265,7 +271,8 @@ "labelWidth": 49, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "package", @@ -303,7 +310,8 @@ "labelWidth": 63, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "step", @@ -341,7 +349,8 @@ "labelWidth": 36, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "callout", @@ -379,7 +388,8 @@ "labelWidth": 55, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "stored_data", @@ -417,7 +427,8 @@ "labelWidth": 91, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "person", @@ -455,7 +466,8 @@ "labelWidth": 53, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "diamond", @@ -493,7 +505,8 @@ "labelWidth": 68, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "oval", @@ -531,7 +544,8 @@ "labelWidth": 36, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "circle", @@ -569,7 +583,8 @@ "labelWidth": 44, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "hexagon", @@ -607,7 +622,8 @@ "labelWidth": 65, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "cloud", @@ -645,7 +661,8 @@ "labelWidth": 45, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -686,7 +703,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(square -> page)[0]", @@ -725,7 +742,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(parallelogram -> document)[0]", @@ -764,7 +781,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(document -> cylinder)[0]", @@ -803,7 +820,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(queue -> package)[0]", @@ -842,7 +859,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(package -> step)[0]", @@ -881,7 +898,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(callout -> stored_data)[0]", @@ -920,7 +937,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(stored_data -> person)[0]", @@ -959,7 +976,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(diamond -> oval)[0]", @@ -998,7 +1015,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(oval -> circle)[0]", @@ -1037,7 +1054,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(hexagon -> cloud)[0]", @@ -1076,7 +1093,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/arrowhead_adjustment/dagre/board.exp.json b/e2etests/testdata/stable/arrowhead_adjustment/dagre/board.exp.json index 24bd87a2c..53e292e5b 100644 --- a/e2etests/testdata/stable/arrowhead_adjustment/dagre/board.exp.json +++ b/e2etests/testdata/stable/arrowhead_adjustment/dagre/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "b", @@ -75,7 +76,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "a", @@ -113,7 +115,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "Oval", @@ -150,7 +153,8 @@ "underline": false, "labelWidth": 0, "labelHeight": 0, - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -200,7 +204,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(c -> b)[0]", @@ -260,7 +264,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(a <-> Oval)[0]", @@ -308,7 +312,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(c -- a)[0]", @@ -356,7 +360,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(Oval <-> c)[0]", @@ -416,7 +420,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/arrowhead_adjustment/elk/board.exp.json b/e2etests/testdata/stable/arrowhead_adjustment/elk/board.exp.json index cf578c843..a7eb43d09 100644 --- a/e2etests/testdata/stable/arrowhead_adjustment/elk/board.exp.json +++ b/e2etests/testdata/stable/arrowhead_adjustment/elk/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "b", @@ -75,7 +76,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "a", @@ -113,7 +115,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "Oval", @@ -150,7 +153,8 @@ "underline": false, "labelWidth": 0, "labelHeight": 0, - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -199,7 +203,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(c -> b)[0]", @@ -238,7 +242,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(a <-> Oval)[0]", @@ -277,7 +281,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(c -- a)[0]", @@ -324,7 +328,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(Oval <-> c)[0]", @@ -379,7 +383,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/arrowhead_labels/dagre/board.exp.json b/e2etests/testdata/stable/arrowhead_labels/dagre/board.exp.json index 5413c61ea..60509b81b 100644 --- a/e2etests/testdata/stable/arrowhead_labels/dagre/board.exp.json +++ b/e2etests/testdata/stable/arrowhead_labels/dagre/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "b", @@ -75,7 +76,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -125,7 +127,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/arrowhead_labels/elk/board.exp.json b/e2etests/testdata/stable/arrowhead_labels/elk/board.exp.json index 9d7513d12..648d83fc8 100644 --- a/e2etests/testdata/stable/arrowhead_labels/elk/board.exp.json +++ b/e2etests/testdata/stable/arrowhead_labels/elk/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "b", @@ -75,7 +76,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -116,7 +118,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/binary_tree/dagre/board.exp.json b/e2etests/testdata/stable/binary_tree/dagre/board.exp.json index 24eb61c49..92781dc2d 100644 --- a/e2etests/testdata/stable/binary_tree/dagre/board.exp.json +++ b/e2etests/testdata/stable/binary_tree/dagre/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "b", @@ -75,7 +76,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "c", @@ -113,7 +115,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "d", @@ -151,7 +154,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "e", @@ -189,7 +193,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "f", @@ -227,7 +232,8 @@ "labelWidth": 11, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "g", @@ -265,7 +271,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "h", @@ -303,7 +310,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "i", @@ -341,7 +349,8 @@ "labelWidth": 9, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "j", @@ -379,7 +388,8 @@ "labelWidth": 10, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "k", @@ -417,7 +427,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "l", @@ -455,7 +466,8 @@ "labelWidth": 9, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "m", @@ -493,7 +505,8 @@ "labelWidth": 17, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "n", @@ -531,7 +544,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "o", @@ -569,7 +583,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -619,7 +634,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(a -> c)[0]", @@ -667,7 +682,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(b -> d)[0]", @@ -715,7 +730,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(b -> e)[0]", @@ -763,7 +778,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(c -> f)[0]", @@ -811,7 +826,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(c -> g)[0]", @@ -859,7 +874,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(d -> h)[0]", @@ -907,7 +922,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(d -> i)[0]", @@ -955,7 +970,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(e -> j)[0]", @@ -1003,7 +1018,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(e -> k)[0]", @@ -1051,7 +1066,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(f -> l)[0]", @@ -1099,7 +1114,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(f -> m)[0]", @@ -1147,7 +1162,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(g -> n)[0]", @@ -1195,7 +1210,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(g -> o)[0]", @@ -1243,7 +1258,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/binary_tree/elk/board.exp.json b/e2etests/testdata/stable/binary_tree/elk/board.exp.json index e182c2abc..287a0e4fe 100644 --- a/e2etests/testdata/stable/binary_tree/elk/board.exp.json +++ b/e2etests/testdata/stable/binary_tree/elk/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "b", @@ -75,7 +76,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "c", @@ -113,7 +115,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "d", @@ -151,7 +154,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "e", @@ -189,7 +193,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "f", @@ -227,7 +232,8 @@ "labelWidth": 11, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "g", @@ -265,7 +271,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "h", @@ -303,7 +310,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "i", @@ -341,7 +349,8 @@ "labelWidth": 9, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "j", @@ -379,7 +388,8 @@ "labelWidth": 10, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "k", @@ -417,7 +427,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "l", @@ -455,7 +466,8 @@ "labelWidth": 9, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "m", @@ -493,7 +505,8 @@ "labelWidth": 17, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "n", @@ -531,7 +544,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "o", @@ -569,7 +583,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -610,7 +625,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(a -> c)[0]", @@ -657,7 +672,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(b -> d)[0]", @@ -704,7 +719,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(b -> e)[0]", @@ -743,7 +758,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(c -> f)[0]", @@ -790,7 +805,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(c -> g)[0]", @@ -829,7 +844,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(d -> h)[0]", @@ -868,7 +883,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(d -> i)[0]", @@ -915,7 +930,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(e -> j)[0]", @@ -954,7 +969,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(e -> k)[0]", @@ -1001,7 +1016,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(f -> l)[0]", @@ -1040,7 +1055,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(f -> m)[0]", @@ -1087,7 +1102,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(g -> n)[0]", @@ -1134,7 +1149,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(g -> o)[0]", @@ -1173,7 +1188,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/chaos1/dagre/board.exp.json b/e2etests/testdata/stable/chaos1/dagre/board.exp.json index 28e624e90..37dd9e762 100644 --- a/e2etests/testdata/stable/chaos1/dagre/board.exp.json +++ b/e2etests/testdata/stable/chaos1/dagre/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 46, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "aaa.bbb", @@ -75,7 +76,8 @@ "labelWidth": 32, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "ddd", @@ -113,7 +115,8 @@ "labelWidth": 33, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "eee", @@ -151,7 +154,8 @@ "labelWidth": 30, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "aaa.ccc", @@ -189,7 +193,8 @@ "labelWidth": 28, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 } ], "connections": [ @@ -239,7 +244,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(eee <- aaa.ccc)[0]", @@ -287,7 +292,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/chaos1/elk/board.exp.json b/e2etests/testdata/stable/chaos1/elk/board.exp.json index 9b4a92ab8..f7b484b65 100644 --- a/e2etests/testdata/stable/chaos1/elk/board.exp.json +++ b/e2etests/testdata/stable/chaos1/elk/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 46, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "aaa.bbb", @@ -75,7 +76,8 @@ "labelWidth": 32, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "ddd", @@ -113,7 +115,8 @@ "labelWidth": 33, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "eee", @@ -151,7 +154,8 @@ "labelWidth": 30, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "aaa.ccc", @@ -189,7 +193,8 @@ "labelWidth": 28, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 } ], "connections": [ @@ -230,7 +235,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(eee <- aaa.ccc)[0]", @@ -269,7 +274,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/chaos2/dagre/board.exp.json b/e2etests/testdata/stable/chaos2/dagre/board.exp.json index 2a1cf9a86..e14512753 100644 --- a/e2etests/testdata/stable/chaos2/dagre/board.exp.json +++ b/e2etests/testdata/stable/chaos2/dagre/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 32, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "aa.bb", @@ -75,7 +76,8 @@ "labelWidth": 31, "labelHeight": 36, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "aa.bb.cc", @@ -113,7 +115,8 @@ "labelWidth": 24, "labelHeight": 31, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 3 + "zIndex": 0, + "level": 3 }, { "id": "aa.bb.cc.dd", @@ -151,7 +154,8 @@ "labelWidth": 22, "labelHeight": 26, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 4 + "zIndex": 0, + "level": 4 }, { "id": "aa.bb.cc.dd.ee", @@ -188,7 +192,8 @@ "underline": false, "labelWidth": 16, "labelHeight": 24, - "zIndex": 5 + "zIndex": 0, + "level": 5 }, { "id": "aa.bb.cc.dd.ff", @@ -226,7 +231,8 @@ "labelWidth": 17, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 5 + "zIndex": 0, + "level": 5 }, { "id": "aa.bb.cc.gg", @@ -263,7 +269,8 @@ "underline": false, "labelWidth": 17, "labelHeight": 24, - "zIndex": 4 + "zIndex": 0, + "level": 4 }, { "id": "aa.bb.cc.hh", @@ -301,7 +308,8 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 4 + "zIndex": 0, + "level": 4 }, { "id": "aa.bb.ii", @@ -339,7 +347,8 @@ "labelWidth": 14, "labelHeight": 31, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 3 + "zIndex": 0, + "level": 3 }, { "id": "aa.bb.ii.jj", @@ -377,7 +386,8 @@ "labelWidth": 15, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 4 + "zIndex": 0, + "level": 4 }, { "id": "aa.bb.kk", @@ -415,7 +425,8 @@ "labelWidth": 22, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 3 + "zIndex": 0, + "level": 3 }, { "id": "aa.ll", @@ -453,7 +464,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "aa.mm", @@ -491,7 +503,8 @@ "labelWidth": 31, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "aa.nn", @@ -528,7 +541,8 @@ "underline": false, "labelWidth": 18, "labelHeight": 24, - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "aa.oo", @@ -566,7 +580,8 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 } ], "connections": [ @@ -616,7 +631,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 6 + "zIndex": 0 }, { "id": "aa.bb.cc.(gg -- hh)[0]", @@ -664,7 +679,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 6 + "zIndex": 0 }, { "id": "aa.bb.(ii -> cc.dd)[0]", @@ -760,7 +775,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 6 + "zIndex": 0 }, { "id": "aa.(ll <-> bb)[0]", @@ -808,7 +823,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 6 + "zIndex": 0 }, { "id": "aa.(mm -> bb.cc)[0]", @@ -868,7 +883,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 6 + "zIndex": 0 }, { "id": "aa.(mm -> ll)[0]", @@ -916,7 +931,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 6 + "zIndex": 0 }, { "id": "aa.(mm <-> bb)[0]", @@ -964,7 +979,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 6 + "zIndex": 0 }, { "id": "aa.(ll <-> bb.cc.gg)[0]", @@ -1060,7 +1075,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 6 + "zIndex": 0 }, { "id": "aa.(mm <- bb.ii)[0]", @@ -1108,7 +1123,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 6 + "zIndex": 0 }, { "id": "aa.(bb.cc <- ll)[0]", @@ -1156,7 +1171,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 6 + "zIndex": 0 }, { "id": "aa.(bb.ii <-> ll)[0]", @@ -1216,7 +1231,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 6 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/chaos2/elk/board.exp.json b/e2etests/testdata/stable/chaos2/elk/board.exp.json index f001ad2b1..8b13f40e1 100644 --- a/e2etests/testdata/stable/chaos2/elk/board.exp.json +++ b/e2etests/testdata/stable/chaos2/elk/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 32, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "aa.bb", @@ -75,7 +76,8 @@ "labelWidth": 31, "labelHeight": 36, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "aa.bb.cc", @@ -113,7 +115,8 @@ "labelWidth": 24, "labelHeight": 31, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 3 + "zIndex": 0, + "level": 3 }, { "id": "aa.bb.cc.dd", @@ -151,7 +154,8 @@ "labelWidth": 22, "labelHeight": 26, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 4 + "zIndex": 0, + "level": 4 }, { "id": "aa.bb.cc.dd.ee", @@ -188,7 +192,8 @@ "underline": false, "labelWidth": 16, "labelHeight": 24, - "zIndex": 5 + "zIndex": 0, + "level": 5 }, { "id": "aa.bb.cc.dd.ff", @@ -226,7 +231,8 @@ "labelWidth": 17, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 5 + "zIndex": 0, + "level": 5 }, { "id": "aa.bb.cc.gg", @@ -263,7 +269,8 @@ "underline": false, "labelWidth": 17, "labelHeight": 24, - "zIndex": 4 + "zIndex": 0, + "level": 4 }, { "id": "aa.bb.cc.hh", @@ -301,7 +308,8 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 4 + "zIndex": 0, + "level": 4 }, { "id": "aa.bb.ii", @@ -339,7 +347,8 @@ "labelWidth": 14, "labelHeight": 31, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 3 + "zIndex": 0, + "level": 3 }, { "id": "aa.bb.ii.jj", @@ -377,7 +386,8 @@ "labelWidth": 15, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 4 + "zIndex": 0, + "level": 4 }, { "id": "aa.bb.kk", @@ -415,7 +425,8 @@ "labelWidth": 22, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 3 + "zIndex": 0, + "level": 3 }, { "id": "aa.ll", @@ -453,7 +464,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "aa.mm", @@ -491,7 +503,8 @@ "labelWidth": 31, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "aa.nn", @@ -528,7 +541,8 @@ "underline": false, "labelWidth": 18, "labelHeight": 24, - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "aa.oo", @@ -566,7 +580,8 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 } ], "connections": [ @@ -607,7 +622,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 6 + "zIndex": 0 }, { "id": "aa.bb.cc.(gg -- hh)[0]", @@ -646,7 +661,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 6 + "zIndex": 0 }, { "id": "aa.bb.(ii -> cc.dd)[0]", @@ -693,7 +708,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 6 + "zIndex": 0 }, { "id": "aa.(ll <-> bb)[0]", @@ -740,7 +755,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 6 + "zIndex": 0 }, { "id": "aa.(mm -> bb.cc)[0]", @@ -795,7 +810,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 6 + "zIndex": 0 }, { "id": "aa.(mm -> ll)[0]", @@ -842,7 +857,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 6 + "zIndex": 0 }, { "id": "aa.(mm <-> bb)[0]", @@ -897,7 +912,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 6 + "zIndex": 0 }, { "id": "aa.(ll <-> bb.cc.gg)[0]", @@ -952,7 +967,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 6 + "zIndex": 0 }, { "id": "aa.(mm <- bb.ii)[0]", @@ -999,7 +1014,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 6 + "zIndex": 0 }, { "id": "aa.(bb.cc <- ll)[0]", @@ -1054,7 +1069,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 6 + "zIndex": 0 }, { "id": "aa.(bb.ii <-> ll)[0]", @@ -1117,7 +1132,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 6 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/child_parent_edges/dagre/board.exp.json b/e2etests/testdata/stable/child_parent_edges/dagre/board.exp.json index 45890126b..dd97cece7 100644 --- a/e2etests/testdata/stable/child_parent_edges/dagre/board.exp.json +++ b/e2etests/testdata/stable/child_parent_edges/dagre/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 17, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "a.b", @@ -75,7 +76,8 @@ "labelWidth": 17, "labelHeight": 36, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "a.b.c", @@ -113,7 +115,8 @@ "labelWidth": 14, "labelHeight": 31, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 3 + "zIndex": 0, + "level": 3 }, { "id": "a.b.c.d", @@ -151,7 +154,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 4 + "zIndex": 0, + "level": 4 } ], "connections": [ @@ -237,7 +241,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 5 + "zIndex": 0 }, { "id": "a.(b -> b.c)[0]", @@ -321,7 +325,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 5 + "zIndex": 0 }, { "id": "a.(b.c.d -> b)[0]", @@ -369,7 +373,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 5 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/child_parent_edges/elk/board.exp.json b/e2etests/testdata/stable/child_parent_edges/elk/board.exp.json index af4faba6a..14e93a0b2 100644 --- a/e2etests/testdata/stable/child_parent_edges/elk/board.exp.json +++ b/e2etests/testdata/stable/child_parent_edges/elk/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 17, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "a.b", @@ -75,7 +76,8 @@ "labelWidth": 17, "labelHeight": 36, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "a.b.c", @@ -113,7 +115,8 @@ "labelWidth": 14, "labelHeight": 31, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 3 + "zIndex": 0, + "level": 3 }, { "id": "a.b.c.d", @@ -151,7 +154,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 4 + "zIndex": 0, + "level": 4 } ], "connections": [ @@ -192,7 +196,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 5 + "zIndex": 0 }, { "id": "a.(b -> b.c)[0]", @@ -231,7 +235,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 5 + "zIndex": 0 }, { "id": "a.(b.c.d -> b)[0]", @@ -278,7 +282,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 5 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/circular_dependency/dagre/board.exp.json b/e2etests/testdata/stable/circular_dependency/dagre/board.exp.json index 29ea208e6..416286d6c 100644 --- a/e2etests/testdata/stable/circular_dependency/dagre/board.exp.json +++ b/e2etests/testdata/stable/circular_dependency/dagre/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "b", @@ -75,7 +76,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "c", @@ -113,7 +115,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -163,7 +166,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(b -> c)[0]", @@ -211,7 +214,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(c -> b)[0]", @@ -259,7 +262,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(b -> a)[0]", @@ -307,7 +310,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/circular_dependency/elk/board.exp.json b/e2etests/testdata/stable/circular_dependency/elk/board.exp.json index 73a5d471f..2f1b78b23 100644 --- a/e2etests/testdata/stable/circular_dependency/elk/board.exp.json +++ b/e2etests/testdata/stable/circular_dependency/elk/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "b", @@ -75,7 +76,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "c", @@ -113,7 +115,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -154,7 +157,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(b -> c)[0]", @@ -193,7 +196,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(c -> b)[0]", @@ -232,7 +235,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(b -> a)[0]", @@ -271,7 +274,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/class/dagre/board.exp.json b/e2etests/testdata/stable/class/dagre/board.exp.json index c473b8cfc..224b7f5b1 100644 --- a/e2etests/testdata/stable/class/dagre/board.exp.json +++ b/e2etests/testdata/stable/class/dagre/board.exp.json @@ -68,7 +68,8 @@ "underline": false, "labelWidth": 150, "labelHeight": 36, - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [] diff --git a/e2etests/testdata/stable/class/elk/board.exp.json b/e2etests/testdata/stable/class/elk/board.exp.json index 7e6c29ddc..b9f35589b 100644 --- a/e2etests/testdata/stable/class/elk/board.exp.json +++ b/e2etests/testdata/stable/class/elk/board.exp.json @@ -68,7 +68,8 @@ "underline": false, "labelWidth": 150, "labelHeight": 36, - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [] diff --git a/e2etests/testdata/stable/code_snippet/dagre/board.exp.json b/e2etests/testdata/stable/code_snippet/dagre/board.exp.json index cd182c555..6cd1e4202 100644 --- a/e2etests/testdata/stable/code_snippet/dagre/board.exp.json +++ b/e2etests/testdata/stable/code_snippet/dagre/board.exp.json @@ -36,7 +36,8 @@ "underline": false, "labelWidth": 755, "labelHeight": 166, - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "x", @@ -74,7 +75,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "y", @@ -112,7 +114,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -162,7 +165,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(hey -> y)[0]", @@ -210,7 +213,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/code_snippet/elk/board.exp.json b/e2etests/testdata/stable/code_snippet/elk/board.exp.json index 4dacb85c4..b8f8d107a 100644 --- a/e2etests/testdata/stable/code_snippet/elk/board.exp.json +++ b/e2etests/testdata/stable/code_snippet/elk/board.exp.json @@ -36,7 +36,8 @@ "underline": false, "labelWidth": 755, "labelHeight": 166, - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "x", @@ -74,7 +75,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "y", @@ -112,7 +114,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -153,7 +156,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(hey -> y)[0]", @@ -192,7 +195,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/connected_container/dagre/board.exp.json b/e2etests/testdata/stable/connected_container/dagre/board.exp.json index 8f6a6dfac..6ee7a8a33 100644 --- a/e2etests/testdata/stable/connected_container/dagre/board.exp.json +++ b/e2etests/testdata/stable/connected_container/dagre/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 17, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "a.b", @@ -75,7 +76,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "c", @@ -113,7 +115,8 @@ "labelWidth": 17, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "c.d", @@ -151,7 +154,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "f", @@ -189,7 +193,8 @@ "labelWidth": 14, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "f.h", @@ -227,7 +232,8 @@ "labelWidth": 16, "labelHeight": 36, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "f.h.g", @@ -265,7 +271,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 3 + "zIndex": 0, + "level": 3 } ], "connections": [ @@ -327,7 +334,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 }, { "id": "(c.d -> f.h.g)[0]", @@ -399,7 +406,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/connected_container/elk/board.exp.json b/e2etests/testdata/stable/connected_container/elk/board.exp.json index a59e14196..40e019241 100644 --- a/e2etests/testdata/stable/connected_container/elk/board.exp.json +++ b/e2etests/testdata/stable/connected_container/elk/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 17, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "a.b", @@ -75,7 +76,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "c", @@ -113,7 +115,8 @@ "labelWidth": 17, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "c.d", @@ -151,7 +154,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "f", @@ -189,7 +193,8 @@ "labelWidth": 14, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "f.h", @@ -227,7 +232,8 @@ "labelWidth": 16, "labelHeight": 36, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "f.h.g", @@ -265,7 +271,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 3 + "zIndex": 0, + "level": 3 } ], "connections": [ @@ -306,7 +313,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 }, { "id": "(c.d -> f.h.g)[0]", @@ -345,7 +352,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/container_edges/dagre/board.exp.json b/e2etests/testdata/stable/container_edges/dagre/board.exp.json index 9083f817c..01a5da1bc 100644 --- a/e2etests/testdata/stable/container_edges/dagre/board.exp.json +++ b/e2etests/testdata/stable/container_edges/dagre/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "g", @@ -75,7 +76,8 @@ "labelWidth": 18, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "g.b", @@ -113,7 +115,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "d", @@ -151,7 +154,8 @@ "labelWidth": 18, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "d.h", @@ -189,7 +193,8 @@ "labelWidth": 16, "labelHeight": 36, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "d.h.c", @@ -227,7 +232,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 3 + "zIndex": 0, + "level": 3 }, { "id": "g.e", @@ -265,7 +271,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "f", @@ -303,7 +310,8 @@ "labelWidth": 11, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -353,7 +361,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 }, { "id": "(g.b -> d.h.c)[0]", @@ -413,7 +421,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 }, { "id": "(d -> g.e)[0]", @@ -461,7 +469,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 }, { "id": "(g.e -> f)[0]", @@ -509,7 +517,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 }, { "id": "(f -> g)[0]", @@ -557,7 +565,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 }, { "id": "(g -> d.h)[0]", @@ -605,7 +613,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/container_edges/elk/board.exp.json b/e2etests/testdata/stable/container_edges/elk/board.exp.json index 6e9dba901..646780050 100644 --- a/e2etests/testdata/stable/container_edges/elk/board.exp.json +++ b/e2etests/testdata/stable/container_edges/elk/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "g", @@ -75,7 +76,8 @@ "labelWidth": 18, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "g.b", @@ -113,7 +115,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "d", @@ -151,7 +154,8 @@ "labelWidth": 18, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "d.h", @@ -189,7 +193,8 @@ "labelWidth": 16, "labelHeight": 36, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "d.h.c", @@ -227,7 +232,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 3 + "zIndex": 0, + "level": 3 }, { "id": "g.e", @@ -265,7 +271,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "f", @@ -303,7 +310,8 @@ "labelWidth": 11, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -344,7 +352,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 }, { "id": "(g.b -> d.h.c)[0]", @@ -383,7 +391,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 }, { "id": "(d -> g.e)[0]", @@ -438,7 +446,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 }, { "id": "(g.e -> f)[0]", @@ -485,7 +493,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 }, { "id": "(f -> g)[0]", @@ -532,7 +540,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 }, { "id": "(g -> d.h)[0]", @@ -571,7 +579,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/dense/dagre/board.exp.json b/e2etests/testdata/stable/dense/dagre/board.exp.json index 1f047852d..9ad565eb3 100644 --- a/e2etests/testdata/stable/dense/dagre/board.exp.json +++ b/e2etests/testdata/stable/dense/dagre/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "b", @@ -75,7 +76,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "c", @@ -113,7 +115,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "d", @@ -151,7 +154,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "e", @@ -189,7 +193,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "f", @@ -227,7 +232,8 @@ "labelWidth": 11, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "g", @@ -265,7 +271,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "h", @@ -303,7 +310,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "i", @@ -341,7 +349,8 @@ "labelWidth": 9, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "j", @@ -379,7 +388,8 @@ "labelWidth": 10, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "k", @@ -417,7 +427,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "l", @@ -455,7 +466,8 @@ "labelWidth": 9, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "m", @@ -493,7 +505,8 @@ "labelWidth": 17, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "n", @@ -531,7 +544,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "o", @@ -569,7 +583,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "p", @@ -607,7 +622,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "q", @@ -645,7 +661,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -695,7 +712,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(c -> b)[0]", @@ -755,7 +772,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(d -> e)[0]", @@ -815,7 +832,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(f -> e)[0]", @@ -875,7 +892,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(b -> f)[0]", @@ -935,7 +952,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(b -> g)[0]", @@ -983,7 +1000,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(g -> f)[0]", @@ -1031,7 +1048,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(b -> h)[0]", @@ -1079,7 +1096,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(b -> i)[0]", @@ -1187,7 +1204,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(b -> d)[0]", @@ -1247,7 +1264,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(j -> c)[0]", @@ -1295,7 +1312,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(j -> a)[0]", @@ -1355,7 +1372,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(b -> j)[0]", @@ -1403,7 +1420,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(i -> k)[0]", @@ -1451,7 +1468,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(d -> l)[0]", @@ -1499,7 +1516,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(l -> e)[0]", @@ -1547,7 +1564,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(m -> l)[0]", @@ -1595,7 +1612,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(m -> n)[0]", @@ -1643,7 +1660,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(n -> i)[0]", @@ -1691,7 +1708,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(d -> n)[0]", @@ -1739,7 +1756,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(f -> n)[0]", @@ -1787,7 +1804,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(b -> o)[0]", @@ -1835,7 +1852,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(p -> l)[0]", @@ -1883,7 +1900,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(e -> q)[0]", @@ -1931,7 +1948,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/dense/elk/board.exp.json b/e2etests/testdata/stable/dense/elk/board.exp.json index 45aaf4214..8c8866ecc 100644 --- a/e2etests/testdata/stable/dense/elk/board.exp.json +++ b/e2etests/testdata/stable/dense/elk/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "b", @@ -75,7 +76,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "c", @@ -113,7 +115,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "d", @@ -151,7 +154,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "e", @@ -189,7 +193,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "f", @@ -227,7 +232,8 @@ "labelWidth": 11, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "g", @@ -265,7 +271,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "h", @@ -303,7 +310,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "i", @@ -341,7 +349,8 @@ "labelWidth": 9, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "j", @@ -379,7 +388,8 @@ "labelWidth": 10, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "k", @@ -417,7 +427,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "l", @@ -455,7 +466,8 @@ "labelWidth": 9, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "m", @@ -493,7 +505,8 @@ "labelWidth": 17, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "n", @@ -531,7 +544,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "o", @@ -569,7 +583,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "p", @@ -607,7 +622,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "q", @@ -645,7 +661,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -686,7 +703,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(c -> b)[0]", @@ -733,7 +750,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(d -> e)[0]", @@ -780,7 +797,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(f -> e)[0]", @@ -827,7 +844,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(b -> f)[0]", @@ -874,7 +891,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(b -> g)[0]", @@ -921,7 +938,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(g -> f)[0]", @@ -968,7 +985,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(b -> h)[0]", @@ -1015,7 +1032,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(b -> i)[0]", @@ -1070,7 +1087,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(b -> d)[0]", @@ -1109,7 +1126,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(j -> c)[0]", @@ -1148,7 +1165,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(j -> a)[0]", @@ -1195,7 +1212,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(b -> j)[0]", @@ -1250,7 +1267,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(i -> k)[0]", @@ -1289,7 +1306,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(d -> l)[0]", @@ -1336,7 +1353,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(l -> e)[0]", @@ -1383,7 +1400,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(m -> l)[0]", @@ -1430,7 +1447,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(m -> n)[0]", @@ -1477,7 +1494,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(n -> i)[0]", @@ -1516,7 +1533,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(d -> n)[0]", @@ -1555,7 +1572,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(f -> n)[0]", @@ -1602,7 +1619,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(b -> o)[0]", @@ -1649,7 +1666,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(p -> l)[0]", @@ -1688,7 +1705,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(e -> q)[0]", @@ -1727,7 +1744,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/different_subgraphs/dagre/board.exp.json b/e2etests/testdata/stable/different_subgraphs/dagre/board.exp.json index dca8ec276..1019e206f 100644 --- a/e2etests/testdata/stable/different_subgraphs/dagre/board.exp.json +++ b/e2etests/testdata/stable/different_subgraphs/dagre/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 77, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "a", @@ -75,7 +76,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "tree", @@ -113,7 +115,8 @@ "labelWidth": 34, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "and", @@ -151,7 +154,8 @@ "labelWidth": 32, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "nodes", @@ -189,7 +193,8 @@ "labelWidth": 47, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "some", @@ -227,7 +232,8 @@ "labelWidth": 43, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "more", @@ -265,7 +271,8 @@ "labelWidth": 41, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "many", @@ -303,7 +310,8 @@ "labelWidth": 45, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "then", @@ -341,7 +349,8 @@ "labelWidth": 38, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "here", @@ -379,7 +388,8 @@ "labelWidth": 36, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "you", @@ -417,7 +427,8 @@ "labelWidth": 32, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "have", @@ -455,7 +466,8 @@ "labelWidth": 38, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "hierarchy", @@ -493,7 +505,8 @@ "labelWidth": 73, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "another", @@ -531,7 +544,8 @@ "labelWidth": 63, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "of", @@ -569,7 +583,8 @@ "labelWidth": 20, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "nesting", @@ -607,7 +622,8 @@ "labelWidth": 58, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "trees", @@ -645,7 +661,8 @@ "labelWidth": 42, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "finally.a", @@ -683,7 +700,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "finally.tree", @@ -721,7 +739,8 @@ "labelWidth": 34, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "finally.inside", @@ -759,7 +778,8 @@ "labelWidth": 48, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "finally.hierarchy", @@ -797,7 +817,8 @@ "labelWidth": 73, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "finally.root", @@ -835,7 +856,8 @@ "labelWidth": 35, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 } ], "connections": [ @@ -885,7 +907,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(a -> and)[0]", @@ -933,7 +955,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(a -> nodes)[0]", @@ -981,7 +1003,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(and -> some)[0]", @@ -1029,7 +1051,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(tree -> more)[0]", @@ -1077,7 +1099,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(tree -> many)[0]", @@ -1125,7 +1147,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(then -> here)[0]", @@ -1173,7 +1195,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(here -> you)[0]", @@ -1221,7 +1243,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(have -> hierarchy)[0]", @@ -1269,7 +1291,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(then -> hierarchy)[0]", @@ -1317,7 +1339,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(finally -> another)[0]", @@ -1365,7 +1387,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(another -> of)[0]", @@ -1413,7 +1435,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(nesting -> trees)[0]", @@ -1461,7 +1483,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(finally -> trees)[0]", @@ -1509,7 +1531,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "finally.(a -> tree)[0]", @@ -1557,7 +1579,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "finally.(inside -> a)[0]", @@ -1605,7 +1627,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "finally.(tree -> hierarchy)[0]", @@ -1653,7 +1675,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "finally.(a -> root)[0]", @@ -1701,7 +1723,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/different_subgraphs/elk/board.exp.json b/e2etests/testdata/stable/different_subgraphs/elk/board.exp.json index 595dbd557..d057f23a2 100644 --- a/e2etests/testdata/stable/different_subgraphs/elk/board.exp.json +++ b/e2etests/testdata/stable/different_subgraphs/elk/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 77, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "a", @@ -75,7 +76,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "tree", @@ -113,7 +115,8 @@ "labelWidth": 34, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "and", @@ -151,7 +154,8 @@ "labelWidth": 32, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "nodes", @@ -189,7 +193,8 @@ "labelWidth": 47, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "some", @@ -227,7 +232,8 @@ "labelWidth": 43, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "more", @@ -265,7 +271,8 @@ "labelWidth": 41, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "many", @@ -303,7 +310,8 @@ "labelWidth": 45, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "then", @@ -341,7 +349,8 @@ "labelWidth": 38, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "here", @@ -379,7 +388,8 @@ "labelWidth": 36, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "you", @@ -417,7 +427,8 @@ "labelWidth": 32, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "have", @@ -455,7 +466,8 @@ "labelWidth": 38, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "hierarchy", @@ -493,7 +505,8 @@ "labelWidth": 73, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "another", @@ -531,7 +544,8 @@ "labelWidth": 63, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "of", @@ -569,7 +583,8 @@ "labelWidth": 20, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "nesting", @@ -607,7 +622,8 @@ "labelWidth": 58, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "trees", @@ -645,7 +661,8 @@ "labelWidth": 42, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "finally.a", @@ -683,7 +700,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "finally.tree", @@ -721,7 +739,8 @@ "labelWidth": 34, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "finally.inside", @@ -759,7 +778,8 @@ "labelWidth": 48, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "finally.hierarchy", @@ -797,7 +817,8 @@ "labelWidth": 73, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "finally.root", @@ -835,7 +856,8 @@ "labelWidth": 35, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 } ], "connections": [ @@ -884,7 +906,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(a -> and)[0]", @@ -931,7 +953,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(a -> nodes)[0]", @@ -970,7 +992,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(and -> some)[0]", @@ -1009,7 +1031,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(tree -> more)[0]", @@ -1048,7 +1070,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(tree -> many)[0]", @@ -1095,7 +1117,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(then -> here)[0]", @@ -1134,7 +1156,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(here -> you)[0]", @@ -1173,7 +1195,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(have -> hierarchy)[0]", @@ -1212,7 +1234,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(then -> hierarchy)[0]", @@ -1259,7 +1281,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(finally -> another)[0]", @@ -1298,7 +1320,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(another -> of)[0]", @@ -1337,7 +1359,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(nesting -> trees)[0]", @@ -1376,7 +1398,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(finally -> trees)[0]", @@ -1423,7 +1445,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "finally.(a -> tree)[0]", @@ -1470,7 +1492,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "finally.(inside -> a)[0]", @@ -1509,7 +1531,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "finally.(tree -> hierarchy)[0]", @@ -1548,7 +1570,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "finally.(a -> root)[0]", @@ -1587,7 +1609,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/direction/dagre/board.exp.json b/e2etests/testdata/stable/direction/dagre/board.exp.json index 821680267..94bdc0db0 100644 --- a/e2etests/testdata/stable/direction/dagre/board.exp.json +++ b/e2etests/testdata/stable/direction/dagre/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 18, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "b.2", @@ -75,7 +76,8 @@ "labelWidth": 16, "labelHeight": 36, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "a", @@ -113,7 +115,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "c", @@ -151,7 +154,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "d", @@ -189,7 +193,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "e", @@ -227,7 +232,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "b.1", @@ -265,7 +271,8 @@ "labelWidth": 12, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "b.3", @@ -303,7 +310,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "b.4", @@ -341,7 +349,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "b.5", @@ -379,7 +388,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "b.2.a", @@ -417,7 +427,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 3 + "zIndex": 0, + "level": 3 }, { "id": "b.2.b", @@ -455,7 +466,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 3 + "zIndex": 0, + "level": 3 }, { "id": "b.2.c", @@ -493,7 +505,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 3 + "zIndex": 0, + "level": 3 }, { "id": "b.2.d", @@ -531,7 +544,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 3 + "zIndex": 0, + "level": 3 }, { "id": "b.2.e", @@ -569,7 +583,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 3 + "zIndex": 0, + "level": 3 } ], "connections": [ @@ -619,7 +634,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 }, { "id": "(b -> c)[0]", @@ -667,7 +682,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 }, { "id": "(c -> d)[0]", @@ -715,7 +730,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 }, { "id": "(d -> e)[0]", @@ -763,7 +778,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 }, { "id": "b.(1 -> 2)[0]", @@ -811,7 +826,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 }, { "id": "b.(2 -> 3)[0]", @@ -859,7 +874,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 }, { "id": "b.(3 -> 4)[0]", @@ -907,7 +922,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 }, { "id": "b.(4 -> 5)[0]", @@ -955,7 +970,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 }, { "id": "b.2.(a -> b)[0]", @@ -1003,7 +1018,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 }, { "id": "b.2.(b -> c)[0]", @@ -1051,7 +1066,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 }, { "id": "b.2.(c -> d)[0]", @@ -1099,7 +1114,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 }, { "id": "b.2.(d -> e)[0]", @@ -1147,7 +1162,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/direction/elk/board.exp.json b/e2etests/testdata/stable/direction/elk/board.exp.json index c6a1c80a1..2406399ad 100644 --- a/e2etests/testdata/stable/direction/elk/board.exp.json +++ b/e2etests/testdata/stable/direction/elk/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 18, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "b.2", @@ -75,7 +76,8 @@ "labelWidth": 16, "labelHeight": 36, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "a", @@ -113,7 +115,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "c", @@ -151,7 +154,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "d", @@ -189,7 +193,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "e", @@ -227,7 +232,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "b.1", @@ -265,7 +271,8 @@ "labelWidth": 12, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "b.3", @@ -303,7 +310,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "b.4", @@ -341,7 +349,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "b.5", @@ -379,7 +388,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "b.2.a", @@ -417,7 +427,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 3 + "zIndex": 0, + "level": 3 }, { "id": "b.2.b", @@ -455,7 +466,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 3 + "zIndex": 0, + "level": 3 }, { "id": "b.2.c", @@ -493,7 +505,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 3 + "zIndex": 0, + "level": 3 }, { "id": "b.2.d", @@ -531,7 +544,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 3 + "zIndex": 0, + "level": 3 }, { "id": "b.2.e", @@ -569,7 +583,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 3 + "zIndex": 0, + "level": 3 } ], "connections": [ @@ -610,7 +625,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 }, { "id": "(b -> c)[0]", @@ -649,7 +664,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 }, { "id": "(c -> d)[0]", @@ -688,7 +703,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 }, { "id": "(d -> e)[0]", @@ -727,7 +742,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 }, { "id": "b.(1 -> 2)[0]", @@ -766,7 +781,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 }, { "id": "b.(2 -> 3)[0]", @@ -805,7 +820,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 }, { "id": "b.(3 -> 4)[0]", @@ -844,7 +859,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 }, { "id": "b.(4 -> 5)[0]", @@ -883,7 +898,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 }, { "id": "b.2.(a -> b)[0]", @@ -922,7 +937,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 }, { "id": "b.2.(b -> c)[0]", @@ -961,7 +976,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 }, { "id": "b.2.(c -> d)[0]", @@ -1000,7 +1015,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 }, { "id": "b.2.(d -> e)[0]", @@ -1039,7 +1054,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/font_colors/dagre/board.exp.json b/e2etests/testdata/stable/font_colors/dagre/board.exp.json index e0499e3ac..baa3326bd 100644 --- a/e2etests/testdata/stable/font_colors/dagre/board.exp.json +++ b/e2etests/testdata/stable/font_colors/dagre/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 45, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "beta", @@ -75,7 +76,8 @@ "labelWidth": 36, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -125,7 +127,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/font_colors/elk/board.exp.json b/e2etests/testdata/stable/font_colors/elk/board.exp.json index 3f4ebe78e..2766ed834 100644 --- a/e2etests/testdata/stable/font_colors/elk/board.exp.json +++ b/e2etests/testdata/stable/font_colors/elk/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 45, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "beta", @@ -75,7 +76,8 @@ "labelWidth": 36, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -116,7 +118,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/giant_markdown_test/dagre/board.exp.json b/e2etests/testdata/stable/giant_markdown_test/dagre/board.exp.json index 15f17648d..4d1de50b6 100644 --- a/e2etests/testdata/stable/giant_markdown_test/dagre/board.exp.json +++ b/e2etests/testdata/stable/giant_markdown_test/dagre/board.exp.json @@ -36,7 +36,8 @@ "underline": false, "labelWidth": 3051, "labelHeight": 4848, - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "a", @@ -74,7 +75,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "b", @@ -112,7 +114,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -162,7 +165,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(md -> b)[0]", @@ -210,7 +213,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/giant_markdown_test/elk/board.exp.json b/e2etests/testdata/stable/giant_markdown_test/elk/board.exp.json index 8be889b9d..3fa5d6c9d 100644 --- a/e2etests/testdata/stable/giant_markdown_test/elk/board.exp.json +++ b/e2etests/testdata/stable/giant_markdown_test/elk/board.exp.json @@ -36,7 +36,8 @@ "underline": false, "labelWidth": 3051, "labelHeight": 4848, - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "a", @@ -74,7 +75,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "b", @@ -112,7 +114,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -153,7 +156,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(md -> b)[0]", @@ -192,7 +195,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/hr/dagre/board.exp.json b/e2etests/testdata/stable/hr/dagre/board.exp.json index 3b366c266..617660858 100644 --- a/e2etests/testdata/stable/hr/dagre/board.exp.json +++ b/e2etests/testdata/stable/hr/dagre/board.exp.json @@ -36,7 +36,8 @@ "underline": false, "labelWidth": 738, "labelHeight": 134, - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "a", @@ -74,7 +75,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "b", @@ -112,7 +114,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -162,7 +165,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(md -> b)[0]", @@ -210,7 +213,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/hr/elk/board.exp.json b/e2etests/testdata/stable/hr/elk/board.exp.json index 4ce193770..a677c56ac 100644 --- a/e2etests/testdata/stable/hr/elk/board.exp.json +++ b/e2etests/testdata/stable/hr/elk/board.exp.json @@ -36,7 +36,8 @@ "underline": false, "labelWidth": 738, "labelHeight": 134, - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "a", @@ -74,7 +75,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "b", @@ -112,7 +114,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -153,7 +156,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(md -> b)[0]", @@ -192,7 +195,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/images/dagre/board.exp.json b/e2etests/testdata/stable/images/dagre/board.exp.json index 29ef1200c..d7b9011d3 100644 --- a/e2etests/testdata/stable/images/dagre/board.exp.json +++ b/e2etests/testdata/stable/images/dagre/board.exp.json @@ -48,7 +48,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "OUTSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "b", @@ -97,7 +98,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "OUTSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -147,7 +149,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/images/elk/board.exp.json b/e2etests/testdata/stable/images/elk/board.exp.json index 5ac0e2902..898a6f5dd 100644 --- a/e2etests/testdata/stable/images/elk/board.exp.json +++ b/e2etests/testdata/stable/images/elk/board.exp.json @@ -48,7 +48,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "OUTSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "b", @@ -97,7 +98,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "OUTSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -138,7 +140,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/investigate/dagre/board.exp.json b/e2etests/testdata/stable/investigate/dagre/board.exp.json index 8a5fa0f5f..d175c156a 100644 --- a/e2etests/testdata/stable/investigate/dagre/board.exp.json +++ b/e2etests/testdata/stable/investigate/dagre/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 22, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "bb", @@ -75,7 +76,8 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "cc", @@ -113,7 +115,8 @@ "labelWidth": 21, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "dd", @@ -151,7 +154,8 @@ "labelWidth": 34, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "dd.ee", @@ -189,7 +193,8 @@ "labelWidth": 22, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "ll", @@ -227,7 +232,8 @@ "labelWidth": 18, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "ll.mm", @@ -265,7 +271,8 @@ "labelWidth": 31, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "ff", @@ -303,7 +310,8 @@ "labelWidth": 23, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "ff.mm", @@ -341,7 +349,8 @@ "labelWidth": 31, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "ff.gg", @@ -379,7 +388,8 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "dd.hh", @@ -417,7 +427,8 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "ww", @@ -466,7 +477,8 @@ "labelWidth": 31, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "yy", @@ -504,7 +516,8 @@ "labelWidth": 32, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "yy.zz", @@ -553,7 +566,8 @@ "labelWidth": 20, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "ad", @@ -591,7 +605,8 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "nn", @@ -629,7 +644,8 @@ "labelWidth": 33, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "ii", @@ -667,7 +683,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "jj", @@ -705,7 +722,8 @@ "labelWidth": 15, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "kk", @@ -743,7 +761,8 @@ "labelWidth": 22, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "nn.oo", @@ -781,7 +800,8 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "ff.pp", @@ -819,7 +839,8 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "ll.qq", @@ -857,7 +878,8 @@ "labelWidth": 24, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "ll.rr", @@ -895,7 +917,8 @@ "labelWidth": 18, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "ss", @@ -933,7 +956,8 @@ "labelWidth": 28, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "ss.tt", @@ -971,7 +995,8 @@ "labelWidth": 18, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "uu", @@ -1009,7 +1034,8 @@ "labelWidth": 32, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "uu.vv", @@ -1047,7 +1073,8 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "rm", @@ -1085,7 +1112,8 @@ "labelWidth": 24, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "nn.xx", @@ -1123,7 +1151,8 @@ "labelWidth": 22, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "yy.ab", @@ -1161,7 +1190,8 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "nn.ac", @@ -1199,7 +1229,8 @@ "labelWidth": 22, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 } ], "connections": [ @@ -1249,7 +1280,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(bb -- cc)[0]", @@ -1297,7 +1328,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(aa -> dd.ee)[0]", @@ -1393,7 +1424,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(bb -> ff.gg)[0]", @@ -1657,7 +1688,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(cc -> dd.hh)[0]", @@ -1705,7 +1736,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(dd.ee -> ii)[0]", @@ -1753,7 +1784,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(ii -- jj)[0]", @@ -1801,7 +1832,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(jj -> kk)[0]", @@ -1861,7 +1892,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(kk -> ff.mm)[0]", @@ -1969,7 +2000,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(ff.mm -> ll.mm)[0]", @@ -2053,7 +2084,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(ll.mm -> nn.oo)[0]", @@ -2185,7 +2216,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "ff.(gg -> pp)[0]", @@ -2233,7 +2264,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(ff.pp -> ll.qq)[0]", @@ -2293,7 +2324,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "ll.(qq -> rr)[0]", @@ -2341,7 +2372,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(dd.hh -> ss.tt)[0]", @@ -2425,7 +2456,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(ss.tt -> uu.vv)[0]", @@ -2485,7 +2516,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(kk -> ww)[0]", @@ -2533,7 +2564,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(uu.vv -> ww)[0]", @@ -2581,7 +2612,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(ww -> rm)[0]", @@ -2725,7 +2756,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(rm -> nn.xx)[0]", @@ -2857,7 +2888,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(ll.rr -> yy.zz)[0]", @@ -2917,7 +2948,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(rm -> yy.zz)[0]", @@ -2977,7 +3008,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "yy.(zz -> ab)[0]", @@ -3025,7 +3056,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(yy.ab -> nn.ac)[0]", @@ -3085,7 +3116,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(nn.ac -> ad)[0]", @@ -3133,7 +3164,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(ww -> ff.gg)[0]", @@ -3181,7 +3212,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/investigate/elk/board.exp.json b/e2etests/testdata/stable/investigate/elk/board.exp.json index 24f934439..f01c5d9b1 100644 --- a/e2etests/testdata/stable/investigate/elk/board.exp.json +++ b/e2etests/testdata/stable/investigate/elk/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 22, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "bb", @@ -75,7 +76,8 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "cc", @@ -113,7 +115,8 @@ "labelWidth": 21, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "dd", @@ -151,7 +154,8 @@ "labelWidth": 34, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "dd.ee", @@ -189,7 +193,8 @@ "labelWidth": 22, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "ll", @@ -227,7 +232,8 @@ "labelWidth": 18, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "ll.mm", @@ -265,7 +271,8 @@ "labelWidth": 31, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "ff", @@ -303,7 +310,8 @@ "labelWidth": 23, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "ff.mm", @@ -341,7 +349,8 @@ "labelWidth": 31, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "ff.gg", @@ -379,7 +388,8 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "dd.hh", @@ -417,7 +427,8 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "ww", @@ -466,7 +477,8 @@ "labelWidth": 31, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "yy", @@ -504,7 +516,8 @@ "labelWidth": 32, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "yy.zz", @@ -553,7 +566,8 @@ "labelWidth": 20, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "ad", @@ -591,7 +605,8 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "nn", @@ -629,7 +644,8 @@ "labelWidth": 33, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "ii", @@ -667,7 +683,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "jj", @@ -705,7 +722,8 @@ "labelWidth": 15, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "kk", @@ -743,7 +761,8 @@ "labelWidth": 22, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "nn.oo", @@ -781,7 +800,8 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "ff.pp", @@ -819,7 +839,8 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "ll.qq", @@ -857,7 +878,8 @@ "labelWidth": 24, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "ll.rr", @@ -895,7 +917,8 @@ "labelWidth": 18, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "ss", @@ -933,7 +956,8 @@ "labelWidth": 28, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "ss.tt", @@ -971,7 +995,8 @@ "labelWidth": 18, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "uu", @@ -1009,7 +1034,8 @@ "labelWidth": 32, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "uu.vv", @@ -1047,7 +1073,8 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "rm", @@ -1085,7 +1112,8 @@ "labelWidth": 24, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "nn.xx", @@ -1123,7 +1151,8 @@ "labelWidth": 22, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "yy.ab", @@ -1161,7 +1190,8 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "nn.ac", @@ -1199,7 +1229,8 @@ "labelWidth": 22, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 } ], "connections": [ @@ -1248,7 +1279,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(bb -- cc)[0]", @@ -1287,7 +1318,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(aa -> dd.ee)[0]", @@ -1326,7 +1357,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(bb -> ff.gg)[0]", @@ -1381,7 +1412,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(cc -> dd.hh)[0]", @@ -1420,7 +1451,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(dd.ee -> ii)[0]", @@ -1459,7 +1490,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(ii -- jj)[0]", @@ -1498,7 +1529,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(jj -> kk)[0]", @@ -1537,7 +1568,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(kk -> ff.mm)[0]", @@ -1576,7 +1607,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(ff.mm -> ll.mm)[0]", @@ -1615,7 +1646,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(ll.mm -> nn.oo)[0]", @@ -1654,7 +1685,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "ff.(gg -> pp)[0]", @@ -1693,7 +1724,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(ff.pp -> ll.qq)[0]", @@ -1740,7 +1771,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "ll.(qq -> rr)[0]", @@ -1779,7 +1810,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(dd.hh -> ss.tt)[0]", @@ -1826,7 +1857,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(ss.tt -> uu.vv)[0]", @@ -1865,7 +1896,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(kk -> ww)[0]", @@ -1912,7 +1943,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(uu.vv -> ww)[0]", @@ -1951,7 +1982,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(ww -> rm)[0]", @@ -1990,7 +2021,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(rm -> nn.xx)[0]", @@ -2045,7 +2076,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(ll.rr -> yy.zz)[0]", @@ -2092,7 +2123,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(rm -> yy.zz)[0]", @@ -2131,7 +2162,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "yy.(zz -> ab)[0]", @@ -2170,7 +2201,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(yy.ab -> nn.ac)[0]", @@ -2217,7 +2248,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(nn.ac -> ad)[0]", @@ -2256,7 +2287,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(ww -> ff.gg)[0]", @@ -2303,7 +2334,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/large_arch/dagre/board.exp.json b/e2etests/testdata/stable/large_arch/dagre/board.exp.json index f755f3713..363e988e9 100644 --- a/e2etests/testdata/stable/large_arch/dagre/board.exp.json +++ b/e2etests/testdata/stable/large_arch/dagre/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "b", @@ -75,7 +76,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "c", @@ -113,7 +115,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "d", @@ -151,7 +154,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "e", @@ -189,7 +193,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "f", @@ -227,7 +232,8 @@ "labelWidth": 11, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "g", @@ -265,7 +271,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "h", @@ -303,7 +310,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "i", @@ -341,7 +349,8 @@ "labelWidth": 9, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "i.j", @@ -379,7 +388,8 @@ "labelWidth": 11, "labelHeight": 36, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "i.j.k", @@ -417,7 +427,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 3 + "zIndex": 0, + "level": 3 }, { "id": "i.j.l", @@ -455,7 +466,8 @@ "labelWidth": 9, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 3 + "zIndex": 0, + "level": 3 }, { "id": "i.m", @@ -493,7 +505,8 @@ "labelWidth": 17, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "i.n", @@ -531,7 +544,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "i.o", @@ -569,7 +583,8 @@ "labelWidth": 16, "labelHeight": 36, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "i.o.p", @@ -607,7 +622,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 3 + "zIndex": 0, + "level": 3 }, { "id": "q", @@ -645,7 +661,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "r", @@ -683,7 +700,8 @@ "labelWidth": 13, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "r.s", @@ -721,7 +739,8 @@ "labelWidth": 15, "labelHeight": 36, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "r.s.t", @@ -759,7 +778,8 @@ "labelWidth": 11, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 3 + "zIndex": 0, + "level": 3 }, { "id": "r.s.u", @@ -797,7 +817,8 @@ "labelWidth": 14, "labelHeight": 31, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 3 + "zIndex": 0, + "level": 3 }, { "id": "r.s.u.v", @@ -835,7 +856,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 4 + "zIndex": 0, + "level": 4 }, { "id": "r.s.w", @@ -873,7 +895,8 @@ "labelWidth": 18, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 3 + "zIndex": 0, + "level": 3 }, { "id": "r.s.x", @@ -911,7 +934,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 3 + "zIndex": 0, + "level": 3 }, { "id": "r.s.y", @@ -949,7 +973,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 3 + "zIndex": 0, + "level": 3 }, { "id": "r.z", @@ -987,7 +1012,8 @@ "labelWidth": 12, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "r.aa", @@ -1025,7 +1051,8 @@ "labelWidth": 22, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "r.bb", @@ -1063,7 +1090,8 @@ "labelWidth": 31, "labelHeight": 36, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "r.bb.cc", @@ -1101,7 +1129,8 @@ "labelWidth": 21, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 3 + "zIndex": 0, + "level": 3 }, { "id": "r.bb.dd", @@ -1139,7 +1168,8 @@ "labelWidth": 24, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 3 + "zIndex": 0, + "level": 3 }, { "id": "r.ee", @@ -1177,7 +1207,8 @@ "labelWidth": 22, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "r.ff", @@ -1215,7 +1246,8 @@ "labelWidth": 17, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "r.gg", @@ -1253,7 +1285,8 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 } ], "connections": [ @@ -1327,7 +1360,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 5 + "zIndex": 0 }, { "id": "i.(j.l -> o.p)[0]", @@ -1399,7 +1432,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 5 + "zIndex": 0 }, { "id": "(q -> i.m)[0]", @@ -1459,7 +1492,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 5 + "zIndex": 0 }, { "id": "(i.m -> q)[0]", @@ -1519,7 +1552,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 5 + "zIndex": 0 }, { "id": "(i.n -> q)[0]", @@ -1579,7 +1612,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 5 + "zIndex": 0 }, { "id": "(i.m -> c)[0]", @@ -1639,7 +1672,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 5 + "zIndex": 0 }, { "id": "(i.m -> d)[0]", @@ -1699,7 +1732,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 5 + "zIndex": 0 }, { "id": "(i.m -> g)[0]", @@ -1759,7 +1792,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 5 + "zIndex": 0 }, { "id": "(i.m -> f)[0]", @@ -1819,7 +1852,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 5 + "zIndex": 0 }, { "id": "(d -> e)[0]", @@ -1867,7 +1900,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 5 + "zIndex": 0 }, { "id": "r.s.(x -> t)[0]", @@ -1939,7 +1972,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 5 + "zIndex": 0 }, { "id": "r.s.(x -> w)[0]", @@ -2011,7 +2044,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 5 + "zIndex": 0 }, { "id": "r.(gg -> s.t)[0]", @@ -2083,7 +2116,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 5 + "zIndex": 0 }, { "id": "r.(s.u.v -> z)[0]", @@ -2155,7 +2188,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 5 + "zIndex": 0 }, { "id": "r.(aa -> s.t)[0]", @@ -2227,7 +2260,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 5 + "zIndex": 0 }, { "id": "(r.s.w -> i.m)[0]", @@ -2299,7 +2332,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 5 + "zIndex": 0 }, { "id": "(r.s.t -> g)[0]", @@ -2419,7 +2452,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 5 + "zIndex": 0 }, { "id": "(r.s.t -> h)[0]", @@ -2491,7 +2524,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 5 + "zIndex": 0 }, { "id": "r.(ee -> ff)[0]", @@ -2563,7 +2596,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 5 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/large_arch/elk/board.exp.json b/e2etests/testdata/stable/large_arch/elk/board.exp.json index 84336e7e1..5d5feac5e 100644 --- a/e2etests/testdata/stable/large_arch/elk/board.exp.json +++ b/e2etests/testdata/stable/large_arch/elk/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "b", @@ -75,7 +76,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "c", @@ -113,7 +115,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "d", @@ -151,7 +154,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "e", @@ -189,7 +193,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "f", @@ -227,7 +232,8 @@ "labelWidth": 11, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "g", @@ -265,7 +271,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "h", @@ -303,7 +310,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "i", @@ -341,7 +349,8 @@ "labelWidth": 9, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "i.j", @@ -379,7 +388,8 @@ "labelWidth": 11, "labelHeight": 36, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "i.j.k", @@ -417,7 +427,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 3 + "zIndex": 0, + "level": 3 }, { "id": "i.j.l", @@ -455,7 +466,8 @@ "labelWidth": 9, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 3 + "zIndex": 0, + "level": 3 }, { "id": "i.m", @@ -493,7 +505,8 @@ "labelWidth": 17, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "i.n", @@ -531,7 +544,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "i.o", @@ -569,7 +583,8 @@ "labelWidth": 16, "labelHeight": 36, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "i.o.p", @@ -607,7 +622,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 3 + "zIndex": 0, + "level": 3 }, { "id": "q", @@ -645,7 +661,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "r", @@ -683,7 +700,8 @@ "labelWidth": 13, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "r.s", @@ -721,7 +739,8 @@ "labelWidth": 15, "labelHeight": 36, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "r.s.t", @@ -759,7 +778,8 @@ "labelWidth": 11, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 3 + "zIndex": 0, + "level": 3 }, { "id": "r.s.u", @@ -797,7 +817,8 @@ "labelWidth": 14, "labelHeight": 31, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 3 + "zIndex": 0, + "level": 3 }, { "id": "r.s.u.v", @@ -835,7 +856,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 4 + "zIndex": 0, + "level": 4 }, { "id": "r.s.w", @@ -873,7 +895,8 @@ "labelWidth": 18, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 3 + "zIndex": 0, + "level": 3 }, { "id": "r.s.x", @@ -911,7 +934,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 3 + "zIndex": 0, + "level": 3 }, { "id": "r.s.y", @@ -949,7 +973,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 3 + "zIndex": 0, + "level": 3 }, { "id": "r.z", @@ -987,7 +1012,8 @@ "labelWidth": 12, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "r.aa", @@ -1025,7 +1051,8 @@ "labelWidth": 22, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "r.bb", @@ -1063,7 +1090,8 @@ "labelWidth": 31, "labelHeight": 36, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "r.bb.cc", @@ -1101,7 +1129,8 @@ "labelWidth": 21, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 3 + "zIndex": 0, + "level": 3 }, { "id": "r.bb.dd", @@ -1139,7 +1168,8 @@ "labelWidth": 24, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 3 + "zIndex": 0, + "level": 3 }, { "id": "r.ee", @@ -1177,7 +1207,8 @@ "labelWidth": 22, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "r.ff", @@ -1215,7 +1246,8 @@ "labelWidth": 17, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "r.gg", @@ -1253,7 +1285,8 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 } ], "connections": [ @@ -1302,7 +1335,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 5 + "zIndex": 0 }, { "id": "i.(j.l -> o.p)[0]", @@ -1341,7 +1374,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 5 + "zIndex": 0 }, { "id": "(q -> i.m)[0]", @@ -1396,7 +1429,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 5 + "zIndex": 0 }, { "id": "(i.m -> q)[0]", @@ -1443,7 +1476,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 5 + "zIndex": 0 }, { "id": "(i.n -> q)[0]", @@ -1482,7 +1515,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 5 + "zIndex": 0 }, { "id": "(i.m -> c)[0]", @@ -1529,7 +1562,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 5 + "zIndex": 0 }, { "id": "(i.m -> d)[0]", @@ -1576,7 +1609,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 5 + "zIndex": 0 }, { "id": "(i.m -> g)[0]", @@ -1623,7 +1656,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 5 + "zIndex": 0 }, { "id": "(i.m -> f)[0]", @@ -1670,7 +1703,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 5 + "zIndex": 0 }, { "id": "(d -> e)[0]", @@ -1709,7 +1742,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 5 + "zIndex": 0 }, { "id": "r.s.(x -> t)[0]", @@ -1756,7 +1789,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 5 + "zIndex": 0 }, { "id": "r.s.(x -> w)[0]", @@ -1795,7 +1828,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 5 + "zIndex": 0 }, { "id": "r.(gg -> s.t)[0]", @@ -1834,7 +1867,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 5 + "zIndex": 0 }, { "id": "r.(s.u.v -> z)[0]", @@ -1873,7 +1906,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 5 + "zIndex": 0 }, { "id": "r.(aa -> s.t)[0]", @@ -1920,7 +1953,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 5 + "zIndex": 0 }, { "id": "(r.s.w -> i.m)[0]", @@ -1959,7 +1992,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 5 + "zIndex": 0 }, { "id": "(r.s.t -> g)[0]", @@ -2006,7 +2039,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 5 + "zIndex": 0 }, { "id": "(r.s.t -> h)[0]", @@ -2053,7 +2086,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 5 + "zIndex": 0 }, { "id": "r.(ee -> ff)[0]", @@ -2092,7 +2125,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 5 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/latex/dagre/board.exp.json b/e2etests/testdata/stable/latex/dagre/board.exp.json index 91ede30f7..7c67a066e 100644 --- a/e2etests/testdata/stable/latex/dagre/board.exp.json +++ b/e2etests/testdata/stable/latex/dagre/board.exp.json @@ -36,7 +36,8 @@ "underline": false, "labelWidth": 382, "labelHeight": 101, - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "b", @@ -73,7 +74,8 @@ "underline": false, "labelWidth": 65, "labelHeight": 18, - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "z", @@ -110,7 +112,8 @@ "underline": false, "labelWidth": 179, "labelHeight": 51, - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "c", @@ -148,7 +151,8 @@ "labelWidth": 114, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "sugar", @@ -186,7 +190,8 @@ "labelWidth": 46, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "solution", @@ -224,7 +229,8 @@ "labelWidth": 64, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -274,7 +280,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(z -> b)[0]", @@ -322,7 +328,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(a -> c)[0]", @@ -370,7 +376,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(b -> c)[0]", @@ -418,7 +424,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(sugar -> c)[0]", @@ -466,7 +472,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(c -> solution)[0]", @@ -514,7 +520,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/latex/elk/board.exp.json b/e2etests/testdata/stable/latex/elk/board.exp.json index fcb80157f..f5169ca81 100644 --- a/e2etests/testdata/stable/latex/elk/board.exp.json +++ b/e2etests/testdata/stable/latex/elk/board.exp.json @@ -36,7 +36,8 @@ "underline": false, "labelWidth": 382, "labelHeight": 101, - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "b", @@ -73,7 +74,8 @@ "underline": false, "labelWidth": 65, "labelHeight": 18, - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "z", @@ -110,7 +112,8 @@ "underline": false, "labelWidth": 179, "labelHeight": 51, - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "c", @@ -148,7 +151,8 @@ "labelWidth": 114, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "sugar", @@ -186,7 +190,8 @@ "labelWidth": 46, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "solution", @@ -224,7 +229,8 @@ "labelWidth": 64, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -273,7 +279,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(z -> b)[0]", @@ -312,7 +318,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(a -> c)[0]", @@ -359,7 +365,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(b -> c)[0]", @@ -398,7 +404,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(sugar -> c)[0]", @@ -445,7 +451,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(c -> solution)[0]", @@ -484,7 +490,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/li1/dagre/board.exp.json b/e2etests/testdata/stable/li1/dagre/board.exp.json index 68fbffe76..ef0b21375 100644 --- a/e2etests/testdata/stable/li1/dagre/board.exp.json +++ b/e2etests/testdata/stable/li1/dagre/board.exp.json @@ -36,7 +36,8 @@ "underline": false, "labelWidth": 379, "labelHeight": 100, - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "a", @@ -74,7 +75,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "b", @@ -112,7 +114,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -162,7 +165,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(md -> b)[0]", @@ -210,7 +213,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/li1/elk/board.exp.json b/e2etests/testdata/stable/li1/elk/board.exp.json index 28d8511a8..7a775116c 100644 --- a/e2etests/testdata/stable/li1/elk/board.exp.json +++ b/e2etests/testdata/stable/li1/elk/board.exp.json @@ -36,7 +36,8 @@ "underline": false, "labelWidth": 379, "labelHeight": 100, - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "a", @@ -74,7 +75,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "b", @@ -112,7 +114,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -153,7 +156,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(md -> b)[0]", @@ -192,7 +195,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/li2/dagre/board.exp.json b/e2etests/testdata/stable/li2/dagre/board.exp.json index d304fb466..fb1e86fb3 100644 --- a/e2etests/testdata/stable/li2/dagre/board.exp.json +++ b/e2etests/testdata/stable/li2/dagre/board.exp.json @@ -36,7 +36,8 @@ "underline": false, "labelWidth": 245, "labelHeight": 76, - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "a", @@ -74,7 +75,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "b", @@ -112,7 +114,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -162,7 +165,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(md -> b)[0]", @@ -210,7 +213,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/li2/elk/board.exp.json b/e2etests/testdata/stable/li2/elk/board.exp.json index 8fd876876..07f33ae94 100644 --- a/e2etests/testdata/stable/li2/elk/board.exp.json +++ b/e2etests/testdata/stable/li2/elk/board.exp.json @@ -36,7 +36,8 @@ "underline": false, "labelWidth": 245, "labelHeight": 76, - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "a", @@ -74,7 +75,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "b", @@ -112,7 +114,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -153,7 +156,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(md -> b)[0]", @@ -192,7 +195,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/li3/dagre/board.exp.json b/e2etests/testdata/stable/li3/dagre/board.exp.json index 4febddb15..73ccc4c49 100644 --- a/e2etests/testdata/stable/li3/dagre/board.exp.json +++ b/e2etests/testdata/stable/li3/dagre/board.exp.json @@ -36,7 +36,8 @@ "underline": false, "labelWidth": 347, "labelHeight": 512, - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "a", @@ -74,7 +75,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "b", @@ -112,7 +114,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -162,7 +165,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(md -> b)[0]", @@ -210,7 +213,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/li3/elk/board.exp.json b/e2etests/testdata/stable/li3/elk/board.exp.json index 40385ff75..153b23cc7 100644 --- a/e2etests/testdata/stable/li3/elk/board.exp.json +++ b/e2etests/testdata/stable/li3/elk/board.exp.json @@ -36,7 +36,8 @@ "underline": false, "labelWidth": 347, "labelHeight": 512, - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "a", @@ -74,7 +75,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "b", @@ -112,7 +114,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -153,7 +156,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(md -> b)[0]", @@ -192,7 +195,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/li4/dagre/board.exp.json b/e2etests/testdata/stable/li4/dagre/board.exp.json index 28c706f51..beb04851b 100644 --- a/e2etests/testdata/stable/li4/dagre/board.exp.json +++ b/e2etests/testdata/stable/li4/dagre/board.exp.json @@ -36,7 +36,8 @@ "underline": false, "labelWidth": 920, "labelHeight": 376, - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "a", @@ -74,7 +75,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "b", @@ -112,7 +114,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -162,7 +165,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(md -> b)[0]", @@ -210,7 +213,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/li4/elk/board.exp.json b/e2etests/testdata/stable/li4/elk/board.exp.json index 081393ce3..e3c415af9 100644 --- a/e2etests/testdata/stable/li4/elk/board.exp.json +++ b/e2etests/testdata/stable/li4/elk/board.exp.json @@ -36,7 +36,8 @@ "underline": false, "labelWidth": 920, "labelHeight": 376, - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "a", @@ -74,7 +75,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "b", @@ -112,7 +114,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -153,7 +156,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(md -> b)[0]", @@ -192,7 +195,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/lone_h1/dagre/board.exp.json b/e2etests/testdata/stable/lone_h1/dagre/board.exp.json index e8f394122..eff491567 100644 --- a/e2etests/testdata/stable/lone_h1/dagre/board.exp.json +++ b/e2etests/testdata/stable/lone_h1/dagre/board.exp.json @@ -36,7 +36,8 @@ "underline": false, "labelWidth": 266, "labelHeight": 50, - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "a", @@ -74,7 +75,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "b", @@ -112,7 +114,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -162,7 +165,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(md -> b)[0]", @@ -210,7 +213,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/lone_h1/elk/board.exp.json b/e2etests/testdata/stable/lone_h1/elk/board.exp.json index e72ff8f7a..e2d4191d7 100644 --- a/e2etests/testdata/stable/lone_h1/elk/board.exp.json +++ b/e2etests/testdata/stable/lone_h1/elk/board.exp.json @@ -36,7 +36,8 @@ "underline": false, "labelWidth": 266, "labelHeight": 50, - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "a", @@ -74,7 +75,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "b", @@ -112,7 +114,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -153,7 +156,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(md -> b)[0]", @@ -192,7 +195,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/markdown/dagre/board.exp.json b/e2etests/testdata/stable/markdown/dagre/board.exp.json index 849709fa5..ddc1820d3 100644 --- a/e2etests/testdata/stable/markdown/dagre/board.exp.json +++ b/e2etests/testdata/stable/markdown/dagre/board.exp.json @@ -36,7 +36,8 @@ "underline": false, "labelWidth": 531, "labelHeight": 186, - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "x", @@ -74,7 +75,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "y", @@ -112,7 +114,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -162,7 +165,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(hey -> y)[0]", @@ -210,7 +213,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/markdown/elk/board.exp.json b/e2etests/testdata/stable/markdown/elk/board.exp.json index 53b5c2b45..5a2dc1b7a 100644 --- a/e2etests/testdata/stable/markdown/elk/board.exp.json +++ b/e2etests/testdata/stable/markdown/elk/board.exp.json @@ -36,7 +36,8 @@ "underline": false, "labelWidth": 531, "labelHeight": 186, - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "x", @@ -74,7 +75,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "y", @@ -112,7 +114,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -153,7 +156,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(hey -> y)[0]", @@ -192,7 +195,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/md_2space_newline/dagre/board.exp.json b/e2etests/testdata/stable/md_2space_newline/dagre/board.exp.json index ce04b922f..9d0fbe26f 100644 --- a/e2etests/testdata/stable/md_2space_newline/dagre/board.exp.json +++ b/e2etests/testdata/stable/md_2space_newline/dagre/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 129, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "markdown.md", @@ -74,7 +75,8 @@ "underline": false, "labelWidth": 459, "labelHeight": 48, - "zIndex": 2 + "zIndex": 0, + "level": 2 } ], "connections": [] diff --git a/e2etests/testdata/stable/md_2space_newline/elk/board.exp.json b/e2etests/testdata/stable/md_2space_newline/elk/board.exp.json index 8c587a003..1d7641708 100644 --- a/e2etests/testdata/stable/md_2space_newline/elk/board.exp.json +++ b/e2etests/testdata/stable/md_2space_newline/elk/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 129, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "markdown.md", @@ -74,7 +75,8 @@ "underline": false, "labelWidth": 459, "labelHeight": 48, - "zIndex": 2 + "zIndex": 0, + "level": 2 } ], "connections": [] diff --git a/e2etests/testdata/stable/md_backslash_newline/dagre/board.exp.json b/e2etests/testdata/stable/md_backslash_newline/dagre/board.exp.json index f4879d7fc..53c2c3f0b 100644 --- a/e2etests/testdata/stable/md_backslash_newline/dagre/board.exp.json +++ b/e2etests/testdata/stable/md_backslash_newline/dagre/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 129, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "markdown.md", @@ -74,7 +75,8 @@ "underline": false, "labelWidth": 459, "labelHeight": 48, - "zIndex": 2 + "zIndex": 0, + "level": 2 } ], "connections": [] diff --git a/e2etests/testdata/stable/md_backslash_newline/elk/board.exp.json b/e2etests/testdata/stable/md_backslash_newline/elk/board.exp.json index e4a3da091..068744935 100644 --- a/e2etests/testdata/stable/md_backslash_newline/elk/board.exp.json +++ b/e2etests/testdata/stable/md_backslash_newline/elk/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 129, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "markdown.md", @@ -74,7 +75,8 @@ "underline": false, "labelWidth": 459, "labelHeight": 48, - "zIndex": 2 + "zIndex": 0, + "level": 2 } ], "connections": [] diff --git a/e2etests/testdata/stable/md_code_block_fenced/dagre/board.exp.json b/e2etests/testdata/stable/md_code_block_fenced/dagre/board.exp.json index 832e07a2c..85c063655 100644 --- a/e2etests/testdata/stable/md_code_block_fenced/dagre/board.exp.json +++ b/e2etests/testdata/stable/md_code_block_fenced/dagre/board.exp.json @@ -36,7 +36,8 @@ "underline": false, "labelWidth": 196, "labelHeight": 111, - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "a", @@ -74,7 +75,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "b", @@ -112,7 +114,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -162,7 +165,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(md -> b)[0]", @@ -210,7 +213,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/md_code_block_fenced/elk/board.exp.json b/e2etests/testdata/stable/md_code_block_fenced/elk/board.exp.json index e0b6a925f..bc78c41c3 100644 --- a/e2etests/testdata/stable/md_code_block_fenced/elk/board.exp.json +++ b/e2etests/testdata/stable/md_code_block_fenced/elk/board.exp.json @@ -36,7 +36,8 @@ "underline": false, "labelWidth": 196, "labelHeight": 111, - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "a", @@ -74,7 +75,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "b", @@ -112,7 +114,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -153,7 +156,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(md -> b)[0]", @@ -192,7 +195,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/md_code_block_indented/dagre/board.exp.json b/e2etests/testdata/stable/md_code_block_indented/dagre/board.exp.json index c47059420..f1f950621 100644 --- a/e2etests/testdata/stable/md_code_block_indented/dagre/board.exp.json +++ b/e2etests/testdata/stable/md_code_block_indented/dagre/board.exp.json @@ -36,7 +36,8 @@ "underline": false, "labelWidth": 212, "labelHeight": 151, - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "a", @@ -74,7 +75,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "b", @@ -112,7 +114,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -162,7 +165,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(md -> b)[0]", @@ -210,7 +213,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/md_code_block_indented/elk/board.exp.json b/e2etests/testdata/stable/md_code_block_indented/elk/board.exp.json index 5bfe119bf..b6b5a8f7e 100644 --- a/e2etests/testdata/stable/md_code_block_indented/elk/board.exp.json +++ b/e2etests/testdata/stable/md_code_block_indented/elk/board.exp.json @@ -36,7 +36,8 @@ "underline": false, "labelWidth": 212, "labelHeight": 151, - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "a", @@ -74,7 +75,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "b", @@ -112,7 +114,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -153,7 +156,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(md -> b)[0]", @@ -192,7 +195,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/md_code_inline/dagre/board.exp.json b/e2etests/testdata/stable/md_code_inline/dagre/board.exp.json index 2215f7b2b..cc3a0ed5b 100644 --- a/e2etests/testdata/stable/md_code_inline/dagre/board.exp.json +++ b/e2etests/testdata/stable/md_code_inline/dagre/board.exp.json @@ -36,7 +36,8 @@ "underline": false, "labelWidth": 46, "labelHeight": 24, - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "a", @@ -74,7 +75,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "b", @@ -112,7 +114,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -162,7 +165,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(md -> b)[0]", @@ -210,7 +213,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/md_code_inline/elk/board.exp.json b/e2etests/testdata/stable/md_code_inline/elk/board.exp.json index 1badd2e9d..d0323cd24 100644 --- a/e2etests/testdata/stable/md_code_inline/elk/board.exp.json +++ b/e2etests/testdata/stable/md_code_inline/elk/board.exp.json @@ -36,7 +36,8 @@ "underline": false, "labelWidth": 46, "labelHeight": 24, - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "a", @@ -74,7 +75,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "b", @@ -112,7 +114,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -153,7 +156,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(md -> b)[0]", @@ -192,7 +195,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/multiline_text/dagre/board.exp.json b/e2etests/testdata/stable/multiline_text/dagre/board.exp.json index 304cc1cef..1df032cf5 100644 --- a/e2etests/testdata/stable/multiline_text/dagre/board.exp.json +++ b/e2etests/testdata/stable/multiline_text/dagre/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 102, "labelHeight": 58, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [] diff --git a/e2etests/testdata/stable/multiline_text/elk/board.exp.json b/e2etests/testdata/stable/multiline_text/elk/board.exp.json index 4fa066c12..9766cb8d3 100644 --- a/e2etests/testdata/stable/multiline_text/elk/board.exp.json +++ b/e2etests/testdata/stable/multiline_text/elk/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 102, "labelHeight": 58, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [] diff --git a/e2etests/testdata/stable/multiple_trees/dagre/board.exp.json b/e2etests/testdata/stable/multiple_trees/dagre/board.exp.json index 7b1d39457..a1562b355 100644 --- a/e2etests/testdata/stable/multiple_trees/dagre/board.exp.json +++ b/e2etests/testdata/stable/multiple_trees/dagre/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "b", @@ -75,7 +76,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "c", @@ -113,7 +115,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "d", @@ -151,7 +154,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "e", @@ -189,7 +193,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "f", @@ -227,7 +232,8 @@ "labelWidth": 11, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "g", @@ -265,7 +271,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "h", @@ -303,7 +310,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "i", @@ -341,7 +349,8 @@ "labelWidth": 9, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "j", @@ -379,7 +388,8 @@ "labelWidth": 10, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "k", @@ -417,7 +427,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "l", @@ -455,7 +466,8 @@ "labelWidth": 9, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "m", @@ -493,7 +505,8 @@ "labelWidth": 17, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "n", @@ -531,7 +544,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "o", @@ -569,7 +583,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "p", @@ -607,7 +622,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "q", @@ -645,7 +661,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "r", @@ -683,7 +700,8 @@ "labelWidth": 11, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "s", @@ -721,7 +739,8 @@ "labelWidth": 12, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "t", @@ -759,7 +778,8 @@ "labelWidth": 11, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "u", @@ -797,7 +817,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "v", @@ -835,7 +856,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "w", @@ -873,7 +895,8 @@ "labelWidth": 18, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -923,7 +946,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(a -> c)[0]", @@ -971,7 +994,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(a -> d)[0]", @@ -1019,7 +1042,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(a -> e)[0]", @@ -1067,7 +1090,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(a -> f)[0]", @@ -1115,7 +1138,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(g -> a)[0]", @@ -1163,7 +1186,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(a -> h)[0]", @@ -1211,7 +1234,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(i -> b)[0]", @@ -1259,7 +1282,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(j -> b)[0]", @@ -1307,7 +1330,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(k -> g)[0]", @@ -1355,7 +1378,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(l -> g)[0]", @@ -1403,7 +1426,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(c -> m)[0]", @@ -1451,7 +1474,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(c -> n)[0]", @@ -1499,7 +1522,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(d -> o)[0]", @@ -1547,7 +1570,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(d -> p)[0]", @@ -1595,7 +1618,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(e -> q)[0]", @@ -1643,7 +1666,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(e -> r)[0]", @@ -1691,7 +1714,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(p -> s)[0]", @@ -1739,7 +1762,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(f -> t)[0]", @@ -1787,7 +1810,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(f -> u)[0]", @@ -1835,7 +1858,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(v -> h)[0]", @@ -1883,7 +1906,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(w -> h)[0]", @@ -1931,7 +1954,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/multiple_trees/elk/board.exp.json b/e2etests/testdata/stable/multiple_trees/elk/board.exp.json index deadaab75..5c7272fd0 100644 --- a/e2etests/testdata/stable/multiple_trees/elk/board.exp.json +++ b/e2etests/testdata/stable/multiple_trees/elk/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "b", @@ -75,7 +76,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "c", @@ -113,7 +115,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "d", @@ -151,7 +154,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "e", @@ -189,7 +193,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "f", @@ -227,7 +232,8 @@ "labelWidth": 11, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "g", @@ -265,7 +271,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "h", @@ -303,7 +310,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "i", @@ -341,7 +349,8 @@ "labelWidth": 9, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "j", @@ -379,7 +388,8 @@ "labelWidth": 10, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "k", @@ -417,7 +427,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "l", @@ -455,7 +466,8 @@ "labelWidth": 9, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "m", @@ -493,7 +505,8 @@ "labelWidth": 17, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "n", @@ -531,7 +544,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "o", @@ -569,7 +583,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "p", @@ -607,7 +622,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "q", @@ -645,7 +661,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "r", @@ -683,7 +700,8 @@ "labelWidth": 11, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "s", @@ -721,7 +739,8 @@ "labelWidth": 12, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "t", @@ -759,7 +778,8 @@ "labelWidth": 11, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "u", @@ -797,7 +817,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "v", @@ -835,7 +856,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "w", @@ -873,7 +895,8 @@ "labelWidth": 18, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -922,7 +945,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(a -> c)[0]", @@ -969,7 +992,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(a -> d)[0]", @@ -1016,7 +1039,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(a -> e)[0]", @@ -1055,7 +1078,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(a -> f)[0]", @@ -1102,7 +1125,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(g -> a)[0]", @@ -1141,7 +1164,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(a -> h)[0]", @@ -1188,7 +1211,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(i -> b)[0]", @@ -1227,7 +1250,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(j -> b)[0]", @@ -1274,7 +1297,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(k -> g)[0]", @@ -1321,7 +1344,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(l -> g)[0]", @@ -1360,7 +1383,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(c -> m)[0]", @@ -1407,7 +1430,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(c -> n)[0]", @@ -1446,7 +1469,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(d -> o)[0]", @@ -1493,7 +1516,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(d -> p)[0]", @@ -1532,7 +1555,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(e -> q)[0]", @@ -1571,7 +1594,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(e -> r)[0]", @@ -1618,7 +1641,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(p -> s)[0]", @@ -1657,7 +1680,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(f -> t)[0]", @@ -1696,7 +1719,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(f -> u)[0]", @@ -1743,7 +1766,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(v -> h)[0]", @@ -1790,7 +1813,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(w -> h)[0]", @@ -1829,7 +1852,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/n22_e32/dagre/board.exp.json b/e2etests/testdata/stable/n22_e32/dagre/board.exp.json index 1fd58842a..4642fa42f 100644 --- a/e2etests/testdata/stable/n22_e32/dagre/board.exp.json +++ b/e2etests/testdata/stable/n22_e32/dagre/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "b", @@ -75,7 +76,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "c", @@ -113,7 +115,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "d", @@ -151,7 +154,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "e", @@ -189,7 +193,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "f", @@ -227,7 +232,8 @@ "labelWidth": 11, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "g", @@ -265,7 +271,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "h", @@ -303,7 +310,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "i", @@ -341,7 +349,8 @@ "labelWidth": 9, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "j", @@ -379,7 +388,8 @@ "labelWidth": 10, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "k", @@ -417,7 +427,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "l", @@ -455,7 +466,8 @@ "labelWidth": 9, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "m", @@ -493,7 +505,8 @@ "labelWidth": 17, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "n", @@ -531,7 +544,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "o", @@ -569,7 +583,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "p", @@ -607,7 +622,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "q", @@ -645,7 +661,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "r", @@ -683,7 +700,8 @@ "labelWidth": 11, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "s", @@ -721,7 +739,8 @@ "labelWidth": 12, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "t", @@ -759,7 +778,8 @@ "labelWidth": 11, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "u", @@ -797,7 +817,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -859,7 +880,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(c -> a)[0]", @@ -943,7 +964,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(d -> a)[0]", @@ -991,7 +1012,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(d -> b)[0]", @@ -1075,7 +1096,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(d -> e)[0]", @@ -1123,7 +1144,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(e -> f)[0]", @@ -1171,7 +1192,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(f -> b)[0]", @@ -1219,7 +1240,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(c -> f)[0]", @@ -1327,7 +1348,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(g -> c)[0]", @@ -1387,7 +1408,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(g -> h)[0]", @@ -1435,7 +1456,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(h -> i)[0]", @@ -1483,7 +1504,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(i -> j)[0]", @@ -1531,7 +1552,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(j -> k)[0]", @@ -1579,7 +1600,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(k -> e)[0]", @@ -1627,7 +1648,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(j -> f)[0]", @@ -1711,7 +1732,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(l -> m)[0]", @@ -1771,7 +1792,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(n -> l)[0]", @@ -1819,7 +1840,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(n -> l)[1]", @@ -1867,7 +1888,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(n -> m)[0]", @@ -1951,7 +1972,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(n -> o)[0]", @@ -1999,7 +2020,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(o -> p)[0]", @@ -2047,7 +2068,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(p -> m)[0]", @@ -2095,7 +2116,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(n -> p)[0]", @@ -2155,7 +2176,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(q -> n)[0]", @@ -2263,7 +2284,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(q -> r)[0]", @@ -2311,7 +2332,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(r -> s)[0]", @@ -2359,7 +2380,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(s -> t)[0]", @@ -2407,7 +2428,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(t -> u)[0]", @@ -2455,7 +2476,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(u -> o)[0]", @@ -2503,7 +2524,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(t -> p)[0]", @@ -2587,7 +2608,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(c -> t)[0]", @@ -2635,7 +2656,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(s -> a)[0]", @@ -2719,7 +2740,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(u -> a)[0]", @@ -2767,7 +2788,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/n22_e32/elk/board.exp.json b/e2etests/testdata/stable/n22_e32/elk/board.exp.json index 3c92ca593..1b4eff007 100644 --- a/e2etests/testdata/stable/n22_e32/elk/board.exp.json +++ b/e2etests/testdata/stable/n22_e32/elk/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "b", @@ -75,7 +76,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "c", @@ -113,7 +115,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "d", @@ -151,7 +154,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "e", @@ -189,7 +193,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "f", @@ -227,7 +232,8 @@ "labelWidth": 11, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "g", @@ -265,7 +271,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "h", @@ -303,7 +310,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "i", @@ -341,7 +349,8 @@ "labelWidth": 9, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "j", @@ -379,7 +388,8 @@ "labelWidth": 10, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "k", @@ -417,7 +427,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "l", @@ -455,7 +466,8 @@ "labelWidth": 9, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "m", @@ -493,7 +505,8 @@ "labelWidth": 17, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "n", @@ -531,7 +544,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "o", @@ -569,7 +583,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "p", @@ -607,7 +622,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "q", @@ -645,7 +661,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "r", @@ -683,7 +700,8 @@ "labelWidth": 11, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "s", @@ -721,7 +739,8 @@ "labelWidth": 12, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "t", @@ -759,7 +778,8 @@ "labelWidth": 11, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "u", @@ -797,7 +817,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -846,7 +867,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(c -> a)[0]", @@ -893,7 +914,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(d -> a)[0]", @@ -940,7 +961,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(d -> b)[0]", @@ -979,7 +1000,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(d -> e)[0]", @@ -1026,7 +1047,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(e -> f)[0]", @@ -1065,7 +1086,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(f -> b)[0]", @@ -1112,7 +1133,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(c -> f)[0]", @@ -1167,7 +1188,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(g -> c)[0]", @@ -1206,7 +1227,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(g -> h)[0]", @@ -1253,7 +1274,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(h -> i)[0]", @@ -1292,7 +1313,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(i -> j)[0]", @@ -1331,7 +1352,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(j -> k)[0]", @@ -1370,7 +1391,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(k -> e)[0]", @@ -1409,7 +1430,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(j -> f)[0]", @@ -1464,7 +1485,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(l -> m)[0]", @@ -1511,7 +1532,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(n -> l)[0]", @@ -1558,7 +1579,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(n -> l)[1]", @@ -1597,7 +1618,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(n -> m)[0]", @@ -1644,7 +1665,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(n -> o)[0]", @@ -1691,7 +1712,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(o -> p)[0]", @@ -1730,7 +1751,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(p -> m)[0]", @@ -1777,7 +1798,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(n -> p)[0]", @@ -1832,7 +1853,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(q -> n)[0]", @@ -1871,7 +1892,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(q -> r)[0]", @@ -1918,7 +1939,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(r -> s)[0]", @@ -1957,7 +1978,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(s -> t)[0]", @@ -1996,7 +2017,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(t -> u)[0]", @@ -2035,7 +2056,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(u -> o)[0]", @@ -2074,7 +2095,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(t -> p)[0]", @@ -2129,7 +2150,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(c -> t)[0]", @@ -2176,7 +2197,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(s -> a)[0]", @@ -2231,7 +2252,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(u -> a)[0]", @@ -2278,7 +2299,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/one_container_loop/dagre/board.exp.json b/e2etests/testdata/stable/one_container_loop/dagre/board.exp.json index 13b9125b1..56939fe30 100644 --- a/e2etests/testdata/stable/one_container_loop/dagre/board.exp.json +++ b/e2etests/testdata/stable/one_container_loop/dagre/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 17, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "a.b", @@ -75,7 +76,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "c", @@ -113,7 +115,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "d", @@ -151,7 +154,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "e", @@ -189,7 +193,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "f", @@ -227,7 +232,8 @@ "labelWidth": 11, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "g", @@ -265,7 +271,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "a.h", @@ -303,7 +310,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 } ], "connections": [ @@ -425,7 +433,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(d -> c)[0]", @@ -473,7 +481,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(e -> c)[0]", @@ -521,7 +529,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(f -> d)[0]", @@ -569,7 +577,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(a -> e)[0]", @@ -653,7 +661,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(g -> f)[0]", @@ -701,7 +709,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(a.h -> g)[0]", @@ -749,7 +757,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/one_container_loop/elk/board.exp.json b/e2etests/testdata/stable/one_container_loop/elk/board.exp.json index 2004579dd..0e02739ec 100644 --- a/e2etests/testdata/stable/one_container_loop/elk/board.exp.json +++ b/e2etests/testdata/stable/one_container_loop/elk/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 17, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "a.b", @@ -75,7 +76,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "c", @@ -113,7 +115,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "d", @@ -151,7 +154,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "e", @@ -189,7 +193,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "f", @@ -227,7 +232,8 @@ "labelWidth": 11, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "g", @@ -265,7 +271,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "a.h", @@ -303,7 +310,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 } ], "connections": [ @@ -360,7 +368,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(d -> c)[0]", @@ -399,7 +407,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(e -> c)[0]", @@ -446,7 +454,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(f -> d)[0]", @@ -485,7 +493,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(a -> e)[0]", @@ -524,7 +532,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(g -> f)[0]", @@ -563,7 +571,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(a.h -> g)[0]", @@ -610,7 +618,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/one_three_one_container/dagre/board.exp.json b/e2etests/testdata/stable/one_three_one_container/dagre/board.exp.json index 099dbd554..2592a4550 100644 --- a/e2etests/testdata/stable/one_three_one_container/dagre/board.exp.json +++ b/e2etests/testdata/stable/one_three_one_container/dagre/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 45, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "top.start", @@ -75,7 +76,8 @@ "labelWidth": 40, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "a", @@ -113,7 +115,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "b", @@ -151,7 +154,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "c", @@ -189,7 +193,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "bottom", @@ -227,7 +232,8 @@ "labelWidth": 90, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "bottom.end", @@ -265,7 +271,8 @@ "labelWidth": 32, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 } ], "connections": [ @@ -315,7 +322,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(top.start -> b)[0]", @@ -363,7 +370,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(top.start -> c)[0]", @@ -411,7 +418,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(a -> bottom.end)[0]", @@ -459,7 +466,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(b -> bottom.end)[0]", @@ -507,7 +514,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(c -> bottom.end)[0]", @@ -555,7 +562,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/one_three_one_container/elk/board.exp.json b/e2etests/testdata/stable/one_three_one_container/elk/board.exp.json index d75375de7..3548b3c91 100644 --- a/e2etests/testdata/stable/one_three_one_container/elk/board.exp.json +++ b/e2etests/testdata/stable/one_three_one_container/elk/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 45, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "top.start", @@ -75,7 +76,8 @@ "labelWidth": 40, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "a", @@ -113,7 +115,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "b", @@ -151,7 +154,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "c", @@ -189,7 +193,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "bottom", @@ -227,7 +232,8 @@ "labelWidth": 90, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "bottom.end", @@ -265,7 +271,8 @@ "labelWidth": 32, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 } ], "connections": [ @@ -314,7 +321,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(top.start -> b)[0]", @@ -353,7 +360,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(top.start -> c)[0]", @@ -400,7 +407,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(a -> bottom.end)[0]", @@ -447,7 +454,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(b -> bottom.end)[0]", @@ -494,7 +501,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(c -> bottom.end)[0]", @@ -533,7 +540,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/p/dagre/board.exp.json b/e2etests/testdata/stable/p/dagre/board.exp.json index d9a4c76d1..579fd45cf 100644 --- a/e2etests/testdata/stable/p/dagre/board.exp.json +++ b/e2etests/testdata/stable/p/dagre/board.exp.json @@ -36,7 +36,8 @@ "underline": false, "labelWidth": 1857, "labelHeight": 24, - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "a", @@ -74,7 +75,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "b", @@ -112,7 +114,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -162,7 +165,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(md -> b)[0]", @@ -210,7 +213,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/p/elk/board.exp.json b/e2etests/testdata/stable/p/elk/board.exp.json index 8ee3cb510..e6474660b 100644 --- a/e2etests/testdata/stable/p/elk/board.exp.json +++ b/e2etests/testdata/stable/p/elk/board.exp.json @@ -36,7 +36,8 @@ "underline": false, "labelWidth": 1857, "labelHeight": 24, - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "a", @@ -74,7 +75,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "b", @@ -112,7 +114,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -153,7 +156,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(md -> b)[0]", @@ -192,7 +195,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/pre/dagre/board.exp.json b/e2etests/testdata/stable/pre/dagre/board.exp.json index b3fcb1221..b4153c389 100644 --- a/e2etests/testdata/stable/pre/dagre/board.exp.json +++ b/e2etests/testdata/stable/pre/dagre/board.exp.json @@ -36,7 +36,8 @@ "underline": false, "labelWidth": 602, "labelHeight": 170, - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "a", @@ -74,7 +75,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "b", @@ -112,7 +114,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -162,7 +165,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(md -> b)[0]", @@ -210,7 +213,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/pre/elk/board.exp.json b/e2etests/testdata/stable/pre/elk/board.exp.json index b78f94e70..050f2197b 100644 --- a/e2etests/testdata/stable/pre/elk/board.exp.json +++ b/e2etests/testdata/stable/pre/elk/board.exp.json @@ -36,7 +36,8 @@ "underline": false, "labelWidth": 602, "labelHeight": 170, - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "a", @@ -74,7 +75,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "b", @@ -112,7 +114,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -153,7 +156,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(md -> b)[0]", @@ -192,7 +195,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/sql_tables/dagre/board.exp.json b/e2etests/testdata/stable/sql_tables/dagre/board.exp.json index 57c3ee056..e4f5b8038 100644 --- a/e2etests/testdata/stable/sql_tables/dagre/board.exp.json +++ b/e2etests/testdata/stable/sql_tables/dagre/board.exp.json @@ -67,7 +67,8 @@ "underline": false, "labelWidth": 61, "labelHeight": 36, - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "products", @@ -129,7 +130,8 @@ "underline": false, "labelWidth": 99, "labelHeight": 36, - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "orders", @@ -185,7 +187,8 @@ "underline": false, "labelWidth": 74, "labelHeight": 36, - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "shipments", @@ -247,7 +250,8 @@ "underline": false, "labelWidth": 116, "labelHeight": 36, - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -297,7 +301,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(products <-> orders)[0]", @@ -345,7 +349,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(shipments <-> orders)[0]", @@ -393,7 +397,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/sql_tables/elk/board.exp.json b/e2etests/testdata/stable/sql_tables/elk/board.exp.json index 1ee6d326d..4580c1251 100644 --- a/e2etests/testdata/stable/sql_tables/elk/board.exp.json +++ b/e2etests/testdata/stable/sql_tables/elk/board.exp.json @@ -67,7 +67,8 @@ "underline": false, "labelWidth": 61, "labelHeight": 36, - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "products", @@ -129,7 +130,8 @@ "underline": false, "labelWidth": 99, "labelHeight": 36, - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "orders", @@ -185,7 +187,8 @@ "underline": false, "labelWidth": 74, "labelHeight": 36, - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "shipments", @@ -247,7 +250,8 @@ "underline": false, "labelWidth": 116, "labelHeight": 36, - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -296,7 +300,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(products <-> orders)[0]", @@ -335,7 +339,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(shipments <-> orders)[0]", @@ -382,7 +386,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/square_3d/dagre/board.exp.json b/e2etests/testdata/stable/square_3d/dagre/board.exp.json index d0fe54576..1271b3d7c 100644 --- a/e2etests/testdata/stable/square_3d/dagre/board.exp.json +++ b/e2etests/testdata/stable/square_3d/dagre/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 71, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "square", @@ -75,7 +76,8 @@ "labelWidth": 54, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -125,7 +127,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/square_3d/elk/board.exp.json b/e2etests/testdata/stable/square_3d/elk/board.exp.json index c72c9bcdd..e2493608c 100644 --- a/e2etests/testdata/stable/square_3d/elk/board.exp.json +++ b/e2etests/testdata/stable/square_3d/elk/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 71, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "square", @@ -75,7 +76,8 @@ "labelWidth": 54, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -116,7 +118,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/straight_hierarchy_container/dagre/board.exp.json b/e2etests/testdata/stable/straight_hierarchy_container/dagre/board.exp.json index 284bf2e27..c7ac38f4a 100644 --- a/e2etests/testdata/stable/straight_hierarchy_container/dagre/board.exp.json +++ b/e2etests/testdata/stable/straight_hierarchy_container/dagre/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "c", @@ -75,7 +76,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "b", @@ -113,7 +115,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "l1", @@ -151,7 +154,8 @@ "labelWidth": 24, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "l1.b", @@ -189,7 +193,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "l1.a", @@ -227,7 +232,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "l1.c", @@ -265,7 +271,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "l2c1", @@ -303,7 +310,8 @@ "labelWidth": 50, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "l2c1.a", @@ -341,7 +349,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "l2c3", @@ -379,7 +388,8 @@ "labelWidth": 50, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "l2c3.c", @@ -417,7 +427,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "l2c2", @@ -455,7 +466,8 @@ "labelWidth": 50, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "l2c2.b", @@ -493,7 +505,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "l3c1", @@ -531,7 +544,8 @@ "labelWidth": 50, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "l3c1.a", @@ -569,7 +583,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "l3c1.b", @@ -607,7 +622,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "l3c2", @@ -645,7 +661,8 @@ "labelWidth": 50, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "l3c2.c", @@ -683,7 +700,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "l4", @@ -721,7 +739,8 @@ "labelWidth": 25, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "l4.c1", @@ -759,7 +778,8 @@ "labelWidth": 26, "labelHeight": 36, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "l4.c1.a", @@ -797,7 +817,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 3 + "zIndex": 0, + "level": 3 }, { "id": "l4.c2", @@ -835,7 +856,8 @@ "labelWidth": 26, "labelHeight": 36, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "l4.c2.b", @@ -873,7 +895,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 3 + "zIndex": 0, + "level": 3 }, { "id": "l4.c3", @@ -911,7 +934,8 @@ "labelWidth": 26, "labelHeight": 36, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "l4.c3.c", @@ -949,7 +973,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 3 + "zIndex": 0, + "level": 3 } ], "connections": [ @@ -999,7 +1024,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 }, { "id": "(a -> l1.a)[0]", @@ -1047,7 +1072,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 }, { "id": "(c -> l1.c)[0]", @@ -1095,7 +1120,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 }, { "id": "(l1.a -> l2c1.a)[0]", @@ -1155,7 +1180,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 }, { "id": "(l1.c -> l2c3.c)[0]", @@ -1215,7 +1240,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 }, { "id": "(l1.b -> l2c2.b)[0]", @@ -1275,7 +1300,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 }, { "id": "(l2c1.a -> l3c1.a)[0]", @@ -1335,7 +1360,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 }, { "id": "(l2c2.b -> l3c1.b)[0]", @@ -1395,7 +1420,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 }, { "id": "(l2c3.c -> l3c2.c)[0]", @@ -1455,7 +1480,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 }, { "id": "(l3c1.a -> l4.c1.a)[0]", @@ -1527,7 +1552,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 }, { "id": "(l3c1.b -> l4.c2.b)[0]", @@ -1599,7 +1624,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 }, { "id": "(l3c2.c -> l4.c3.c)[0]", @@ -1671,7 +1696,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/straight_hierarchy_container/elk/board.exp.json b/e2etests/testdata/stable/straight_hierarchy_container/elk/board.exp.json index f2ff75d3d..4cc4db44b 100644 --- a/e2etests/testdata/stable/straight_hierarchy_container/elk/board.exp.json +++ b/e2etests/testdata/stable/straight_hierarchy_container/elk/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "c", @@ -75,7 +76,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "b", @@ -113,7 +115,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "l1", @@ -151,7 +154,8 @@ "labelWidth": 24, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "l1.b", @@ -189,7 +193,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "l1.a", @@ -227,7 +232,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "l1.c", @@ -265,7 +271,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "l2c1", @@ -303,7 +310,8 @@ "labelWidth": 50, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "l2c1.a", @@ -341,7 +349,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "l2c3", @@ -379,7 +388,8 @@ "labelWidth": 50, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "l2c3.c", @@ -417,7 +427,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "l2c2", @@ -455,7 +466,8 @@ "labelWidth": 50, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "l2c2.b", @@ -493,7 +505,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "l3c1", @@ -531,7 +544,8 @@ "labelWidth": 50, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "l3c1.a", @@ -569,7 +583,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "l3c1.b", @@ -607,7 +622,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "l3c2", @@ -645,7 +661,8 @@ "labelWidth": 50, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "l3c2.c", @@ -683,7 +700,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "l4", @@ -721,7 +739,8 @@ "labelWidth": 25, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "l4.c1", @@ -759,7 +778,8 @@ "labelWidth": 26, "labelHeight": 36, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "l4.c1.a", @@ -797,7 +817,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 3 + "zIndex": 0, + "level": 3 }, { "id": "l4.c2", @@ -835,7 +856,8 @@ "labelWidth": 26, "labelHeight": 36, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "l4.c2.b", @@ -873,7 +895,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 3 + "zIndex": 0, + "level": 3 }, { "id": "l4.c3", @@ -911,7 +934,8 @@ "labelWidth": 26, "labelHeight": 36, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "l4.c3.c", @@ -949,7 +973,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 3 + "zIndex": 0, + "level": 3 } ], "connections": [ @@ -990,7 +1015,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 }, { "id": "(a -> l1.a)[0]", @@ -1029,7 +1054,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 }, { "id": "(c -> l1.c)[0]", @@ -1068,7 +1093,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 }, { "id": "(l1.a -> l2c1.a)[0]", @@ -1115,7 +1140,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 }, { "id": "(l1.c -> l2c3.c)[0]", @@ -1154,7 +1179,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 }, { "id": "(l1.b -> l2c2.b)[0]", @@ -1201,7 +1226,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 }, { "id": "(l2c1.a -> l3c1.a)[0]", @@ -1240,7 +1265,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 }, { "id": "(l2c2.b -> l3c1.b)[0]", @@ -1287,7 +1312,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 }, { "id": "(l2c3.c -> l3c2.c)[0]", @@ -1326,7 +1351,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 }, { "id": "(l3c1.a -> l4.c1.a)[0]", @@ -1365,7 +1390,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 }, { "id": "(l3c1.b -> l4.c2.b)[0]", @@ -1412,7 +1437,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 }, { "id": "(l3c2.c -> l4.c3.c)[0]", @@ -1451,7 +1476,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 4 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/stylish/dagre/board.exp.json b/e2etests/testdata/stable/stylish/dagre/board.exp.json index 36430db19..eac9bf75f 100644 --- a/e2etests/testdata/stable/stylish/dagre/board.exp.json +++ b/e2etests/testdata/stable/stylish/dagre/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "y", @@ -75,7 +76,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -125,7 +127,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/stylish/elk/board.exp.json b/e2etests/testdata/stable/stylish/elk/board.exp.json index de71f7b79..7df611198 100644 --- a/e2etests/testdata/stable/stylish/elk/board.exp.json +++ b/e2etests/testdata/stable/stylish/elk/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 13, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "y", @@ -75,7 +76,8 @@ "labelWidth": 14, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -116,7 +118,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/transparent_3d/dagre/board.exp.json b/e2etests/testdata/stable/transparent_3d/dagre/board.exp.json index 5e26d64b9..f2de4f323 100644 --- a/e2etests/testdata/stable/transparent_3d/dagre/board.exp.json +++ b/e2etests/testdata/stable/transparent_3d/dagre/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 39, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [] diff --git a/e2etests/testdata/stable/transparent_3d/elk/board.exp.json b/e2etests/testdata/stable/transparent_3d/elk/board.exp.json index f44e41856..41cb8cf6f 100644 --- a/e2etests/testdata/stable/transparent_3d/elk/board.exp.json +++ b/e2etests/testdata/stable/transparent_3d/elk/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 39, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [] diff --git a/e2etests/testdata/stable/us_map/dagre/board.exp.json b/e2etests/testdata/stable/us_map/dagre/board.exp.json index 145cbac91..b5ba0c1f4 100644 --- a/e2etests/testdata/stable/us_map/dagre/board.exp.json +++ b/e2etests/testdata/stable/us_map/dagre/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 26, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "HI", @@ -75,7 +76,8 @@ "labelWidth": 19, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "AL", @@ -113,7 +115,8 @@ "labelWidth": 24, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "FL", @@ -151,7 +154,8 @@ "labelWidth": 21, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "GA", @@ -189,7 +193,8 @@ "labelWidth": 26, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "MS", @@ -227,7 +232,8 @@ "labelWidth": 26, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "TN", @@ -265,7 +271,8 @@ "labelWidth": 24, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "AZ", @@ -303,7 +310,8 @@ "labelWidth": 25, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "CA", @@ -341,7 +349,8 @@ "labelWidth": 25, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "NV", @@ -379,7 +388,8 @@ "labelWidth": 25, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "NM", @@ -417,7 +427,8 @@ "labelWidth": 26, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "UT", @@ -455,7 +466,8 @@ "labelWidth": 24, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "AR", @@ -493,7 +505,8 @@ "labelWidth": 26, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "LA", @@ -531,7 +544,8 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "MO", @@ -569,7 +583,8 @@ "labelWidth": 28, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "OK", @@ -607,7 +622,8 @@ "labelWidth": 26, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "TX", @@ -645,7 +661,8 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "OR", @@ -683,7 +700,8 @@ "labelWidth": 26, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "CO", @@ -721,7 +739,8 @@ "labelWidth": 26, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "KS", @@ -759,7 +778,8 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "NE", @@ -797,7 +817,8 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "WY", @@ -835,7 +856,8 @@ "labelWidth": 28, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "CT", @@ -873,7 +895,8 @@ "labelWidth": 24, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "MA", @@ -911,7 +934,8 @@ "labelWidth": 27, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "NY", @@ -949,7 +973,8 @@ "labelWidth": 24, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "RI", @@ -987,7 +1012,8 @@ "labelWidth": 18, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "DE", @@ -1025,7 +1051,8 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "MD", @@ -1063,7 +1090,8 @@ "labelWidth": 27, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "NJ", @@ -1101,7 +1129,8 @@ "labelWidth": 22, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "PA", @@ -1139,7 +1168,8 @@ "labelWidth": 24, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "NC", @@ -1177,7 +1207,8 @@ "labelWidth": 24, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "SC", @@ -1215,7 +1246,8 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "ID", @@ -1253,7 +1285,8 @@ "labelWidth": 19, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "MT", @@ -1291,7 +1324,8 @@ "labelWidth": 26, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "WA", @@ -1329,7 +1363,8 @@ "labelWidth": 29, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "IL", @@ -1367,7 +1402,8 @@ "labelWidth": 17, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "IN", @@ -1405,7 +1441,8 @@ "labelWidth": 19, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "IA", @@ -1443,7 +1480,8 @@ "labelWidth": 19, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "MI", @@ -1481,7 +1519,8 @@ "labelWidth": 21, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "KY", @@ -1519,7 +1558,8 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "WI", @@ -1557,7 +1597,8 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "OH", @@ -1595,7 +1636,8 @@ "labelWidth": 26, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "MN", @@ -1633,7 +1675,8 @@ "labelWidth": 27, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "SD", @@ -1671,7 +1714,8 @@ "labelWidth": 24, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "VA", @@ -1709,7 +1753,8 @@ "labelWidth": 25, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "WV", @@ -1747,7 +1792,8 @@ "labelWidth": 29, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "ME", @@ -1785,7 +1831,8 @@ "labelWidth": 25, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "NH", @@ -1823,7 +1870,8 @@ "labelWidth": 25, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "VT", @@ -1861,7 +1909,8 @@ "labelWidth": 24, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "ND", @@ -1899,7 +1948,8 @@ "labelWidth": 25, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -1949,7 +1999,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(FL -- GA)[0]", @@ -1997,7 +2047,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(GA -- MS)[0]", @@ -2045,7 +2095,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(MS -- TN)[0]", @@ -2177,7 +2227,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(AZ -- CA)[0]", @@ -2225,7 +2275,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(CA -- NV)[0]", @@ -2273,7 +2323,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(NV -- NM)[0]", @@ -2321,7 +2371,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(NM -- UT)[0]", @@ -2381,7 +2431,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(AR -- LA)[0]", @@ -2429,7 +2479,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(LA -- MS)[0]", @@ -2477,7 +2527,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(MS -- MO)[0]", @@ -2525,7 +2575,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(MO -- OK)[0]", @@ -2609,7 +2659,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(OK -- TN)[0]", @@ -2657,7 +2707,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(TN -- TX)[0]", @@ -2705,7 +2755,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(CA -- NV)[1]", @@ -2753,7 +2803,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(NV -- OR)[0]", @@ -2813,7 +2863,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(CO -- KS)[0]", @@ -2861,7 +2911,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(KS -- NE)[0]", @@ -2921,7 +2971,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(NE -- NM)[0]", @@ -2969,7 +3019,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(NM -- OK)[0]", @@ -3017,7 +3067,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(OK -- UT)[0]", @@ -3065,7 +3115,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(UT -- WY)[0]", @@ -3125,7 +3175,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(CT -- MA)[0]", @@ -3173,7 +3223,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(MA -- NY)[0]", @@ -3233,7 +3283,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(NY -- RI)[0]", @@ -3293,7 +3343,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(DE -- MD)[0]", @@ -3341,7 +3391,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(MD -- NJ)[0]", @@ -3389,7 +3439,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(NJ -- PA)[0]", @@ -3449,7 +3499,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(FL -- GA)[1]", @@ -3497,7 +3547,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(GA -- NC)[0]", @@ -3605,7 +3655,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(NC -- SC)[0]", @@ -3653,7 +3703,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(SC -- TN)[0]", @@ -3701,7 +3751,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(ID -- MT)[0]", @@ -3749,7 +3799,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(MT -- NV)[0]", @@ -3797,7 +3847,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(NV -- OR)[1]", @@ -3857,7 +3907,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(OR -- UT)[0]", @@ -3905,7 +3955,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(UT -- WA)[0]", @@ -3953,7 +4003,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(WA -- WY)[0]", @@ -4001,7 +4051,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(IL -- IN)[0]", @@ -4049,7 +4099,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(IN -- IA)[0]", @@ -4097,7 +4147,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(IA -- MI)[0]", @@ -4145,7 +4195,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(MI -- KY)[0]", @@ -4193,7 +4243,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(KY -- MO)[0]", @@ -4241,7 +4291,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(MO -- WI)[0]", @@ -4325,7 +4375,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(IN -- KY)[0]", @@ -4409,7 +4459,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(KY -- MI)[0]", @@ -4457,7 +4507,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(MI -- OH)[0]", @@ -4565,7 +4615,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(IA -- MN)[0]", @@ -4625,7 +4675,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(MN -- MO)[0]", @@ -4673,7 +4723,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(MO -- NE)[0]", @@ -4721,7 +4771,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(NE -- SD)[0]", @@ -4769,7 +4819,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(SD -- WI)[0]", @@ -4817,7 +4867,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(KS -- MO)[0]", @@ -4865,7 +4915,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(MO -- NE)[1]", @@ -4913,7 +4963,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(NE -- OK)[0]", @@ -4973,7 +5023,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(KY -- MO)[1]", @@ -5021,7 +5071,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(MO -- OH)[0]", @@ -5081,7 +5131,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(OH -- TN)[0]", @@ -5141,7 +5191,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(TN -- VA)[0]", @@ -5189,7 +5239,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(VA -- WV)[0]", @@ -5237,7 +5287,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(LA -- MS)[1]", @@ -5285,7 +5335,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(MS -- TX)[0]", @@ -5441,7 +5491,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(ME -- NH)[0]", @@ -5489,7 +5539,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(MD -- PA)[0]", @@ -5573,7 +5623,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(PA -- VA)[0]", @@ -5621,7 +5671,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(VA -- WV)[1]", @@ -5669,7 +5719,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(MA -- NH)[0]", @@ -5717,7 +5767,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(NH -- NY)[0]", @@ -5765,7 +5815,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(NY -- RI)[1]", @@ -5825,7 +5875,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(RI -- VT)[0]", @@ -5873,7 +5923,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(MI -- MN)[0]", @@ -5921,7 +5971,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(MN -- OH)[0]", @@ -6005,7 +6055,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(OH -- WI)[0]", @@ -6053,7 +6103,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(MN -- ND)[0]", @@ -6113,7 +6163,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(ND -- SD)[0]", @@ -6161,7 +6211,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(SD -- WI)[1]", @@ -6209,7 +6259,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(MS -- TN)[1]", @@ -6341,7 +6391,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(MO -- NE)[2]", @@ -6389,7 +6439,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(NE -- OK)[1]", @@ -6449,7 +6499,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(OK -- TN)[1]", @@ -6497,7 +6547,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(MT -- ND)[0]", @@ -6545,7 +6595,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(ND -- SD)[1]", @@ -6593,7 +6643,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(SD -- WY)[0]", @@ -6701,7 +6751,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(NE -- SD)[1]", @@ -6749,7 +6799,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(SD -- WY)[1]", @@ -6857,7 +6907,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(NV -- OR)[2]", @@ -6917,7 +6967,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(OR -- UT)[1]", @@ -6965,7 +7015,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(NH -- VT)[0]", @@ -7073,7 +7123,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(NJ -- NY)[0]", @@ -7121,7 +7171,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(NY -- PA)[0]", @@ -7169,7 +7219,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(NM -- OK)[1]", @@ -7217,7 +7267,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(OK -- TX)[0]", @@ -7277,7 +7327,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(NY -- PA)[1]", @@ -7325,7 +7375,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(PA -- RI)[0]", @@ -7373,7 +7423,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(RI -- VT)[1]", @@ -7421,7 +7471,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(NC -- SC)[1]", @@ -7469,7 +7519,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(SC -- TN)[1]", @@ -7517,7 +7567,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(TN -- VA)[1]", @@ -7565,7 +7615,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(ND -- SD)[2]", @@ -7613,7 +7663,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(OH -- PA)[0]", @@ -7673,7 +7723,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(PA -- WV)[0]", @@ -7733,7 +7783,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(OK -- TX)[1]", @@ -7793,7 +7843,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(OR -- WA)[0]", @@ -7853,7 +7903,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(PA -- WV)[1]", @@ -7913,7 +7963,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(SD -- WY)[2]", @@ -8021,7 +8071,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(TN -- VA)[2]", @@ -8069,7 +8119,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(UT -- WY)[1]", @@ -8129,7 +8179,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(VA -- WV)[2]", @@ -8177,7 +8227,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/stable/us_map/elk/board.exp.json b/e2etests/testdata/stable/us_map/elk/board.exp.json index 08b090faf..015e58844 100644 --- a/e2etests/testdata/stable/us_map/elk/board.exp.json +++ b/e2etests/testdata/stable/us_map/elk/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 26, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "HI", @@ -75,7 +76,8 @@ "labelWidth": 19, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "AL", @@ -113,7 +115,8 @@ "labelWidth": 24, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "FL", @@ -151,7 +154,8 @@ "labelWidth": 21, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "GA", @@ -189,7 +193,8 @@ "labelWidth": 26, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "MS", @@ -227,7 +232,8 @@ "labelWidth": 26, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "TN", @@ -265,7 +271,8 @@ "labelWidth": 24, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "AZ", @@ -303,7 +310,8 @@ "labelWidth": 25, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "CA", @@ -341,7 +349,8 @@ "labelWidth": 25, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "NV", @@ -379,7 +388,8 @@ "labelWidth": 25, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "NM", @@ -417,7 +427,8 @@ "labelWidth": 26, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "UT", @@ -455,7 +466,8 @@ "labelWidth": 24, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "AR", @@ -493,7 +505,8 @@ "labelWidth": 26, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "LA", @@ -531,7 +544,8 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "MO", @@ -569,7 +583,8 @@ "labelWidth": 28, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "OK", @@ -607,7 +622,8 @@ "labelWidth": 26, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "TX", @@ -645,7 +661,8 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "OR", @@ -683,7 +700,8 @@ "labelWidth": 26, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "CO", @@ -721,7 +739,8 @@ "labelWidth": 26, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "KS", @@ -759,7 +778,8 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "NE", @@ -797,7 +817,8 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "WY", @@ -835,7 +856,8 @@ "labelWidth": 28, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "CT", @@ -873,7 +895,8 @@ "labelWidth": 24, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "MA", @@ -911,7 +934,8 @@ "labelWidth": 27, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "NY", @@ -949,7 +973,8 @@ "labelWidth": 24, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "RI", @@ -987,7 +1012,8 @@ "labelWidth": 18, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "DE", @@ -1025,7 +1051,8 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "MD", @@ -1063,7 +1090,8 @@ "labelWidth": 27, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "NJ", @@ -1101,7 +1129,8 @@ "labelWidth": 22, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "PA", @@ -1139,7 +1168,8 @@ "labelWidth": 24, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "NC", @@ -1177,7 +1207,8 @@ "labelWidth": 24, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "SC", @@ -1215,7 +1246,8 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "ID", @@ -1253,7 +1285,8 @@ "labelWidth": 19, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "MT", @@ -1291,7 +1324,8 @@ "labelWidth": 26, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "WA", @@ -1329,7 +1363,8 @@ "labelWidth": 29, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "IL", @@ -1367,7 +1402,8 @@ "labelWidth": 17, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "IN", @@ -1405,7 +1441,8 @@ "labelWidth": 19, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "IA", @@ -1443,7 +1480,8 @@ "labelWidth": 19, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "MI", @@ -1481,7 +1519,8 @@ "labelWidth": 21, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "KY", @@ -1519,7 +1558,8 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "WI", @@ -1557,7 +1597,8 @@ "labelWidth": 23, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "OH", @@ -1595,7 +1636,8 @@ "labelWidth": 26, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "MN", @@ -1633,7 +1675,8 @@ "labelWidth": 27, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "SD", @@ -1671,7 +1714,8 @@ "labelWidth": 24, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "VA", @@ -1709,7 +1753,8 @@ "labelWidth": 25, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "WV", @@ -1747,7 +1792,8 @@ "labelWidth": 29, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "ME", @@ -1785,7 +1831,8 @@ "labelWidth": 25, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "NH", @@ -1823,7 +1870,8 @@ "labelWidth": 25, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "VT", @@ -1861,7 +1909,8 @@ "labelWidth": 24, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "ND", @@ -1899,7 +1948,8 @@ "labelWidth": 25, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -1940,7 +1990,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(FL -- GA)[0]", @@ -1979,7 +2029,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(GA -- MS)[0]", @@ -2018,7 +2068,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(MS -- TN)[0]", @@ -2073,7 +2123,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(AZ -- CA)[0]", @@ -2112,7 +2162,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(CA -- NV)[0]", @@ -2151,7 +2201,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(NV -- NM)[0]", @@ -2198,7 +2248,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(NM -- UT)[0]", @@ -2245,7 +2295,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(AR -- LA)[0]", @@ -2284,7 +2334,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(LA -- MS)[0]", @@ -2331,7 +2381,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(MS -- MO)[0]", @@ -2378,7 +2428,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(MO -- OK)[0]", @@ -2433,7 +2483,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(OK -- TN)[0]", @@ -2480,7 +2530,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(TN -- TX)[0]", @@ -2527,7 +2577,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(CA -- NV)[1]", @@ -2574,7 +2624,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(NV -- OR)[0]", @@ -2613,7 +2663,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(CO -- KS)[0]", @@ -2652,7 +2702,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(KS -- NE)[0]", @@ -2691,7 +2741,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(NE -- NM)[0]", @@ -2730,7 +2780,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(NM -- OK)[0]", @@ -2769,7 +2819,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(OK -- UT)[0]", @@ -2816,7 +2866,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(UT -- WY)[0]", @@ -2871,7 +2921,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(CT -- MA)[0]", @@ -2910,7 +2960,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(MA -- NY)[0]", @@ -2949,7 +2999,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(NY -- RI)[0]", @@ -2996,7 +3046,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(DE -- MD)[0]", @@ -3035,7 +3085,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(MD -- NJ)[0]", @@ -3074,7 +3124,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(NJ -- PA)[0]", @@ -3121,7 +3171,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(FL -- GA)[1]", @@ -3168,7 +3218,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(GA -- NC)[0]", @@ -3223,7 +3273,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(NC -- SC)[0]", @@ -3262,7 +3312,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(SC -- TN)[0]", @@ -3301,7 +3351,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(ID -- MT)[0]", @@ -3340,7 +3390,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(MT -- NV)[0]", @@ -3387,7 +3437,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(NV -- OR)[1]", @@ -3434,7 +3484,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(OR -- UT)[0]", @@ -3481,7 +3531,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(UT -- WA)[0]", @@ -3528,7 +3578,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(WA -- WY)[0]", @@ -3567,7 +3617,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(IL -- IN)[0]", @@ -3606,7 +3656,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(IN -- IA)[0]", @@ -3653,7 +3703,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(IA -- MI)[0]", @@ -3692,7 +3742,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(MI -- KY)[0]", @@ -3739,7 +3789,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(KY -- MO)[0]", @@ -3778,7 +3828,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(MO -- WI)[0]", @@ -3825,7 +3875,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(IN -- KY)[0]", @@ -3864,7 +3914,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(KY -- MI)[0]", @@ -3911,7 +3961,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(MI -- OH)[0]", @@ -3958,7 +4008,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(IA -- MN)[0]", @@ -4013,7 +4063,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(MN -- MO)[0]", @@ -4060,7 +4110,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(MO -- NE)[0]", @@ -4107,7 +4157,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(NE -- SD)[0]", @@ -4154,7 +4204,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(SD -- WI)[0]", @@ -4201,7 +4251,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(KS -- MO)[0]", @@ -4248,7 +4298,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(MO -- NE)[1]", @@ -4295,7 +4345,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(NE -- OK)[0]", @@ -4350,7 +4400,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(KY -- MO)[1]", @@ -4397,7 +4447,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(MO -- OH)[0]", @@ -4444,7 +4494,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(OH -- TN)[0]", @@ -4491,7 +4541,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(TN -- VA)[0]", @@ -4538,7 +4588,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(VA -- WV)[0]", @@ -4585,7 +4635,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(LA -- MS)[1]", @@ -4632,7 +4682,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(MS -- TX)[0]", @@ -4687,7 +4737,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(ME -- NH)[0]", @@ -4726,7 +4776,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(MD -- PA)[0]", @@ -4781,7 +4831,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(PA -- VA)[0]", @@ -4828,7 +4878,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(VA -- WV)[1]", @@ -4867,7 +4917,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(MA -- NH)[0]", @@ -4914,7 +4964,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(NH -- NY)[0]", @@ -4961,7 +5011,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(NY -- RI)[1]", @@ -5008,7 +5058,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(RI -- VT)[0]", @@ -5055,7 +5105,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(MI -- MN)[0]", @@ -5094,7 +5144,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(MN -- OH)[0]", @@ -5141,7 +5191,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(OH -- WI)[0]", @@ -5196,7 +5246,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(MN -- ND)[0]", @@ -5251,7 +5301,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(ND -- SD)[0]", @@ -5298,7 +5348,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(SD -- WI)[1]", @@ -5345,7 +5395,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(MS -- TN)[1]", @@ -5400,7 +5450,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(MO -- NE)[2]", @@ -5447,7 +5497,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(NE -- OK)[1]", @@ -5502,7 +5552,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(OK -- TN)[1]", @@ -5549,7 +5599,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(MT -- ND)[0]", @@ -5588,7 +5638,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(ND -- SD)[1]", @@ -5627,7 +5677,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(SD -- WY)[0]", @@ -5682,7 +5732,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(NE -- SD)[1]", @@ -5729,7 +5779,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(SD -- WY)[1]", @@ -5784,7 +5834,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(NV -- OR)[2]", @@ -5831,7 +5881,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(OR -- UT)[1]", @@ -5870,7 +5920,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(NH -- VT)[0]", @@ -5917,7 +5967,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(NJ -- NY)[0]", @@ -5964,7 +6014,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(NY -- PA)[0]", @@ -6011,7 +6061,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(NM -- OK)[1]", @@ -6058,7 +6108,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(OK -- TX)[0]", @@ -6105,7 +6155,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(NY -- PA)[1]", @@ -6152,7 +6202,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(PA -- RI)[0]", @@ -6199,7 +6249,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(RI -- VT)[1]", @@ -6246,7 +6296,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(NC -- SC)[1]", @@ -6293,7 +6343,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(SC -- TN)[1]", @@ -6340,7 +6390,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(TN -- VA)[1]", @@ -6379,7 +6429,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(ND -- SD)[2]", @@ -6426,7 +6476,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(OH -- PA)[0]", @@ -6473,7 +6523,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(PA -- WV)[0]", @@ -6520,7 +6570,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(OK -- TX)[1]", @@ -6567,7 +6617,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(OR -- WA)[0]", @@ -6614,7 +6664,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(PA -- WV)[1]", @@ -6669,7 +6719,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(SD -- WY)[2]", @@ -6716,7 +6766,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(TN -- VA)[2]", @@ -6763,7 +6813,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(UT -- WY)[1]", @@ -6810,7 +6860,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(VA -- WV)[2]", @@ -6857,7 +6907,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/todo/container_child_edge/dagre/board.exp.json b/e2etests/testdata/todo/container_child_edge/dagre/board.exp.json index 2b91f71c9..7845aded3 100644 --- a/e2etests/testdata/todo/container_child_edge/dagre/board.exp.json +++ b/e2etests/testdata/todo/container_child_edge/dagre/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 117, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "container.first", @@ -75,7 +76,8 @@ "labelWidth": 35, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "container.second", @@ -113,7 +115,8 @@ "labelWidth": 55, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 } ], "connections": [ @@ -163,7 +166,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(container -> container.second)[0]", @@ -211,7 +214,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 } ] } diff --git a/e2etests/testdata/todo/container_child_edge/elk/board.exp.json b/e2etests/testdata/todo/container_child_edge/elk/board.exp.json index 76ea3356d..ffec9fbe7 100644 --- a/e2etests/testdata/todo/container_child_edge/elk/board.exp.json +++ b/e2etests/testdata/todo/container_child_edge/elk/board.exp.json @@ -37,7 +37,8 @@ "labelWidth": 117, "labelHeight": 41, "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "container.first", @@ -75,7 +76,8 @@ "labelWidth": 35, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 }, { "id": "container.second", @@ -113,7 +115,8 @@ "labelWidth": 55, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 2 + "zIndex": 0, + "level": 2 } ], "connections": [ @@ -154,7 +157,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 }, { "id": "(container -> container.second)[0]", @@ -201,7 +204,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 0 } ] } diff --git a/testdata/d2compiler/TestCompile/basic_icon.exp.json b/testdata/d2compiler/TestCompile/basic_icon.exp.json index 25b5f7093..02ede7ad0 100644 --- a/testdata/d2compiler/TestCompile/basic_icon.exp.json +++ b/testdata/d2compiler/TestCompile/basic_icon.exp.json @@ -91,7 +91,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -148,7 +149,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2compiler/TestCompile/basic_sequence.exp.json b/testdata/d2compiler/TestCompile/basic_sequence.exp.json index 072abeff2..f8d4b1304 100644 --- a/testdata/d2compiler/TestCompile/basic_sequence.exp.json +++ b/testdata/d2compiler/TestCompile/basic_sequence.exp.json @@ -86,7 +86,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -131,7 +132,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2compiler/TestCompile/basic_shape.exp.json b/testdata/d2compiler/TestCompile/basic_shape.exp.json index 55a75ce1c..db0e9a0af 100644 --- a/testdata/d2compiler/TestCompile/basic_shape.exp.json +++ b/testdata/d2compiler/TestCompile/basic_shape.exp.json @@ -86,7 +86,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -131,7 +132,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2compiler/TestCompile/basic_style.exp.json b/testdata/d2compiler/TestCompile/basic_style.exp.json index 1e2df17f0..16abe3f00 100644 --- a/testdata/d2compiler/TestCompile/basic_style.exp.json +++ b/testdata/d2compiler/TestCompile/basic_style.exp.json @@ -93,7 +93,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [], "objects": [ @@ -142,7 +143,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2compiler/TestCompile/class_paren.exp.json b/testdata/d2compiler/TestCompile/class_paren.exp.json index c86f7f020..2ab82327b 100644 --- a/testdata/d2compiler/TestCompile/class_paren.exp.json +++ b/testdata/d2compiler/TestCompile/class_paren.exp.json @@ -185,7 +185,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [], "objects": [ @@ -251,7 +252,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2compiler/TestCompile/class_style.exp.json b/testdata/d2compiler/TestCompile/class_style.exp.json index 0b411d650..eb27f765d 100644 --- a/testdata/d2compiler/TestCompile/class_style.exp.json +++ b/testdata/d2compiler/TestCompile/class_style.exp.json @@ -159,7 +159,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [], "objects": [ @@ -218,7 +219,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2compiler/TestCompile/default_direction.exp.json b/testdata/d2compiler/TestCompile/default_direction.exp.json index 22ac40c17..0b959a582 100644 --- a/testdata/d2compiler/TestCompile/default_direction.exp.json +++ b/testdata/d2compiler/TestCompile/default_direction.exp.json @@ -47,7 +47,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -92,7 +93,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2compiler/TestCompile/edge.exp.json b/testdata/d2compiler/TestCompile/edge.exp.json index 09e4428ef..995965be4 100644 --- a/testdata/d2compiler/TestCompile/edge.exp.json +++ b/testdata/d2compiler/TestCompile/edge.exp.json @@ -70,7 +70,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -101,7 +102,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -146,7 +148,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -189,7 +192,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json b/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json index bf32e2e02..5898433cc 100644 --- a/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json +++ b/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json @@ -249,7 +249,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -310,7 +311,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -355,7 +357,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -398,7 +401,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_chain.exp.json b/testdata/d2compiler/TestCompile/edge_chain.exp.json index 4aa8282e0..572b37eef 100644 --- a/testdata/d2compiler/TestCompile/edge_chain.exp.json +++ b/testdata/d2compiler/TestCompile/edge_chain.exp.json @@ -117,7 +117,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -148,7 +149,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "index": 0, @@ -178,7 +180,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -223,7 +226,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -286,7 +290,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "z", @@ -329,7 +334,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_chain_map.exp.json b/testdata/d2compiler/TestCompile/edge_chain_map.exp.json index 6c49a5af8..620ab42c9 100644 --- a/testdata/d2compiler/TestCompile/edge_chain_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_chain_map.exp.json @@ -146,7 +146,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -177,7 +178,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "index": 0, @@ -207,7 +209,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -252,7 +255,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -315,7 +319,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "z", @@ -358,7 +363,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_column_index.exp.json b/testdata/d2compiler/TestCompile/edge_column_index.exp.json index c3cf797ee..94b0fcd6c 100644 --- a/testdata/d2compiler/TestCompile/edge_column_index.exp.json +++ b/testdata/d2compiler/TestCompile/edge_column_index.exp.json @@ -348,7 +348,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -381,7 +382,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -473,7 +475,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "dst", @@ -563,7 +566,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json b/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json index b6b3c1a0d..684bc3434 100644 --- a/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json +++ b/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json @@ -115,7 +115,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -150,7 +151,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -195,7 +197,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -238,7 +241,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json index d0220923f..dbb041507 100644 --- a/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json @@ -158,7 +158,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -205,7 +206,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -270,7 +272,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -333,7 +336,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json index 4b56270c3..d37af8b7b 100644 --- a/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json @@ -126,7 +126,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -170,7 +171,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -215,7 +217,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -258,7 +261,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_in_column.exp.json b/testdata/d2compiler/TestCompile/edge_in_column.exp.json index 05c4e1e69..900e626a5 100644 --- a/testdata/d2compiler/TestCompile/edge_in_column.exp.json +++ b/testdata/d2compiler/TestCompile/edge_in_column.exp.json @@ -161,7 +161,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [], "objects": [ @@ -216,7 +217,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_index.exp.json b/testdata/d2compiler/TestCompile/edge_index.exp.json index 1dab7db6a..f5e9dde8e 100644 --- a/testdata/d2compiler/TestCompile/edge_index.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index.exp.json @@ -141,7 +141,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -175,7 +176,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -240,7 +242,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -303,7 +306,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_index_map.exp.json b/testdata/d2compiler/TestCompile/edge_index_map.exp.json index 1e1a5ff30..0d70359de 100644 --- a/testdata/d2compiler/TestCompile/edge_index_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index_map.exp.json @@ -160,7 +160,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -194,7 +195,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -259,7 +261,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -322,7 +325,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_index_nested.exp.json b/testdata/d2compiler/TestCompile/edge_index_nested.exp.json index 9f77b4f31..3e2f59378 100644 --- a/testdata/d2compiler/TestCompile/edge_index_nested.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index_nested.exp.json @@ -170,7 +170,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -204,7 +205,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -249,7 +251,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "x", @@ -312,7 +315,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -375,7 +379,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json b/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json index 2be418922..36d7fe8ca 100644 --- a/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json @@ -186,7 +186,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -220,7 +221,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -285,7 +287,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "x", @@ -348,7 +351,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -411,7 +415,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json index 3ace9b870..6384c4d51 100644 --- a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json +++ b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json @@ -199,7 +199,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -237,7 +238,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -302,7 +304,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "a", @@ -365,7 +368,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -428,7 +432,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json index 34560630d..db1b4e846 100644 --- a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json +++ b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json @@ -205,7 +205,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -243,7 +244,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -288,7 +290,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "a", @@ -362,7 +365,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -436,7 +440,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json index d1be6a904..c9d8f1037 100644 --- a/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json +++ b/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json @@ -218,7 +218,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -256,7 +257,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -301,7 +303,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "a", @@ -375,7 +378,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -449,7 +453,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json index 8373caa0b..e89f0a775 100644 --- a/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json +++ b/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json @@ -236,7 +236,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -274,7 +275,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -319,7 +321,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "a", @@ -393,7 +396,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -467,7 +471,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_label_map.exp.json b/testdata/d2compiler/TestCompile/edge_label_map.exp.json index e728aeb38..2dcadbd48 100644 --- a/testdata/d2compiler/TestCompile/edge_label_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_label_map.exp.json @@ -126,7 +126,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -161,7 +162,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -206,7 +208,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "qwer", @@ -249,7 +252,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_map.exp.json b/testdata/d2compiler/TestCompile/edge_map.exp.json index c314961d7..23bc94bc3 100644 --- a/testdata/d2compiler/TestCompile/edge_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map.exp.json @@ -109,7 +109,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -140,7 +141,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -185,7 +187,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -228,7 +231,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json index 961ff5094..8238a32f1 100644 --- a/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json @@ -138,7 +138,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -182,7 +183,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -227,7 +229,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -270,7 +273,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json b/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json index 25c0db906..11a27902c 100644 --- a/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json @@ -154,7 +154,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -192,7 +193,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -257,7 +259,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -320,7 +323,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json b/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json index 46422a6fe..43ecb54ff 100644 --- a/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json @@ -172,7 +172,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -210,7 +211,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -275,7 +277,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -338,7 +341,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_map_nested.exp.json b/testdata/d2compiler/TestCompile/edge_map_nested.exp.json index 2097718a6..9947df343 100644 --- a/testdata/d2compiler/TestCompile/edge_map_nested.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_nested.exp.json @@ -134,7 +134,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -169,7 +170,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -214,7 +216,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -257,7 +260,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json b/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json index 017d5dfc8..aeb1bcbd5 100644 --- a/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json @@ -116,7 +116,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -151,7 +152,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -196,7 +198,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -239,7 +242,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json index 9a50c75ff..0506cfe02 100644 --- a/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json @@ -226,7 +226,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -286,7 +287,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -351,7 +353,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -414,7 +417,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json index 5142f8595..d46e06a17 100644 --- a/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json @@ -120,7 +120,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -164,7 +165,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -209,7 +211,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -252,7 +255,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json index cd8446a1e..d7a333387 100644 --- a/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json @@ -176,7 +176,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -223,7 +224,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -288,7 +290,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -351,7 +354,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2compiler/TestCompile/escaped_id.exp.json b/testdata/d2compiler/TestCompile/escaped_id.exp.json index af200618f..9abba2d3a 100644 --- a/testdata/d2compiler/TestCompile/escaped_id.exp.json +++ b/testdata/d2compiler/TestCompile/escaped_id.exp.json @@ -47,7 +47,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -92,7 +93,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2compiler/TestCompile/image_style.exp.json b/testdata/d2compiler/TestCompile/image_style.exp.json index 997030792..0e52a0d08 100644 --- a/testdata/d2compiler/TestCompile/image_style.exp.json +++ b/testdata/d2compiler/TestCompile/image_style.exp.json @@ -168,7 +168,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [], "objects": [ @@ -229,7 +230,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2compiler/TestCompile/nested_sql.exp.json b/testdata/d2compiler/TestCompile/nested_sql.exp.json index 69e2f421c..21154c301 100644 --- a/testdata/d2compiler/TestCompile/nested_sql.exp.json +++ b/testdata/d2compiler/TestCompile/nested_sql.exp.json @@ -181,7 +181,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [], "objects": [ @@ -226,7 +227,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "table", @@ -285,7 +287,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2compiler/TestCompile/path_link.exp.json b/testdata/d2compiler/TestCompile/path_link.exp.json index 300cfe06f..397b51dba 100644 --- a/testdata/d2compiler/TestCompile/path_link.exp.json +++ b/testdata/d2compiler/TestCompile/path_link.exp.json @@ -86,7 +86,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -132,7 +133,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json b/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json index 69651a4a9..536e221da 100644 --- a/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json +++ b/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json @@ -281,7 +281,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [], "objects": [ @@ -394,7 +395,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -437,7 +439,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2compiler/TestCompile/root_direction.exp.json b/testdata/d2compiler/TestCompile/root_direction.exp.json index 0f9ea2488..514729c8b 100644 --- a/testdata/d2compiler/TestCompile/root_direction.exp.json +++ b/testdata/d2compiler/TestCompile/root_direction.exp.json @@ -57,7 +57,8 @@ "direction": { "value": "right" } - } + }, + "zIndex": 0 }, "edges": null, "objects": null diff --git a/testdata/d2compiler/TestCompile/root_sequence.exp.json b/testdata/d2compiler/TestCompile/root_sequence.exp.json index 7ee72472d..aee7f378a 100644 --- a/testdata/d2compiler/TestCompile/root_sequence.exp.json +++ b/testdata/d2compiler/TestCompile/root_sequence.exp.json @@ -57,7 +57,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": null diff --git a/testdata/d2compiler/TestCompile/set_direction.exp.json b/testdata/d2compiler/TestCompile/set_direction.exp.json index 39c25c81d..cc544204b 100644 --- a/testdata/d2compiler/TestCompile/set_direction.exp.json +++ b/testdata/d2compiler/TestCompile/set_direction.exp.json @@ -86,7 +86,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -131,7 +132,8 @@ "direction": { "value": "left" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2compiler/TestCompile/sql_paren.exp.json b/testdata/d2compiler/TestCompile/sql_paren.exp.json index 13eff1ae6..5c8c75ed9 100644 --- a/testdata/d2compiler/TestCompile/sql_paren.exp.json +++ b/testdata/d2compiler/TestCompile/sql_paren.exp.json @@ -162,7 +162,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [], "objects": [ @@ -223,7 +224,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2compiler/TestCompile/stroke-width.exp.json b/testdata/d2compiler/TestCompile/stroke-width.exp.json index b947b14a2..1f05b7ca2 100644 --- a/testdata/d2compiler/TestCompile/stroke-width.exp.json +++ b/testdata/d2compiler/TestCompile/stroke-width.exp.json @@ -93,7 +93,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [], "objects": [ @@ -142,7 +143,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2compiler/TestCompile/table_style.exp.json b/testdata/d2compiler/TestCompile/table_style.exp.json index f44f416b4..79e1ea440 100644 --- a/testdata/d2compiler/TestCompile/table_style.exp.json +++ b/testdata/d2compiler/TestCompile/table_style.exp.json @@ -159,7 +159,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [], "objects": [ @@ -218,7 +219,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2compiler/TestCompile/table_style_map.exp.json b/testdata/d2compiler/TestCompile/table_style_map.exp.json index 4b150db68..2c8260d32 100644 --- a/testdata/d2compiler/TestCompile/table_style_map.exp.json +++ b/testdata/d2compiler/TestCompile/table_style_map.exp.json @@ -210,7 +210,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [], "objects": [ @@ -269,7 +270,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2compiler/TestCompile/underscore_edge.exp.json b/testdata/d2compiler/TestCompile/underscore_edge.exp.json index 84d29cf9c..f0741e0a4 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge.exp.json @@ -121,7 +121,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -152,7 +153,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -228,7 +230,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -282,7 +285,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json index c9eb30378..dd53dcad8 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json @@ -180,7 +180,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -211,7 +212,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "index": 0, @@ -241,7 +243,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -348,7 +351,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -402,7 +406,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "z", @@ -456,7 +461,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json index 4a3d687fe..f10568194 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json @@ -187,7 +187,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -218,7 +219,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "index": 1, @@ -248,7 +250,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -293,7 +296,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "a", @@ -367,7 +371,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -441,7 +446,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json index 705d516f8..86507ebaf 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json @@ -192,7 +192,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -226,7 +227,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -271,7 +273,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "a", @@ -345,7 +348,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -419,7 +423,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json index 7d1942adb..dbaaa7445 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json @@ -161,7 +161,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -192,7 +193,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -237,7 +239,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -311,7 +314,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "z", @@ -376,7 +380,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json index 830a09082..073d7f280 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json @@ -87,7 +87,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -132,7 +133,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -186,7 +188,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json index 7ca34f0e3..634a5280e 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json @@ -116,7 +116,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -161,7 +162,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -204,7 +206,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "z", @@ -258,7 +261,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json index 69b1b036e..d68ff4ba6 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json @@ -130,7 +130,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -175,7 +176,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -249,7 +251,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json index 00824907e..4e645d8fa 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json @@ -130,7 +130,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -206,7 +207,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "x", @@ -249,7 +251,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json index 1b9272a22..92cc9326b 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json @@ -127,7 +127,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -172,7 +173,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -215,7 +217,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "z", @@ -280,7 +283,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2compiler/TestCompile/url_link.exp.json b/testdata/d2compiler/TestCompile/url_link.exp.json index ee7b7a06e..f7cf70e38 100644 --- a/testdata/d2compiler/TestCompile/url_link.exp.json +++ b/testdata/d2compiler/TestCompile/url_link.exp.json @@ -86,7 +86,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -132,7 +133,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2exporter/TestExport/connection/arrowhead.exp.json b/testdata/d2exporter/TestExport/connection/arrowhead.exp.json index 50853c66c..60ac88668 100644 --- a/testdata/d2exporter/TestExport/connection/arrowhead.exp.json +++ b/testdata/d2exporter/TestExport/connection/arrowhead.exp.json @@ -36,7 +36,8 @@ "underline": false, "labelWidth": 0, "labelHeight": 0, - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "y", @@ -73,7 +74,8 @@ "underline": false, "labelWidth": 0, "labelHeight": 0, - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -106,7 +108,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/testdata/d2exporter/TestExport/connection/basic.exp.json b/testdata/d2exporter/TestExport/connection/basic.exp.json index 08955be89..726218c9c 100644 --- a/testdata/d2exporter/TestExport/connection/basic.exp.json +++ b/testdata/d2exporter/TestExport/connection/basic.exp.json @@ -36,7 +36,8 @@ "underline": false, "labelWidth": 0, "labelHeight": 0, - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "y", @@ -73,7 +74,8 @@ "underline": false, "labelWidth": 0, "labelHeight": 0, - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -106,7 +108,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/testdata/d2exporter/TestExport/connection/stroke-dash.exp.json b/testdata/d2exporter/TestExport/connection/stroke-dash.exp.json index a0dc6acb0..4d68e010d 100644 --- a/testdata/d2exporter/TestExport/connection/stroke-dash.exp.json +++ b/testdata/d2exporter/TestExport/connection/stroke-dash.exp.json @@ -36,7 +36,8 @@ "underline": false, "labelWidth": 0, "labelHeight": 0, - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "y", @@ -73,7 +74,8 @@ "underline": false, "labelWidth": 0, "labelHeight": 0, - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -106,7 +108,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/testdata/d2exporter/TestExport/connection/theme_stroke-dash.exp.json b/testdata/d2exporter/TestExport/connection/theme_stroke-dash.exp.json index 524a496d8..e97b648ac 100644 --- a/testdata/d2exporter/TestExport/connection/theme_stroke-dash.exp.json +++ b/testdata/d2exporter/TestExport/connection/theme_stroke-dash.exp.json @@ -36,7 +36,8 @@ "underline": false, "labelWidth": 0, "labelHeight": 0, - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "y", @@ -73,7 +74,8 @@ "underline": false, "labelWidth": 0, "labelHeight": 0, - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -106,7 +108,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 }, { "id": "(x -> y)[1]", @@ -137,7 +139,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/testdata/d2exporter/TestExport/label/basic_shape.exp.json b/testdata/d2exporter/TestExport/label/basic_shape.exp.json index 6593e9910..931fe4753 100644 --- a/testdata/d2exporter/TestExport/label/basic_shape.exp.json +++ b/testdata/d2exporter/TestExport/label/basic_shape.exp.json @@ -36,7 +36,8 @@ "underline": false, "labelWidth": 0, "labelHeight": 0, - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [] diff --git a/testdata/d2exporter/TestExport/label/connection_font_color.exp.json b/testdata/d2exporter/TestExport/label/connection_font_color.exp.json index 93a48c163..748ca5390 100644 --- a/testdata/d2exporter/TestExport/label/connection_font_color.exp.json +++ b/testdata/d2exporter/TestExport/label/connection_font_color.exp.json @@ -36,7 +36,8 @@ "underline": false, "labelWidth": 0, "labelHeight": 0, - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "y", @@ -73,7 +74,8 @@ "underline": false, "labelWidth": 0, "labelHeight": 0, - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -106,7 +108,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/testdata/d2exporter/TestExport/label/shape_font_color.exp.json b/testdata/d2exporter/TestExport/label/shape_font_color.exp.json index 81ff5951f..e0985129a 100644 --- a/testdata/d2exporter/TestExport/label/shape_font_color.exp.json +++ b/testdata/d2exporter/TestExport/label/shape_font_color.exp.json @@ -36,7 +36,8 @@ "underline": false, "labelWidth": 0, "labelHeight": 0, - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [] diff --git a/testdata/d2exporter/TestExport/shape/basic.exp.json b/testdata/d2exporter/TestExport/shape/basic.exp.json index 188372eb7..ec233aa08 100644 --- a/testdata/d2exporter/TestExport/shape/basic.exp.json +++ b/testdata/d2exporter/TestExport/shape/basic.exp.json @@ -36,7 +36,8 @@ "underline": false, "labelWidth": 0, "labelHeight": 0, - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [] diff --git a/testdata/d2exporter/TestExport/shape/border-radius.exp.json b/testdata/d2exporter/TestExport/shape/border-radius.exp.json index fedf87d54..6b9a69075 100644 --- a/testdata/d2exporter/TestExport/shape/border-radius.exp.json +++ b/testdata/d2exporter/TestExport/shape/border-radius.exp.json @@ -36,7 +36,8 @@ "underline": false, "labelWidth": 0, "labelHeight": 0, - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [] diff --git a/testdata/d2exporter/TestExport/shape/image_dimensions.exp.json b/testdata/d2exporter/TestExport/shape/image_dimensions.exp.json index 63b7d95cc..f33f6473d 100644 --- a/testdata/d2exporter/TestExport/shape/image_dimensions.exp.json +++ b/testdata/d2exporter/TestExport/shape/image_dimensions.exp.json @@ -47,7 +47,8 @@ "underline": false, "labelWidth": 0, "labelHeight": 0, - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [] diff --git a/testdata/d2exporter/TestExport/shape/synonyms.exp.json b/testdata/d2exporter/TestExport/shape/synonyms.exp.json index 075174b0c..b67ca940a 100644 --- a/testdata/d2exporter/TestExport/shape/synonyms.exp.json +++ b/testdata/d2exporter/TestExport/shape/synonyms.exp.json @@ -36,7 +36,8 @@ "underline": false, "labelWidth": 0, "labelHeight": 0, - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "y", @@ -73,7 +74,8 @@ "underline": false, "labelWidth": 0, "labelHeight": 0, - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [] diff --git a/testdata/d2exporter/TestExport/shape/text_color.exp.json b/testdata/d2exporter/TestExport/shape/text_color.exp.json index e30872ec3..db7273d5a 100644 --- a/testdata/d2exporter/TestExport/shape/text_color.exp.json +++ b/testdata/d2exporter/TestExport/shape/text_color.exp.json @@ -36,7 +36,8 @@ "underline": false, "labelWidth": 0, "labelHeight": 0, - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [] diff --git a/testdata/d2exporter/TestExport/theme/connection_with_bold.exp.json b/testdata/d2exporter/TestExport/theme/connection_with_bold.exp.json index a8765da4e..cf2e7cf34 100644 --- a/testdata/d2exporter/TestExport/theme/connection_with_bold.exp.json +++ b/testdata/d2exporter/TestExport/theme/connection_with_bold.exp.json @@ -36,7 +36,8 @@ "underline": false, "labelWidth": 0, "labelHeight": 0, - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "y", @@ -73,7 +74,8 @@ "underline": false, "labelWidth": 0, "labelHeight": 0, - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -106,7 +108,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/testdata/d2exporter/TestExport/theme/connection_with_italic.exp.json b/testdata/d2exporter/TestExport/theme/connection_with_italic.exp.json index 8fd82f679..b3d780bb9 100644 --- a/testdata/d2exporter/TestExport/theme/connection_with_italic.exp.json +++ b/testdata/d2exporter/TestExport/theme/connection_with_italic.exp.json @@ -36,7 +36,8 @@ "underline": false, "labelWidth": 0, "labelHeight": 0, - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "y", @@ -73,7 +74,8 @@ "underline": false, "labelWidth": 0, "labelHeight": 0, - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -106,7 +108,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/testdata/d2exporter/TestExport/theme/connection_without_italic.exp.json b/testdata/d2exporter/TestExport/theme/connection_without_italic.exp.json index 8b0690825..b1d30b075 100644 --- a/testdata/d2exporter/TestExport/theme/connection_without_italic.exp.json +++ b/testdata/d2exporter/TestExport/theme/connection_without_italic.exp.json @@ -36,7 +36,8 @@ "underline": false, "labelWidth": 0, "labelHeight": 0, - "zIndex": 1 + "zIndex": 0, + "level": 1 }, { "id": "y", @@ -73,7 +74,8 @@ "underline": false, "labelWidth": 0, "labelHeight": 0, - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -106,7 +108,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 0 } ] } diff --git a/testdata/d2exporter/TestExport/theme/shape_with_italic.exp.json b/testdata/d2exporter/TestExport/theme/shape_with_italic.exp.json index 5d647a1f6..73a0eab3c 100644 --- a/testdata/d2exporter/TestExport/theme/shape_with_italic.exp.json +++ b/testdata/d2exporter/TestExport/theme/shape_with_italic.exp.json @@ -36,7 +36,8 @@ "underline": false, "labelWidth": 0, "labelHeight": 0, - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [] diff --git a/testdata/d2exporter/TestExport/theme/shape_without_bold.exp.json b/testdata/d2exporter/TestExport/theme/shape_without_bold.exp.json index 855735fdb..e136a4d38 100644 --- a/testdata/d2exporter/TestExport/theme/shape_without_bold.exp.json +++ b/testdata/d2exporter/TestExport/theme/shape_without_bold.exp.json @@ -36,7 +36,8 @@ "underline": false, "labelWidth": 0, "labelHeight": 0, - "zIndex": 1 + "zIndex": 0, + "level": 1 } ], "connections": [] diff --git a/testdata/d2oracle/TestCreate/base.exp.json b/testdata/d2oracle/TestCreate/base.exp.json index a7ac1c375..2378b30c1 100644 --- a/testdata/d2oracle/TestCreate/base.exp.json +++ b/testdata/d2oracle/TestCreate/base.exp.json @@ -47,7 +47,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -92,7 +93,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestCreate/container.exp.json b/testdata/d2oracle/TestCreate/container.exp.json index dc7bbf8f1..826ecb30b 100644 --- a/testdata/d2oracle/TestCreate/container.exp.json +++ b/testdata/d2oracle/TestCreate/container.exp.json @@ -76,7 +76,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -121,7 +122,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "q", @@ -164,7 +166,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestCreate/container_edge.exp.json b/testdata/d2oracle/TestCreate/container_edge.exp.json index 21565478e..86f090cc4 100644 --- a/testdata/d2oracle/TestCreate/container_edge.exp.json +++ b/testdata/d2oracle/TestCreate/container_edge.exp.json @@ -99,7 +99,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -130,7 +131,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -175,7 +177,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "x", @@ -218,7 +221,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -261,7 +265,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestCreate/container_edge_label.exp.json b/testdata/d2oracle/TestCreate/container_edge_label.exp.json index 77f7b9a48..df5fcb180 100644 --- a/testdata/d2oracle/TestCreate/container_edge_label.exp.json +++ b/testdata/d2oracle/TestCreate/container_edge_label.exp.json @@ -109,7 +109,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -140,7 +141,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -185,7 +187,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "x", @@ -228,7 +231,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -271,7 +275,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestCreate/edge.exp.json b/testdata/d2oracle/TestCreate/edge.exp.json index ec2ec4313..2469379f1 100644 --- a/testdata/d2oracle/TestCreate/edge.exp.json +++ b/testdata/d2oracle/TestCreate/edge.exp.json @@ -70,7 +70,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -101,7 +102,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -146,7 +148,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -189,7 +192,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestCreate/edge_nested.exp.json b/testdata/d2oracle/TestCreate/edge_nested.exp.json index 5d8ed4b19..521c7ee74 100644 --- a/testdata/d2oracle/TestCreate/edge_nested.exp.json +++ b/testdata/d2oracle/TestCreate/edge_nested.exp.json @@ -86,7 +86,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -117,7 +118,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -162,7 +164,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "x", @@ -205,7 +208,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -248,7 +252,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestCreate/edge_scope.exp.json b/testdata/d2oracle/TestCreate/edge_scope.exp.json index 2ff35f256..f9cf54cf0 100644 --- a/testdata/d2oracle/TestCreate/edge_scope.exp.json +++ b/testdata/d2oracle/TestCreate/edge_scope.exp.json @@ -99,7 +99,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -130,7 +131,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -175,7 +177,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "x", @@ -218,7 +221,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -261,7 +265,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json b/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json index fa3474290..c7516bc04 100644 --- a/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json +++ b/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json @@ -99,7 +99,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -130,7 +131,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -175,7 +177,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "x", @@ -218,7 +221,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -261,7 +265,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json b/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json index 32b0a3db0..32bd13e82 100644 --- a/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json +++ b/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json @@ -110,7 +110,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -141,7 +142,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -197,7 +199,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -251,7 +254,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "z", @@ -294,7 +298,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "q", @@ -337,7 +342,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestCreate/edge_unique.exp.json b/testdata/d2oracle/TestCreate/edge_unique.exp.json index 68eb01b49..dc8a4abce 100644 --- a/testdata/d2oracle/TestCreate/edge_unique.exp.json +++ b/testdata/d2oracle/TestCreate/edge_unique.exp.json @@ -256,7 +256,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -287,7 +288,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "index": 0, @@ -317,7 +319,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "index": 1, @@ -347,7 +350,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "index": 2, @@ -377,7 +381,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -422,7 +427,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -465,7 +471,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "hello", @@ -548,7 +555,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "x", @@ -631,7 +639,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -714,7 +723,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestCreate/gen_key.exp.json b/testdata/d2oracle/TestCreate/gen_key.exp.json index ee6032e00..e80eea295 100644 --- a/testdata/d2oracle/TestCreate/gen_key.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key.exp.json @@ -70,7 +70,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -115,7 +116,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "square 2", @@ -158,7 +160,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestCreate/gen_key_n.exp.json b/testdata/d2oracle/TestCreate/gen_key_n.exp.json index 66a55f903..37936f950 100644 --- a/testdata/d2oracle/TestCreate/gen_key_n.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key_n.exp.json @@ -328,7 +328,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -395,7 +396,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -460,7 +462,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "z", @@ -525,7 +528,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "square", @@ -568,7 +572,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "square 2", @@ -611,7 +616,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "square 3", @@ -654,7 +660,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "square 4", @@ -697,7 +704,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "square 5", @@ -740,7 +748,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "square 6", @@ -783,7 +792,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "square 7", @@ -826,7 +836,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "square 8", @@ -869,7 +880,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "square 9", @@ -912,7 +924,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "square 10", @@ -955,7 +968,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "square 11", @@ -998,7 +1012,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestCreate/gen_key_nested.exp.json b/testdata/d2oracle/TestCreate/gen_key_nested.exp.json index ab99bdedd..87390319a 100644 --- a/testdata/d2oracle/TestCreate/gen_key_nested.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key_nested.exp.json @@ -136,7 +136,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -267,7 +268,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -396,7 +398,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "z", @@ -525,7 +528,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "square", @@ -601,7 +605,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "square 2", @@ -677,7 +682,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestCreate/gen_key_scope.exp.json b/testdata/d2oracle/TestCreate/gen_key_scope.exp.json index e429b1605..13561d4d2 100644 --- a/testdata/d2oracle/TestCreate/gen_key_scope.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key_scope.exp.json @@ -121,7 +121,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -188,7 +189,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -253,7 +255,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "z", @@ -318,7 +321,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "square", @@ -361,7 +365,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "square 2", @@ -404,7 +409,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json b/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json index 4e34daf68..1b1eb234f 100644 --- a/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json @@ -70,7 +70,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -115,7 +116,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "x 2", @@ -158,7 +160,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json b/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json index c2d340411..2b4068cac 100644 --- a/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json +++ b/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json @@ -109,7 +109,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -154,7 +155,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "orange", @@ -197,7 +199,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json index 73f6f3626..d40ba110f 100644 --- a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json +++ b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json @@ -155,7 +155,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -200,7 +201,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "rawr", @@ -243,7 +245,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "orange", @@ -286,7 +289,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "after", @@ -329,7 +333,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json index edaeba937..c7acfe593 100644 --- a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json +++ b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json @@ -155,7 +155,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -200,7 +201,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "rawr", @@ -243,7 +245,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "orange", @@ -286,7 +289,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "after", @@ -329,7 +333,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestCreate/nested.exp.json b/testdata/d2oracle/TestCreate/nested.exp.json index 2ba4dcb6f..ade21862c 100644 --- a/testdata/d2oracle/TestCreate/nested.exp.json +++ b/testdata/d2oracle/TestCreate/nested.exp.json @@ -69,7 +69,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -136,7 +137,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "c", @@ -201,7 +203,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "square", @@ -266,7 +269,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestCreate/scope.exp.json b/testdata/d2oracle/TestCreate/scope.exp.json index 56bce7e52..791ce462d 100644 --- a/testdata/d2oracle/TestCreate/scope.exp.json +++ b/testdata/d2oracle/TestCreate/scope.exp.json @@ -98,7 +98,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -165,7 +166,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -230,7 +232,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "z", @@ -295,7 +298,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "square", @@ -338,7 +342,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json b/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json index 404e508c0..47b99bd80 100644 --- a/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json +++ b/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json @@ -47,7 +47,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -92,7 +93,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/children.exp.json b/testdata/d2oracle/TestDelete/children.exp.json index 4d7148816..b4d1e4fc0 100644 --- a/testdata/d2oracle/TestDelete/children.exp.json +++ b/testdata/d2oracle/TestDelete/children.exp.json @@ -93,7 +93,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -124,7 +125,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -169,7 +171,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "x", @@ -212,7 +215,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -255,7 +259,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/children_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_conflicts.exp.json index 8c9d70638..349e74e09 100644 --- a/testdata/d2oracle/TestDelete/children_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_conflicts.exp.json @@ -70,7 +70,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -115,7 +116,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "x", @@ -158,7 +160,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json index 0f45cbe4c..d21f267ed 100644 --- a/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json @@ -126,7 +126,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -157,7 +158,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -202,7 +204,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "x 2", @@ -265,7 +268,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -308,7 +312,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json index 368b8310d..396cdb848 100644 --- a/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json @@ -219,7 +219,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -250,7 +251,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "index": 0, @@ -280,7 +282,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -325,7 +328,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "z", @@ -368,7 +372,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "x 2", @@ -431,7 +436,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "z 2", @@ -494,7 +500,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -557,7 +564,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json index 74f50700a..474b72021 100644 --- a/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json @@ -103,7 +103,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -168,7 +169,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "x", @@ -211,7 +213,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json index c49fc91ba..d6eef0f98 100644 --- a/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json @@ -195,7 +195,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -226,7 +227,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -311,7 +313,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y 2", @@ -374,7 +377,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "x", @@ -417,7 +421,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -460,7 +465,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json index 313097061..0f6a9945b 100644 --- a/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json @@ -99,7 +99,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -144,7 +145,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -187,7 +189,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "x", @@ -230,7 +233,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json index 725a50f18..45ab6be77 100644 --- a/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json @@ -158,7 +158,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -265,7 +266,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -350,7 +352,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "x", @@ -393,7 +396,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json b/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json index 91f74c667..00194d878 100644 --- a/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json @@ -47,7 +47,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -92,7 +93,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/children_order.exp.json b/testdata/d2oracle/TestDelete/children_order.exp.json index ace7a8b31..8e16e64c9 100644 --- a/testdata/d2oracle/TestDelete/children_order.exp.json +++ b/testdata/d2oracle/TestDelete/children_order.exp.json @@ -122,7 +122,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -167,7 +168,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "before", @@ -210,7 +212,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "congo", @@ -253,7 +256,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "after", @@ -296,7 +300,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json index 668543222..672c80212 100644 --- a/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json @@ -103,7 +103,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -168,7 +169,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "x", @@ -211,7 +213,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/children_scope.exp.json b/testdata/d2oracle/TestDelete/children_scope.exp.json index 7bd1b5112..2a9ab9d84 100644 --- a/testdata/d2oracle/TestDelete/children_scope.exp.json +++ b/testdata/d2oracle/TestDelete/children_scope.exp.json @@ -133,7 +133,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -164,7 +165,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -220,7 +222,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "q", @@ -274,7 +277,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "\"what's up\"", @@ -317,7 +321,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "x", @@ -360,7 +365,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -403,7 +409,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/container_near.exp.json b/testdata/d2oracle/TestDelete/container_near.exp.json index 704202b70..2904e02ec 100644 --- a/testdata/d2oracle/TestDelete/container_near.exp.json +++ b/testdata/d2oracle/TestDelete/container_near.exp.json @@ -171,7 +171,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -231,7 +232,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "z", @@ -274,7 +276,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "a", @@ -332,7 +335,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/delete_icon.exp.json b/testdata/d2oracle/TestDelete/delete_icon.exp.json index 9a370a688..f71814aea 100644 --- a/testdata/d2oracle/TestDelete/delete_icon.exp.json +++ b/testdata/d2oracle/TestDelete/delete_icon.exp.json @@ -97,7 +97,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -153,7 +154,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "x", @@ -208,7 +210,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/delete_link.exp.json b/testdata/d2oracle/TestDelete/delete_link.exp.json index bd4a60f19..fbb71aa46 100644 --- a/testdata/d2oracle/TestDelete/delete_link.exp.json +++ b/testdata/d2oracle/TestDelete/delete_link.exp.json @@ -47,7 +47,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -92,7 +93,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/delete_near.exp.json b/testdata/d2oracle/TestDelete/delete_near.exp.json index 5ec43d9a8..ba1fef220 100644 --- a/testdata/d2oracle/TestDelete/delete_near.exp.json +++ b/testdata/d2oracle/TestDelete/delete_near.exp.json @@ -70,7 +70,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -115,7 +116,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -158,7 +160,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json b/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json index 1fe0d5f5c..6212b032a 100644 --- a/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json +++ b/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json @@ -70,7 +70,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -115,7 +116,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -158,7 +160,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json b/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json index e7e41216f..3eefd73d8 100644 --- a/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json +++ b/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json @@ -70,7 +70,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -115,7 +116,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -158,7 +160,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/delete_tooltip.exp.json b/testdata/d2oracle/TestDelete/delete_tooltip.exp.json index cddd7377e..57a87fcdd 100644 --- a/testdata/d2oracle/TestDelete/delete_tooltip.exp.json +++ b/testdata/d2oracle/TestDelete/delete_tooltip.exp.json @@ -47,7 +47,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -92,7 +93,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json b/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json index c8c0b2a8f..c3ca2e052 100644 --- a/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json +++ b/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json @@ -103,7 +103,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -134,7 +135,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -232,7 +234,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -297,7 +300,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "z", @@ -362,7 +366,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -416,7 +421,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/edge_common.exp.json b/testdata/d2oracle/TestDelete/edge_common.exp.json index f268c4258..0b8c10a7c 100644 --- a/testdata/d2oracle/TestDelete/edge_common.exp.json +++ b/testdata/d2oracle/TestDelete/edge_common.exp.json @@ -70,7 +70,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -101,7 +102,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -146,7 +148,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -189,7 +192,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/edge_common_2.exp.json b/testdata/d2oracle/TestDelete/edge_common_2.exp.json index 81c153998..a0ff4695d 100644 --- a/testdata/d2oracle/TestDelete/edge_common_2.exp.json +++ b/testdata/d2oracle/TestDelete/edge_common_2.exp.json @@ -70,7 +70,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -101,7 +102,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -146,7 +148,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -189,7 +192,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/edge_common_3.exp.json b/testdata/d2oracle/TestDelete/edge_common_3.exp.json index 884567505..e27a63060 100644 --- a/testdata/d2oracle/TestDelete/edge_common_3.exp.json +++ b/testdata/d2oracle/TestDelete/edge_common_3.exp.json @@ -92,7 +92,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -179,7 +180,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "a", @@ -233,7 +235,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -287,7 +290,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/edge_common_4.exp.json b/testdata/d2oracle/TestDelete/edge_common_4.exp.json index b17687cc0..69946d8fd 100644 --- a/testdata/d2oracle/TestDelete/edge_common_4.exp.json +++ b/testdata/d2oracle/TestDelete/edge_common_4.exp.json @@ -92,7 +92,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -179,7 +180,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "a", @@ -233,7 +235,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -287,7 +290,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/edge_conflict.exp.json b/testdata/d2oracle/TestDelete/edge_conflict.exp.json index 151e6a69a..64b67be28 100644 --- a/testdata/d2oracle/TestDelete/edge_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/edge_conflict.exp.json @@ -115,7 +115,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -146,7 +147,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -191,7 +193,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y 2", @@ -276,7 +279,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "a", @@ -330,7 +334,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -384,7 +389,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/edge_decrement.exp.json b/testdata/d2oracle/TestDelete/edge_decrement.exp.json index 7e8cd36b0..93e75c548 100644 --- a/testdata/d2oracle/TestDelete/edge_decrement.exp.json +++ b/testdata/d2oracle/TestDelete/edge_decrement.exp.json @@ -452,7 +452,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -486,7 +487,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "index": 1, @@ -519,7 +521,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "index": 2, @@ -552,7 +555,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "index": 3, @@ -585,7 +589,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -770,7 +775,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -953,7 +959,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/edge_first.exp.json b/testdata/d2oracle/TestDelete/edge_first.exp.json index ff36efa04..d333ea461 100644 --- a/testdata/d2oracle/TestDelete/edge_first.exp.json +++ b/testdata/d2oracle/TestDelete/edge_first.exp.json @@ -181,7 +181,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -212,7 +213,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "index": 0, @@ -242,7 +244,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -309,7 +312,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "p", @@ -374,7 +378,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "d", @@ -439,7 +444,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "x", @@ -482,7 +488,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "p", @@ -525,7 +532,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -588,7 +596,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "z", @@ -631,7 +640,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/edge_flat_style.exp.json b/testdata/d2oracle/TestDelete/edge_flat_style.exp.json index 305e6a4aa..dfd442e7f 100644 --- a/testdata/d2oracle/TestDelete/edge_flat_style.exp.json +++ b/testdata/d2oracle/TestDelete/edge_flat_style.exp.json @@ -47,7 +47,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -92,7 +93,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/edge_identical_child.exp.json b/testdata/d2oracle/TestDelete/edge_identical_child.exp.json index eb781b86d..c4c0672a4 100644 --- a/testdata/d2oracle/TestDelete/edge_identical_child.exp.json +++ b/testdata/d2oracle/TestDelete/edge_identical_child.exp.json @@ -103,7 +103,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -134,7 +135,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -201,7 +203,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -266,7 +269,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "z", @@ -331,7 +335,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -385,7 +390,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -439,7 +445,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/edge_key_style.exp.json b/testdata/d2oracle/TestDelete/edge_key_style.exp.json index 7562e03e2..9cba6610a 100644 --- a/testdata/d2oracle/TestDelete/edge_key_style.exp.json +++ b/testdata/d2oracle/TestDelete/edge_key_style.exp.json @@ -70,7 +70,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -101,7 +102,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -146,7 +148,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -189,7 +192,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/edge_last.exp.json b/testdata/d2oracle/TestDelete/edge_last.exp.json index ba877e571..d150073a4 100644 --- a/testdata/d2oracle/TestDelete/edge_last.exp.json +++ b/testdata/d2oracle/TestDelete/edge_last.exp.json @@ -218,7 +218,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -249,7 +250,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "index": 0, @@ -279,7 +281,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "index": 0, @@ -309,7 +312,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -376,7 +380,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "p", @@ -441,7 +446,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "d", @@ -506,7 +512,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "p", @@ -549,7 +556,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "x", @@ -592,7 +600,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -655,7 +664,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "z", @@ -718,7 +728,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "q", @@ -761,7 +772,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/edge_map_style.exp.json b/testdata/d2oracle/TestDelete/edge_map_style.exp.json index 9ff8ae11c..63feb2319 100644 --- a/testdata/d2oracle/TestDelete/edge_map_style.exp.json +++ b/testdata/d2oracle/TestDelete/edge_map_style.exp.json @@ -70,7 +70,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -101,7 +102,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -146,7 +148,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -189,7 +192,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/edge_middle.exp.json b/testdata/d2oracle/TestDelete/edge_middle.exp.json index 91b14b60f..b768d81f8 100644 --- a/testdata/d2oracle/TestDelete/edge_middle.exp.json +++ b/testdata/d2oracle/TestDelete/edge_middle.exp.json @@ -204,7 +204,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -235,7 +236,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "index": 0, @@ -265,7 +267,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "index": 0, @@ -295,7 +298,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -362,7 +366,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "p", @@ -427,7 +432,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "d", @@ -492,7 +498,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "x", @@ -535,7 +542,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -598,7 +606,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "z", @@ -641,7 +650,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "q", @@ -684,7 +694,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "p", @@ -727,7 +738,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/empty_map.exp.json b/testdata/d2oracle/TestDelete/empty_map.exp.json index 2acea4509..bf2fc7c04 100644 --- a/testdata/d2oracle/TestDelete/empty_map.exp.json +++ b/testdata/d2oracle/TestDelete/empty_map.exp.json @@ -76,7 +76,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -121,7 +122,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -164,7 +166,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/flat.exp.json b/testdata/d2oracle/TestDelete/flat.exp.json index 3f6f4cf3f..8f692aee9 100644 --- a/testdata/d2oracle/TestDelete/flat.exp.json +++ b/testdata/d2oracle/TestDelete/flat.exp.json @@ -23,7 +23,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": null diff --git a/testdata/d2oracle/TestDelete/flat_reserved.exp.json b/testdata/d2oracle/TestDelete/flat_reserved.exp.json index 601cb3246..8fcf4f37e 100644 --- a/testdata/d2oracle/TestDelete/flat_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/flat_reserved.exp.json @@ -70,7 +70,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -101,7 +102,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -146,7 +148,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "B", @@ -189,7 +192,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/hoist_children.exp.json b/testdata/d2oracle/TestDelete/hoist_children.exp.json index 6ef96aeff..8662f0020 100644 --- a/testdata/d2oracle/TestDelete/hoist_children.exp.json +++ b/testdata/d2oracle/TestDelete/hoist_children.exp.json @@ -76,7 +76,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -121,7 +122,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "c", @@ -164,7 +166,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json b/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json index 26f1c0df6..cfab5bba0 100644 --- a/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json +++ b/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json @@ -93,7 +93,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -124,7 +125,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -169,7 +171,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "c", @@ -212,7 +215,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "d", @@ -255,7 +259,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/key_with_edges.exp.json b/testdata/d2oracle/TestDelete/key_with_edges.exp.json index 92d07ef4d..b20618e92 100644 --- a/testdata/d2oracle/TestDelete/key_with_edges.exp.json +++ b/testdata/d2oracle/TestDelete/key_with_edges.exp.json @@ -92,7 +92,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -179,7 +180,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "meow", @@ -233,7 +235,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "bark", @@ -287,7 +290,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json b/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json index 1a050b474..2b818fc9e 100644 --- a/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json +++ b/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json @@ -58,7 +58,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -114,7 +115,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "bark", @@ -168,7 +170,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json b/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json index 972602ab8..b81d88ff4 100644 --- a/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json +++ b/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json @@ -58,7 +58,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -114,7 +115,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "bark", @@ -168,7 +170,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json b/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json index 54537c67c..f8730da6d 100644 --- a/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json +++ b/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json @@ -92,7 +92,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -179,7 +180,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "meow", @@ -233,7 +235,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "bark", @@ -287,7 +290,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/multi_near.exp.json b/testdata/d2oracle/TestDelete/multi_near.exp.json index 52e790bd6..a75c6b20c 100644 --- a/testdata/d2oracle/TestDelete/multi_near.exp.json +++ b/testdata/d2oracle/TestDelete/multi_near.exp.json @@ -194,7 +194,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -239,7 +240,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "Bluefish", @@ -297,7 +299,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "Yo", @@ -355,7 +358,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "Blah", @@ -398,7 +402,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json b/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json index 512dee2e2..e88563b08 100644 --- a/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json @@ -128,7 +128,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -193,7 +194,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "z 2", @@ -236,7 +238,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "z", @@ -279,7 +282,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json b/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json index fe559c369..5e60e8140 100644 --- a/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json @@ -99,7 +99,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -144,7 +145,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "z", @@ -187,7 +189,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "z", @@ -230,7 +233,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json b/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json index c649b5ac0..20dbd0b7f 100644 --- a/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json +++ b/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json @@ -92,7 +92,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -179,7 +180,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "c", @@ -233,7 +235,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "d", @@ -287,7 +290,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json b/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json index 247e72c2f..6b094245a 100644 --- a/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json +++ b/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json @@ -75,7 +75,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [], "objects": [ @@ -146,7 +147,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json b/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json index cfa33cab0..826b0a62d 100644 --- a/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json +++ b/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json @@ -111,7 +111,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [], "objects": [ @@ -160,7 +161,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/near.exp.json b/testdata/d2oracle/TestDelete/near.exp.json index 6991d9d32..b5247a5ae 100644 --- a/testdata/d2oracle/TestDelete/near.exp.json +++ b/testdata/d2oracle/TestDelete/near.exp.json @@ -47,7 +47,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -92,7 +93,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/nested.exp.json b/testdata/d2oracle/TestDelete/nested.exp.json index df80511e7..97a3c9092 100644 --- a/testdata/d2oracle/TestDelete/nested.exp.json +++ b/testdata/d2oracle/TestDelete/nested.exp.json @@ -69,7 +69,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -136,7 +137,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "c", @@ -201,7 +203,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "d", @@ -266,7 +269,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/nested_2.exp.json b/testdata/d2oracle/TestDelete/nested_2.exp.json index 8279fda83..3b1f44f87 100644 --- a/testdata/d2oracle/TestDelete/nested_2.exp.json +++ b/testdata/d2oracle/TestDelete/nested_2.exp.json @@ -69,7 +69,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -136,7 +137,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -201,7 +203,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "c", @@ -266,7 +269,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json b/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json index c37eda91d..954c33cd8 100644 --- a/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json +++ b/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json @@ -99,7 +99,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -130,7 +131,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -175,7 +177,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "x", @@ -218,7 +221,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -261,7 +265,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/nested_flat_style.exp.json b/testdata/d2oracle/TestDelete/nested_flat_style.exp.json index 168b2d4b9..7efbb59e0 100644 --- a/testdata/d2oracle/TestDelete/nested_flat_style.exp.json +++ b/testdata/d2oracle/TestDelete/nested_flat_style.exp.json @@ -47,7 +47,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -92,7 +93,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/nested_reserved.exp.json b/testdata/d2oracle/TestDelete/nested_reserved.exp.json index 3795fe11d..77ffecaf3 100644 --- a/testdata/d2oracle/TestDelete/nested_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/nested_reserved.exp.json @@ -103,7 +103,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -201,7 +202,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -297,7 +299,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "jingle", @@ -362,7 +365,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json b/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json index 23921a096..11173539c 100644 --- a/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json +++ b/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json @@ -87,7 +87,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -132,7 +133,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "pipe", @@ -186,7 +188,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/node_in_edge.exp.json b/testdata/d2oracle/TestDelete/node_in_edge.exp.json index d56558fd8..80c1d7673 100644 --- a/testdata/d2oracle/TestDelete/node_in_edge.exp.json +++ b/testdata/d2oracle/TestDelete/node_in_edge.exp.json @@ -168,7 +168,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -199,7 +200,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "index": 0, @@ -229,7 +231,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -274,7 +277,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "\"what's up\"", @@ -317,7 +321,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "x", @@ -360,7 +365,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -403,7 +409,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "q", @@ -446,7 +453,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "p", @@ -489,7 +497,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json b/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json index dd1456fcf..2718ecc06 100644 --- a/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json +++ b/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json @@ -207,7 +207,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -238,7 +239,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "index": 0, @@ -268,7 +270,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "index": 0, @@ -298,7 +301,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -354,7 +358,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -408,7 +413,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "\"what's up\"", @@ -451,7 +457,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "x", @@ -494,7 +501,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -557,7 +565,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "z", @@ -620,7 +629,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "q", @@ -663,7 +673,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json b/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json index 47a45ceaa..1fbff9a99 100644 --- a/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json @@ -166,7 +166,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -197,7 +198,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -266,7 +268,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "B", @@ -329,7 +332,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json b/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json index 61f9dcdee..6fe3a518b 100644 --- a/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json @@ -166,7 +166,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -201,7 +202,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -266,7 +268,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "B", @@ -329,7 +332,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/order_1.exp.json b/testdata/d2oracle/TestDelete/order_1.exp.json index c83f093cc..6157f1d58 100644 --- a/testdata/d2oracle/TestDelete/order_1.exp.json +++ b/testdata/d2oracle/TestDelete/order_1.exp.json @@ -93,7 +93,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -124,7 +125,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -169,7 +171,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -212,7 +215,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "z", @@ -255,7 +259,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/order_2.exp.json b/testdata/d2oracle/TestDelete/order_2.exp.json index 71042a674..271368317 100644 --- a/testdata/d2oracle/TestDelete/order_2.exp.json +++ b/testdata/d2oracle/TestDelete/order_2.exp.json @@ -70,7 +70,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -115,7 +116,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "z", @@ -158,7 +160,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/order_3.exp.json b/testdata/d2oracle/TestDelete/order_3.exp.json index 7c75321f9..ee20c088c 100644 --- a/testdata/d2oracle/TestDelete/order_3.exp.json +++ b/testdata/d2oracle/TestDelete/order_3.exp.json @@ -70,7 +70,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -115,7 +116,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "z", @@ -158,7 +160,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/order_4.exp.json b/testdata/d2oracle/TestDelete/order_4.exp.json index ab41da5d0..1bf7681e8 100644 --- a/testdata/d2oracle/TestDelete/order_4.exp.json +++ b/testdata/d2oracle/TestDelete/order_4.exp.json @@ -47,7 +47,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -92,7 +93,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/order_5.exp.json b/testdata/d2oracle/TestDelete/order_5.exp.json index c3336c5dd..f9591ccb1 100644 --- a/testdata/d2oracle/TestDelete/order_5.exp.json +++ b/testdata/d2oracle/TestDelete/order_5.exp.json @@ -145,7 +145,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -176,7 +177,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "index": 0, @@ -206,7 +208,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -251,7 +254,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -294,7 +298,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "c", @@ -337,7 +342,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "q", @@ -380,7 +386,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "p", @@ -423,7 +430,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/order_6.exp.json b/testdata/d2oracle/TestDelete/order_6.exp.json index 3f2e88242..208189f03 100644 --- a/testdata/d2oracle/TestDelete/order_6.exp.json +++ b/testdata/d2oracle/TestDelete/order_6.exp.json @@ -121,7 +121,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -208,7 +209,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "lol", @@ -251,7 +253,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "p", @@ -316,7 +319,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "q", @@ -381,7 +385,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/order_7.exp.json b/testdata/d2oracle/TestDelete/order_7.exp.json index d6744ebb7..2a34733d3 100644 --- a/testdata/d2oracle/TestDelete/order_7.exp.json +++ b/testdata/d2oracle/TestDelete/order_7.exp.json @@ -132,7 +132,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -230,7 +231,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "lol", @@ -273,7 +275,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "p", @@ -349,7 +352,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "q", @@ -425,7 +429,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "more", @@ -501,7 +506,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/order_8.exp.json b/testdata/d2oracle/TestDelete/order_8.exp.json index 735aad526..be2c3b15e 100644 --- a/testdata/d2oracle/TestDelete/order_8.exp.json +++ b/testdata/d2oracle/TestDelete/order_8.exp.json @@ -139,7 +139,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -184,7 +185,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -227,7 +229,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "zebra", @@ -270,7 +273,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "q", @@ -313,7 +317,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "kang", @@ -356,7 +361,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/shape_class.exp.json b/testdata/d2oracle/TestDelete/shape_class.exp.json index ed1e50f18..a9ad37a5a 100644 --- a/testdata/d2oracle/TestDelete/shape_class.exp.json +++ b/testdata/d2oracle/TestDelete/shape_class.exp.json @@ -47,7 +47,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -92,7 +93,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/shape_sql_table.exp.json b/testdata/d2oracle/TestDelete/shape_sql_table.exp.json index 419ea072a..535b3a08e 100644 --- a/testdata/d2oracle/TestDelete/shape_sql_table.exp.json +++ b/testdata/d2oracle/TestDelete/shape_sql_table.exp.json @@ -267,7 +267,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -298,7 +299,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -343,7 +345,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "disks", @@ -447,7 +450,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "AWS S3 Vancouver", @@ -490,7 +494,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/singular_flat_style.exp.json b/testdata/d2oracle/TestDelete/singular_flat_style.exp.json index 442097e70..749cb24bd 100644 --- a/testdata/d2oracle/TestDelete/singular_flat_style.exp.json +++ b/testdata/d2oracle/TestDelete/singular_flat_style.exp.json @@ -47,7 +47,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -92,7 +93,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/singular_map_style.exp.json b/testdata/d2oracle/TestDelete/singular_map_style.exp.json index b75f55c35..a8ebf2492 100644 --- a/testdata/d2oracle/TestDelete/singular_map_style.exp.json +++ b/testdata/d2oracle/TestDelete/singular_map_style.exp.json @@ -47,7 +47,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -92,7 +93,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json b/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json index a19da74fe..aa746baba 100644 --- a/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json @@ -110,7 +110,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -155,7 +156,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "z", @@ -209,7 +211,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "z", @@ -252,7 +255,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestDelete/underscore_remove.exp.json b/testdata/d2oracle/TestDelete/underscore_remove.exp.json index dd78e801c..c88f95af6 100644 --- a/testdata/d2oracle/TestDelete/underscore_remove.exp.json +++ b/testdata/d2oracle/TestDelete/underscore_remove.exp.json @@ -139,7 +139,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -170,7 +171,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "index": 0, @@ -200,7 +202,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -245,7 +248,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "a", @@ -288,7 +292,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -331,7 +336,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "c", @@ -374,7 +380,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "d", @@ -417,7 +424,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/append_multiple_styles.exp.json b/testdata/d2oracle/TestMove/append_multiple_styles.exp.json index 5693019db..83e350ba3 100644 --- a/testdata/d2oracle/TestMove/append_multiple_styles.exp.json +++ b/testdata/d2oracle/TestMove/append_multiple_styles.exp.json @@ -231,7 +231,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [], "objects": [ @@ -276,7 +277,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "a", @@ -346,7 +348,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/basic.exp.json b/testdata/d2oracle/TestMove/basic.exp.json index 9216171b9..c4dc094ca 100644 --- a/testdata/d2oracle/TestMove/basic.exp.json +++ b/testdata/d2oracle/TestMove/basic.exp.json @@ -47,7 +47,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -92,7 +93,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/basic_nested.exp.json b/testdata/d2oracle/TestMove/basic_nested.exp.json index 5667c2d99..c4d957eda 100644 --- a/testdata/d2oracle/TestMove/basic_nested.exp.json +++ b/testdata/d2oracle/TestMove/basic_nested.exp.json @@ -76,7 +76,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -121,7 +122,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "c", @@ -164,7 +166,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/basic_out_of_container.exp.json b/testdata/d2oracle/TestMove/basic_out_of_container.exp.json index e80df6540..63f2b2f1b 100644 --- a/testdata/d2oracle/TestMove/basic_out_of_container.exp.json +++ b/testdata/d2oracle/TestMove/basic_out_of_container.exp.json @@ -70,7 +70,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -115,7 +116,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -158,7 +160,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/between_containers.exp.json b/testdata/d2oracle/TestMove/between_containers.exp.json index 5b35c6d5e..99e32d107 100644 --- a/testdata/d2oracle/TestMove/between_containers.exp.json +++ b/testdata/d2oracle/TestMove/between_containers.exp.json @@ -99,7 +99,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -144,7 +145,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "c", @@ -187,7 +189,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -230,7 +233,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/chain_connected_nested.exp.json b/testdata/d2oracle/TestMove/chain_connected_nested.exp.json index 615332dbd..334fe24b2 100644 --- a/testdata/d2oracle/TestMove/chain_connected_nested.exp.json +++ b/testdata/d2oracle/TestMove/chain_connected_nested.exp.json @@ -130,7 +130,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -161,7 +162,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "index": 0, @@ -191,7 +193,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -236,7 +239,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "z", @@ -299,7 +303,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "x", @@ -362,7 +367,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json b/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json index 865e6210b..9f7d94237 100644 --- a/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json +++ b/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json @@ -118,7 +118,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -149,7 +150,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "index": 0, @@ -179,7 +181,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -235,7 +238,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -289,7 +293,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "x", @@ -352,7 +357,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "z", @@ -395,7 +401,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/connected_nested.exp.json b/testdata/d2oracle/TestMove/connected_nested.exp.json index a5792a9d1..da0d0aefd 100644 --- a/testdata/d2oracle/TestMove/connected_nested.exp.json +++ b/testdata/d2oracle/TestMove/connected_nested.exp.json @@ -93,7 +93,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -124,7 +125,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -169,7 +171,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "x", @@ -212,7 +215,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "z", @@ -255,7 +259,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/container_near.exp.json b/testdata/d2oracle/TestMove/container_near.exp.json index 2f8b2384c..008b8acef 100644 --- a/testdata/d2oracle/TestMove/container_near.exp.json +++ b/testdata/d2oracle/TestMove/container_near.exp.json @@ -201,7 +201,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -246,7 +247,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -326,7 +328,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "a", @@ -380,7 +383,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "z", @@ -434,7 +438,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -477,7 +482,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "a", @@ -520,7 +526,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/edge_across_containers.exp.json b/testdata/d2oracle/TestMove/edge_across_containers.exp.json index 6bb4de01d..8f9c5a436 100644 --- a/testdata/d2oracle/TestMove/edge_across_containers.exp.json +++ b/testdata/d2oracle/TestMove/edge_across_containers.exp.json @@ -144,7 +144,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -175,7 +176,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -220,7 +222,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "d", @@ -305,7 +308,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -370,7 +374,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "c", @@ -413,7 +418,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/edge_basic.exp.json b/testdata/d2oracle/TestMove/edge_basic.exp.json index 353c67dc1..2d5107213 100644 --- a/testdata/d2oracle/TestMove/edge_basic.exp.json +++ b/testdata/d2oracle/TestMove/edge_basic.exp.json @@ -70,7 +70,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -101,7 +102,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -146,7 +148,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -189,7 +192,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/edge_chain_basic.exp.json b/testdata/d2oracle/TestMove/edge_chain_basic.exp.json index 03d087ec1..778265580 100644 --- a/testdata/d2oracle/TestMove/edge_chain_basic.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_basic.exp.json @@ -107,7 +107,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -138,7 +139,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "index": 0, @@ -168,7 +170,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -213,7 +216,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -276,7 +280,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "c", @@ -319,7 +324,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/edge_chain_circular.exp.json b/testdata/d2oracle/TestMove/edge_chain_circular.exp.json index 5e0fd751c..e05f318c3 100644 --- a/testdata/d2oracle/TestMove/edge_chain_circular.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_circular.exp.json @@ -158,7 +158,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -189,7 +190,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "index": 0, @@ -219,7 +221,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -264,7 +267,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -349,7 +353,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "c", @@ -412,7 +417,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json b/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json index e53bd0bec..dd1550d8e 100644 --- a/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json @@ -141,7 +141,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -172,7 +173,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "index": 0, @@ -202,7 +204,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -278,7 +281,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "a", @@ -332,7 +336,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -395,7 +400,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "c", @@ -438,7 +444,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json b/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json index 38c443c4a..7032806d9 100644 --- a/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json @@ -158,7 +158,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -189,7 +190,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "index": 0, @@ -219,7 +221,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -264,7 +267,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -307,7 +311,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "c", @@ -392,7 +397,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "d", @@ -435,7 +441,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/edge_conflict.exp.json b/testdata/d2oracle/TestMove/edge_conflict.exp.json index 62c325c64..30a511067 100644 --- a/testdata/d2oracle/TestMove/edge_conflict.exp.json +++ b/testdata/d2oracle/TestMove/edge_conflict.exp.json @@ -144,7 +144,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -175,7 +176,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -220,7 +222,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "x", @@ -263,7 +266,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y 2", @@ -348,7 +352,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "a", @@ -402,7 +407,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -456,7 +462,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/edge_into_container.exp.json b/testdata/d2oracle/TestMove/edge_into_container.exp.json index 6218e4fd0..09fc6585b 100644 --- a/testdata/d2oracle/TestMove/edge_into_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_into_container.exp.json @@ -133,7 +133,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -164,7 +165,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -240,7 +242,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "d", @@ -283,7 +286,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -337,7 +341,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "c", @@ -380,7 +385,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/edge_nested_basic.exp.json b/testdata/d2oracle/TestMove/edge_nested_basic.exp.json index 902b1a123..b2c906839 100644 --- a/testdata/d2oracle/TestMove/edge_nested_basic.exp.json +++ b/testdata/d2oracle/TestMove/edge_nested_basic.exp.json @@ -99,7 +99,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -130,7 +131,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -175,7 +177,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "d", @@ -218,7 +221,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "c", @@ -261,7 +265,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/edge_out_of_container.exp.json b/testdata/d2oracle/TestMove/edge_out_of_container.exp.json index 252f57ea1..464fd589a 100644 --- a/testdata/d2oracle/TestMove/edge_out_of_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_out_of_container.exp.json @@ -110,7 +110,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -141,7 +142,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -186,7 +188,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -240,7 +243,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "c", @@ -283,7 +287,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/extend_map.exp.json b/testdata/d2oracle/TestMove/extend_map.exp.json index e1335c7f0..1a2641d3f 100644 --- a/testdata/d2oracle/TestMove/extend_map.exp.json +++ b/testdata/d2oracle/TestMove/extend_map.exp.json @@ -157,7 +157,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -222,7 +223,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "e", @@ -265,7 +267,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "c", @@ -308,7 +311,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -351,7 +355,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/extend_stationary_path.exp.json b/testdata/d2oracle/TestMove/extend_stationary_path.exp.json index 5ad3f58bd..5bb8cfca4 100644 --- a/testdata/d2oracle/TestMove/extend_stationary_path.exp.json +++ b/testdata/d2oracle/TestMove/extend_stationary_path.exp.json @@ -150,7 +150,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -237,7 +238,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "c", @@ -322,7 +324,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -407,7 +410,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/flat_between_containers.exp.json b/testdata/d2oracle/TestMove/flat_between_containers.exp.json index b62a33065..e0230f680 100644 --- a/testdata/d2oracle/TestMove/flat_between_containers.exp.json +++ b/testdata/d2oracle/TestMove/flat_between_containers.exp.json @@ -99,7 +99,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -144,7 +145,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "c", @@ -187,7 +189,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -230,7 +233,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/flat_merge.exp.json b/testdata/d2oracle/TestMove/flat_merge.exp.json index 483fdb5ce..ad6fb3a34 100644 --- a/testdata/d2oracle/TestMove/flat_merge.exp.json +++ b/testdata/d2oracle/TestMove/flat_merge.exp.json @@ -132,7 +132,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -177,7 +178,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "c", @@ -220,7 +222,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "d", @@ -263,7 +266,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -306,7 +310,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/flat_middle_container.exp.json b/testdata/d2oracle/TestMove/flat_middle_container.exp.json index a45b71135..a5ca300e2 100644 --- a/testdata/d2oracle/TestMove/flat_middle_container.exp.json +++ b/testdata/d2oracle/TestMove/flat_middle_container.exp.json @@ -110,7 +110,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -166,7 +167,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "c", @@ -220,7 +222,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "d", @@ -263,7 +266,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -306,7 +310,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/flat_nested_merge.exp.json b/testdata/d2oracle/TestMove/flat_nested_merge.exp.json index 737c1a629..872501201 100644 --- a/testdata/d2oracle/TestMove/flat_nested_merge.exp.json +++ b/testdata/d2oracle/TestMove/flat_nested_merge.exp.json @@ -188,7 +188,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -266,7 +267,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -342,7 +344,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "d", @@ -418,7 +421,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "e", @@ -494,7 +498,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "p", @@ -548,7 +553,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "q", @@ -602,7 +608,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -667,7 +674,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "m", @@ -732,7 +740,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "o", @@ -797,7 +806,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "z", @@ -840,7 +850,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json b/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json index 56cde491e..bd1184f40 100644 --- a/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json +++ b/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json @@ -286,7 +286,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -426,7 +427,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -575,7 +577,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "c", @@ -724,7 +727,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "d", @@ -767,7 +771,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "e", @@ -810,7 +815,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "f", @@ -853,7 +859,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "g", @@ -896,7 +903,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "q", @@ -972,7 +980,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json b/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json index b5a99a192..2c8081ef1 100644 --- a/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json +++ b/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json @@ -109,7 +109,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -154,7 +155,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -197,7 +199,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json b/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json index be6599d0a..457c51dc8 100644 --- a/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json +++ b/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json @@ -150,7 +150,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -195,7 +196,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "c", @@ -238,7 +240,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -281,7 +284,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json b/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json index f4586228d..50b0bb150 100644 --- a/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json +++ b/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json @@ -80,7 +80,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -125,7 +126,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -168,7 +170,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/flat_style.exp.json b/testdata/d2oracle/TestMove/flat_style.exp.json index 8e0bcea62..5390eb45c 100644 --- a/testdata/d2oracle/TestMove/flat_style.exp.json +++ b/testdata/d2oracle/TestMove/flat_style.exp.json @@ -159,7 +159,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [], "objects": [ @@ -204,7 +205,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "a", @@ -318,7 +320,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/full_edge_slice.exp.json b/testdata/d2oracle/TestMove/full_edge_slice.exp.json index 238363e12..91f515286 100644 --- a/testdata/d2oracle/TestMove/full_edge_slice.exp.json +++ b/testdata/d2oracle/TestMove/full_edge_slice.exp.json @@ -213,7 +213,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -244,7 +245,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "index": 1, @@ -274,7 +276,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -350,7 +353,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -393,7 +397,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "c", @@ -487,7 +492,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "d", @@ -561,7 +567,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/full_slice.exp.json b/testdata/d2oracle/TestMove/full_slice.exp.json index b7ffc8ff5..a57483bc6 100644 --- a/testdata/d2oracle/TestMove/full_slice.exp.json +++ b/testdata/d2oracle/TestMove/full_slice.exp.json @@ -99,7 +99,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -144,7 +145,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -187,7 +189,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "c", @@ -230,7 +233,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/gnarly_1.exp.json b/testdata/d2oracle/TestMove/gnarly_1.exp.json index 0c46d052f..753fd5159 100644 --- a/testdata/d2oracle/TestMove/gnarly_1.exp.json +++ b/testdata/d2oracle/TestMove/gnarly_1.exp.json @@ -357,7 +357,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -388,7 +389,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "index": 0, @@ -418,7 +420,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "index": 0, @@ -448,7 +451,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -555,7 +559,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -598,7 +603,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "p", @@ -703,7 +709,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "q", @@ -777,7 +784,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "a", @@ -842,7 +850,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -907,7 +916,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "c", @@ -972,7 +982,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "e", @@ -1037,7 +1048,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "f", @@ -1102,7 +1114,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "p", @@ -1156,7 +1169,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "q", @@ -1210,7 +1224,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "x", @@ -1264,7 +1279,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/hoist_container_children.exp.json b/testdata/d2oracle/TestMove/hoist_container_children.exp.json index 729b716c4..86a27aee9 100644 --- a/testdata/d2oracle/TestMove/hoist_container_children.exp.json +++ b/testdata/d2oracle/TestMove/hoist_container_children.exp.json @@ -122,7 +122,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -167,7 +168,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "c", @@ -210,7 +212,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "d", @@ -253,7 +256,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "a", @@ -296,7 +300,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/into_container_existing_map.exp.json b/testdata/d2oracle/TestMove/into_container_existing_map.exp.json index cef9f69ca..d43b1fd6b 100644 --- a/testdata/d2oracle/TestMove/into_container_existing_map.exp.json +++ b/testdata/d2oracle/TestMove/into_container_existing_map.exp.json @@ -99,7 +99,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -144,7 +145,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -187,7 +189,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "c", @@ -230,7 +233,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json b/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json index be51f69ce..a4f3878ae 100644 --- a/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json +++ b/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json @@ -76,7 +76,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -121,7 +122,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "c", @@ -164,7 +166,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json b/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json index 8fc2045a0..f6bfa2dbd 100644 --- a/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json +++ b/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json @@ -210,7 +210,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [], "objects": [ @@ -255,7 +256,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "c", @@ -308,7 +310,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json b/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json index 493b4cff5..3c2db3561 100644 --- a/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json +++ b/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json @@ -116,7 +116,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [], "objects": [ @@ -165,7 +166,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -208,7 +210,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/map_transplant.exp.json b/testdata/d2oracle/TestMove/map_transplant.exp.json index 0bcc93844..f71c387c9 100644 --- a/testdata/d2oracle/TestMove/map_transplant.exp.json +++ b/testdata/d2oracle/TestMove/map_transplant.exp.json @@ -219,7 +219,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [], "objects": [ @@ -264,7 +265,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "c", @@ -307,7 +309,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "d", @@ -350,7 +353,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "a", @@ -397,7 +401,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/map_with_label.exp.json b/testdata/d2oracle/TestMove/map_with_label.exp.json index 0f55d724b..b86e23711 100644 --- a/testdata/d2oracle/TestMove/map_with_label.exp.json +++ b/testdata/d2oracle/TestMove/map_with_label.exp.json @@ -109,7 +109,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -154,7 +155,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "d", @@ -197,7 +199,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "a", @@ -240,7 +243,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/merge_nested_maps.exp.json b/testdata/d2oracle/TestMove/merge_nested_maps.exp.json index 4d5eb8c56..ade7c5294 100644 --- a/testdata/d2oracle/TestMove/merge_nested_maps.exp.json +++ b/testdata/d2oracle/TestMove/merge_nested_maps.exp.json @@ -270,7 +270,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -315,7 +316,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -462,7 +464,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "c", @@ -516,7 +519,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "d", @@ -590,7 +594,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "e", @@ -655,7 +660,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "g", @@ -720,7 +726,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "o", @@ -763,7 +770,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "k", @@ -806,7 +814,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/merge_reserved.exp.json b/testdata/d2oracle/TestMove/merge_reserved.exp.json index 439d97217..351c99c30 100644 --- a/testdata/d2oracle/TestMove/merge_reserved.exp.json +++ b/testdata/d2oracle/TestMove/merge_reserved.exp.json @@ -261,7 +261,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -306,7 +307,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -442,7 +444,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "c", @@ -496,7 +499,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "e", @@ -550,7 +554,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "g", @@ -604,7 +609,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "k", @@ -647,7 +653,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/middle_container.exp.json b/testdata/d2oracle/TestMove/middle_container.exp.json index d0dd56f55..372b3e141 100644 --- a/testdata/d2oracle/TestMove/middle_container.exp.json +++ b/testdata/d2oracle/TestMove/middle_container.exp.json @@ -99,7 +99,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -144,7 +145,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "z", @@ -187,7 +189,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -230,7 +233,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/move_container_children.exp.json b/testdata/d2oracle/TestMove/move_container_children.exp.json index f9c22268a..8e138bd9a 100644 --- a/testdata/d2oracle/TestMove/move_container_children.exp.json +++ b/testdata/d2oracle/TestMove/move_container_children.exp.json @@ -145,7 +145,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -190,7 +191,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "q", @@ -233,7 +235,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "a", @@ -276,7 +279,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "d", @@ -319,7 +323,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -362,7 +367,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json b/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json index b8bfb2e10..3334fa936 100644 --- a/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json +++ b/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json @@ -145,7 +145,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -190,7 +191,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -233,7 +235,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "a", @@ -276,7 +279,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "d", @@ -319,7 +323,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "x", @@ -362,7 +367,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json b/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json index 6002bd77e..007f466db 100644 --- a/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json +++ b/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json @@ -86,7 +86,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -131,7 +132,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -174,7 +176,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/move_out_of_edge.exp.json b/testdata/d2oracle/TestMove/move_out_of_edge.exp.json index f16251f0c..35436c44f 100644 --- a/testdata/d2oracle/TestMove/move_out_of_edge.exp.json +++ b/testdata/d2oracle/TestMove/move_out_of_edge.exp.json @@ -126,7 +126,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -157,7 +158,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -202,7 +204,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "a", @@ -256,7 +259,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "c", @@ -310,7 +314,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "d", @@ -375,7 +380,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "e", @@ -440,7 +446,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "f", @@ -505,7 +512,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json b/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json index 6d69c47a9..edcbe9838 100644 --- a/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json +++ b/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json @@ -166,7 +166,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -197,7 +198,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -295,7 +297,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "e", @@ -391,7 +394,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "q", @@ -434,7 +438,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "a", @@ -488,7 +493,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "c", @@ -542,7 +548,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "f", @@ -607,7 +614,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json b/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json index a75357554..7a00e38bb 100644 --- a/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json +++ b/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json @@ -281,7 +281,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -379,7 +380,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -517,7 +519,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "c", @@ -675,7 +678,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "g", @@ -718,7 +722,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "x", @@ -761,7 +766,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "d", @@ -826,7 +832,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "f", @@ -902,7 +909,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/near.exp.json b/testdata/d2oracle/TestMove/near.exp.json index 9ee15fbae..cb7651a29 100644 --- a/testdata/d2oracle/TestMove/near.exp.json +++ b/testdata/d2oracle/TestMove/near.exp.json @@ -109,7 +109,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -180,7 +181,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -223,7 +225,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/nhooyr_one.exp.json b/testdata/d2oracle/TestMove/nhooyr_one.exp.json index a6d7b80b2..97903a67a 100644 --- a/testdata/d2oracle/TestMove/nhooyr_one.exp.json +++ b/testdata/d2oracle/TestMove/nhooyr_one.exp.json @@ -128,7 +128,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -173,7 +174,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "c", @@ -216,7 +218,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "d", @@ -259,7 +262,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "q", @@ -302,7 +306,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/nhooyr_two.exp.json b/testdata/d2oracle/TestMove/nhooyr_two.exp.json index e68f72400..ecb9b4520 100644 --- a/testdata/d2oracle/TestMove/nhooyr_two.exp.json +++ b/testdata/d2oracle/TestMove/nhooyr_two.exp.json @@ -174,7 +174,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -205,7 +206,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -250,7 +252,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "d", @@ -293,7 +296,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "x", @@ -336,7 +340,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -379,7 +384,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "c", @@ -422,7 +428,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "meow", @@ -465,7 +472,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/parentheses.exp.json b/testdata/d2oracle/TestMove/parentheses.exp.json index f2b4b100e..4e6b621f3 100644 --- a/testdata/d2oracle/TestMove/parentheses.exp.json +++ b/testdata/d2oracle/TestMove/parentheses.exp.json @@ -109,7 +109,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -140,7 +141,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -216,7 +218,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "x", @@ -259,7 +262,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "\"y (z)\"", @@ -313,7 +317,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/partial_edge_slice.exp.json b/testdata/d2oracle/TestMove/partial_edge_slice.exp.json index 6f1e7797f..c195ff637 100644 --- a/testdata/d2oracle/TestMove/partial_edge_slice.exp.json +++ b/testdata/d2oracle/TestMove/partial_edge_slice.exp.json @@ -116,7 +116,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -147,7 +148,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -192,7 +194,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -255,7 +258,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "c", @@ -298,7 +302,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/partial_slice.exp.json b/testdata/d2oracle/TestMove/partial_slice.exp.json index f4978e04f..aabbe7acb 100644 --- a/testdata/d2oracle/TestMove/partial_slice.exp.json +++ b/testdata/d2oracle/TestMove/partial_slice.exp.json @@ -70,7 +70,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -115,7 +116,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -158,7 +160,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/rename_2.exp.json b/testdata/d2oracle/TestMove/rename_2.exp.json index 37d25714b..937909663 100644 --- a/testdata/d2oracle/TestMove/rename_2.exp.json +++ b/testdata/d2oracle/TestMove/rename_2.exp.json @@ -145,7 +145,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -190,7 +191,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y 2", @@ -233,7 +235,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b 2", @@ -276,7 +279,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "x", @@ -319,7 +323,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "a", @@ -362,7 +367,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/reuse_map.exp.json b/testdata/d2oracle/TestMove/reuse_map.exp.json index e5555dbce..652b13429 100644 --- a/testdata/d2oracle/TestMove/reuse_map.exp.json +++ b/testdata/d2oracle/TestMove/reuse_map.exp.json @@ -162,7 +162,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -207,7 +208,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -281,7 +283,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "hey", @@ -324,7 +327,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "k", @@ -367,7 +371,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "yo", @@ -421,7 +426,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/slice_style.exp.json b/testdata/d2oracle/TestMove/slice_style.exp.json index 6680653ea..42a7dc91f 100644 --- a/testdata/d2oracle/TestMove/slice_style.exp.json +++ b/testdata/d2oracle/TestMove/slice_style.exp.json @@ -114,7 +114,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -159,7 +160,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -245,7 +247,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/underscore_children.exp.json b/testdata/d2oracle/TestMove/underscore_children.exp.json index 5a43f84b3..e89132833 100644 --- a/testdata/d2oracle/TestMove/underscore_children.exp.json +++ b/testdata/d2oracle/TestMove/underscore_children.exp.json @@ -110,7 +110,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -155,7 +156,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "c", @@ -229,7 +231,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/underscore_edge_children.exp.json b/testdata/d2oracle/TestMove/underscore_edge_children.exp.json index e1a1fb736..95f50abde 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_children.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_children.exp.json @@ -133,7 +133,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -164,7 +165,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -209,7 +211,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "c", @@ -283,7 +286,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "c", @@ -326,7 +330,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json index 8d7d7c159..97d969f6b 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json @@ -99,7 +99,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -130,7 +131,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -175,7 +177,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -218,7 +221,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "c", @@ -261,7 +265,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json index 0061f2f15..2e4d62e0c 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json @@ -110,7 +110,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -141,7 +142,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -186,7 +188,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "c", @@ -260,7 +263,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -314,7 +318,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json index 42c8f2e8a..7719e8988 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json @@ -110,7 +110,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -141,7 +142,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -186,7 +188,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "d", @@ -240,7 +243,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "c", @@ -283,7 +287,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json index 2581b5f76..d07cec755 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json @@ -99,7 +99,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -130,7 +131,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -175,7 +177,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "f", @@ -218,7 +221,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "c", @@ -261,7 +265,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json index 5dd71fb13..5cb63bcbc 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json @@ -132,7 +132,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -163,7 +164,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -208,7 +210,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "c", @@ -304,7 +307,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -369,7 +373,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/underscore_edge_split.exp.json b/testdata/d2oracle/TestMove/underscore_edge_split.exp.json index 21d713554..2c5e07291 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_split.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_split.exp.json @@ -162,7 +162,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -193,7 +194,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -238,7 +240,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -281,7 +284,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "c", @@ -324,7 +328,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "f", @@ -378,7 +383,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "yo", @@ -421,7 +427,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/underscore_merge.exp.json b/testdata/d2oracle/TestMove/underscore_merge.exp.json index c33d485f2..d08d9c2fa 100644 --- a/testdata/d2oracle/TestMove/underscore_merge.exp.json +++ b/testdata/d2oracle/TestMove/underscore_merge.exp.json @@ -142,7 +142,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -187,7 +188,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "c", @@ -230,7 +232,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -293,7 +296,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/underscore_split.exp.json b/testdata/d2oracle/TestMove/underscore_split.exp.json index 743a706df..50f8552f7 100644 --- a/testdata/d2oracle/TestMove/underscore_split.exp.json +++ b/testdata/d2oracle/TestMove/underscore_split.exp.json @@ -139,7 +139,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -184,7 +185,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -227,7 +229,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "f", @@ -281,7 +284,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "c", @@ -324,7 +328,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/underscore_split_out.exp.json b/testdata/d2oracle/TestMove/underscore_split_out.exp.json index 7545eb2fc..25c09fe7b 100644 --- a/testdata/d2oracle/TestMove/underscore_split_out.exp.json +++ b/testdata/d2oracle/TestMove/underscore_split_out.exp.json @@ -197,7 +197,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -242,7 +243,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -285,7 +287,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "c", @@ -359,7 +362,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "e", @@ -402,7 +406,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "f", @@ -445,7 +450,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/underscore_transplant.exp.json b/testdata/d2oracle/TestMove/underscore_transplant.exp.json index 5528c035d..b3fd8b0ea 100644 --- a/testdata/d2oracle/TestMove/underscore_transplant.exp.json +++ b/testdata/d2oracle/TestMove/underscore_transplant.exp.json @@ -99,7 +99,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -144,7 +145,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -187,7 +189,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "c", @@ -230,7 +233,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/unique_name.exp.json b/testdata/d2oracle/TestMove/unique_name.exp.json index 25ba5b6ab..3e3b1c459 100644 --- a/testdata/d2oracle/TestMove/unique_name.exp.json +++ b/testdata/d2oracle/TestMove/unique_name.exp.json @@ -156,7 +156,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -232,7 +233,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -306,7 +308,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b 2", @@ -349,7 +352,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "c", @@ -392,7 +396,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestMove/unique_name_with_references.exp.json b/testdata/d2oracle/TestMove/unique_name_with_references.exp.json index f0cc05cc2..9389b8662 100644 --- a/testdata/d2oracle/TestMove/unique_name_with_references.exp.json +++ b/testdata/d2oracle/TestMove/unique_name_with_references.exp.json @@ -179,7 +179,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -210,7 +211,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -286,7 +288,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -329,7 +332,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b 2", @@ -403,7 +407,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "c", @@ -446,7 +451,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "d", @@ -489,7 +495,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestRename/arrows.exp.json b/testdata/d2oracle/TestRename/arrows.exp.json index fadc22c55..e277317fb 100644 --- a/testdata/d2oracle/TestRename/arrows.exp.json +++ b/testdata/d2oracle/TestRename/arrows.exp.json @@ -70,7 +70,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -101,7 +102,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -146,7 +148,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -189,7 +192,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestRename/arrows_chain.exp.json b/testdata/d2oracle/TestRename/arrows_chain.exp.json index a8c899380..310e8d84a 100644 --- a/testdata/d2oracle/TestRename/arrows_chain.exp.json +++ b/testdata/d2oracle/TestRename/arrows_chain.exp.json @@ -144,7 +144,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -175,7 +176,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "index": 0, @@ -205,7 +207,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "index": 0, @@ -235,7 +238,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -280,7 +284,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -343,7 +348,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "z", @@ -406,7 +412,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "q", @@ -449,7 +456,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestRename/arrows_complex.exp.json b/testdata/d2oracle/TestRename/arrows_complex.exp.json index a395eed50..6df01f671 100644 --- a/testdata/d2oracle/TestRename/arrows_complex.exp.json +++ b/testdata/d2oracle/TestRename/arrows_complex.exp.json @@ -124,7 +124,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -155,7 +156,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -211,7 +213,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -265,7 +268,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "x", @@ -308,7 +312,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -351,7 +356,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestRename/arrows_trim_common.exp.json b/testdata/d2oracle/TestRename/arrows_trim_common.exp.json index d5ab00830..a7042fe18 100644 --- a/testdata/d2oracle/TestRename/arrows_trim_common.exp.json +++ b/testdata/d2oracle/TestRename/arrows_trim_common.exp.json @@ -160,7 +160,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -191,7 +192,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "index": 0, @@ -221,7 +223,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "index": 0, @@ -251,7 +254,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -296,7 +300,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "x", @@ -339,7 +344,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -402,7 +408,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "z", @@ -465,7 +472,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "q", @@ -508,7 +516,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json b/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json index e25cf3fd4..1e031352a 100644 --- a/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json +++ b/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json @@ -210,7 +210,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -241,7 +242,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "index": 0, @@ -271,7 +273,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "index": 0, @@ -301,7 +304,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -512,7 +516,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "x", @@ -566,7 +571,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -651,7 +657,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "z", @@ -736,7 +743,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "\"q)\"", @@ -790,7 +798,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestRename/complex_edge_1.exp.json b/testdata/d2oracle/TestRename/complex_edge_1.exp.json index ceedb2f94..3d8d47374 100644 --- a/testdata/d2oracle/TestRename/complex_edge_1.exp.json +++ b/testdata/d2oracle/TestRename/complex_edge_1.exp.json @@ -124,7 +124,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -155,7 +156,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -211,7 +213,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "ooo", @@ -265,7 +268,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "x", @@ -308,7 +312,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -351,7 +356,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestRename/complex_edge_2.exp.json b/testdata/d2oracle/TestRename/complex_edge_2.exp.json index 663d56cc2..729b345df 100644 --- a/testdata/d2oracle/TestRename/complex_edge_2.exp.json +++ b/testdata/d2oracle/TestRename/complex_edge_2.exp.json @@ -124,7 +124,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -155,7 +156,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -211,7 +213,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -265,7 +268,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "papa", @@ -308,7 +312,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -351,7 +356,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestRename/conflict.exp.json b/testdata/d2oracle/TestRename/conflict.exp.json index c8dc12220..5809dded2 100644 --- a/testdata/d2oracle/TestRename/conflict.exp.json +++ b/testdata/d2oracle/TestRename/conflict.exp.json @@ -70,7 +70,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -115,7 +116,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "la", @@ -158,7 +160,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestRename/conflict_2.exp.json b/testdata/d2oracle/TestRename/conflict_2.exp.json index 55f6a2df6..33b8028a6 100644 --- a/testdata/d2oracle/TestRename/conflict_2.exp.json +++ b/testdata/d2oracle/TestRename/conflict_2.exp.json @@ -121,7 +121,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -188,7 +189,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "2", @@ -253,7 +255,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "3", @@ -318,7 +321,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "5 2", @@ -361,7 +365,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "5", @@ -404,7 +409,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestRename/conflict_with_dots.exp.json b/testdata/d2oracle/TestRename/conflict_with_dots.exp.json index bbae9e6d0..27ad26210 100644 --- a/testdata/d2oracle/TestRename/conflict_with_dots.exp.json +++ b/testdata/d2oracle/TestRename/conflict_with_dots.exp.json @@ -70,7 +70,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -115,7 +116,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "\"a.b 2\"", @@ -158,7 +160,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestRename/container.exp.json b/testdata/d2oracle/TestRename/container.exp.json index 9c5aaa8ca..e5cae43c4 100644 --- a/testdata/d2oracle/TestRename/container.exp.json +++ b/testdata/d2oracle/TestRename/container.exp.json @@ -749,7 +749,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -783,7 +784,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "index": 0, @@ -813,7 +815,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "index": 0, @@ -843,7 +846,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "index": 0, @@ -873,7 +877,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "index": 0, @@ -903,7 +908,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "index": 0, @@ -933,7 +939,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "index": 0, @@ -963,7 +970,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -1249,7 +1257,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "\"\"", @@ -1533,7 +1542,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "z", @@ -1806,7 +1816,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "i", @@ -1849,7 +1860,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "p", @@ -1965,7 +1977,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "k", @@ -2081,7 +2094,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "l", @@ -2166,7 +2180,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "a", @@ -2251,7 +2266,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "q", @@ -2294,7 +2310,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "+", @@ -2357,7 +2374,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "more", @@ -2400,7 +2418,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "ok", @@ -2465,7 +2484,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "q", @@ -2530,7 +2550,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "z", @@ -2595,7 +2616,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "p", @@ -2649,7 +2671,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "k", @@ -2703,7 +2726,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestRename/edges.exp.json b/testdata/d2oracle/TestRename/edges.exp.json index 466d177cb..87f4a3f4c 100644 --- a/testdata/d2oracle/TestRename/edges.exp.json +++ b/testdata/d2oracle/TestRename/edges.exp.json @@ -414,7 +414,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -445,7 +446,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "index": 0, @@ -475,7 +477,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "index": 0, @@ -505,7 +508,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "index": 0, @@ -535,7 +539,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "index": 0, @@ -565,7 +570,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "index": 0, @@ -595,7 +601,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -764,7 +771,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "%%%", @@ -951,7 +959,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "p", @@ -1036,7 +1045,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "k", @@ -1121,7 +1131,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "l", @@ -1206,7 +1217,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "a", @@ -1291,7 +1303,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "q", @@ -1334,7 +1347,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "+", @@ -1397,7 +1411,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestRename/flat.exp.json b/testdata/d2oracle/TestRename/flat.exp.json index 7f8875b49..c6136fc22 100644 --- a/testdata/d2oracle/TestRename/flat.exp.json +++ b/testdata/d2oracle/TestRename/flat.exp.json @@ -47,7 +47,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -92,7 +93,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestRename/generated.exp.json b/testdata/d2oracle/TestRename/generated.exp.json index e01f2dc0d..24af03ca8 100644 --- a/testdata/d2oracle/TestRename/generated.exp.json +++ b/testdata/d2oracle/TestRename/generated.exp.json @@ -47,7 +47,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -92,7 +93,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestRename/near.exp.json b/testdata/d2oracle/TestRename/near.exp.json index 4f1095f42..77f6a3aa7 100644 --- a/testdata/d2oracle/TestRename/near.exp.json +++ b/testdata/d2oracle/TestRename/near.exp.json @@ -109,7 +109,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -169,7 +170,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "z", @@ -212,7 +214,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestRename/nested.exp.json b/testdata/d2oracle/TestRename/nested.exp.json index 37125d75a..42104b6b9 100644 --- a/testdata/d2oracle/TestRename/nested.exp.json +++ b/testdata/d2oracle/TestRename/nested.exp.json @@ -176,7 +176,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -318,7 +319,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -458,7 +460,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "z", @@ -598,7 +601,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "q", @@ -738,7 +742,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "nerve-gift-jingler", @@ -845,7 +850,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestSet/base.exp.json b/testdata/d2oracle/TestSet/base.exp.json index 23a9eb9f4..475561aff 100644 --- a/testdata/d2oracle/TestSet/base.exp.json +++ b/testdata/d2oracle/TestSet/base.exp.json @@ -47,7 +47,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -92,7 +93,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestSet/block_string_multiline.exp.json b/testdata/d2oracle/TestSet/block_string_multiline.exp.json index dd4bcff09..3838792f8 100644 --- a/testdata/d2oracle/TestSet/block_string_multiline.exp.json +++ b/testdata/d2oracle/TestSet/block_string_multiline.exp.json @@ -54,7 +54,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -100,7 +101,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestSet/block_string_oneline.exp.json b/testdata/d2oracle/TestSet/block_string_oneline.exp.json index 3601a7f2c..728786f48 100644 --- a/testdata/d2oracle/TestSet/block_string_oneline.exp.json +++ b/testdata/d2oracle/TestSet/block_string_oneline.exp.json @@ -54,7 +54,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -100,7 +101,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestSet/edge.exp.json b/testdata/d2oracle/TestSet/edge.exp.json index bcbd533e2..4816a21d6 100644 --- a/testdata/d2oracle/TestSet/edge.exp.json +++ b/testdata/d2oracle/TestSet/edge.exp.json @@ -80,7 +80,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -111,7 +112,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -156,7 +158,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -199,7 +202,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestSet/edge_append_style.exp.json b/testdata/d2oracle/TestSet/edge_append_style.exp.json index bf9784284..172b7c5bb 100644 --- a/testdata/d2oracle/TestSet/edge_append_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_append_style.exp.json @@ -115,7 +115,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -150,7 +151,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -195,7 +197,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -238,7 +241,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestSet/edge_chain.exp.json b/testdata/d2oracle/TestSet/edge_chain.exp.json index 44a7c7de3..39e757bce 100644 --- a/testdata/d2oracle/TestSet/edge_chain.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain.exp.json @@ -207,7 +207,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -241,7 +242,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "index": 0, @@ -271,7 +273,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -316,7 +319,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "q", @@ -379,7 +383,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "z", @@ -462,7 +467,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "p", @@ -505,7 +511,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json b/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json index 65b3feb0a..e555cedee 100644 --- a/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json @@ -190,7 +190,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -228,7 +229,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "index": 0, @@ -258,7 +260,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -323,7 +326,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -406,7 +410,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "z", @@ -449,7 +454,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json b/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json index a80e0b0d9..f38bb7b97 100644 --- a/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json @@ -274,7 +274,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -305,7 +306,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "index": 0, @@ -348,7 +350,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -393,7 +396,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -496,7 +500,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "z", @@ -579,7 +584,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json b/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json index aaeec05db..ca2f37f46 100644 --- a/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json @@ -230,7 +230,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -268,7 +269,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "index": 0, @@ -298,7 +300,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -343,7 +346,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "q", @@ -406,7 +410,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "z", @@ -489,7 +494,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "p", @@ -532,7 +538,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestSet/edge_index_case.exp.json b/testdata/d2oracle/TestSet/edge_index_case.exp.json index f3250cd29..4fb3fd9cb 100644 --- a/testdata/d2oracle/TestSet/edge_index_case.exp.json +++ b/testdata/d2oracle/TestSet/edge_index_case.exp.json @@ -184,7 +184,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -215,7 +216,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "index": 0, @@ -245,7 +247,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -290,7 +293,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "z", @@ -333,7 +337,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "Square", @@ -376,7 +381,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "Square 2", @@ -419,7 +425,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "x", @@ -462,7 +469,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -505,7 +513,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestSet/edge_index_nested.exp.json b/testdata/d2oracle/TestSet/edge_index_nested.exp.json index b220c23c0..f049c45c5 100644 --- a/testdata/d2oracle/TestSet/edge_index_nested.exp.json +++ b/testdata/d2oracle/TestSet/edge_index_nested.exp.json @@ -109,7 +109,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -140,7 +141,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -185,7 +187,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "q", @@ -228,7 +231,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "z", @@ -271,7 +275,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestSet/edge_key_and_key.exp.json b/testdata/d2oracle/TestSet/edge_key_and_key.exp.json index 0fff2fd1f..e4d626aeb 100644 --- a/testdata/d2oracle/TestSet/edge_key_and_key.exp.json +++ b/testdata/d2oracle/TestSet/edge_key_and_key.exp.json @@ -160,7 +160,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -195,7 +196,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -302,7 +304,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -356,7 +359,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "c", @@ -410,7 +414,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestSet/edge_label.exp.json b/testdata/d2oracle/TestSet/edge_label.exp.json index 3b5f7c6d6..bd67df275 100644 --- a/testdata/d2oracle/TestSet/edge_label.exp.json +++ b/testdata/d2oracle/TestSet/edge_label.exp.json @@ -125,7 +125,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -160,7 +161,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -205,7 +207,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -248,7 +251,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestSet/edge_merge_style.exp.json b/testdata/d2oracle/TestSet/edge_merge_style.exp.json index 245894900..a9307f498 100644 --- a/testdata/d2oracle/TestSet/edge_merge_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_merge_style.exp.json @@ -162,7 +162,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -200,7 +201,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -245,7 +247,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "y", @@ -288,7 +291,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json b/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json index 3ef412b1b..bbb5a1a58 100644 --- a/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json @@ -109,7 +109,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -140,7 +141,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -185,7 +187,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "q", @@ -228,7 +231,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "z", @@ -271,7 +275,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json b/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json index 134cacd97..74cd74500 100644 --- a/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json @@ -155,7 +155,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -190,7 +191,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -235,7 +237,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "q", @@ -278,7 +281,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "z", @@ -321,7 +325,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestSet/expanded_map_style.exp.json b/testdata/d2oracle/TestSet/expanded_map_style.exp.json index 3204495d1..e9973e0de 100644 --- a/testdata/d2oracle/TestSet/expanded_map_style.exp.json +++ b/testdata/d2oracle/TestSet/expanded_map_style.exp.json @@ -111,7 +111,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [], "objects": [ @@ -160,7 +161,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestSet/icon.exp.json b/testdata/d2oracle/TestSet/icon.exp.json index e432724cd..e039759f1 100644 --- a/testdata/d2oracle/TestSet/icon.exp.json +++ b/testdata/d2oracle/TestSet/icon.exp.json @@ -86,7 +86,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -143,7 +144,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestSet/inline_style.exp.json b/testdata/d2oracle/TestSet/inline_style.exp.json index d5ffcea3d..c627397b0 100644 --- a/testdata/d2oracle/TestSet/inline_style.exp.json +++ b/testdata/d2oracle/TestSet/inline_style.exp.json @@ -137,7 +137,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [], "objects": [ @@ -189,7 +190,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestSet/label.exp.json b/testdata/d2oracle/TestSet/label.exp.json index 55551022b..5b6b23ca6 100644 --- a/testdata/d2oracle/TestSet/label.exp.json +++ b/testdata/d2oracle/TestSet/label.exp.json @@ -57,7 +57,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -102,7 +103,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestSet/label_primary.exp.json b/testdata/d2oracle/TestSet/label_primary.exp.json index b14337fd8..bd40fc405 100644 --- a/testdata/d2oracle/TestSet/label_primary.exp.json +++ b/testdata/d2oracle/TestSet/label_primary.exp.json @@ -105,7 +105,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -136,7 +137,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -181,7 +183,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "q", @@ -224,7 +227,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "z", @@ -267,7 +271,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestSet/label_replace.exp.json b/testdata/d2oracle/TestSet/label_replace.exp.json index 469fc2b78..0dc6bfa73 100644 --- a/testdata/d2oracle/TestSet/label_replace.exp.json +++ b/testdata/d2oracle/TestSet/label_replace.exp.json @@ -57,7 +57,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -102,7 +103,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestSet/label_unset.exp.json b/testdata/d2oracle/TestSet/label_unset.exp.json index 9a2bb4bfb..587e5fb79 100644 --- a/testdata/d2oracle/TestSet/label_unset.exp.json +++ b/testdata/d2oracle/TestSet/label_unset.exp.json @@ -47,7 +47,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -92,7 +93,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestSet/map_key_missing.exp.json b/testdata/d2oracle/TestSet/map_key_missing.exp.json index 2b1b0bc02..87f3df0ba 100644 --- a/testdata/d2oracle/TestSet/map_key_missing.exp.json +++ b/testdata/d2oracle/TestSet/map_key_missing.exp.json @@ -103,7 +103,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -134,7 +135,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -199,7 +201,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "b", @@ -242,7 +245,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestSet/nested_alex.exp.json b/testdata/d2oracle/TestSet/nested_alex.exp.json index f9bd8b398..345b0dc0e 100644 --- a/testdata/d2oracle/TestSet/nested_alex.exp.json +++ b/testdata/d2oracle/TestSet/nested_alex.exp.json @@ -175,7 +175,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [ { @@ -206,7 +207,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ], "objects": [ @@ -251,7 +253,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "here", @@ -314,7 +317,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, { "id": "test", @@ -357,7 +361,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestSet/new_style.exp.json b/testdata/d2oracle/TestSet/new_style.exp.json index db5981740..ba281deaa 100644 --- a/testdata/d2oracle/TestSet/new_style.exp.json +++ b/testdata/d2oracle/TestSet/new_style.exp.json @@ -93,7 +93,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [], "objects": [ @@ -142,7 +143,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestSet/replace_shape.exp.json b/testdata/d2oracle/TestSet/replace_shape.exp.json index 2480ec191..2cc0381bf 100644 --- a/testdata/d2oracle/TestSet/replace_shape.exp.json +++ b/testdata/d2oracle/TestSet/replace_shape.exp.json @@ -68,7 +68,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -124,7 +125,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestSet/replace_style.exp.json b/testdata/d2oracle/TestSet/replace_style.exp.json index 6b7003fbb..a976f3823 100644 --- a/testdata/d2oracle/TestSet/replace_style.exp.json +++ b/testdata/d2oracle/TestSet/replace_style.exp.json @@ -75,7 +75,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [], "objects": [ @@ -146,7 +147,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json b/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json index 6971bee40..442e009e5 100644 --- a/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json +++ b/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json @@ -130,7 +130,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [], "objects": [ @@ -246,7 +247,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestSet/shape.exp.json b/testdata/d2oracle/TestSet/shape.exp.json index 47cb8df98..40204b2b9 100644 --- a/testdata/d2oracle/TestSet/shape.exp.json +++ b/testdata/d2oracle/TestSet/shape.exp.json @@ -86,7 +86,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": null, "objects": [ @@ -131,7 +132,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, diff --git a/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json b/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json index ac8ebe385..e51c401d8 100644 --- a/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json +++ b/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json @@ -93,7 +93,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 }, "edges": [], "objects": [ @@ -142,7 +143,8 @@ "direction": { "value": "" } - } + }, + "zIndex": 0 } ] }, From 61f4e1172a1813f67f551800c7666d45708af3fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BAlio=20C=C3=A9sar=20Batista?= Date: Wed, 30 Nov 2022 11:26:12 -0800 Subject: [PATCH 09/19] Ensure object count doesn't change suring sorting --- d2renderers/d2svg/d2svg_test.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/d2renderers/d2svg/d2svg_test.go b/d2renderers/d2svg/d2svg_test.go index 8e6ed0277..5730edbb2 100644 --- a/d2renderers/d2svg/d2svg_test.go +++ b/d2renderers/d2svg/d2svg_test.go @@ -71,6 +71,10 @@ func TestSortObjects(t *testing.T) { sortObjects(allObjects) + if len(allObjects) != len(expectedOrder) { + t.Fatal("number of objects changed while sorting") + } + for i := 0; i < len(allObjects); i++ { if allObjects[i].GetID() != expectedOrder[i].GetID() { t.Fatalf("object order differs at index %d, got '%s' expected '%s'", i, allObjects[i].GetID(), expectedOrder[i].GetID()) From 8705212a95d30f215697cc9dd512718607a257a7 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Tue, 29 Nov 2022 11:11:05 -0800 Subject: [PATCH 10/19] add font_sizes test --- e2etests/stable_test.go | 28 + .../stable/font_sizes/dagre/board.exp.json | 604 ++++++++++++++++++ .../stable/font_sizes/dagre/sketch.exp.svg | 40 ++ .../stable/font_sizes/elk/board.exp.json | 577 +++++++++++++++++ .../stable/font_sizes/elk/sketch.exp.svg | 40 ++ 5 files changed, 1289 insertions(+) create mode 100644 e2etests/testdata/stable/font_sizes/dagre/board.exp.json create mode 100644 e2etests/testdata/stable/font_sizes/dagre/sketch.exp.svg create mode 100644 e2etests/testdata/stable/font_sizes/elk/board.exp.json create mode 100644 e2etests/testdata/stable/font_sizes/elk/sketch.exp.svg diff --git a/e2etests/stable_test.go b/e2etests/stable_test.go index 02b66f0a3..f75a8d6e3 100644 --- a/e2etests/stable_test.go +++ b/e2etests/stable_test.go @@ -1014,6 +1014,34 @@ cube: { stroke-width: 7 } } +`, + }, + { + name: "font_sizes", + script: ` +size XS.style.font-size: 13 +size S.style.font-size: 14 +size M.style.font-size: 16 +size L.style.font-size: 20 +size XL.style.font-size: 24 +size XXL.style.font-size: 28 +size XXXL.style.font-size: 32 + +custom 8.style.font-size: 8 +custom 12.style.font-size: 12 +custom 18.style.font-size: 18 +custom 21.style.font-size: 21 +custom 64.style.font-size: 64 + +custom 8 -> size XS: custom 10 { + style.font-size: 10 +} +size S -> size M: custom 15 { + style.font-size: 15 +} +size XXXL -> custom 64: custom 48 { + style.font-size: 48 +} `, }, } diff --git a/e2etests/testdata/stable/font_sizes/dagre/board.exp.json b/e2etests/testdata/stable/font_sizes/dagre/board.exp.json new file mode 100644 index 000000000..8eeb1f17e --- /dev/null +++ b/e2etests/testdata/stable/font_sizes/dagre/board.exp.json @@ -0,0 +1,604 @@ +{ + "name": "", + "shapes": [ + { + "id": "size XS", + "type": "", + "pos": { + "x": 1084, + "y": 226 + }, + "width": 154, + "height": 126, + "level": 1, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#F7F8FE", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "size XS", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 54, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER" + }, + { + "id": "size S", + "type": "", + "pos": { + "x": 1, + "y": 0 + }, + "width": 145, + "height": 126, + "level": 1, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#F7F8FE", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "size S", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 45, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER" + }, + { + "id": "size M", + "type": "", + "pos": { + "x": 0, + "y": 226 + }, + "width": 147, + "height": 126, + "level": 1, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#F7F8FE", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "size M", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 47, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER" + }, + { + "id": "size L", + "type": "", + "pos": { + "x": 206, + "y": 0 + }, + "width": 144, + "height": 126, + "level": 1, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#F7F8FE", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "size L", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 44, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER" + }, + { + "id": "size XL", + "type": "", + "pos": { + "x": 410, + "y": 0 + }, + "width": 153, + "height": 126, + "level": 1, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#F7F8FE", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "size XL", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 53, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER" + }, + { + "id": "size XXL", + "type": "", + "pos": { + "x": 623, + "y": 0 + }, + "width": 162, + "height": 126, + "level": 1, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#F7F8FE", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "size XXL", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 62, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER" + }, + { + "id": "size XXXL", + "type": "", + "pos": { + "x": 845, + "y": 0 + }, + "width": 171, + "height": 126, + "level": 1, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#F7F8FE", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "size XXXL", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 71, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER" + }, + { + "id": "custom 8", + "type": "", + "pos": { + "x": 1076, + "y": 0 + }, + "width": 169, + "height": 126, + "level": 1, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#F7F8FE", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "custom 8", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 69, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER" + }, + { + "id": "custom 12", + "type": "", + "pos": { + "x": 1305, + "y": 0 + }, + "width": 178, + "height": 126, + "level": 1, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#F7F8FE", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "custom 12", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 78, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER" + }, + { + "id": "custom 18", + "type": "", + "pos": { + "x": 1543, + "y": 0 + }, + "width": 178, + "height": 126, + "level": 1, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#F7F8FE", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "custom 18", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 78, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER" + }, + { + "id": "custom 21", + "type": "", + "pos": { + "x": 1781, + "y": 0 + }, + "width": 178, + "height": 126, + "level": 1, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#F7F8FE", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "custom 21", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 78, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER" + }, + { + "id": "custom 64", + "type": "", + "pos": { + "x": 841, + "y": 226 + }, + "width": 179, + "height": 126, + "level": 1, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#F7F8FE", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "custom 64", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 79, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER" + } + ], + "connections": [ + { + "id": "(custom 8 -> size XS)[0]", + "src": "custom 8", + "srcArrow": "none", + "srcLabel": "", + "dst": "size XS", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "custom 10", + "fontSize": 10, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 67, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "route": [ + { + "x": 1160.5, + "y": 126 + }, + { + "x": 1160.5, + "y": 166 + }, + { + "x": 1160.5, + "y": 186 + }, + { + "x": 1160.5, + "y": 226 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null + }, + { + "id": "(size S -> size M)[0]", + "src": "size S", + "srcArrow": "none", + "srcLabel": "", + "dst": "size M", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "custom 15", + "fontSize": 15, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 67, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "route": [ + { + "x": 73.5, + "y": 126 + }, + { + "x": 73.5, + "y": 166 + }, + { + "x": 73.5, + "y": 186 + }, + { + "x": 73.5, + "y": 226 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null + }, + { + "id": "(size XXXL -> custom 64)[0]", + "src": "size XXXL", + "srcArrow": "none", + "srcLabel": "", + "dst": "custom 64", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "custom 48", + "fontSize": 48, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 67, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "route": [ + { + "x": 930.5, + "y": 126 + }, + { + "x": 930.5, + "y": 166 + }, + { + "x": 930.5, + "y": 186 + }, + { + "x": 930.5, + "y": 226 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null + } + ] +} diff --git a/e2etests/testdata/stable/font_sizes/dagre/sketch.exp.svg b/e2etests/testdata/stable/font_sizes/dagre/sketch.exp.svg new file mode 100644 index 000000000..763a935c3 --- /dev/null +++ b/e2etests/testdata/stable/font_sizes/dagre/sketch.exp.svg @@ -0,0 +1,40 @@ + +size XSsize Ssize Msize Lsize XLsize XXLsize XXXLcustom 8custom 12custom 18custom 21custom 64 + + +custom 10 + + +custom 15 + + +custom 48 \ No newline at end of file diff --git a/e2etests/testdata/stable/font_sizes/elk/board.exp.json b/e2etests/testdata/stable/font_sizes/elk/board.exp.json new file mode 100644 index 000000000..ed0b2abdb --- /dev/null +++ b/e2etests/testdata/stable/font_sizes/elk/board.exp.json @@ -0,0 +1,577 @@ +{ + "name": "", + "shapes": [ + { + "id": "size XS", + "type": "", + "pos": { + "x": 1324, + "y": 359 + }, + "width": 154, + "height": 126, + "level": 1, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#F7F8FE", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "size XS", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 54, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER" + }, + { + "id": "size S", + "type": "", + "pos": { + "x": 1505, + "y": 12 + }, + "width": 145, + "height": 126, + "level": 1, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#F7F8FE", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "size S", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 45, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER" + }, + { + "id": "size M", + "type": "", + "pos": { + "x": 1504, + "y": 359 + }, + "width": 147, + "height": 126, + "level": 1, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#F7F8FE", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "size M", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 47, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER" + }, + { + "id": "size L", + "type": "", + "pos": { + "x": 954, + "y": 12 + }, + "width": 144, + "height": 126, + "level": 1, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#F7F8FE", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "size L", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 44, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER" + }, + { + "id": "size XL", + "type": "", + "pos": { + "x": 12, + "y": 12 + }, + "width": 153, + "height": 126, + "level": 1, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#F7F8FE", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "size XL", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 53, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER" + }, + { + "id": "size XXL", + "type": "", + "pos": { + "x": 383, + "y": 12 + }, + "width": 162, + "height": 126, + "level": 1, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#F7F8FE", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "size XXL", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 62, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER" + }, + { + "id": "size XXXL", + "type": "", + "pos": { + "x": 565, + "y": 12 + }, + "width": 171, + "height": 126, + "level": 1, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#F7F8FE", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "size XXXL", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 71, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER" + }, + { + "id": "custom 8", + "type": "", + "pos": { + "x": 1316, + "y": 12 + }, + "width": 169, + "height": 126, + "level": 1, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#F7F8FE", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "custom 8", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 69, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER" + }, + { + "id": "custom 12", + "type": "", + "pos": { + "x": 1118, + "y": 12 + }, + "width": 178, + "height": 126, + "level": 1, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#F7F8FE", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "custom 12", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 78, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER" + }, + { + "id": "custom 18", + "type": "", + "pos": { + "x": 756, + "y": 12 + }, + "width": 178, + "height": 126, + "level": 1, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#F7F8FE", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "custom 18", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 78, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER" + }, + { + "id": "custom 21", + "type": "", + "pos": { + "x": 185, + "y": 12 + }, + "width": 178, + "height": 126, + "level": 1, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#F7F8FE", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "custom 21", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 78, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER" + }, + { + "id": "custom 64", + "type": "", + "pos": { + "x": 561, + "y": 359 + }, + "width": 179, + "height": 126, + "level": 1, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#F7F8FE", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "custom 64", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 79, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER" + } + ], + "connections": [ + { + "id": "(custom 8 -> size XS)[0]", + "src": "custom 8", + "srcArrow": "none", + "srcLabel": "", + "dst": "size XS", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "custom 10", + "fontSize": 10, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 67, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "route": [ + { + "x": 1400.5, + "y": 138 + }, + { + "x": 1400.5, + "y": 359 + } + ], + "animated": false, + "tooltip": "", + "icon": null + }, + { + "id": "(size S -> size M)[0]", + "src": "size S", + "srcArrow": "none", + "srcLabel": "", + "dst": "size M", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "custom 15", + "fontSize": 15, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 67, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "route": [ + { + "x": 1577.5, + "y": 138 + }, + { + "x": 1577.5, + "y": 359 + } + ], + "animated": false, + "tooltip": "", + "icon": null + }, + { + "id": "(size XXXL -> custom 64)[0]", + "src": "size XXXL", + "srcArrow": "none", + "srcLabel": "", + "dst": "custom 64", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "custom 48", + "fontSize": 48, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 67, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "route": [ + { + "x": 650.5, + "y": 138 + }, + { + "x": 650.5, + "y": 359 + } + ], + "animated": false, + "tooltip": "", + "icon": null + } + ] +} diff --git a/e2etests/testdata/stable/font_sizes/elk/sketch.exp.svg b/e2etests/testdata/stable/font_sizes/elk/sketch.exp.svg new file mode 100644 index 000000000..e64669212 --- /dev/null +++ b/e2etests/testdata/stable/font_sizes/elk/sketch.exp.svg @@ -0,0 +1,40 @@ + +size XSsize Ssize Msize Lsize XLsize XXLsize XXXLcustom 8custom 12custom 18custom 21custom 64 + + +custom 10 + + +custom 15 + + +custom 48 \ No newline at end of file From 53cfa31ee19a98a7f99c777da164f84fc89a6ac3 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Tue, 29 Nov 2022 11:27:41 -0800 Subject: [PATCH 11/19] render all font sizes in range --- d2graph/d2graph.go | 9 +- d2renderers/textmeasure/textmeasure.go | 29 ++- .../stable/font_sizes/dagre/board.exp.json | 208 +++++++++--------- .../stable/font_sizes/dagre/sketch.exp.svg | 22 +- .../stable/font_sizes/elk/board.exp.json | 190 ++++++++-------- .../stable/font_sizes/elk/sketch.exp.svg | 22 +- 6 files changed, 257 insertions(+), 223 deletions(-) diff --git a/d2graph/d2graph.go b/d2graph/d2graph.go index 7bc2ba1cc..a1be0ebb2 100644 --- a/d2graph/d2graph.go +++ b/d2graph/d2graph.go @@ -415,6 +415,9 @@ func (obj *Object) Text() *d2target.MText { if obj.IsContainer() { fontSize = obj.Level().LabelSize() } + if obj.Attributes.Style.FontSize != nil { + fontSize, _ = strconv.Atoi(obj.Attributes.Style.FontSize.Value) + } // Class and Table objects have Label set to header if obj.Class != nil || obj.SQLTable != nil { fontSize = d2fonts.FONT_SIZE_XL @@ -662,9 +665,13 @@ func (e *Edge) ArrowString() string { } func (e *Edge) Text() *d2target.MText { + fontSize := d2fonts.FONT_SIZE_M + if e.Attributes.Style.FontSize != nil { + fontSize, _ = strconv.Atoi(e.Attributes.Style.FontSize.Value) + } return &d2target.MText{ Text: e.Attributes.Label.Value, - FontSize: d2fonts.FONT_SIZE_M, + FontSize: fontSize, IsBold: false, IsItalic: true, diff --git a/d2renderers/textmeasure/textmeasure.go b/d2renderers/textmeasure/textmeasure.go index 4a96c0c3a..5b9cb5bb4 100644 --- a/d2renderers/textmeasure/textmeasure.go +++ b/d2renderers/textmeasure/textmeasure.go @@ -143,7 +143,34 @@ func NewRuler() (*Ruler, error) { } func (t *Ruler) Measure(font d2fonts.Font, s string) (width, height int) { - w, h := t.MeasurePrecise(font, s) + hasSize := false + for _, size := range d2fonts.FontSizes { + if size == font.Size { + hasSize = true + break + } + } + var w, h float64 + if hasSize { + w, h = t.MeasurePrecise(font, s) + } else { + // find the closest font size we have and scale the measurement + closestSize := d2fonts.FontSizes[0] + smallestDiff := math.Abs(float64(closestSize - font.Size)) + for i := 1; i < len(d2fonts.FontSizes); i++ { + diff := math.Abs(float64(d2fonts.FontSizes[i] - font.Size)) + if diff < smallestDiff { + smallestDiff = diff + closestSize = d2fonts.FontSizes[i] + } + } + scaledFont := font + scaledFont.Size = closestSize + w, h = t.MeasurePrecise(scaledFont, s) + f := float64(font.Size) / float64(closestSize) + w *= f + h *= f + } return int(math.Ceil(w)), int(math.Ceil(h)) } diff --git a/e2etests/testdata/stable/font_sizes/dagre/board.exp.json b/e2etests/testdata/stable/font_sizes/dagre/board.exp.json index 8eeb1f17e..4137c5d24 100644 --- a/e2etests/testdata/stable/font_sizes/dagre/board.exp.json +++ b/e2etests/testdata/stable/font_sizes/dagre/board.exp.json @@ -5,11 +5,11 @@ "id": "size XS", "type": "", "pos": { - "x": 1084, - "y": 226 + "x": 1293, + "y": 278 }, - "width": 154, - "height": 126, + "width": 145, + "height": 122, "level": 1, "opacity": 1, "strokeDash": 0, @@ -28,26 +28,26 @@ "methods": null, "columns": null, "label": "size XS", - "fontSize": 16, + "fontSize": 13, "fontFamily": "DEFAULT", "language": "", "color": "#0A0F25", "italic": false, "bold": true, "underline": false, - "labelWidth": 54, - "labelHeight": 26, + "labelWidth": 45, + "labelHeight": 22, "labelPosition": "INSIDE_MIDDLE_CENTER" }, { "id": "size S", "type": "", "pos": { - "x": 1, - "y": 0 + "x": 4, + "y": 12 }, - "width": 145, - "height": 126, + "width": 140, + "height": 123, "level": 1, "opacity": 1, "strokeDash": 0, @@ -66,15 +66,15 @@ "methods": null, "columns": null, "label": "size S", - "fontSize": 16, + "fontSize": 14, "fontFamily": "DEFAULT", "language": "", "color": "#0A0F25", "italic": false, "bold": true, "underline": false, - "labelWidth": 45, - "labelHeight": 26, + "labelWidth": 40, + "labelHeight": 23, "labelPosition": "INSIDE_MIDDLE_CENTER" }, { @@ -82,7 +82,7 @@ "type": "", "pos": { "x": 0, - "y": 226 + "y": 276 }, "width": 147, "height": 126, @@ -119,11 +119,11 @@ "id": "size L", "type": "", "pos": { - "x": 206, - "y": 0 + "x": 204, + "y": 8 }, - "width": 144, - "height": 126, + "width": 153, + "height": 131, "level": 1, "opacity": 1, "strokeDash": 0, @@ -142,26 +142,26 @@ "methods": null, "columns": null, "label": "size L", - "fontSize": 16, + "fontSize": 20, "fontFamily": "DEFAULT", "language": "", "color": "#0A0F25", "italic": false, "bold": true, "underline": false, - "labelWidth": 44, - "labelHeight": 26, + "labelWidth": 53, + "labelHeight": 31, "labelPosition": "INSIDE_MIDDLE_CENTER" }, { "id": "size XL", "type": "", "pos": { - "x": 410, - "y": 0 + "x": 417, + "y": 5 }, - "width": 153, - "height": 126, + "width": 177, + "height": 136, "level": 1, "opacity": 1, "strokeDash": 0, @@ -180,26 +180,26 @@ "methods": null, "columns": null, "label": "size XL", - "fontSize": 16, + "fontSize": 24, "fontFamily": "DEFAULT", "language": "", "color": "#0A0F25", "italic": false, "bold": true, "underline": false, - "labelWidth": 53, - "labelHeight": 26, + "labelWidth": 77, + "labelHeight": 36, "labelPosition": "INSIDE_MIDDLE_CENTER" }, { "id": "size XXL", "type": "", "pos": { - "x": 623, - "y": 0 + "x": 654, + "y": 3 }, - "width": 162, - "height": 126, + "width": 204, + "height": 141, "level": 1, "opacity": 1, "strokeDash": 0, @@ -218,26 +218,26 @@ "methods": null, "columns": null, "label": "size XXL", - "fontSize": 16, + "fontSize": 28, "fontFamily": "DEFAULT", "language": "", "color": "#0A0F25", "italic": false, "bold": true, "underline": false, - "labelWidth": 62, - "labelHeight": 26, + "labelWidth": 104, + "labelHeight": 41, "labelPosition": "INSIDE_MIDDLE_CENTER" }, { "id": "size XXXL", "type": "", "pos": { - "x": 845, + "x": 918, "y": 0 }, - "width": 171, - "height": 126, + "width": 237, + "height": 146, "level": 1, "opacity": 1, "strokeDash": 0, @@ -256,26 +256,26 @@ "methods": null, "columns": null, "label": "size XXXL", - "fontSize": 16, + "fontSize": 32, "fontFamily": "DEFAULT", "language": "", "color": "#0A0F25", "italic": false, "bold": true, "underline": false, - "labelWidth": 71, - "labelHeight": 26, + "labelWidth": 137, + "labelHeight": 46, "labelPosition": "INSIDE_MIDDLE_CENTER" }, { "id": "custom 8", "type": "", "pos": { - "x": 1076, - "y": 0 + "x": 1297, + "y": 15 }, - "width": 169, - "height": 126, + "width": 138, + "height": 116, "level": 1, "opacity": 1, "strokeDash": 0, @@ -294,26 +294,26 @@ "methods": null, "columns": null, "label": "custom 8", - "fontSize": 16, + "fontSize": 8, "fontFamily": "DEFAULT", "language": "", "color": "#0A0F25", "italic": false, "bold": true, "underline": false, - "labelWidth": 69, - "labelHeight": 26, + "labelWidth": 38, + "labelHeight": 16, "labelPosition": "INSIDE_MIDDLE_CENTER" }, { "id": "custom 12", "type": "", "pos": { - "x": 1305, - "y": 0 + "x": 1495, + "y": 13 }, - "width": 178, - "height": 126, + "width": 160, + "height": 121, "level": 1, "opacity": 1, "strokeDash": 0, @@ -332,26 +332,26 @@ "methods": null, "columns": null, "label": "custom 12", - "fontSize": 16, + "fontSize": 12, "fontFamily": "DEFAULT", "language": "", "color": "#0A0F25", "italic": false, "bold": true, "underline": false, - "labelWidth": 78, - "labelHeight": 26, + "labelWidth": 60, + "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER" }, { "id": "custom 18", "type": "", "pos": { - "x": 1543, - "y": 0 + "x": 1715, + "y": 9 }, - "width": 178, - "height": 126, + "width": 187, + "height": 128, "level": 1, "opacity": 1, "strokeDash": 0, @@ -370,26 +370,26 @@ "methods": null, "columns": null, "label": "custom 18", - "fontSize": 16, + "fontSize": 18, "fontFamily": "DEFAULT", "language": "", "color": "#0A0F25", "italic": false, "bold": true, "underline": false, - "labelWidth": 78, - "labelHeight": 26, + "labelWidth": 87, + "labelHeight": 28, "labelPosition": "INSIDE_MIDDLE_CENTER" }, { "id": "custom 21", "type": "", "pos": { - "x": 1781, - "y": 0 + "x": 1962, + "y": 7 }, - "width": 178, - "height": 126, + "width": 200, + "height": 132, "level": 1, "opacity": 1, "strokeDash": 0, @@ -408,26 +408,26 @@ "methods": null, "columns": null, "label": "custom 21", - "fontSize": 16, + "fontSize": 21, "fontFamily": "DEFAULT", "language": "", "color": "#0A0F25", "italic": false, "bold": true, "underline": false, - "labelWidth": 78, - "labelHeight": 26, + "labelWidth": 100, + "labelHeight": 32, "labelPosition": "INSIDE_MIDDLE_CENTER" }, { "id": "custom 64", "type": "", "pos": { - "x": 841, - "y": 226 + "x": 839, + "y": 246 }, - "width": 179, - "height": 126, + "width": 394, + "height": 186, "level": 1, "opacity": 1, "strokeDash": 0, @@ -446,15 +446,15 @@ "methods": null, "columns": null, "label": "custom 64", - "fontSize": 16, + "fontSize": 64, "fontFamily": "DEFAULT", "language": "", "color": "#0A0F25", "italic": false, "bold": true, "underline": false, - "labelWidth": 79, - "labelHeight": 26, + "labelWidth": 294, + "labelHeight": 86, "labelPosition": "INSIDE_MIDDLE_CENTER" } ], @@ -479,26 +479,26 @@ "italic": true, "bold": false, "underline": false, - "labelWidth": 67, - "labelHeight": 21, + "labelWidth": 42, + "labelHeight": 13, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, "route": [ { - "x": 1160.5, - "y": 126 + "x": 1365.5, + "y": 131 }, { - "x": 1160.5, - "y": 166 + "x": 1365.5, + "y": 183 }, { - "x": 1160.5, - "y": 186 + "x": 1365.5, + "y": 212.4 }, { - "x": 1160.5, - "y": 226 + "x": 1365.5, + "y": 278 } ], "isCurve": true, @@ -526,26 +526,26 @@ "italic": true, "bold": false, "underline": false, - "labelWidth": 67, - "labelHeight": 21, + "labelWidth": 63, + "labelHeight": 19, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, "route": [ { "x": 73.5, - "y": 126 + "y": 135.5 }, { "x": 73.5, - "y": 166 + "y": 183.9 }, { "x": 73.5, - "y": 186 + "y": 212 }, { "x": 73.5, - "y": 226 + "y": 276 } ], "isCurve": true, @@ -573,26 +573,26 @@ "italic": true, "bold": false, "underline": false, - "labelWidth": 67, - "labelHeight": 21, + "labelWidth": 200, + "labelHeight": 61, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, "route": [ { - "x": 930.5, - "y": 126 + "x": 1036, + "y": 146 }, { - "x": 930.5, - "y": 166 - }, - { - "x": 930.5, + "x": 1036, "y": 186 }, { - "x": 930.5, - "y": 226 + "x": 1036, + "y": 206 + }, + { + "x": 1036, + "y": 246 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/font_sizes/dagre/sketch.exp.svg b/e2etests/testdata/stable/font_sizes/dagre/sketch.exp.svg index 763a935c3..d68a51a79 100644 --- a/e2etests/testdata/stable/font_sizes/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/font_sizes/dagre/sketch.exp.svg @@ -2,7 +2,7 @@ \ No newline at end of file diff --git a/e2etests/testdata/todo/font_sizes_containers_large/elk/board.exp.json b/e2etests/testdata/todo/font_sizes_containers_large/elk/board.exp.json new file mode 100644 index 000000000..307837e98 --- /dev/null +++ b/e2etests/testdata/todo/font_sizes_containers_large/elk/board.exp.json @@ -0,0 +1,196 @@ +{ + "name": "", + "shapes": [ + { + "id": "ninety nine", + "type": "", + "pos": { + "x": 12, + "y": 12 + }, + "width": 724, + "height": 716, + "level": 1, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#E3E9FD", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "ninety nine", + "fontSize": 99, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 460, + "labelHeight": 130, + "labelPosition": "INSIDE_TOP_CENTER" + }, + { + "id": "ninety nine.sixty four", + "type": "", + "pos": { + "x": 87, + "y": 87 + }, + "width": 574, + "height": 566, + "level": 2, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#EDF0FD", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "sixty four", + "fontSize": 64, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 253, + "labelHeight": 86, + "labelPosition": "INSIDE_TOP_CENTER" + }, + { + "id": "ninety nine.sixty four.thirty two", + "type": "", + "pos": { + "x": 162, + "y": 162 + }, + "width": 424, + "height": 416, + "level": 3, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#F7F8FE", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "thirty two", + "fontSize": 32, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 135, + "labelHeight": 46, + "labelPosition": "INSIDE_TOP_CENTER" + }, + { + "id": "ninety nine.sixty four.thirty two.sixteen", + "type": "", + "pos": { + "x": 237, + "y": 237 + }, + "width": 274, + "height": 266, + "level": 4, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#FFFFFF", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "sixteen", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 53, + "labelHeight": 26, + "labelPosition": "INSIDE_TOP_CENTER" + }, + { + "id": "ninety nine.sixty four.thirty two.sixteen.eight", + "type": "", + "pos": { + "x": 312, + "y": 312 + }, + "width": 124, + "height": 116, + "level": 5, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#FFFFFF", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "eight", + "fontSize": 8, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 24, + "labelHeight": 16, + "labelPosition": "INSIDE_MIDDLE_CENTER" + } + ], + "connections": [] +} diff --git a/e2etests/testdata/todo/font_sizes_containers_large/elk/sketch.exp.svg b/e2etests/testdata/todo/font_sizes_containers_large/elk/sketch.exp.svg new file mode 100644 index 000000000..39dd19532 --- /dev/null +++ b/e2etests/testdata/todo/font_sizes_containers_large/elk/sketch.exp.svg @@ -0,0 +1,24 @@ + +ninety ninesixty fourthirty twosixteeneight \ No newline at end of file diff --git a/e2etests/testdata/todo/font_sizes_large/dagre/board.exp.json b/e2etests/testdata/todo/font_sizes_large/dagre/board.exp.json new file mode 100644 index 000000000..982458dc1 --- /dev/null +++ b/e2etests/testdata/todo/font_sizes_large/dagre/board.exp.json @@ -0,0 +1,385 @@ +{ + "name": "", + "shapes": [ + { + "id": "eight", + "type": "", + "pos": { + "x": 233, + "y": 0 + }, + "width": 124, + "height": 116, + "level": 1, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#F7F8FE", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "eight", + "fontSize": 8, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 24, + "labelHeight": 16, + "labelPosition": "INSIDE_MIDDLE_CENTER" + }, + { + "id": "sixteen", + "type": "", + "pos": { + "x": 217, + "y": 216 + }, + "width": 157, + "height": 126, + "level": 1, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#F7F8FE", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "sixteen", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 57, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER" + }, + { + "id": "thirty two", + "type": "", + "pos": { + "x": 172, + "y": 442 + }, + "width": 247, + "height": 146, + "level": 1, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#F7F8FE", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "thirty two", + "fontSize": 32, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 147, + "labelHeight": 46, + "labelPosition": "INSIDE_MIDDLE_CENTER" + }, + { + "id": "sixty four", + "type": "", + "pos": { + "x": 108, + "y": 688 + }, + "width": 375, + "height": 186, + "level": 1, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#F7F8FE", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "sixty four", + "fontSize": 64, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 275, + "labelHeight": 86, + "labelPosition": "INSIDE_MIDDLE_CENTER" + }, + { + "id": "ninety nine", + "type": "", + "pos": { + "x": 0, + "y": 974 + }, + "width": 590, + "height": 230, + "level": 1, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#F7F8FE", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "ninety nine", + "fontSize": 99, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 490, + "labelHeight": 130, + "labelPosition": "INSIDE_MIDDLE_CENTER" + } + ], + "connections": [ + { + "id": "(eight -> sixteen)[0]", + "src": "eight", + "srcArrow": "none", + "srcLabel": "", + "dst": "sixteen", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "twelve", + "fontSize": 12, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 33, + "labelHeight": 16, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "route": [ + { + "x": 295, + "y": 116 + }, + { + "x": 295, + "y": 156 + }, + { + "x": 295, + "y": 176 + }, + { + "x": 295, + "y": 216 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null + }, + { + "id": "(sixteen -> thirty two)[0]", + "src": "sixteen", + "srcArrow": "none", + "srcLabel": "", + "dst": "thirty two", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "twenty four", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 114, + "labelHeight": 31, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "route": [ + { + "x": 295, + "y": 342 + }, + { + "x": 295, + "y": 382 + }, + { + "x": 295, + "y": 402 + }, + { + "x": 295, + "y": 442 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null + }, + { + "id": "(thirty two -> sixty four)[0]", + "src": "thirty two", + "srcArrow": "none", + "srcLabel": "", + "dst": "sixty four", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "forty eight", + "fontSize": 48, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 203, + "labelHeight": 61, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "route": [ + { + "x": 295, + "y": 588 + }, + { + "x": 295, + "y": 628 + }, + { + "x": 295, + "y": 648 + }, + { + "x": 295, + "y": 688 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null + }, + { + "id": "(sixty four -> ninety nine)[0]", + "src": "sixty four", + "srcArrow": "none", + "srcLabel": "", + "dst": "ninety nine", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "eighty one", + "fontSize": 81, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 343, + "labelHeight": 102, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "route": [ + { + "x": 295, + "y": 874 + }, + { + "x": 295, + "y": 914 + }, + { + "x": 295, + "y": 934 + }, + { + "x": 295, + "y": 974 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null + } + ] +} diff --git a/e2etests/testdata/todo/font_sizes_large/dagre/sketch.exp.svg b/e2etests/testdata/todo/font_sizes_large/dagre/sketch.exp.svg new file mode 100644 index 000000000..a41423f10 --- /dev/null +++ b/e2etests/testdata/todo/font_sizes_large/dagre/sketch.exp.svg @@ -0,0 +1,43 @@ + +eightsixteenthirty twosixty fourninety nine + + +twelve + + +twenty four + + +forty eight + + +eighty one \ No newline at end of file diff --git a/e2etests/testdata/todo/font_sizes_large/elk/board.exp.json b/e2etests/testdata/todo/font_sizes_large/elk/board.exp.json new file mode 100644 index 000000000..85b0d3b12 --- /dev/null +++ b/e2etests/testdata/todo/font_sizes_large/elk/board.exp.json @@ -0,0 +1,349 @@ +{ + "name": "", + "shapes": [ + { + "id": "eight", + "type": "", + "pos": { + "x": 295, + "y": 12 + }, + "width": 124, + "height": 116, + "level": 1, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#F7F8FE", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "eight", + "fontSize": 8, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 24, + "labelHeight": 16, + "labelPosition": "INSIDE_MIDDLE_CENTER" + }, + { + "id": "sixteen", + "type": "", + "pos": { + "x": 279, + "y": 344 + }, + "width": 157, + "height": 126, + "level": 1, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#F7F8FE", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "sixteen", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 57, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER" + }, + { + "id": "thirty two", + "type": "", + "pos": { + "x": 234, + "y": 701 + }, + "width": 247, + "height": 146, + "level": 1, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#F7F8FE", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "thirty two", + "fontSize": 32, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 147, + "labelHeight": 46, + "labelPosition": "INSIDE_MIDDLE_CENTER" + }, + { + "id": "sixty four", + "type": "", + "pos": { + "x": 170, + "y": 1108 + }, + "width": 375, + "height": 186, + "level": 1, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#F7F8FE", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "sixty four", + "fontSize": 64, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 275, + "labelHeight": 86, + "labelPosition": "INSIDE_MIDDLE_CENTER" + }, + { + "id": "ninety nine", + "type": "", + "pos": { + "x": 62, + "y": 1596 + }, + "width": 590, + "height": 230, + "level": 1, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#F7F8FE", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "ninety nine", + "fontSize": 99, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 490, + "labelHeight": 130, + "labelPosition": "INSIDE_MIDDLE_CENTER" + } + ], + "connections": [ + { + "id": "(eight -> sixteen)[0]", + "src": "eight", + "srcArrow": "none", + "srcLabel": "", + "dst": "sixteen", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "twelve", + "fontSize": 12, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 33, + "labelHeight": 16, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "route": [ + { + "x": 357, + "y": 128 + }, + { + "x": 357, + "y": 344 + } + ], + "animated": false, + "tooltip": "", + "icon": null + }, + { + "id": "(sixteen -> thirty two)[0]", + "src": "sixteen", + "srcArrow": "none", + "srcLabel": "", + "dst": "thirty two", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "twenty four", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 114, + "labelHeight": 31, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "route": [ + { + "x": 357, + "y": 470 + }, + { + "x": 357, + "y": 701 + } + ], + "animated": false, + "tooltip": "", + "icon": null + }, + { + "id": "(thirty two -> sixty four)[0]", + "src": "thirty two", + "srcArrow": "none", + "srcLabel": "", + "dst": "sixty four", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "forty eight", + "fontSize": 48, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 203, + "labelHeight": 61, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "route": [ + { + "x": 357, + "y": 847 + }, + { + "x": 357, + "y": 1108 + } + ], + "animated": false, + "tooltip": "", + "icon": null + }, + { + "id": "(sixty four -> ninety nine)[0]", + "src": "sixty four", + "srcArrow": "none", + "srcLabel": "", + "dst": "ninety nine", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "eighty one", + "fontSize": 81, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 343, + "labelHeight": 102, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "route": [ + { + "x": 357, + "y": 1294 + }, + { + "x": 357, + "y": 1596 + } + ], + "animated": false, + "tooltip": "", + "icon": null + } + ] +} diff --git a/e2etests/testdata/todo/font_sizes_large/elk/sketch.exp.svg b/e2etests/testdata/todo/font_sizes_large/elk/sketch.exp.svg new file mode 100644 index 000000000..91a92c371 --- /dev/null +++ b/e2etests/testdata/todo/font_sizes_large/elk/sketch.exp.svg @@ -0,0 +1,43 @@ + +eightsixteenthirty twosixty fourninety nine + + +twelve + + +twenty four + + +forty eight + + +eighty one \ No newline at end of file diff --git a/e2etests/testdata/todo/tall_edge_label/dagre/board.exp.json b/e2etests/testdata/todo/tall_edge_label/dagre/board.exp.json new file mode 100644 index 000000000..2de602438 --- /dev/null +++ b/e2etests/testdata/todo/tall_edge_label/dagre/board.exp.json @@ -0,0 +1,130 @@ +{ + "name": "", + "shapes": [ + { + "id": "a", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 113, + "height": 126, + "level": 1, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#F7F8FE", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "a", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 13, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER" + }, + { + "id": "b", + "type": "", + "pos": { + "x": 0, + "y": 226 + }, + "width": 113, + "height": 126, + "level": 1, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#F7F8FE", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "b", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 13, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER" + } + ], + "connections": [ + { + "id": "(a -> b)[0]", + "src": "a", + "srcArrow": "none", + "srcLabel": "", + "dst": "b", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "There\nonce\nwas\na\nvery\ntall\nedge\nlabel", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 38, + "labelHeight": 133, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "route": [ + { + "x": 56.5, + "y": 126 + }, + { + "x": 56.5, + "y": 166 + }, + { + "x": 56.5, + "y": 186 + }, + { + "x": 56.5, + "y": 226 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null + } + ] +} diff --git a/e2etests/testdata/todo/tall_edge_label/dagre/sketch.exp.svg b/e2etests/testdata/todo/tall_edge_label/dagre/sketch.exp.svg new file mode 100644 index 000000000..986f6e3a5 --- /dev/null +++ b/e2etests/testdata/todo/tall_edge_label/dagre/sketch.exp.svg @@ -0,0 +1,34 @@ + +ab + + +Thereoncewasaverytalledgelabel \ No newline at end of file diff --git a/e2etests/testdata/todo/tall_edge_label/elk/board.exp.json b/e2etests/testdata/todo/tall_edge_label/elk/board.exp.json new file mode 100644 index 000000000..7b6dc1dad --- /dev/null +++ b/e2etests/testdata/todo/tall_edge_label/elk/board.exp.json @@ -0,0 +1,121 @@ +{ + "name": "", + "shapes": [ + { + "id": "a", + "type": "", + "pos": { + "x": 12, + "y": 12 + }, + "width": 113, + "height": 126, + "level": 1, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#F7F8FE", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "a", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 13, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER" + }, + { + "id": "b", + "type": "", + "pos": { + "x": 12, + "y": 471 + }, + "width": 113, + "height": 126, + "level": 1, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#F7F8FE", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "b", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 13, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER" + } + ], + "connections": [ + { + "id": "(a -> b)[0]", + "src": "a", + "srcArrow": "none", + "srcLabel": "", + "dst": "b", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "There\nonce\nwas\na\nvery\ntall\nedge\nlabel", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 38, + "labelHeight": 133, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "route": [ + { + "x": 68.5, + "y": 138 + }, + { + "x": 68.5, + "y": 471 + } + ], + "animated": false, + "tooltip": "", + "icon": null + } + ] +} diff --git a/e2etests/testdata/todo/tall_edge_label/elk/sketch.exp.svg b/e2etests/testdata/todo/tall_edge_label/elk/sketch.exp.svg new file mode 100644 index 000000000..fd896fed3 --- /dev/null +++ b/e2etests/testdata/todo/tall_edge_label/elk/sketch.exp.svg @@ -0,0 +1,34 @@ + +ab + + +Thereoncewasaverytalledgelabel \ No newline at end of file diff --git a/e2etests/todo_test.go b/e2etests/todo_test.go index 4ec848e48..a0cecce13 100644 --- a/e2etests/todo_test.go +++ b/e2etests/todo_test.go @@ -13,6 +13,58 @@ func testTodo(t *testing.T) { script: ` container.first -> container.second: 1->2 container -> container.second: c->2 +`, + }, + { + // issue https://github.com/terrastruct/d2/issues/263 + name: "tall_edge_label", + script: ` +a -> b: There\nonce\nwas\na\nvery\ntall\nedge\nlabel +`, + }, + { + // issue https://github.com/terrastruct/d2/issues/263 + name: "font_sizes_large", + script: ` +eight.style.font-size: 8 +sixteen.style.font-size: 16 +thirty two.style.font-size: 32 +sixty four.style.font-size: 64 +ninety nine.style.font-size: 99 + +eight -> sixteen : twelve { + style.font-size: 12 +} +sixteen -> thirty two : twenty four { + style.font-size: 24 +} +thirty two -> sixty four: forty eight { + style.font-size: 48 +} +sixty four -> ninety nine: eighty one { + style.font-size: 81 +} +`, + }, + { + // issue https://github.com/terrastruct/d2/issues/19 + name: "font_sizes_containers_large", + script: ` +ninety nine: { + style.font-size: 99 + sixty four: { + style.font-size: 64 + thirty two:{ + style.font-size: 32 + sixteen: { + style.font-size: 16 + eight: { + style.font-size: 8 + } + } + } + } +} `, }, } From acebca973927a73210b00db9b165360535c62265 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Tue, 29 Nov 2022 15:10:59 -0800 Subject: [PATCH 13/19] load font at new size on demand --- d2renderers/textmeasure/textmeasure.go | 106 +++++++++++-------------- 1 file changed, 46 insertions(+), 60 deletions(-) diff --git a/d2renderers/textmeasure/textmeasure.go b/d2renderers/textmeasure/textmeasure.go index 5b9cb5bb4..b9192e58d 100644 --- a/d2renderers/textmeasure/textmeasure.go +++ b/d2renderers/textmeasure/textmeasure.go @@ -76,6 +76,8 @@ type Ruler struct { atlases map[d2fonts.Font]*atlas + ttfs map[d2fonts.Font]*truetype.Font + buf []byte prevR rune bounds *rect @@ -97,84 +99,68 @@ type Ruler struct { // }) // txt := text.New(orig, text.NewAtlas(face, text.ASCII)) func NewRuler() (*Ruler, error) { - lineHeights := make(map[d2fonts.Font]float64) - tabWidths := make(map[d2fonts.Font]float64) - atlases := make(map[d2fonts.Font]*atlas) + origin := geo.NewPoint(0, 0) + r := &Ruler{ + Orig: origin, + Dot: origin.Copy(), + LineHeightFactor: 1., + lineHeights: make(map[d2fonts.Font]float64), + tabWidths: make(map[d2fonts.Font]float64), + atlases: make(map[d2fonts.Font]*atlas), + ttfs: make(map[d2fonts.Font]*truetype.Font), + } for _, fontFamily := range d2fonts.FontFamilies { - for _, fontSize := range d2fonts.FontSizes { - for _, fontStyle := range d2fonts.FontStyles { - font := d2fonts.Font{ - Family: fontFamily, - Style: fontStyle, - } - if _, ok := d2fonts.FontFaces[font]; !ok { - continue - } + for _, fontStyle := range d2fonts.FontStyles { + font := d2fonts.Font{ + Family: fontFamily, + Style: fontStyle, + } + // Note: FontFaces lookup is size-agnostic + if _, ok := d2fonts.FontFaces[font]; !ok { + continue + } + if _, loaded := r.ttfs[font]; !loaded { ttf, err := truetype.Parse(d2fonts.FontFaces[font]) if err != nil { return nil, err } - // Added after, since FontFaces lookup is size-agnostic - font.Size = fontSize - face := truetype.NewFace(ttf, &truetype.Options{ - Size: float64(fontSize), - }) - atlas := NewAtlas(face, ASCII) - atlases[font] = atlas - lineHeights[font] = atlas.lineHeight - tabWidths[font] = atlas.glyph(' ').advance * TAB_SIZE + r.ttfs[font] = ttf + } + + for _, fontSize := range d2fonts.FontSizes { + r.addFontSize(font, fontSize) } } } - origin := geo.NewPoint(0, 0) - txt := &Ruler{ - Orig: origin, - Dot: origin.Copy(), - LineHeightFactor: 1., - lineHeights: lineHeights, - tabWidths: tabWidths, - atlases: atlases, - } - txt.clear() + r.clear() - return txt, nil + return r, nil +} + +func (r *Ruler) addFontSize(font d2fonts.Font, fontSize int) { + sizeless := font + sizeless.Size = 0 + face := truetype.NewFace(r.ttfs[sizeless], &truetype.Options{ + Size: float64(fontSize), + }) + font.Size = fontSize + atlas := NewAtlas(face, ASCII) + r.atlases[font] = atlas + r.lineHeights[font] = atlas.lineHeight + r.tabWidths[font] = atlas.glyph(' ').advance * TAB_SIZE } func (t *Ruler) Measure(font d2fonts.Font, s string) (width, height int) { - hasSize := false - for _, size := range d2fonts.FontSizes { - if size == font.Size { - hasSize = true - break - } - } - var w, h float64 - if hasSize { - w, h = t.MeasurePrecise(font, s) - } else { - // find the closest font size we have and scale the measurement - closestSize := d2fonts.FontSizes[0] - smallestDiff := math.Abs(float64(closestSize - font.Size)) - for i := 1; i < len(d2fonts.FontSizes); i++ { - diff := math.Abs(float64(d2fonts.FontSizes[i] - font.Size)) - if diff < smallestDiff { - smallestDiff = diff - closestSize = d2fonts.FontSizes[i] - } - } - scaledFont := font - scaledFont.Size = closestSize - w, h = t.MeasurePrecise(scaledFont, s) - f := float64(font.Size) / float64(closestSize) - w *= f - h *= f - } + w, h := t.MeasurePrecise(font, s) return int(math.Ceil(w)), int(math.Ceil(h)) } func (t *Ruler) MeasurePrecise(font d2fonts.Font, s string) (width, height float64) { + if _, ok := t.atlases[font]; !ok { + t.addFontSize(font, font.Size) + } t.clear() t.buf = append(t.buf, s...) t.drawBuf(font) From 723826ee304a6c8641aea9f723a45ed30252a69e Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Tue, 29 Nov 2022 15:11:52 -0800 Subject: [PATCH 14/19] update tests --- .../stable/font_sizes/dagre/board.exp.json | 32 ++++++------- .../stable/font_sizes/dagre/sketch.exp.svg | 22 ++++----- .../stable/font_sizes/elk/board.exp.json | 36 +++++++------- .../stable/font_sizes/elk/sketch.exp.svg | 22 ++++----- .../dagre/board.exp.json | 4 +- .../elk/board.exp.json | 4 +- .../font_sizes_large/dagre/board.exp.json | 48 +++++++++---------- .../font_sizes_large/dagre/sketch.exp.svg | 24 +++++----- .../todo/font_sizes_large/elk/board.exp.json | 38 +++++++-------- .../todo/font_sizes_large/elk/sketch.exp.svg | 28 +++++------ 10 files changed, 129 insertions(+), 129 deletions(-) diff --git a/e2etests/testdata/stable/font_sizes/dagre/board.exp.json b/e2etests/testdata/stable/font_sizes/dagre/board.exp.json index 4137c5d24..7203ab80f 100644 --- a/e2etests/testdata/stable/font_sizes/dagre/board.exp.json +++ b/e2etests/testdata/stable/font_sizes/dagre/board.exp.json @@ -274,7 +274,7 @@ "x": 1297, "y": 15 }, - "width": 138, + "width": 137, "height": 116, "level": 1, "opacity": 1, @@ -301,7 +301,7 @@ "italic": false, "bold": true, "underline": false, - "labelWidth": 38, + "labelWidth": 37, "labelHeight": 16, "labelPosition": "INSIDE_MIDDLE_CENTER" }, @@ -309,7 +309,7 @@ "id": "custom 12", "type": "", "pos": { - "x": 1495, + "x": 1494, "y": 13 }, "width": 160, @@ -347,10 +347,10 @@ "id": "custom 18", "type": "", "pos": { - "x": 1715, + "x": 1714, "y": 9 }, - "width": 187, + "width": 186, "height": 128, "level": 1, "opacity": 1, @@ -377,7 +377,7 @@ "italic": false, "bold": true, "underline": false, - "labelWidth": 87, + "labelWidth": 86, "labelHeight": 28, "labelPosition": "INSIDE_MIDDLE_CENTER" }, @@ -385,7 +385,7 @@ "id": "custom 21", "type": "", "pos": { - "x": 1962, + "x": 1960, "y": 7 }, "width": 200, @@ -423,10 +423,10 @@ "id": "custom 64", "type": "", "pos": { - "x": 839, + "x": 840, "y": 246 }, - "width": 394, + "width": 393, "height": 186, "level": 1, "opacity": 1, @@ -453,7 +453,7 @@ "italic": false, "bold": true, "underline": false, - "labelWidth": 294, + "labelWidth": 293, "labelHeight": 86, "labelPosition": "INSIDE_MIDDLE_CENTER" } @@ -485,19 +485,19 @@ "labelPercentage": 0, "route": [ { - "x": 1365.5, + "x": 1365, "y": 131 }, { - "x": 1365.5, + "x": 1365, "y": 183 }, { - "x": 1365.5, + "x": 1365, "y": 212.4 }, { - "x": 1365.5, + "x": 1365, "y": 278 } ], @@ -526,7 +526,7 @@ "italic": true, "bold": false, "underline": false, - "labelWidth": 63, + "labelWidth": 64, "labelHeight": 19, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, @@ -573,7 +573,7 @@ "italic": true, "bold": false, "underline": false, - "labelWidth": 200, + "labelWidth": 199, "labelHeight": 61, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, diff --git a/e2etests/testdata/stable/font_sizes/dagre/sketch.exp.svg b/e2etests/testdata/stable/font_sizes/dagre/sketch.exp.svg index d68a51a79..29d19e482 100644 --- a/e2etests/testdata/stable/font_sizes/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/font_sizes/dagre/sketch.exp.svg @@ -2,7 +2,7 @@ eightsixteenthirty twosixty fourninety nine + + +twelve -twenty four - - -forty eight - - -eighty oneeightsixteenthirty twosixty fourninety nine - - -twelve - - -twenty four - - -forty eight - - -eighty one