tldraw 3.16.0-canary.fa3749606e52 → 3.16.0-internal.51e99e128bd4

package/src/test/commands/stretch.test.tsx

@@ -1,11 +1,12 @@
 import { PI, TLShapeId } from '@tldraw/editor'
+import { vi } from 'vitest'
 import { TestEditor } from '../TestEditor'
 import { TL } from '../test-jsx'
 
 let editor: TestEditor
 let ids: Record<string, TLShapeId>
 
-jest.useFakeTimers()
+vi.useFakeTimers()
 
 function createVideoShape() {
 	return editor.createShapesFromJsx(<TL.video ref="video1" x={0} y={0} w={160} h={90} />).video1
@@ -26,10 +27,10 @@ beforeEach(() => {
 describe('when less than two shapes are selected', () => {
 	it('does nothing', () => {
 		editor.setSelectedShapes([ids.boxB])
-		const fn = jest.fn()
+		const fn = vi.fn()
 		editor.store.listen(fn)
 		editor.stretchShapes(editor.getSelectedShapeIds(), 'horizontal')
-		jest.advanceTimersByTime(1000)
+		vi.advanceTimersByTime(1000)
 
 		expect(fn).not.toHaveBeenCalled()
 	})
@@ -39,7 +40,7 @@ describe('when multiple shapes are selected', () => {
 	it('stretches horizontally', () => {
 		editor.selectAll()
 		editor.stretchShapes(editor.getSelectedShapeIds(), 'horizontal')
-		jest.advanceTimersByTime(1000)
+		vi.advanceTimersByTime(1000)
 		editor.expectShapeToMatch(
 			{ id: ids.boxA, x: 0, y: 0, props: { w: 500 } },
 			{ id: ids.boxB, x: 0, y: 100, props: { w: 500 } },
@@ -52,7 +53,7 @@ describe('when multiple shapes are selected', () => {
 		editor.selectAll()
 		expect(editor.getSelectedShapes().length).toBe(4)
 		editor.stretchShapes(editor.getSelectedShapeIds(), 'horizontal')
-		jest.advanceTimersByTime(1000)
+		vi.advanceTimersByTime(1000)
 		const newHeight = (500 * 9) / 16
 		editor.expectShapeToMatch(
 			{ id: ids.boxA, x: 0, y: 0, props: { w: 500 } },
@@ -65,7 +66,7 @@ describe('when multiple shapes are selected', () => {
 	it('stretches vertically', () => {
 		editor.selectAll()
 		editor.stretchShapes(editor.getSelectedShapeIds(), 'vertical')
-		jest.advanceTimersByTime(1000)
+		vi.advanceTimersByTime(1000)
 		editor.expectShapeToMatch(
 			{ id: ids.boxA, x: 0, y: 0, props: { h: 500 } },
 			{ id: ids.boxB, x: 100, y: 0, props: { h: 500 } },
@@ -78,7 +79,7 @@ describe('when multiple shapes are selected', () => {
 		editor.selectAll()
 		expect(editor.getSelectedShapes().length).toBe(4)
 		editor.stretchShapes(editor.getSelectedShapeIds(), 'vertical')
-		jest.advanceTimersByTime(1000)
+		vi.advanceTimersByTime(1000)
 		const newWidth = (500 * 16) / 9
 		editor.expectShapeToMatch(
 			{ id: ids.boxA, x: 0, y: 0, props: { h: 500 } },
@@ -91,7 +92,7 @@ describe('when multiple shapes are selected', () => {
 	it('does, undoes and redoes command', () => {
 		editor.markHistoryStoppingPoint('stretch')
 		editor.stretchShapes(editor.getSelectedShapeIds(), 'horizontal')
-		jest.advanceTimersByTime(1000)
+		vi.advanceTimersByTime(1000)
 
 		editor.expectShapeToMatch({ id: ids.boxB, x: 0, props: { w: 500 } })
 		editor.undo()
@@ -106,7 +107,7 @@ describe('When shapes are the child of another shape.', () => {
 		editor.reparentShapes([ids.boxB], ids.boxA)
 		editor.select(ids.boxB, ids.boxC)
 		editor.stretchShapes(editor.getSelectedShapeIds(), 'horizontal')
-		jest.advanceTimersByTime(1000)
+		vi.advanceTimersByTime(1000)
 		editor.expectShapeToMatch(
 			{ id: ids.boxB, x: 100, y: 100, props: { w: 400 } },
 			{ id: ids.boxC, x: 100, y: 400, props: { w: 400 } }
@@ -117,7 +118,7 @@ describe('When shapes are the child of another shape.', () => {
 		editor.reparentShapes([ids.boxB], ids.boxA)
 		editor.select(ids.boxB, ids.boxC)
 		editor.stretchShapes(editor.getSelectedShapeIds(), 'vertical')
-		jest.advanceTimersByTime(1000)
+		vi.advanceTimersByTime(1000)
 		editor.expectShapeToMatch(
 			{ id: ids.boxB, x: 100, y: 100, props: { h: 400 } },
 			{ id: ids.boxC, x: 400, y: 100, props: { h: 400 } }
@@ -140,7 +141,7 @@ describe('When shapes are the child of a rotated shape.', () => {
 
 		editor.select(ids.boxA, ids.boxC)
 		editor.stretchShapes(editor.getSelectedShapeIds(), 'horizontal')
-		jest.advanceTimersByTime(1000)
+		vi.advanceTimersByTime(1000)
 		editor.expectShapeToMatch(
 			{
 				id: ids.boxA,
@@ -184,7 +185,7 @@ describe('When shapes are the child of a rotated shape.', () => {
 		editor.selectAll()
 
 		editor.stretchShapes(editor.getSelectedShapeIds(), 'vertical')
-		jest.advanceTimersByTime(1000)
+		vi.advanceTimersByTime(1000)
 		editor.expectShapeToMatch(
 			{
 				id: ids.boxA,

package/src/test/createDeepLink.test.tsx

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

package/src/test/cropping.test.ts

@@ -1,8 +1,9 @@
 import { createShapeId, TLImageShape } from '@tldraw/editor'
+import { vi } from 'vitest'
 import { MIN_CROP_SIZE } from '../lib/shapes/shared/crop'
 import { TestEditor } from './TestEditor'
 
-jest.useFakeTimers()
+vi.useFakeTimers()
 
 let editor: TestEditor
 
@@ -495,7 +496,7 @@ describe('When in the select.crop.translating_crop state', () => {
 		})
 
 		editor.keyUp('Shift')
-		jest.advanceTimersByTime(500)
+		vi.advanceTimersByTime(500)
 
 		const afterShiftUp = editor.getShape<TLImageShape>(ids.imageB)!.props.crop!
 

package/src/test/drawing.test.ts

@@ -1,8 +1,9 @@
 import { TLDrawShape, TLHighlightShape, last } from '@tldraw/editor'
+import { vi } from 'vitest'
 import { TestEditor } from './TestEditor'
 import { TEST_DRAW_SHAPE_SCREEN_POINTS } from './drawing.data'
 
-jest.useFakeTimers()
+vi.useFakeTimers()
 
 let editor: TestEditor
 

package/src/test/flipShapes.test.ts

@@ -10,12 +10,13 @@ import {
 	createBindingId,
 	createShapeId,
 } from '@tldraw/editor'
+import { vi } from 'vitest'
 import { getArrowBindings } from '../lib/shapes/arrow/shared'
 import { TestEditor } from './TestEditor'
 
 let editor: TestEditor
 
-jest.useFakeTimers()
+vi.useFakeTimers()
 
 const ids = {
 	boxA: createShapeId('boxA'),
@@ -297,7 +298,7 @@ describe('When one shape is selected', () => {
 	})
 
 	it('Flips the direct child shape positions if the shape is a group', async () => {
-		const fn = jest.fn()
+		const fn = vi.fn()
 
 		editor.selectAll()
 		editor.groupShapes(editor.getSelectedShapeIds()) // this will also select the new group
@@ -306,7 +307,7 @@ describe('When one shape is selected', () => {
 		editor.flipShapes(editor.getSelectedShapeIds(), 'horizontal')
 
 		// The change event should have been called
-		jest.runOnlyPendingTimers()
+		vi.runOnlyPendingTimers()
 		expect(fn).toHaveBeenCalled()
 
 		editor.expectShapeToMatch(

package/src/test/frames.test.ts

@@ -8,13 +8,14 @@ import {
 	createShapeId,
 	toRichText,
 } from '@tldraw/editor'
+import { vi } from 'vitest'
 import { getArrowBindings } from '../lib/shapes/arrow/shared'
 import { DEFAULT_FRAME_PADDING, fitFrameToContent, removeFrame } from '../lib/utils/frames/frames'
 import { TestEditor } from './TestEditor'
 
 let editor: TestEditor
 
-jest.useFakeTimers()
+vi.useFakeTimers()
 
 beforeEach(() => {
 	editor = new TestEditor()
@@ -335,7 +336,7 @@ describe('frame shapes', () => {
 		// move to the center of the frame
 		editor.pointerMove(100, 100)
 
-		jest.advanceTimersByTime(300)
+		vi.advanceTimersByTime(300)
 
 		// Expect the shape to be inside the frame
 		expect(editor.getOnlySelectedShape()!.id).toBe(ids.boxA)
@@ -343,13 +344,13 @@ describe('frame shapes', () => {
 
 		// Move out of the frame
 		editor.pointerMove(275, 275)
-		jest.advanceTimersByTime(250)
+		vi.advanceTimersByTime(250)
 
 		expect(editor.getOnlySelectedShape()!.parentId).toBe(editor.getCurrentPageId())
 
 		// Move back into the frame
 		editor.pointerMove(150, 150)
-		jest.advanceTimersByTime(250)
+		vi.advanceTimersByTime(250)
 
 		// Expect the shape to be inside the frame again
 		expect(editor.getOnlySelectedShape()!.parentId).toBe(frameId)
@@ -384,7 +385,7 @@ describe('frame shapes', () => {
 
 		editor.setCurrentTool('select').select(box1.id).pointerDown(127, 127).pointerMove(132, 127)
 
-		jest.advanceTimersByTime(250)
+		vi.advanceTimersByTime(250)
 
 		expect(editor.getOnlySelectedShape()!.id).toBe(box1.id)
 		if (editor.getShape(box1)?.parentId !== frame.id) {
@@ -403,14 +404,14 @@ describe('frame shapes', () => {
 		editor.pointerMove(175, 175)
 		expect(editor.getOnlySelectedShape()!.parentId).toBe(frame.id)
 
-		jest.advanceTimersByTime(250)
+		vi.advanceTimersByTime(250)
 		expect(editor.getOnlySelectedShape()!.parentId).toBe(frame.id)
 
 		// Let's try that
 		editor.pointerMove(1750, 1750)
-		jest.advanceTimersByTime(200)
+		vi.advanceTimersByTime(200)
 		editor.pointerMove(175, 175)
-		jest.advanceTimersByTime(200)
+		vi.advanceTimersByTime(200)
 
 		// yay
 		expect(editor.getHintingShapeIds()).toHaveLength(1)
@@ -958,7 +959,7 @@ describe('When dragging a shape inside a group inside a frame', () => {
 		editor.pointerMove(150, 150).pointerDown(150, 150).pointerMove(140, 140)
 
 		expect(editor.getOnlySelectedShapeId()).toBe(ids.box1)
-		jest.advanceTimersByTime(300)
+		vi.advanceTimersByTime(300)
 
 		expect(editor.getShape(ids.box1)!.parentId).toBe(ids.group1)
 	})
@@ -973,7 +974,7 @@ it('Drags into a frame', () => {
 	editor.pointerDown(550, 550)
 	editor.pointerMove(250, 250)
 
-	jest.advanceTimersByTime(200)
+	vi.advanceTimersByTime(200)
 
 	expect(editor.getShape(box1)!.parentId).toBe(frame.id)
 })
@@ -992,7 +993,7 @@ it('Allows dragging grouped shapes into frames if every shape in the group is in
 	editor.pointerDown(1100, 1100)
 	editor.pointerMove(250, 250)
 
-	jest.advanceTimersByTime(250)
+	vi.advanceTimersByTime(250)
 
 	expect(editor.getHintingShapeIds()).toMatchObject([frame.id])
 
@@ -1068,7 +1069,7 @@ describe('When dragging a shape', () => {
 		editor.pointerMove(30, 50)
 		editor.pointerUp(30, 50)
 		const parent = editor.getShape(rectId)?.parentId
-		jest.advanceTimersByTime(200)
+		vi.advanceTimersByTime(200)
 		expect(parent).toBe(frameId)
 	})
 
@@ -1185,7 +1186,7 @@ describe('Unparenting behavior', () => {
 	// 	expect(editor.getShape(rect.id)!.parentId).toBe(frame.id)
 	// 	editor.pointerDown(90, 50)
 	// 	editor.pointerMove(110, 50)
-	// 	jest.advanceTimersByTime(200)
+	// 	vi.advanceTimersByTime(200)
 	// 	expect(editor.getShape(rect.id)!.parentId).toBe(editor.getCurrentPageId())
 	// 	editor.pointerUp(110, 50)
 	// 	expect(editor.getShape(rect.id)!.parentId).toBe(editor.getCurrentPageId())
@@ -1199,7 +1200,7 @@ describe('Unparenting behavior', () => {
 		expect(editor.getShape(rect.id)!.parentId).toBe(frame.id)
 		editor.pointerDown(90, 50)
 		editor.pointerMove(110, 50)
-		jest.advanceTimersByTime(200)
+		vi.advanceTimersByTime(200)
 		expect(editor.getShape(rect.id)!.parentId).toBe(editor.getCurrentPageId())
 		editor.pointerUp(110, 50)
 		expect(editor.getShape(rect.id)!.parentId).toBe(editor.getCurrentPageId())
@@ -1299,7 +1300,7 @@ describe('Unparenting behavior', () => {
 		expect(editor.getShape(triangle.id)!.parentId).toBe(frame.id)
 
 		// But after a delay, the triangle is reparented because it's not overlapping
-		jest.advanceTimersByTime(200)
+		vi.advanceTimersByTime(200)
 		expect(editor.getShape(triangle.id)!.parentId).toBe(editor.getCurrentPageId())
 
 		editor.pointerMove(50, 50)
@@ -1308,7 +1309,7 @@ describe('Unparenting behavior', () => {
 		expect(editor.getShape(triangle.id)!.parentId).toBe(editor.getCurrentPageId())
 
 		// But after a delay, the triangle is reparented because it's overlapping
-		jest.advanceTimersByTime(200)
+		vi.advanceTimersByTime(200)
 		expect(editor.getShape(triangle.id)!.parentId).toBe(frame.id)
 	})
 
@@ -1348,12 +1349,12 @@ describe('Unparenting behavior', () => {
 			expect(editor.isIn('select.translating')).toBe(true)
 
 			// Wait for reparenting to happen
-			jest.advanceTimersByTime(250)
+			vi.advanceTimersByTime(250)
 			expect(editor.getShape(largeRect.id)!.parentId).toBe(frameId)
 
 			// The large rectangle should now be reparented to the frame, even though the frame covers it
 			editor.pointerUp(250, 250)
-			jest.advanceTimersByTime(250)
+			vi.advanceTimersByTime(250)
 		}
 
 		// When the shape has no fill and an empty label, it should fall out of the frame
@@ -1503,7 +1504,7 @@ describe('When dragging groups or shapes within a group', () => {
 		editor.pointerDown(1100, 1100)
 		editor.pointerMove(250, 250)
 
-		jest.advanceTimersByTime(200)
+		vi.advanceTimersByTime(200)
 
 		expect(editor.getShape(group)!.parentId).toBe(frame.id)
 	})
@@ -1526,14 +1527,14 @@ describe('When dragging groups or shapes within a group', () => {
 		editor.select(rect1ID)
 		editor.pointerDown(15, 15)
 		editor.pointerMove(100, 100)
-		jest.advanceTimersByTime(200)
+		vi.advanceTimersByTime(200)
 
 		expect(editor.getShape(rect1ID)?.parentId).toBe(group.id)
 		expect(editor.getShape(rect2ID)?.parentId).toBe(group.id)
 		expect(group.parentId).toBe(frame.id)
 
 		editor.pointerUp(100, 100)
-		jest.advanceTimersByTime(200)
+		vi.advanceTimersByTime(200)
 
 		expect(editor.getShape(rect1ID)?.parentId).toBe(group.id)
 		expect(editor.getShape(rect2ID)?.parentId).toBe(group.id)
@@ -1558,7 +1559,7 @@ describe('When dragging groups or shapes within a group', () => {
 		editor.pointerDown(15, 15)
 		editor.pointerMove(200, 200)
 
-		jest.advanceTimersByTime(200)
+		vi.advanceTimersByTime(200)
 		expect(editor.getShape(rect1ID)?.parentId).toBe(group.id)
 		expect(editor.getShape(rect2ID)?.parentId).toBe(group.id)
 		expect(editor.getShape(group.id)?.parentId).toBe(editor.getCurrentPageId())
@@ -1587,7 +1588,7 @@ describe('When dragging groups or shapes within a group', () => {
 		editor.pointerDown(15, 15)
 		editor.pointerMove(200, 200)
 
-		jest.advanceTimersByTime(200)
+		vi.advanceTimersByTime(200)
 		expect(editor.getShape(rect1ID)?.parentId).toBe(group.id)
 		expect(editor.getShape(rect2ID)?.parentId).toBe(group.id)
 		expect(editor.getShape(group.id)?.parentId).toBe(editor.getCurrentPageId())
@@ -1638,7 +1639,7 @@ describe('When dragging groups or shapes within a group', () => {
 		editor.pointerDown(215, 215)
 		editor.pointerMove(15, 15)
 
-		jest.advanceTimersByTime(200)
+		vi.advanceTimersByTime(200)
 		expect(editor.getShape(rect1ID)?.parentId).toBe(group.id)
 		expect(editor.getShape(rect2ID)?.parentId).toBe(group.id)
 		expect(editor.getShape(group.id)?.parentId).toBe(frameID)

package/src/test/getCulledShapes.test.tsx

@@ -1,4 +1,5 @@
 import { Box, TLShapeId, createShapeId } from '@tldraw/editor'
+import { vi } from 'vitest'
 import { TestEditor } from './TestEditor'
 import { TL } from './test-jsx'
 
@@ -28,13 +29,13 @@ it('lists shapes in viewport', () => {
 
 	// Move the camera 201 pixels to the right and 201 pixels down
 	editor.pan({ x: -201, y: -201 })
-	jest.advanceTimersByTime(500)
+	vi.advanceTimersByTime(500)
 
 	// A is now outside of the viewport, like D
 	expect(editor.getCulledShapes()).toStrictEqual(new Set([ids.A, ids.D]))
 
 	editor.pan({ x: -900, y: -900 })
-	jest.advanceTimersByTime(500)
+	vi.advanceTimersByTime(500)
 	// Now all shapes are outside of the viewport, except for D (which is clipped)
 	expect(editor.getCulledShapes()).toStrictEqual(new Set([ids.A, ids.B, ids.C]))
 

package/src/test/groups.test.tsx

@@ -1070,7 +1070,7 @@ describe('the select tool', () => {
 		// that we're doing hit testing manually—we'll catch that it was inside a shape
 
 		// editor.keyUp('Shift')
-		// jest.advanceTimersByTime(200)
+		// vi.advanceTimersByTime(200)
 
 		// expect(editor.selectedShapeIds.includes(ids.boxA)).toBe(false)
 		// expect(editor.selectedShapeIds.includes(ids.boxB)).toBe(true)

package/src/test/handleDeepLink.test.tsx

@@ -1,8 +1,9 @@
 import { PageRecordType, TLDeepLink, createDeepLinkString, createShapeId } from '@tldraw/editor'
+import { vi } from 'vitest'
 import { TestEditor } from './TestEditor'
 import { TL } from './test-jsx'
 
-jest.useFakeTimers()
+vi.useFakeTimers()
 
 let editor: TestEditor