tldraw 3.16.0-canary.e9c30b532b82 → 3.16.0-canary.eb473ba53051

package/src/test/getCulledShapes.test.tsx

@@ -1,11 +1,50 @@
-import { Box, TLShapeId, createShapeId } from '@tldraw/editor'
+import {
+	BaseBoxShapeUtil,
+	Box,
+	RecordProps,
+	T,
+	TLBaseShape,
+	TLShapeId,
+	createShapeId,
+} from '@tldraw/editor'
+import { vi } from 'vitest'
 import { TestEditor } from './TestEditor'
 import { TL } from './test-jsx'
 
+// Custom uncullable shape type for testing canCull override
+type UncullableShape = TLBaseShape<'uncullable', { w: number; h: number }>
+
+class UncullableShapeUtil extends BaseBoxShapeUtil<UncullableShape> {
+	static override type = 'uncullable' as const
+	static override props: RecordProps<UncullableShape> = {
+		w: T.number,
+		h: T.number,
+	}
+
+	override canCull() {
+		return false
+	}
+
+	override getDefaultProps(): UncullableShape['props'] {
+		return {
+			w: 100,
+			h: 100,
+		}
+	}
+
+	override component() {
+		return <div>Uncullable shape</div>
+	}
+
+	override indicator() {
+		return <div>Uncullable shape</div>
+	}
+}
+
 let editor: TestEditor
 
 beforeEach(() => {
-	editor = new TestEditor()
+	editor = new TestEditor({ shapeUtils: [UncullableShapeUtil] })
 	editor.setScreenBounds({ x: 0, y: 0, w: 1800, h: 900 })
 })
 
@@ -28,13 +67,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]))
 
@@ -202,3 +241,34 @@ it('works for shapes that are outside of the viewport, but are then moved inside
 	// Arrow should also not be culled
 	expect(editor.getCulledShapes()).toEqual(new Set())
 })
+
+it('respects canCull override - shapes that cannot be culled are never culled', () => {
+	const cullableShapeId = createShapeId()
+	const uncullableShapeId = createShapeId()
+
+	// Create both shapes outside the viewport
+	editor.createShapes([
+		{
+			id: cullableShapeId,
+			type: 'geo',
+			x: -2000, // Way outside viewport
+			y: -2000,
+			props: { w: 100, h: 100 },
+		},
+		{
+			id: uncullableShapeId,
+			type: 'uncullable',
+			x: -2000, // Way outside viewport
+			y: -2000,
+			props: { w: 100, h: 100 },
+		},
+	])
+
+	const culledShapes = editor.getCulledShapes()
+
+	// The regular geo shape should be culled since it's outside the viewport
+	expect(culledShapes).toContain(cullableShapeId)
+
+	// The uncullable shape should NOT be culled even though it's outside the viewport
+	expect(culledShapes).not.toContain(uncullableShapeId)
+})

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
 

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)
 })

package/src/test/resizing.test.ts

@@ -15,12 +15,13 @@ import {
 	rotateSelectionHandle,
 	toRichText,
 } from '@tldraw/editor'
+import { vi } from 'vitest'
 import { NoteShapeUtil } from '../lib/shapes/note/NoteShapeUtil'
 import { TestEditor } from './TestEditor'
 import { getSnapLines } from './getSnapLines'
 import { roundedBox } from './roundedBox'
 
