@tldraw/editor 3.12.0-canary.3ab62f1ff84a → 3.12.0-canary.3d1a69111704

package/src/lib/primitives/intersect.ts

@@ -293,6 +293,47 @@ export function intersectPolygonPolygon(
 	return orderClockwise([...result.values()])
 }
 
+/**
+ * Find all the points where `polyA` and `polyB` intersect and returns them in an undefined order.
+ * To find the polygon that's the intersection of polyA and polyB, use `intersectPolygonPolygon`
+ * instead, which orders the points and includes internal points.
+ *
+ * @param polyA - The first polygon.
+ * @param polyB - The second polygon.
+ * @param isAClosed - Whether `polyA` is a closed polygon or a polyline.
+ * @param isBClosed - Whether `polyB` is a closed polygon or a polyline.
+ * @public
+ */
+export function intersectPolys(
+	polyA: VecLike[],
+	polyB: VecLike[],
+	isAClosed: boolean,
+	isBClosed: boolean
+): VecLike[] {
+	const result: Map<string, VecLike> = new Map()
+
+	// Add all intersection points to result
+	for (let i = 0, n = isAClosed ? polyA.length : polyA.length - 1; i < n; i++) {
+		const currentA = polyA[i]
+		const nextA = polyA[(i + 1) % polyA.length]
+
+		for (let j = 0, m = isBClosed ? polyB.length : polyB.length - 1; j < m; j++) {
+			const currentB = polyB[j]
+			const nextB = polyB[(j + 1) % polyB.length]
+			const intersection = intersectLineSegmentLineSegment(currentA, nextA, currentB, nextB)
+
+			if (intersection !== null) {
+				const id = getPointId(intersection)
+				if (!result.has(id)) {
+					result.set(id, intersection)
+				}
+			}
+		}
+	}
+
+	return [...result.values()]
+}
+
 function getPointId(point: VecLike) {
 	return `${point.x},${point.y}`
 }

package/src/lib/utils/reorderShapes.ts

@@ -154,24 +154,17 @@ function reorderToFront(moving: Set<TLShape>, children: TLShape[], changes: TLSh
 	}
 }
 
-function getVerticesInPageSpace(editor: Editor, shape: TLShape) {
-	const geo = editor.getShapeGeometry(shape)
-	const pageTransform = editor.getShapePageTransform(shape)
-	if (!geo || !pageTransform) return null
-	return pageTransform.applyToPoints(geo.vertices)
-}
-
 function getOverlapChecker(editor: Editor, moving: Set<TLShape>) {
 	const movingVertices = Array.from(moving)
 		.map((shape) => {
-			const vertices = getVerticesInPageSpace(editor, shape)
+			const vertices = editor.getShapePageGeometry(shape).vertices
 			if (!vertices) return null
 			return { shape, vertices }
 		})
 		.filter(Boolean) as { shape: TLShape; vertices: Vec[] }[]
 
 	const isOverlapping = (child: TLShape) => {
-		const vertices = getVerticesInPageSpace(editor, child)
+		const vertices = editor.getShapePageGeometry(child).vertices
 		if (!vertices) return false
 		return movingVertices.some((other) => {
 			return polygonsIntersect(other.vertices, vertices)

package/src/version.ts

@@ -1,9 +1,9 @@
 // This file is automatically generated by internal/scripts/refresh-assets.ts.
 // Do not edit manually. Or do, I'm a comment, not a cop.
 
-export const version = '3.12.0-canary.3ab62f1ff84a'
+export const version = '3.12.0-canary.3d1a69111704'
 export const publishDates = {
 	major: '2024-09-13T14:36:29.063Z',
-	minor: '2025-04-02T10:42:06.481Z',
-	patch: '2025-04-02T10:42:06.481Z',
+	minor: '2025-04-04T08:20:04.596Z',
+	patch: '2025-04-04T08:20:04.596Z',
 }