tldraw 3.16.0-next.282b7be564ae → 3.16.0-next.2f9d39693e4c

package/src/test/commands/alignShapes.test.tsx

@@ -1,11 +1,12 @@
 import { Box, 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()
 
 beforeEach(() => {
 	editor = new TestEditor()
@@ -22,10 +23,10 @@ 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.alignShapes(editor.getSelectedShapeIds(), 'top')
-		jest.advanceTimersByTime(1000)
+		vi.advanceTimersByTime(1000)
 		expect(fn).not.toHaveBeenCalled()
 	})
 })
@@ -34,7 +35,7 @@ describe('when multiple shapes are selected', () => {
 	it('does, undoes and redoes command', () => {
 		editor.markHistoryStoppingPoint('align')
 		editor.alignShapes(editor.getSelectedShapeIds(), 'top')
-		jest.advanceTimersByTime(1000)
+		vi.advanceTimersByTime(1000)
 
 		editor.expectShapeToMatch({ id: ids.boxB, y: 0 })
 		editor.undo()
@@ -45,7 +46,7 @@ describe('when multiple shapes are selected', () => {
 
 	it('aligns top', () => {
 		editor.alignShapes(editor.getSelectedShapeIds(), 'top')
-		jest.advanceTimersByTime(1000)
+		vi.advanceTimersByTime(1000)
 
 		editor.expectShapeToMatch(
 			{ id: ids.boxA, y: 0 },
@@ -56,7 +57,7 @@ describe('when multiple shapes are selected', () => {
 
 	it('aligns right', () => {
 		editor.alignShapes(editor.getSelectedShapeIds(), 'right')
-		jest.advanceTimersByTime(1000)
+		vi.advanceTimersByTime(1000)
 
 		editor.expectShapeToMatch(
 			{ id: ids.boxA, x: 400 },
@@ -67,7 +68,7 @@ describe('when multiple shapes are selected', () => {
 
 	it('aligns bottom', () => {
 		editor.alignShapes(editor.getSelectedShapeIds(), 'bottom')
-		jest.advanceTimersByTime(1000)
+		vi.advanceTimersByTime(1000)
 
 		editor.expectShapeToMatch(
 			{ id: ids.boxA, y: 400 },
@@ -78,7 +79,7 @@ describe('when multiple shapes are selected', () => {
 
 	it('aligns left', () => {
 		editor.alignShapes(editor.getSelectedShapeIds(), 'left')
-		jest.advanceTimersByTime(1000)
+		vi.advanceTimersByTime(1000)
 
 		editor.expectShapeToMatch(
 			{ id: ids.boxA, x: 0 },
@@ -89,7 +90,7 @@ describe('when multiple shapes are selected', () => {
 
 	it('aligns center horizontal', () => {
 		editor.alignShapes(editor.getSelectedShapeIds(), 'center-horizontal')
-		jest.advanceTimersByTime(1000)
+		vi.advanceTimersByTime(1000)
 
 		editor.expectShapeToMatch(
 			{ id: ids.boxA, x: 200 },
@@ -100,7 +101,7 @@ describe('when multiple shapes are selected', () => {
 
 	it('aligns center vertical', () => {
 		editor.alignShapes(editor.getSelectedShapeIds(), 'center-vertical')
-		jest.advanceTimersByTime(1000)
+		vi.advanceTimersByTime(1000)
 
 		editor.expectShapeToMatch(
 			{ id: ids.boxA, y: 200 },
@@ -129,9 +130,9 @@ describe('when multiple shapes are selected', () => {
 		])
 
 		editor.alignShapes(editor.getSelectedShapeIds(), 'center-vertical')
-		jest.advanceTimersByTime(1000)
+		vi.advanceTimersByTime(1000)
 		editor.alignShapes(editor.getSelectedShapeIds(), 'center-horizontal')
-		jest.advanceTimersByTime(1000)
+		vi.advanceTimersByTime(1000)
 
 		const commonBounds = Box.Common([
 			editor.getShapePageBounds(ids.boxA)!,
@@ -168,9 +169,9 @@ describe('when multiple shapes are selected', () => {
 		])
 
 		editor.alignShapes(editor.getSelectedShapeIds(), 'top')
-		jest.advanceTimersByTime(1000)
+		vi.advanceTimersByTime(1000)
 		editor.alignShapes(editor.getSelectedShapeIds(), 'left')
-		jest.advanceTimersByTime(1000)
+		vi.advanceTimersByTime(1000)
 
 		const commonBounds = Box.Common([
 			editor.getShapePageBounds(ids.boxA)!,
@@ -208,9 +209,9 @@ describe('when multiple shapes are selected', () => {
 
 		editor.setSelectedShapes([ids.boxA, ids.boxB, ids.boxC])
 		editor.alignShapes(editor.getSelectedShapeIds(), 'bottom')
-		jest.advanceTimersByTime(1000)
+		vi.advanceTimersByTime(1000)
 		editor.alignShapes(editor.getSelectedShapeIds(), 'right')
-		jest.advanceTimersByTime(1000)
+		vi.advanceTimersByTime(1000)
 
 		const commonBounds = Box.Common([
 			editor.getShapePageBounds(ids.boxA)!,
@@ -251,9 +252,9 @@ describe('When shapes are parented to other shapes...', () => {
 		])
 
 		editor.alignShapes(editor.getSelectedShapeIds(), 'top')
-		jest.advanceTimersByTime(1000)
+		vi.advanceTimersByTime(1000)
 		editor.alignShapes(editor.getSelectedShapeIds(), 'left')
-		jest.advanceTimersByTime(1000)
+		vi.advanceTimersByTime(1000)
 
 		const commonBoundsAfter = Box.Common([
 			editor.getShapePageBounds(ids.boxC)!,
@@ -273,9 +274,9 @@ describe('When shapes are parented to other shapes...', () => {
 		])
 
 		editor.alignShapes(editor.getSelectedShapeIds(), 'bottom')
-		jest.advanceTimersByTime(1000)
+		vi.advanceTimersByTime(1000)
 		editor.alignShapes(editor.getSelectedShapeIds(), 'right')
-		jest.advanceTimersByTime(1000)
+		vi.advanceTimersByTime(1000)
 
 		const commonBoundsAfter = Box.Common([
 			editor.getShapePageBounds(ids.boxC)!,
@@ -339,9 +340,9 @@ describe('When shapes are parented to a rotated shape...', () => {
 		])
 
 		editor.alignShapes(editor.getSelectedShapeIds(), 'top')
-		jest.advanceTimersByTime(1000)
+		vi.advanceTimersByTime(1000)
 		editor.alignShapes(editor.getSelectedShapeIds(), 'left')
-		jest.advanceTimersByTime(1000)
+		vi.advanceTimersByTime(1000)
 
 		const commonBoundsAfter = Box.Common([
 			editor.getShapePageBounds(ids.boxC)!,
@@ -367,9 +368,9 @@ describe('When shapes are parented to a rotated shape...', () => {
 		])
 
 		editor.alignShapes(editor.getSelectedShapeIds(), 'bottom')
-		jest.advanceTimersByTime(1000)
+		vi.advanceTimersByTime(1000)
 		editor.alignShapes(editor.getSelectedShapeIds(), 'right')
-		jest.advanceTimersByTime(1000)
+		vi.advanceTimersByTime(1000)
 
 		const commonBoundsAfter = Box.Common([
 			editor.getShapePageBounds(ids.boxC)!,

package/src/test/commands/animationSpeed.test.ts

@@ -1,3 +1,4 @@
+import { vi } from 'vitest'
 import { TestEditor } from '../TestEditor'
 
 let editor: TestEditor
@@ -6,7 +7,7 @@ beforeEach(() => {
 	editor = new TestEditor()
 })
 
-jest.useFakeTimers()
+vi.useFakeTimers()
 
 it('zooms in gradually when duration is present and animtion speed is default', () => {
 	expect(editor.getZoomLevel()).toBe(1)

package/src/test/commands/centerOnPoint.test.ts

@@ -1,3 +1,4 @@
+import { vi } from 'vitest'
 import { TestEditor } from '../TestEditor'
 
 let editor: TestEditor
@@ -14,9 +15,9 @@ it('centers on the point', () => {
 it('centers on the point with animation', () => {
 	editor.centerOnPoint({ x: 400, y: 400 }, { animation: { duration: 200 } })
 	expect(editor.getViewportPageCenter()).not.toMatchObject({ x: 400, y: 400 })
-	jest.advanceTimersByTime(100)
+	vi.advanceTimersByTime(100)
 	expect(editor.getViewportPageCenter()).not.toMatchObject({ x: 400, y: 400 })
-	jest.advanceTimersByTime(200)
+	vi.advanceTimersByTime(200)
 	expect(editor.getViewportPageCenter()).toMatchObject({ x: 400, y: 400 })
 })
 

package/src/test/commands/clipboard.test.ts

@@ -1,4 +1,5 @@
 import { createShapeId, TLArrowShape } from '@tldraw/editor'
+import { vi } from 'vitest'
 import { getArrowBindings } from '../../lib/shapes/arrow/shared'
 import { TestEditor } from '../TestEditor'
 
@@ -27,13 +28,13 @@ const doMockClipboard = () => {
 
 	Object.assign(window.navigator, {
 		clipboard: {
-			write: jest.fn((content: any) => {
+			write: vi.fn((content: any) => {
 				context.current = content
 			}),
 		},
 	})
 
-	globalThis.ClipboardItem = jest.fn((payload: any) => payload) as any
+	globalThis.ClipboardItem = vi.fn((payload: any) => payload) as any
 
 	return context
 }

package/src/test/commands/createShapes.test.ts

@@ -1,4 +1,5 @@
 import { DefaultColorStyle, TLArrowShape, TLGeoShape, createShapeId } from '@tldraw/editor'
+import { vi } from 'vitest'
 import { TestEditor } from '../TestEditor'
 
 let editor: TestEditor
@@ -126,7 +127,7 @@ it('Throws out all shapes if any shape is invalid', () => {
 
 	expect(editor.getCurrentPageShapeIds().size).toBe(n + 1)
 
-	console.error = jest.fn()
+	console.error = vi.fn()
 
 	// But these will need to be thrown out
 	expect(() => {

package/src/test/commands/deleteShapes.test.ts

@@ -1,4 +1,5 @@
 import { createBindingId, createShapeId } from '@tldraw/editor'
+import { vi } from 'vitest'
 import { getArrowBindings } from '../../lib/shapes/arrow/shared'
 import { TestEditor } from '../TestEditor'
 
@@ -12,7 +13,7 @@ const ids = {
 	arrow1: createShapeId('arrow1'),
 }
 
-jest.useFakeTimers()
+vi.useFakeTimers()
 
 beforeEach(() => {
 	editor = new TestEditor()

package/src/test/commands/distributeShapes.test.tsx

@@ -1,8 +1,9 @@
 import { PI, TLShapeId, createShapeId } from '@tldraw/editor'
+import { vi } from 'vitest'
 import { TestEditor } from '../TestEditor'
 import { TL } from '../test-jsx'
 
-jest.useFakeTimers()
+vi.useFakeTimers()
 
 let editor: TestEditor
 
@@ -46,10 +47,10 @@ describe('distributeShapes command', () => {
 	describe('when less than three shapes are selected', () => {
 		it('does nothing', () => {
 			editor.setSelectedShapes([ids.boxA, ids.boxB])
-			const fn = jest.fn()
+			const fn = vi.fn()
 			editor.store.listen(fn)
 			editor.distributeShapes(editor.getSelectedShapeIds(), 'horizontal')
-			jest.advanceTimersByTime(1000)
+			vi.advanceTimersByTime(1000)
 			expect(fn).not.toHaveBeenCalled()
 		})
 	})
@@ -58,7 +59,7 @@ describe('distributeShapes command', () => {
 		it('distributeShapes horizontally', () => {
 			editor.selectAll()
 			editor.distributeShapes(editor.getSelectedShapeIds(), 'horizontal')
-			jest.advanceTimersByTime(1000)
+			vi.advanceTimersByTime(1000)
 			editor.expectShapeToMatch(
 				{ id: ids.boxA, x: 0 },
 				{ id: ids.boxB, x: 200 },
@@ -70,7 +71,7 @@ describe('distributeShapes command', () => {
 			editor.updateShapes([{ id: ids.boxC, type: 'geo', x: 25 }])
 			editor.selectAll()
 			editor.distributeShapes(editor.getSelectedShapeIds(), 'horizontal')
-			jest.advanceTimersByTime(1000)
+			vi.advanceTimersByTime(1000)
 			editor.expectShapeToMatch(
 				{ id: ids.boxA, x: 0 },
 				{ id: ids.boxB, x: 100 },
@@ -81,7 +82,7 @@ describe('distributeShapes command', () => {
 		it('distributeShapes vertically', () => {
 			editor.selectAll()
 			editor.distributeShapes(editor.getSelectedShapeIds(), 'vertical')
-			jest.advanceTimersByTime(1000)
+			vi.advanceTimersByTime(1000)
 			editor.expectShapeToMatch(
 				{ id: ids.boxA, y: 0 },
 				{ id: ids.boxB, y: 200 },
@@ -93,7 +94,7 @@ describe('distributeShapes command', () => {
 			editor.updateShapes([{ id: ids.boxC, type: 'geo', y: 25 }])
 			editor.selectAll()
 			editor.distributeShapes(editor.getSelectedShapeIds(), 'vertical')
-			jest.advanceTimersByTime(1000)
+			vi.advanceTimersByTime(1000)
 			editor.expectShapeToMatch(
 				{ id: ids.boxA, y: 0 },
 				{ id: ids.boxB, y: 100 },
@@ -135,7 +136,7 @@ describe('distributeShapes command', () => {
 		editor.setSelectedShapes([ids.boxB, ids.boxC, ids.boxD])
 
 		editor.distributeShapes(editor.getSelectedShapeIds(), 'horizontal')
-		jest.advanceTimersByTime(1000)
+		vi.advanceTimersByTime(1000)
 
 		editor.expectShapeToMatch(
 			{ id: ids.boxB, x: 100 },
@@ -177,7 +178,7 @@ describe('distributeShapes command', () => {
 		editor.setSelectedShapes([ids.boxB, ids.boxC, ids.boxD])
 
 		editor.distributeShapes(editor.getSelectedShapeIds(), 'horizontal')
-		jest.advanceTimersByTime(1000)
+		vi.advanceTimersByTime(1000)
 
 		editor.expectShapeToMatch(
 			{ id: ids.boxB, x: 100 },
@@ -222,7 +223,7 @@ describe('distributeShapes command', () => {
 		editor.setSelectedShapes([ids.boxB, ids.boxC, ids.boxD])
 
 		editor.distributeShapes(editor.getSelectedShapeIds(), 'horizontal')
-		jest.advanceTimersByTime(1000)
+		vi.advanceTimersByTime(1000)
 
 		editor.expectShapeToMatch(
 			{ id: ids.boxB, x: 100 },

package/src/test/commands/getSvgString.test.ts

@@ -1,4 +1,5 @@
 import { DefaultDashStyle, TLGeoShape, createShapeId, toRichText } from '@tldraw/editor'
+import { vi } from 'vitest'
 import { TestEditor } from '../TestEditor'
 
 let editor: TestEditor
@@ -14,7 +15,7 @@ function parseSvg({ svg }: { svg: string } = { svg: '' }) {
 	return parser.parseFromString(svg, 'image/svg+xml').firstElementChild as SVGSVGElement
 }
 
-jest.useRealTimers()
+vi.useRealTimers()
 
 beforeEach(() => {
 	editor = new TestEditor()

package/src/test/commands/packShapes.test.ts

@@ -1,4 +1,5 @@
 import { createShapeId } from '@tldraw/editor'
+import { vi } from 'vitest'
 import { TestEditor } from '../TestEditor'
 
 let editor: TestEditor
@@ -10,7 +11,7 @@ const ids = {
 	boxD: createShapeId('boxD'),
 }
 
-jest.useFakeTimers()
+vi.useFakeTimers()
 
 beforeEach(() => {
 	editor = new TestEditor()
@@ -45,7 +46,7 @@ describe('editor.packShapes', () => {
 		editor.selectAll()
 		const centerBefore = editor.getSelectionRotatedPageBounds()!.center.clone()
 		editor.packShapes(editor.getSelectedShapeIds())
-		jest.advanceTimersByTime(1000)
+		vi.advanceTimersByTime(1000)
 		expect(
 			editor.getCurrentPageShapes().map((s) => ({ ...s, parentId: 'wahtever' }))
 		).toMatchSnapshot('packed shapes')
@@ -57,7 +58,7 @@ describe('editor.packShapes', () => {
 		editor.selectAll()
 		const centerBefore = editor.getSelectionRotatedPageBounds()!.center.clone()
 		editor.packShapes(editor.getSelectedShapeIds(), 16)
-		jest.advanceTimersByTime(1000)
+		vi.advanceTimersByTime(1000)
 		expect(
 			editor.getCurrentPageShapes().map((s) => ({ ...s, parentId: 'wahtever' }))
 		).toMatchSnapshot('packed shapes')
@@ -68,7 +69,7 @@ describe('editor.packShapes', () => {
 	it('packs rotated shapes', () => {
 		editor.updateShapes([{ id: ids.boxA, type: 'geo', rotation: Math.PI }])
 		editor.selectAll().packShapes(editor.getSelectedShapeIds(), 16)
-		jest.advanceTimersByTime(1000)
+		vi.advanceTimersByTime(1000)
 		expect(
 			editor.getCurrentPageShapes().map((s) => ({ ...s, parentId: 'wahtever' }))
 		).toMatchSnapshot('packed shapes')

package/src/test/commands/resizeShape.test.ts

@@ -1,9 +1,10 @@
 import { createShapeId } from '@tldraw/editor'
+import { vi } from 'vitest'
 import { TestEditor } from '../TestEditor'
 
 let editor: TestEditor
 
-jest.useFakeTimers()
+vi.useFakeTimers()
 
 const ids = {
 	boxA: createShapeId('boxA'),

package/src/test/commands/rotateShapes.test.ts

@@ -1,4 +1,5 @@
 import { createShapeId } from '@tldraw/editor'
+import { vi } from 'vitest'
 import { TestEditor } from '../TestEditor'
 
 let editor: TestEditor
@@ -40,20 +41,20 @@ beforeEach(() => {
 })
 
 describe('editor.rotateShapesBy', () => {
-	let fnStart = jest.fn()
-	let fnChange = jest.fn()
-	let fnEnd = jest.fn()
+	let fnStart = vi.fn()
+	let fnChange = vi.fn()
+	let fnEnd = vi.fn()
 
 	beforeEach(() => {
 		// Set start / change / end events on only the geo shape
 		const util = editor.getShapeUtil('geo')
 
 		// Bad! who did this (did I do this)
-		util.onRotateStart = fnStart = jest.fn()
+		util.onRotateStart = fnStart = vi.fn()
 
-		util.onRotate = fnChange = jest.fn()
+		util.onRotate = fnChange = vi.fn()
 
-		util.onRotateEnd = fnEnd = jest.fn()
+		util.onRotateEnd = fnEnd = vi.fn()
 	})
 	it('Rotates shapes and fires events', () => {
 		// Select the shape...

package/src/test/commands/setCamera.test.ts

@@ -1,4 +1,5 @@
 import { Box, DEFAULT_CAMERA_OPTIONS, Vec, createShapeId } from '@tldraw/editor'
+import { vi } from 'vitest'
 import { TestEditor } from '../TestEditor'
 
 let editor: TestEditor
@@ -366,14 +367,14 @@ describe('CameraOptions.zoomSpeed', () => {
 		editor.setCameraOptions({ ...DEFAULT_CAMERA_OPTIONS, zoomSpeed: 2 })
 		expect(editor.getCamera()).toMatchObject({ x: 0, y: 0, z: 1 })
 		editor.setCurrentTool('zoom').click()
-		jest.advanceTimersByTime(300)
+		vi.advanceTimersByTime(300)
 		expect(editor.getCamera()).toMatchObject({ x: 0, y: 0, z: 2 })
 	})
 	it('Does not affect zoom tool zooming (0.5x)', () => {
 		editor.setCameraOptions({ ...DEFAULT_CAMERA_OPTIONS, zoomSpeed: 0.5 })
 		expect(editor.getCamera()).toMatchObject({ x: 0, y: 0, z: 1 })
 		editor.setCurrentTool('zoom').click()
-		jest.advanceTimersByTime(300)
+		vi.advanceTimersByTime(300)
 		expect(editor.getCamera()).toMatchObject({ x: 0, y: 0, z: 2 })
 	})
 	it('Does not affect editor zoom method (2x)', () => {
@@ -1028,7 +1029,7 @@ describe('Allows mixed values for x and y', () => {
 
 test('it animated towards the constrained viewport rather than the given viewport', () => {
 	// @ts-expect-error
-	const mockAnimateToViewport = (editor._animateToViewport = jest.fn())
+	const mockAnimateToViewport = (editor._animateToViewport = vi.fn())
 	editor.setCameraOptions({
 		...DEFAULT_CAMERA_OPTIONS,
 		constraints: {

package/src/test/commands/setCurrentPage.test.ts

@@ -1,4 +1,5 @@
 import { IndexKey, PageRecordType, TLPageId, createShapeId } from '@tldraw/editor'
+import { vi } from 'vitest'
 import { TestEditor } from '../TestEditor'
 
 let editor: TestEditor
@@ -76,7 +77,7 @@ describe('setCurrentPage', () => {
 	it('logs an error when trying to navigate to a page that does not exist', () => {
 		const initialPageId = editor.getCurrentPageId()
 		expect(editor.getCurrentPageId()).toBe(initialPageId)
-		console.error = jest.fn()
+		console.error = vi.fn()
 
 		expect(() => {
 			editor.setCurrentPage('page:does-not-exist' as TLPageId)
@@ -105,7 +106,7 @@ describe('setCurrentPage', () => {
 	})
 
 	it('applies camera constraints', () => {
-		const spy = jest.spyOn(editor, 'setCamera')
+		const spy = vi.spyOn(editor, 'setCamera')
 
 		let currentPageId = editor.getCurrentPageId()
 		expect(currentPageId).toMatchInlineSnapshot(`"page:page"`)

package/src/test/commands/stackShapes.test.ts

@@ -1,7 +1,8 @@
 import { createShapeId } from '@tldraw/editor'
+import { vi } from 'vitest'
 import { TestEditor } from '../TestEditor'
 
-jest.useFakeTimers()
+vi.useFakeTimers()
 
 let editor: TestEditor
 
@@ -51,10 +52,10 @@ describe('distributeShapes command', () => {
 	describe('when less than three shapes are selected', () => {
 		it('does nothing', () => {
 			editor.setSelectedShapes([ids.boxA, ids.boxB])
-			const fn = jest.fn()
+			const fn = vi.fn()
 			editor.store.listen(fn)
 			editor.stackShapes(editor.getSelectedShapeIds(), 'horizontal', 0)
-			jest.advanceTimersByTime(1000)
+			vi.advanceTimersByTime(1000)
 			expect(fn).not.toHaveBeenCalled()
 		})
 	})
@@ -65,7 +66,7 @@ describe('distributeShapes command', () => {
 			// @ts-expect-error
 			editor.options.adjacentShapeMargin = 1
 			editor.stackShapes(editor.getSelectedShapeIds(), 'horizontal')
-			jest.advanceTimersByTime(1000)
+			vi.advanceTimersByTime(1000)
 			// 200 distance gap between c and d
 			editor.expectShapeToMatch({
 				id: ids.boxA,
@@ -92,7 +93,7 @@ describe('distributeShapes command', () => {
 		it('stacks the shapes based on a given value', () => {
 			editor.setSelectedShapes([ids.boxA, ids.boxB, ids.boxC, ids.boxD])
 			editor.stackShapes(editor.getSelectedShapeIds(), 'horizontal', 10)
-			jest.advanceTimersByTime(1000)
+			vi.advanceTimersByTime(1000)
 			// 200 distance gap between c and d
 			editor.expectShapeToMatch({
 				id: ids.boxA,
@@ -119,7 +120,7 @@ describe('distributeShapes command', () => {
 		it('stacks the shapes based on the most common gap', () => {
 			editor.setSelectedShapes([ids.boxA, ids.boxB, ids.boxC, ids.boxD])
 			editor.stackShapes(editor.getSelectedShapeIds(), 'horizontal', 0)
-			jest.advanceTimersByTime(1000)
+			vi.advanceTimersByTime(1000)
 			// 200 distance gap between c and d
 			editor.expectShapeToMatch({
 				id: ids.boxA,
@@ -147,7 +148,7 @@ describe('distributeShapes command', () => {
 			editor.updateShapes([{ id: ids.boxD, type: 'geo', x: 540, y: 700 }])
 			editor.setSelectedShapes([ids.boxA, ids.boxB, ids.boxC, ids.boxD])
 			editor.stackShapes(editor.getSelectedShapeIds(), 'horizontal', 0)
-			jest.advanceTimersByTime(1000)
+			vi.advanceTimersByTime(1000)
 			editor.expectShapeToMatch({
 				id: ids.boxA,
 				x: 0,
@@ -175,7 +176,7 @@ describe('distributeShapes command', () => {
 		it('stacks the shapes based on a given value', () => {
 			editor.setSelectedShapes([ids.boxA, ids.boxB, ids.boxC, ids.boxD])
 			editor.stackShapes(editor.getSelectedShapeIds(), 'vertical', 10)
-			jest.advanceTimersByTime(1000)
+			vi.advanceTimersByTime(1000)
 			// 200 distance gap between c and d
 			editor.expectShapeToMatch({
 				id: ids.boxA,
@@ -202,7 +203,7 @@ describe('distributeShapes command', () => {
 		it('stacks the shapes based on the most common gap', () => {
 			editor.setSelectedShapes([ids.boxA, ids.boxB, ids.boxC, ids.boxD])
 			editor.stackShapes(editor.getSelectedShapeIds(), 'vertical', 0)
-			jest.advanceTimersByTime(1000)
+			vi.advanceTimersByTime(1000)
 			// 200 distance gap between c and d
 			editor.expectShapeToMatch({
 				id: ids.boxA,
@@ -230,7 +231,7 @@ describe('distributeShapes command', () => {
 			editor.updateShapes([{ id: ids.boxD, type: 'geo', x: 700, y: 540 }])
 			editor.setSelectedShapes([ids.boxA, ids.boxB, ids.boxC, ids.boxD])
 			editor.stackShapes(editor.getSelectedShapeIds(), 'vertical', 0)
-			jest.advanceTimersByTime(1000)
+			vi.advanceTimersByTime(1000)
 			editor.expectShapeToMatch({
 				id: ids.boxA,
 				x: 0,