tldraw 3.16.0-next.f9f54ec051f3 → 3.16.0-next.fe14f1b4181f

package/src/test/inner-outer-margin.test.ts

@@ -0,0 +1,315 @@
+import { TLArrowShape, createShapeId } from '@tldraw/editor'
+import { getArrowBindings } from '../lib/shapes/arrow/shared'
+import { TestEditor } from './TestEditor'
+
+let editor: TestEditor
+
+const ids = {
+	solidShape: createShapeId('solidShape'),
+	hollowShape: createShapeId('hollowShape'),
+	arrow: createShapeId('arrow'),
+}
+
+const _arrow = () => editor.getOnlySelectedShape() as TLArrowShape
+
+beforeEach(() => {
+	editor = new TestEditor()
+})
+
+describe('Inner/Outer Margin Shape Detection', () => {
+	describe('getShapeAtPoint with inner/outer margins', () => {
+		beforeEach(() => {
+			// Create a solid filled shape
+			editor.createShape({
+				id: ids.solidShape,
+				type: 'geo',
+				x: 100,
+				y: 100,
+				props: {
+					w: 100,
+					h: 100,
+					fill: 'solid',
+				},
+			})
+
+			// Create a hollow shape on top (same position, smaller size)
+			editor.createShape({
+				id: ids.hollowShape,
+				type: 'geo',
+				x: 125,
+				y: 125,
+				props: {
+					w: 50,
+					h: 50,
+					// No fill property - defaults to 'none' (hollow)
+				},
+			})
+		})
+
+		it('should support inner/outer margin options', () => {
+			// Test that the new margin options are accepted
+			const point = { x: 150, y: 150 }
+
+			// Test with array margin [innerMargin, outerMargin]
+			const arrayMarginHit = editor.getShapeAtPoint(point, {
+				hitInside: true,
+				margin: [8, 4],
+			})
+			expect(arrayMarginHit).toBeDefined()
+
+			// Test with insideMargin option
+			const insideMarginHit = editor.getShapeAtPoint(point, {
+				hitInside: true,
+			})
+			expect(insideMarginHit).toBeDefined()
+
+			// Test with single number margin (should use same for both)
+			const singleMarginHit = editor.getShapeAtPoint(point, {
+				hitInside: true,
+				margin: 8,
+			})
+			expect(singleMarginHit).toBeDefined()
+		})
+
+		it('should respect hitInside option for hollow shapes', () => {
+			const point = { x: 150, y: 150 }
+
+			// Without hitInside, should not hit hollow shape
+			const noHitInsideHit = editor.getShapeAtPoint(point, {
+				margin: [8, 0],
+			})
+			expect(noHitInsideHit?.id).toBe(ids.solidShape)
+
+			// With hitInside, should be able to hit hollow shape
+			const withHitInsideHit = editor.getShapeAtPoint(point, {
+				hitInside: true,
+				margin: [8, 0],
+			})
+			expect(withHitInsideHit).toBeDefined()
+		})
+
+		it('should handle edge cases correctly', () => {
+			// Test point exactly on the edge of hollow shape
+			const edgePoint = { x: 125, y: 150 }
+
+			const edgeHit = editor.getShapeAtPoint(edgePoint, {
+				hitInside: true,
+				margin: [8, 8],
+			})
+			expect(edgeHit).toBeDefined()
+		})
+	})
+
+	describe('Arrow binding with inner/outer margins', () => {
+		beforeEach(() => {
+			// Create a solid filled shape
+			editor.createShape({
+				id: ids.solidShape,
+				type: 'geo',
+				x: 100,
+				y: 100,
+				props: {
+					w: 100,
+					h: 100,
+					fill: 'solid',
+				},
+			})
+
+			// Create a hollow shape on top (same position, smaller size)
+			editor.createShape({
+				id: ids.hollowShape,
+				type: 'geo',
+				x: 125,
+				y: 125,
+				props: {
+					w: 50,
+					h: 50,
+					// No fill property - defaults to 'none' (hollow)
+				},
+			})
+		})
+
+		it('should create arrow bindings with inner/outer margin support', () => {
+			editor.setCurrentTool('arrow')
+
+			// Start arrow outside both shapes
+			editor.pointerDown(50, 150)
+
+			// Move to center of hollow shape (which overlaps solid shape)
+			editor.pointerMove(150, 150)
+			editor.pointerUp()
+
+			const createdArrow = editor
+				.getCurrentPageShapes()
+				.find((s) => s.type === 'arrow') as TLArrowShape
+			expect(createdArrow).toBeDefined()
+
+			const arrowBindings = getArrowBindings(editor, createdArrow)
+			expect(arrowBindings.end).toBeDefined()
+			// The binding should be to one of the shapes
+			expect([ids.solidShape, ids.hollowShape]).toContain(arrowBindings.end?.toId)
+		})
+
+		it('should bind to solid shape when no hollow shape is present', () => {
+			// Remove the hollow shape
+			editor.deleteShape(ids.hollowShape)
+
+			editor.setCurrentTool('arrow')
+
+			// Start arrow outside shape
+			editor.pointerDown(50, 150)
+
+			// Move to center of solid shape
+			editor.pointerMove(150, 150)
+			editor.pointerUp()
+
+			const createdArrow = editor
+				.getCurrentPageShapes()
+				.find((s) => s.type === 'arrow') as TLArrowShape
+			expect(createdArrow).toBeDefined()
+
+			const arrowBindings = getArrowBindings(editor, createdArrow)
+			expect(arrowBindings.end).toBeDefined()
+			expect(arrowBindings.end?.toId).toBe(ids.solidShape)
+		})
+	})
+
+	describe('Complex overlapping scenarios', () => {
+		it('should handle multiple overlapping shapes correctly', () => {
+			// Create multiple shapes with different fill states
+			editor.createShape({
+				id: ids.solidShape,
+				type: 'geo',
+				x: 100,
+				y: 100,
+				props: {
+					w: 100,
+					h: 100,
+					fill: 'solid',
+				},
+			})
+
+			editor.createShape({
+				id: ids.hollowShape,
+				type: 'geo',
+				x: 125,
+				y: 125,
+				props: {
+					w: 50,
+					h: 50,
+					// No fill property - defaults to 'none' (hollow)
+				},
+			})
+
+			// Create another hollow shape
+			const hollowShape2 = createShapeId('hollowShape2')
+			editor.createShape({
+				id: hollowShape2,
+				type: 'geo',
+				x: 140,
+				y: 140,
+				props: {
+					w: 30,
+					h: 30,
+					// No fill property - defaults to 'none' (hollow)
+				},
+			})
+
+			// Test point in the innermost hollow shape
+			const point = { x: 155, y: 155 }
+
+			const hit = editor.getShapeAtPoint(point, {
+				hitInside: true,
+				margin: [8, 8],
+			})
+			expect(hit).toBeDefined()
+			// Should hit one of the shapes
+			expect([ids.solidShape, ids.hollowShape, hollowShape2]).toContain(hit?.id)
+		})
+
+		it('should handle shapes with different geometries', () => {
+			// Create a solid rectangle
+			editor.createShape({
+				id: ids.solidShape,
+				type: 'geo',
+				x: 100,
+				y: 100,
+				props: {
+					w: 100,
+					h: 100,
+					fill: 'solid',
+				},
+			})
+
+			// Create a hollow circle on top
+			editor.createShape({
+				id: ids.hollowShape,
+				type: 'geo',
+				x: 125,
+				y: 125,
+				props: {
+					w: 50,
+					h: 50,
+					geo: 'ellipse',
+					// No fill property - defaults to 'none' (hollow)
+				},
+			})
+
+			// Test point inside the circle
+			const point = { x: 150, y: 150 }
+
+			const hit = editor.getShapeAtPoint(point, {
+				hitInside: true,
+				margin: [8, 8],
+			})
+			expect(hit).toBeDefined()
+			// Should hit one of the shapes
+			expect([ids.solidShape, ids.hollowShape]).toContain(hit?.id)
+		})
+	})
+
+	describe('Regression tests for the original bug', () => {
+		it('should support binding to hollow shapes when overlapping solid shapes', () => {
+			// This test verifies that the infrastructure exists for the bug fix
+			// Create a solid shape
+			editor.createShape({
+				id: ids.solidShape,
+				type: 'geo',
+				x: 100,
+				y: 100,
+				props: {
+					w: 100,
+					h: 100,
+					fill: 'solid',
+				},
+			})
+
+			// Create a hollow shape on top
+			editor.createShape({
+				id: ids.hollowShape,
+				type: 'geo',
+				x: 125,
+				y: 125,
+				props: {
+					w: 50,
+					h: 50,
+					// No fill property - defaults to 'none' (hollow)
+				},
+			})
+
+			// Test that we can detect both shapes
+			const point = { x: 150, y: 150 }
+
+			// Should be able to hit the solid shape without hitInside
+			const solidHit = editor.getShapeAtPoint(point)
+			expect(solidHit?.id).toBe(ids.solidShape)
+
+			// Should be able to hit the hollow shape with hitInside and inner margin
+			const hollowHit = editor.getShapeAtPoint(point, {
+				hitInside: true,
+				margin: [8, 0],
+			})
+			expect(hollowHit).toBeDefined()
+		})
+	})
+})

