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

fix: cr, OutNearContianer

Browse source
This commit is contained in:
donglixiaoche 2023-04-05 08:31:23 +08:00
parent a006bf1539
commit 7a395ecf71
No known key found for this signature in database
GPG key ID: 3190E65EBAD6D6E2
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
d2compiler/compile.go
View file

@ -763,10 +763,10 @@ func (c *compiler) validateNear(g *d2graph.Graph) {
var isSrcNearConst, isDstNearConst bool var isSrcNearConst, isDstNearConst bool
if srcNearContainer != nil { if srcNearContainer != nil && srcNearContainer != edge.Src {
_, isSrcNearConst = d2graph.NearConstants[d2graph.Key(srcNearContainer.Attributes.NearKey)[0]] _, isSrcNearConst = d2graph.NearConstants[d2graph.Key(srcNearContainer.Attributes.NearKey)[0]]
} }
if dstNearContainer != nil { if dstNearContainer != nil && dstNearContainer != edge.Dst {
_, isDstNearConst = d2graph.NearConstants[d2graph.Key(dstNearContainer.Attributes.NearKey)[0]] _, isDstNearConst = d2graph.NearConstants[d2graph.Key(dstNearContainer.Attributes.NearKey)[0]]
} }

10
d2graph/d2graph.go
View file

@ -969,13 +969,11 @@ func (obj *Object) GetDefaultSize(mtexts []*d2target.MText, ruler *textmeasure.R
} }
func (obj *Object) OuterNearContainer() *Object { func (obj *Object) OuterNearContainer() *Object {
temp := obj for obj != nil {
for temp != nil { if obj.Attributes.NearKey != nil {
// find outer near container that isn't itself return obj
if temp.Attributes.NearKey != nil && temp != obj {
return temp
} }
temp = temp.Parent obj = obj.Parent
} }
return nil return nil
} }