-jest.useFakeTimers()
+vi.useFakeTimers()
 
 const ORDERED_ROTATE_CORNERS: TLSelectionHandle[] = [
 	'top_left_rotate',
@@ -544,7 +545,7 @@ describe('Reisizing a selection of multiple shapes', () => {
 		// └──────────────────O
 
 		editor.pointerMove(15, 8, { altKey: false, shiftKey: true })
-		jest.advanceTimersByTime(200)
+		vi.advanceTimersByTime(200)
 
 		expect(roundedBox(editor.getSelectionPageBounds()!)).toMatchObject({ w: 15, h: 15 })
 		expect(roundedPageBounds(ids.boxA)).toMatchObject({ x: 0, y: 0, w: 5, h: 5 })
@@ -593,7 +594,7 @@ describe('Reisizing a selection of multiple shapes', () => {
 		editor.pointerDown(30, 20, { target: 'selection', handle: 'top_left_rotate' })
 		editor.pointerMove(20, 20, { shiftKey: true })
 		editor.pointerUp(20, 20, { shiftKey: false })
-		jest.advanceTimersByTime(200)
+		vi.advanceTimersByTime(200)
 
 		expect(editor.getShape(ids.boxB)!.rotation).toBeCloseTo(canonicalizeRotation(-PI / 2))
 
@@ -740,7 +741,7 @@ describe('Reisizing a selection of multiple shapes', () => {
 		// └──────────────────O
 
 		editor.pointerMove(15, 8, { altKey: false, shiftKey: true })
-		jest.advanceTimersByTime(200)
+		vi.advanceTimersByTime(200)
 
 		expect(roundedBox(editor.getSelectionPageBounds()!)).toMatchObject({ w: 15, h: 15 })
 		expect(roundedPageBounds(ids.boxA)).toMatchObject({ x: 0, y: 0, w: 5, h: 5 })
@@ -2364,7 +2365,7 @@ describe('snapping while resizing a shape that has been rotated by multiples of
 			.select(ids.boxX)
 			.pointerDown(100, 70, { target: 'selection', handle: 'top' })
 			.pointerMove(121, 70, { ctrlKey: true, shiftKey: false })
-		jest.advanceTimersByTime(200)
+		vi.advanceTimersByTime(200)
 
 		expect(editor.getShapePageBounds(ids.boxX)!).toMatchObject({
 			x: 40,
@@ -2432,7 +2433,7 @@ describe('snapping while resizing a shape that has been rotated by multiples of
 			.select(ids.boxX)
 			.pointerDown(70, 40, { target: 'selection', handle: 'bottom' })
 			.pointerMove(70, 18, { ctrlKey: true, shiftKey: false })
-		jest.advanceTimersByTime(200)
+		vi.advanceTimersByTime(200)
 
 		expect(editor.getShapePageBounds(ids.boxX)!.x).toBeCloseTo(40)
 		expect(editor.getShapePageBounds(ids.boxX)!.y).toBeCloseTo(20)
@@ -2564,7 +2565,7 @@ describe('snapping while resizing a shape that has been rotated by multiples of
 			.select(ids.boxX)
 			.pointerDown(100, 70, { target: 'selection', handle: 'right' })
 			.pointerMove(121, 70, { ctrlKey: true, shiftKey: false })
-		jest.advanceTimersByTime(200)
+		vi.advanceTimersByTime(200)
 
 		expect(editor.getShapePageBounds(ids.boxX)!.x).toBeCloseTo(40)
 		expect(editor.getShapePageBounds(ids.boxX)!.y).toBeCloseTo(40)
@@ -3824,36 +3825,36 @@ describe('shapes that have do not resize', () => {
 //   })
 // })
 
-describe('bugs', () => {
-	// it('resizing a zero width shape', () => {
-	//	// Draw shapes can no longer have zero width / height
-	// 	const shapeId = createShapeId()
-	// 	app
-	// 		.createShapes([
-	// 			{
-	// 				id: shapeId,
-	// 				type: 'draw',
-	// 				x: 0,
-	// 				y: 0,
-	// 				props: {
-	// 					segments: [
-	// 						{
-	// 							type: 'straight',
-	// 							points: [
-	// 								{ x: 0, y: 0 },
-	// 								{ x: 0, y: 100 },
-	// 							],
-	// 						},
-	// 					],
-	// 				},
-	// 			},
-	// 		])
-	// 		.select(shapeId)
-	// 	expect(editor.selectionRotatedBounds!.width).toBe(0)
-	// 	editor.pointerDown(0, 100, { target: 'selection', handle: 'bottom_right' }).pointerMove(10, 110)
-	// 	expect(editor.selectionRotatedBounds!.width).toBe(0)
-	// })
-})
+// describe('bugs', () => {
+// it('resizing a zero width shape', () => {
+//	// Draw shapes can no longer have zero width / height
+// 	const shapeId = createShapeId()
+// 	app
+// 		.createShapes([
+// 			{
+// 				id: shapeId,
+// 				type: 'draw',
+// 				x: 0,
+// 				y: 0,
+// 				props: {
+// 					segments: [
+// 						{
+// 							type: 'straight',
+// 							points: [
+// 								{ x: 0, y: 0 },
+// 								{ x: 0, y: 100 },
+// 							],
+// 						},
+// 					],
+// 				},
+// 			},
+// 		])
+// 		.select(shapeId)
+// 	expect(editor.selectionRotatedBounds!.width).toBe(0)
+// 	editor.pointerDown(0, 100, { target: 'selection', handle: 'bottom_right' }).pointerMove(10, 110)
+// 	expect(editor.selectionRotatedBounds!.width).toBe(0)
+// })
+// })
 
 it('uses the cross cursor when create resizing', () => {
 	editor.setCurrentTool('geo')
@@ -3942,7 +3943,7 @@ describe('When resizing near the edges of the screen', () => {
 				handle: 'top_left',
 			})
 			.pointerMove(-1, -1) // into the edge scrolling distance
-		jest.advanceTimersByTime(1000)
+		vi.advanceTimersByTime(1000)
 		const after = editor.getShape<TLGeoShape>(ids.boxA)!
 		expect(after.x).toBeLessThan(before.x)
 		expect(after.y).toBeLessThan(before.y)

package/src/test/select.test.tsx

@@ -1,3 +1,4 @@
+import { vi } from 'vitest'
 import { SelectTool } from '../lib/tools/SelectTool/SelectTool'
 import { TestEditor } from './TestEditor'
 import { TL } from './test-jsx'
@@ -28,12 +29,12 @@ describe(SelectTool, () => {
 			// clicking on the input will preserve selection, however you can
 			// click on the shape itself to select it as usual.
 			// clicking on the shape should not do anything
-			// jest.advanceTimersByTime(1000)
+			// vi.advanceTimersByTime(1000)
 			// editor.pointerDown(50, 50, shapeId)
 			// expect(editor.currentPageState.editingShapeId).toBe(shapeId)
 
 			// clicking outside the shape should end editing
-			jest.advanceTimersByTime(1000)
+			vi.advanceTimersByTime(1000)
 
 			editor.pointerDown(150, 150).pointerUp()
 			expect(editor.getCurrentPageState().editingShapeId).toBe(null)
@@ -51,7 +52,7 @@ describe(SelectTool, () => {
 		expect(editor.getCurrentPageState().editingShapeId).toBe(shapeId)
 
 		// clicking outside the shape should end editing
-		jest.advanceTimersByTime(1000)
+		vi.advanceTimersByTime(1000)
 
 		editor.pointerDown(150, 150).pointerUp()
 		expect(editor.getCurrentPageState().editingShapeId).toBe(null)

package/src/test/selection-omnibus.test.ts

@@ -7,6 +7,7 @@ import {
 	tlenv,
 	toRichText,
 } from '@tldraw/editor'
+import { vi } from 'vitest'
 import { TestEditor } from './TestEditor'
 
 let editor: TestEditor
@@ -1652,7 +1653,7 @@ describe('shift brushes to add to the selection', () => {
 		editor.keyUp('Shift')
 		// there's a timer here—we should keep the shift mode until the timer expires
 		expect(editor.getSelectedShapeIds()).toEqual([ids.box2, ids.box1])
-		jest.advanceTimersByTime(500)
+		vi.advanceTimersByTime(500)
 		// once the timer expires, we should be back in regular mode
 		expect(editor.getSelectedShapeIds()).toEqual([ids.box1])
 		editor.keyDown('Shift')
@@ -1722,7 +1723,7 @@ describe('scribble brushes to add to the selection', () => {
 		editor.pointerMove(50, 50)
 		expect(editor.getSelectedShapeIds()).toEqual([ids.box1, ids.box2])
 		editor.keyUp('Shift')
-		jest.advanceTimersByTime(500)
+		vi.advanceTimersByTime(500)
 		expect(editor.getSelectedShapeIds()).toEqual([ids.box1])
 		editor.keyDown('Shift')
 		expect(editor.getSelectedShapeIds()).toEqual([ids.box1, ids.box2])
@@ -1739,7 +1740,7 @@ describe('scribble brushes to add to the selection', () => {
 		expect(editor.getSelectedShapeIds()).toEqual([ids.box4])
 		editor.keyUp('Alt') // scribble
 		expect(editor.getSelectedShapeIds()).toEqual([ids.box4]) // still in timer
-		jest.advanceTimersByTime(1000) // let timer expire
+		vi.advanceTimersByTime(1000) // let timer expire
 		expect(editor.getSelectedShapeIds()).toEqual([ids.box3, ids.box4]) // brushed!
 		editor.keyDown('Alt') // scribble
 		expect(editor.getSelectedShapeIds()).toEqual([ids.box4]) // back to brushed only
@@ -1824,7 +1825,7 @@ describe('When brushing close to the edges of the screen', () => {
 		editor.pointerMove(300, 300)
 		editor.pointerDown()
 		editor.pointerMove(0, 0)
-		jest.advanceTimersByTime(100)
+		vi.advanceTimersByTime(100)
 		editor.pointerUp()
 		const camera2 = editor.getCamera()
 		expect(camera2.x).toBeGreaterThan(camera1.x) // for some reason > is left
@@ -1837,7 +1838,7 @@ describe('When brushing close to the edges of the screen', () => {
 		editor.pointerMove(300, 300)
 		editor.pointerDown()
 		editor.pointerMove(100, 100)
-		jest.advanceTimersByTime(100)
+		vi.advanceTimersByTime(100)
 		editor.pointerUp()
 		const camera2 = editor.getCamera()
 		// should NOT have moved the camera by edge scrolling
@@ -1851,7 +1852,7 @@ describe('When brushing close to the edges of the screen', () => {
 		editor.pointerMove(300, 300)
 		editor.pointerDown()
 		editor.pointerMove(100, 100)
-		jest.advanceTimersByTime(100)
+		vi.advanceTimersByTime(100)
 		editor.pointerUp()
 		const camera4 = editor.getCamera()
 		// should NOT have moved the camera by edge scrolling because the edge is now "inset"
@@ -1860,7 +1861,7 @@ describe('When brushing close to the edges of the screen', () => {
 
 		editor.pointerDown()
 		editor.pointerMove(90, 90) // off the edge of the component
-		jest.advanceTimersByTime(100)
+		vi.advanceTimersByTime(100)
 		const camera5 = editor.getCamera()
 		// should have moved the camera by edge scrolling off the component edge
 		expect(camera5.x).toBeGreaterThan(camera4.x)
@@ -1882,7 +1883,7 @@ describe('When brushing close to the edges of the screen', () => {
 		editor.pointerMove(0, 0)
 		// still only box 1...
 		expect(editor.getSelectedShapeIds()).toEqual([ids.box1])
-		jest.advanceTimersByTime(100)
+		vi.advanceTimersByTime(100)
 		// ...but now viewport will have moved to select box2 as well
 		expect(editor.getSelectedShapeIds()).toEqual([ids.box1, ids.box2])
 		editor.pointerUp()
@@ -1902,7 +1903,7 @@ describe('When brushing close to the edges of the screen', () => {
 		expect(editor.getSelectedShapeIds()).toEqual([ids.box1])
 		editor.pointerMove(0, 0)
 		expect(editor.getSelectedShapeIds()).toEqual([ids.box1])
-		jest.advanceTimersByTime(100)
+		vi.advanceTimersByTime(100)
 		expect(editor.getSelectedShapeIds()).toEqual([ids.box1])
 		editor.pointerUp()
 	})
@@ -2199,7 +2200,7 @@ describe('long press', () => {
 	it('works correctly with screenbounds offset', () => {
 		editor.updateViewportScreenBounds(new Box(100, 100, 800, 600))
 		editor.pointerDown(201, 202)
-		jest.advanceTimersByTime(1000)
+		vi.advanceTimersByTime(1000)
 		// without the fix added in this PR, it would have been 1, 2
 		expect(editor.inputs.currentScreenPoint).toMatchObject({ x: 101, y: 102 })
 	})