package/src/test/maxShapes.test.ts

@@ -1,4 +1,5 @@
 import { createShapeId } from '@tldraw/editor'
+import { vi } from 'vitest'
 import { TestEditor } from './TestEditor'
 
 let editor: TestEditor
@@ -82,7 +83,7 @@ describe('Maximum shapes behavior', () => {
 			})
 
 			it('should emit max-shapes event when limit is reached', () => {
-				const maxShapesHandler = jest.fn()
+				const maxShapesHandler = vi.fn()
 				editor.addListener('max-shapes', maxShapesHandler)
 
 				// Set up the note tool
@@ -282,7 +283,7 @@ describe('Maximum shapes behavior', () => {
 			expect(editor.getCurrentPageShapeIds().size).toBe(5)
 
 			// Try to create one more shape
-			const maxShapesHandler = jest.fn()
+			const maxShapesHandler = vi.fn()
 			editor.addListener('max-shapes', maxShapesHandler)
 
 			const extraShapeId = createShapeId('extra-shape')

package/src/test/modifiers.test.ts

@@ -1,3 +1,4 @@
+import { vi } from 'vitest'
 import { TestEditor } from './TestEditor'
 
 let editor: TestEditor
@@ -6,14 +7,14 @@ beforeEach(() => {
 	editor = new TestEditor()
 })
 
-jest.useFakeTimers()
+vi.useFakeTimers()
 
 it('Shift Key', () => {
 	editor.pointerDown(0, 0)
 	editor.pointerMove(100, 100, { shiftKey: true })
 	editor.pointerMove(100, 100, { shiftKey: false })
 	expect(editor.inputs.shiftKey).toBe(true)
-	jest.advanceTimersByTime(200)
+	vi.advanceTimersByTime(200)
 	expect(editor.inputs.shiftKey).toBe(false)
 })
 
@@ -22,7 +23,7 @@ it('Alt Key', () => {
 	editor.pointerMove(100, 100, { altKey: true })
 	editor.pointerMove(100, 100, { altKey: false })
 	expect(editor.inputs.altKey).toBe(true)
-	jest.advanceTimersByTime(200)
+	vi.advanceTimersByTime(200)
 	expect(editor.inputs.altKey).toBe(false)
 })
 
@@ -31,6 +32,6 @@ it('Ctrl Key', () => {
 	editor.pointerMove(100, 100, { ctrlKey: true })
 	editor.pointerMove(100, 100, { ctrlKey: false })
 	expect(editor.inputs.ctrlKey).toBe(true)
-	jest.advanceTimersByTime(200)
+	vi.advanceTimersByTime(200)
 	expect(editor.inputs.ctrlKey).toBe(false)
 })

package/src/test/navigation.test.ts

@@ -1,4 +1,5 @@
 import { createShapeId } from '@tldraw/editor'
+import { vi } from 'vitest'
 import { TestEditor } from './TestEditor'
 
 let editor: TestEditor
@@ -54,7 +55,7 @@ describe('Shape navigation', () => {
 		])
 
 		// Mock canTabTo to return false for the second shape
-		jest.spyOn(editor.getShapeUtil('geo'), 'canTabTo').mockImplementation((shape) => {
+		vi.spyOn(editor.getShapeUtil('geo'), 'canTabTo').mockImplementation((shape) => {
 			return shape.id !== ids.box2
 		})
 
@@ -100,7 +101,7 @@ describe('Shape navigation', () => {
 		editor.select(ids.box1)
 
 		// Spy on zoomToSelectionIfOffscreen method
-		const zoomSpy = jest.spyOn(editor, 'zoomToSelectionIfOffscreen')
+		const zoomSpy = vi.spyOn(editor, 'zoomToSelectionIfOffscreen')
 
 		// Navigate to next shape (offscreen)
 		editor.selectAdjacentShape('next')
@@ -119,7 +120,7 @@ describe('Shape navigation', () => {
 		])
 
 		// Mock a culled shape (not rendered)
-		jest.spyOn(editor, 'getShapePageBounds').mockImplementation((shape: any) => {
+		vi.spyOn(editor, 'getShapePageBounds').mockImplementation((shape: any) => {
 			// Return normal bounds for box1, null for box2 as if it's culled/not rendered
 			if (shape?.id === ids.box2) {
 				// Still return bounds, but pretend it was calculated even though shape is culled
@@ -150,7 +151,7 @@ describe('Shape navigation', () => {
 			])
 
 			// Setup shape centers for the test
-			jest.spyOn(editor, 'getShapePageBounds').mockImplementation((shape: any) => {
+			vi.spyOn(editor, 'getShapePageBounds').mockImplementation((shape: any) => {
 				if (shape?.id === ids.boxA) {
 					return { center: { x: 10, y: 110 } } as any
 				}
@@ -182,7 +183,7 @@ describe('Shape navigation', () => {
 			])
 
 			// Setup shape centers for the test
-			jest.spyOn(editor, 'getShapePageBounds').mockImplementation((shape: any) => {
+			vi.spyOn(editor, 'getShapePageBounds').mockImplementation((shape: any) => {
 				if (shape?.id === ids.center) {
 					return { center: { x: 100, y: 100 } } as any
 				}
@@ -219,7 +220,7 @@ describe('Shape navigation', () => {
 			])
 
 			// Setup shape centers
-			jest.spyOn(editor, 'getShapePageBounds').mockImplementation((shape: any) => {
+			vi.spyOn(editor, 'getShapePageBounds').mockImplementation((shape: any) => {
 				if (shape?.id === ids.center) return { center: { x: 200, y: 200 } } as any
 				if (shape?.id === ids.right) return { center: { x: 300, y: 200 } } as any
 				if (shape?.id === ids.left) return { center: { x: 100, y: 200 } } as any
@@ -258,7 +259,7 @@ describe('Shape navigation', () => {
 			])
 
 			// Setup shape centers
-			jest.spyOn(editor, 'getShapePageBounds').mockImplementation((shape: any) => {
+			vi.spyOn(editor, 'getShapePageBounds').mockImplementation((shape: any) => {
 				if (shape?.id === ids.center) return { center: { x: 200, y: 200 } } as any
 				if (shape?.id === ids.nearRight) return { center: { x: 250, y: 200 } } as any
 				if (shape?.id === ids.farRight) return { center: { x: 350, y: 200 } } as any
@@ -284,7 +285,7 @@ describe('Shape navigation', () => {
 			])
 
 			// Setup shape centers
-			jest.spyOn(editor, 'getShapePageBounds').mockImplementation((shape: any) => {
+			vi.spyOn(editor, 'getShapePageBounds').mockImplementation((shape: any) => {
 				if (shape?.id === ids.box1) return { center: { x: 50, y: 50 } } as any
 				if (shape?.id === ids.box2) return { center: { x: 150, y: 50 } } as any
 				if (shape?.id === ids.box3) return { center: { x: 150, y: 150 } } as any
@@ -485,7 +486,7 @@ describe('Shape navigation', () => {
 			])
 
 			// Setup shape centers for consistent testing
-			jest.spyOn(editor, 'getShapePageBounds').mockImplementation((shape: any) => {
+			vi.spyOn(editor, 'getShapePageBounds').mockImplementation((shape: any) => {
 				const positions = {
 					[ids.box1]: { x: 25, y: 115 },
 					[ids.box2]: { x: 65, y: 115 },
@@ -612,7 +613,7 @@ describe('Shape navigation', () => {
 			])
 
 			// Setup shape centers for consistent testing
-			jest.spyOn(editor, 'getShapePageBounds').mockImplementation((shape: any) => {
+			vi.spyOn(editor, 'getShapePageBounds').mockImplementation((shape: any) => {
 				const positions = {
 					[ids.box1]: { x: 115, y: 25 },
 					[ids.box2]: { x: 115, y: 65 },
@@ -1006,7 +1007,7 @@ describe('Shape navigation', () => {
 			])
 
 			// Setup shape centers
-			jest.spyOn(editor, 'getShapePageBounds').mockImplementation((shape: any) => {
+			vi.spyOn(editor, 'getShapePageBounds').mockImplementation((shape: any) => {
 				if (shape?.id === ids.row1Shape1) return { center: { x: 50, y: 50 } } as any
 				if (shape?.id === ids.row1Shape2) return { center: { x: 150, y: 50 } } as any
 				if (shape?.id === ids.row1Shape3) return { center: { x: 250, y: 50 } } as any

package/src/test/panning.test.ts

@@ -1,6 +1,7 @@
+import { vi } from 'vitest'
 import { TestEditor } from './TestEditor'
 
-jest.useFakeTimers()
+vi.useFakeTimers()
 
 let editor: TestEditor
 

package/src/test/perf/perf.test.ts

@@ -1,10 +1,11 @@
 import { TLShapePartial, Vec, createShapeId } from '@tldraw/editor'
+import { vi } from 'vitest'
 import { TestEditor } from '../TestEditor'
 import { PerformanceMeasurer } from './PerformanceMeasurer'
 
 let editor = new TestEditor()
 
-jest.useRealTimers()
+vi.useRealTimers()
 
 describe.skip('Example perf tests', () => {
 	it('measures Editor.createShape vs Editor.createShapes', () => {

package/src/test/registerDeepLinkListener.test.tsx

@@ -1,8 +1,9 @@
 import { PageRecordType, Vec, createShapeId } from '@tldraw/editor'
+import { vi } from 'vitest'
 import { TestEditor } from './TestEditor'
 import { TL } from './test-jsx'
 
-jest.useFakeTimers()
+vi.useFakeTimers()
 
 let editor: TestEditor
 
@@ -20,20 +21,20 @@ beforeEach(() => {
 test('it creates a listener that updates the current url', async () => {
 	const unlisten = editor.registerDeepLinkListener()
 
-	jest.advanceTimersByTime(1000)
+	vi.advanceTimersByTime(1000)
 	expect(window.location.href).toMatchInlineSnapshot(`"http://localhost/test?d=v0.0.1080.720.page"`)
 
 	const pageId = PageRecordType.createId('foo')
 	editor.createPage({ id: pageId })
 	editor.setCurrentPage(pageId)
 
-	jest.advanceTimersByTime(1000)
+	vi.advanceTimersByTime(1000)
 
 	expect(window.location.href).toMatchInlineSnapshot(`"http://localhost/test?d=v0.0.1080.720.foo"`)
 
 	editor.pan({ x: 100, y: 100 })
 
-	jest.advanceTimersByTime(1000)
+	vi.advanceTimersByTime(1000)
 
 	expect(window.location.href).toMatchInlineSnapshot(
 		`"http://localhost/test?d=v-100.-100.1080.720.foo"`
@@ -43,7 +44,7 @@ test('it creates a listener that updates the current url', async () => {
 
 	editor.pan({ x: 500, y: 500 })
 
-	jest.advanceTimersByTime(1000)
+	vi.advanceTimersByTime(1000)
 
 	expect(window.location.href).toMatchInlineSnapshot(
 		`"http://localhost/test?d=v-100.-100.1080.720.foo"`
@@ -75,7 +76,7 @@ test('it allows specifying a page target', async () => {
 		param: 'foo',
 	})
 
-	jest.advanceTimersByTime(1000)
+	vi.advanceTimersByTime(1000)
 
 	// no shapes yet
 	expect(window.location.href).toMatchInlineSnapshot(`"http://localhost/test?foo=ppage"`)
@@ -87,19 +88,19 @@ test('it allows specifying a page target', async () => {
 		<TL.geo id={boxB} x={1000} y={1000} w={100} h={100} />,
 	])
 
-	jest.advanceTimersByTime(1000)
+	vi.advanceTimersByTime(1000)
 	expect(window.location.href).toMatchInlineSnapshot(`"http://localhost/test?foo=sa"`)
 
 	editor.pan({ x: -1000, y: -1000 })
 
-	jest.advanceTimersByTime(1000)
+	vi.advanceTimersByTime(1000)
 	expect(window.location.href).toMatchInlineSnapshot(`"http://localhost/test?foo=sb"`)
 
 	unlisten()
 
 	editor.pan({ x: 1000, y: 1000 })
 
-	jest.advanceTimersByTime(1000)
+	vi.advanceTimersByTime(1000)
 	expect(window.location.href).toMatchInlineSnapshot(`"http://localhost/test?foo=sb"`)
 	expect(getNearestShape().id).toBe(boxA)
 })