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

fix multiple sequence diagram inject order

Browse source
This commit is contained in:
Gavin Nishizawa 2023-09-21 18:37:47 -07:00
parent d6a543219c
commit 1baac61711
No known key found for this signature in database
GPG key ID: AE3B177777CE55CD
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
d2layouts/d2layouts.go
View file

@ -79,7 +79,7 @@ func LayoutNested(ctx context.Context, g *d2graph.Graph, graphInfo GraphInfo, co
log.Warn(ctx, "ln info", slog.F("gi", graphInfo), slog.F("root level", g.RootLevel)) log.Warn(ctx, "ln info", slog.F("gi", graphInfo), slog.F("root level", g.RootLevel))
// Before we can layout these nodes, we need to handle all nested diagrams first. // Before we can layout these nodes, we need to handle all nested diagrams first.
extracted := make(map[*d2graph.Object]*d2graph.Graph) extracted := make(map[*d2graph.Object]*d2graph.Graph)
extractedInfo := make(map[*d2graph.Object]GraphInfo) var extractedOrder []*d2graph.Object
var constantNears []*d2graph.Graph var constantNears []*d2graph.Graph
restoreOrder := SaveOrder(g) restoreOrder := SaveOrder(g)
@ -125,8 +125,6 @@ func LayoutNested(ctx context.Context, g *d2graph.Graph, graphInfo GraphInfo, co
continue continue
} }
extractedInfo[curr] = gi
// There is a nested diagram here, so extract its contents and process in the same way // There is a nested diagram here, so extract its contents and process in the same way
nestedGraph := ExtractSubgraph(curr, gi.IsConstantNear) nestedGraph := ExtractSubgraph(curr, gi.IsConstantNear)
@ -157,6 +155,7 @@ func LayoutNested(ctx context.Context, g *d2graph.Graph, graphInfo GraphInfo, co
} else { } else {
// We will restore the contents after running layout with child as the placeholder // We will restore the contents after running layout with child as the placeholder
extracted[curr] = nestedGraph extracted[curr] = nestedGraph
extractedOrder = append(extractedOrder, curr)
} }
} else if len(curr.ChildrenArray) > 0 { } else if len(curr.ChildrenArray) > 0 {
queue = append(queue, curr.ChildrenArray...) queue = append(queue, curr.ChildrenArray...)
@ -199,7 +198,8 @@ func LayoutNested(ctx context.Context, g *d2graph.Graph, graphInfo GraphInfo, co
} }
// With the layout set, inject all the extracted graphs // With the layout set, inject all the extracted graphs
for n, nestedGraph := range extracted { for _, n := range extractedOrder {
nestedGraph := extracted[n]
InjectNested(n, nestedGraph, true) InjectNested(n, nestedGraph, true)
PositionNested(n, nestedGraph) PositionNested(n, nestedGraph)
} }