From de0cf47016492f9334f1a50b7dd9ba55d996b35a Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Sat, 31 Dec 2022 15:50:42 -0800 Subject: [PATCH 1/3] default size for no text --- d2graph/d2graph.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/d2graph/d2graph.go b/d2graph/d2graph.go index 5ecb1b7ad..d0d965f7e 100644 --- a/d2graph/d2graph.go +++ b/d2graph/d2graph.go @@ -981,7 +981,7 @@ func (e *Edge) initIndex() { func findMeasured(mtexts []*d2target.MText, t1 *d2target.MText) *d2target.TextDimensions { if strings.TrimSpace(t1.Text) == "" { - return d2target.NewTextDimensions(0, 0) + return d2target.NewTextDimensions(100, 100) } for i, t2 := range mtexts { if t1.Text != t2.Text { From e8a56bda519a0af3f0cdd6b096dc2f49f7aca207 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Sat, 31 Dec 2022 15:54:50 -0800 Subject: [PATCH 2/3] move --- d2graph/d2graph.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/d2graph/d2graph.go b/d2graph/d2graph.go index d0d965f7e..61ebbb722 100644 --- a/d2graph/d2graph.go +++ b/d2graph/d2graph.go @@ -980,9 +980,6 @@ func (e *Edge) initIndex() { } func findMeasured(mtexts []*d2target.MText, t1 *d2target.MText) *d2target.TextDimensions { - if strings.TrimSpace(t1.Text) == "" { - return d2target.NewTextDimensions(100, 100) - } for i, t2 := range mtexts { if t1.Text != t2.Text { continue @@ -1001,6 +998,9 @@ func findMeasured(mtexts []*d2target.MText, t1 *d2target.MText) *d2target.TextDi } return &mtexts[i].Dimensions } + if strings.TrimSpace(t1.Text) == "" { + return d2target.NewTextDimensions(100, 100) + } return nil } From c04fcc920fc9c1d630310d5744e21a0a24dfb57a Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Sat, 31 Dec 2022 15:59:07 -0800 Subject: [PATCH 3/3] update --- d2graph/d2graph.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/d2graph/d2graph.go b/d2graph/d2graph.go index 61ebbb722..3b8491e75 100644 --- a/d2graph/d2graph.go +++ b/d2graph/d2graph.go @@ -998,9 +998,6 @@ func findMeasured(mtexts []*d2target.MText, t1 *d2target.MText) *d2target.TextDi } return &mtexts[i].Dimensions } - if strings.TrimSpace(t1.Text) == "" { - return d2target.NewTextDimensions(100, 100) - } return nil } @@ -1017,6 +1014,10 @@ func getMarkdownDimensions(mtexts []*d2target.MText, ruler *textmeasure.Ruler, t return d2target.NewTextDimensions(width, height), nil } + if strings.TrimSpace(t.Text) == "" { + return d2target.NewTextDimensions(100, 100), nil + } + return nil, fmt.Errorf("text not pre-measured and no ruler provided") }