remove unnecessary

terrastruct · Dec 12, 2023 · 8ce19c5 · gavin-ts · Dec 12, 2023 · gavin-ts
1 parent 554106d
commit 8ce19c5
Show file tree

Hide file tree

Showing 68 changed files with 5,538 additions and 5,571 deletions.
diff --git a/d2graph/layout.go b/d2graph/layout.go
@@ -436,21 +436,6 @@ func (edge *Edge) TraceToShape(points []*geo.Point, startIndex, endIndex int) (n
 				startingSegment.End = points[startIndex+2]
 				startIndex++
 			}
-			if intersections := labelBox.Intersections(startingSegment); len(intersections) > 0 {
-				overlapsOutsideLabel = true
-				p := intersections[0]
-				if len(intersections) > 1 {
-					p = findOuterIntersection(labelPosition, intersections)
-				}
-				// move starting segment to label intersection point
-				points[startIndex] = p
-				startingSegment.End = p
-				// if the segment becomes too short, just merge it with the next segment
-				if startIndex+1 < endIndex && startingSegment.Length() < MIN_SEGMENT_LEN {
-					points[startIndex+1] = points[startIndex]
-					startIndex++
-				}
-			}
 		}
 	}
 	if !overlapsOutsideLabel {

diff --git a/d2layouts/d2elklayout/layout.go b/d2layouts/d2elklayout/layout.go
@@ -1116,11 +1116,6 @@ func adjustDimensions(obj *d2graph.Object) (width, height float64) {
 				width = go2.Max(width, float64(obj.LabelDimensions.Width))
 			}
 		}
-
-		// special handling
-		if obj.HasOutsideBottomLabel() || obj.Icon != nil {
-			height += float64(obj.LabelDimensions.Height) + label.PADDING
-		}
 	}
 
 	if obj.Icon != nil && obj.Shape.Value != d2target.ShapeImage {
@@ -1189,11 +1184,6 @@ func cleanupAdjustment(obj *d2graph.Object) {
 		}
 	}
 
-	// special handling to start/end connections below label
-	if obj.HasOutsideBottomLabel() {
-		obj.Height -= float64(obj.LabelDimensions.Height) + label.PADDING
-	}
-
 	// remove the extra width/height we added for 3d/multiple after all objects/connections are placed
 	// and shift the shapes down accordingly
 	dx, dy := obj.GetModifierElementAdjustments()

diff --git a/d2renderers/d2sketch/testdata/twitter/sketch.exp.svg b/d2renderers/d2sketch/testdata/twitter/sketch.exp.svg
diff --git a/d2renderers/d2sketch/testdata/twitter_dark/sketch.exp.svg b/d2renderers/d2sketch/testdata/twitter_dark/sketch.exp.svg
diff --git a/d2renderers/d2svg/dark_theme/testdata/twitter/dark_theme.exp.svg b/d2renderers/d2svg/dark_theme/testdata/twitter/dark_theme.exp.svg
diff --git a/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf b/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf
diff --git a/e2etests/testdata/regression/dagre_disconnected_edge/elk/board.exp.json b/e2etests/testdata/regression/dagre_disconnected_edge/elk/board.exp.json
diff --git a/e2etests/testdata/regression/dagre_disconnected_edge/elk/sketch.exp.svg b/e2etests/testdata/regression/dagre_disconnected_edge/elk/sketch.exp.svg
diff --git a/e2etests/testdata/regression/elk_img_empty_label_panic/elk/board.exp.json b/e2etests/testdata/regression/elk_img_empty_label_panic/elk/board.exp.json
diff --git a/e2etests/testdata/regression/elk_img_empty_label_panic/elk/sketch.exp.svg b/e2etests/testdata/regression/elk_img_empty_label_panic/elk/sketch.exp.svg
diff --git a/e2etests/testdata/regression/query_param_escape/elk/board.exp.json b/e2etests/testdata/regression/query_param_escape/elk/board.exp.json