tldraw 3.16.0-canary.acb40a76700b → 3.16.0-canary.b0fec0f5b729

package/src/test/EraserTool.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 = {
 	box1: createShapeId('box1'),
@@ -304,7 +305,7 @@ describe('When clicking and dragging', () => {
 
 		editor.expectToBeIn('eraser.erasing')
 
-		jest.advanceTimersByTime(16)
+		vi.advanceTimersByTime(16)
 		expect(editor.getInstanceState().scribbles.length).toBe(1)
 
 		expect(editor.getErasingShapeIds()).toEqual([ids.box1])
@@ -330,7 +331,7 @@ describe('When clicking and dragging', () => {
 		editor.expectToBeIn('eraser.idle')
 		editor.pointerDown(-100, -100) // outside of any shapes
 		editor.pointerMove(50, 50) // inside of box1
-		jest.advanceTimersByTime(16)
+		vi.advanceTimersByTime(16)
 		expect(editor.getInstanceState().scribbles.length).toBe(1)
 		expect(editor.getErasingShapeIds()).toEqual([ids.box1])
 		editor.cancel()
@@ -345,7 +346,7 @@ describe('When clicking and dragging', () => {
 		editor.expectToBeIn('eraser.idle')
 		editor.pointerDown(275, 275) // in between box2 AND box3, so over of the new group
 		editor.pointerMove(280, 280) // still outside of the new group
-		jest.advanceTimersByTime(16)
+		vi.advanceTimersByTime(16)
 		expect(editor.getInstanceState().scribbles.length).toBe(1)
 		expect(editor.getErasingShapeIds()).toEqual([])
 		editor.pointerMove(0, 0)
@@ -360,7 +361,7 @@ describe('When clicking and dragging', () => {
 		editor.setCurrentTool('eraser')
 		editor.pointerDown(325, 25) // directly on frame1, not its children
 		editor.pointerMove(350, 375) // still in the frame, passing through box3
-		jest.advanceTimersByTime(16)
+		vi.advanceTimersByTime(16)
 		expect(editor.getInstanceState().scribbles.length).toBe(1)
 		expect(editor.getErasingShapeIds()).toEqual([ids.box3])
 		editor.pointerUp()
@@ -374,7 +375,7 @@ describe('When clicking and dragging', () => {
 		editor.pointerDown() // Above the masked part of box3
 		expect(editor.getErasingShapeIds()).toEqual([])
 		editor.pointerMove(425, 500) // Through the masked part of box3
-		jest.advanceTimersByTime(16)
+		vi.advanceTimersByTime(16)
 		expect(editor.getInstanceState().scribbles.length).toBe(1)
 		expect(editor.getErasingShapeIds()).toEqual([])
 		editor.pointerUp()
@@ -402,7 +403,7 @@ describe('When clicking and dragging', () => {
 		editor.pointerDown(-100, -100)
 		expect(editor.getInstanceState().scribbles.length).toBe(0)
 		editor.pointerMove(50, 50)
-		jest.advanceTimersByTime(16)
+		vi.advanceTimersByTime(16)
 		expect(editor.getInstanceState().scribbles.length).toBe(1)
 		editor.pointerMove(50, 50)
 		editor.pointerMove(51, 50)
@@ -472,7 +473,7 @@ describe('When holding meta/ctrl key (accel key)', () => {
 		editor.pointerDown(-100, -100) // outside of any shapes
 		editor.pointerMove(99, 99) // next to box1 AND in box2
 
-		jest.advanceTimersByTime(16)
+		vi.advanceTimersByTime(16)
 		expect(editor.getInstanceState().scribbles.length).toBe(1)
 
 		// Should include all shapes hit initially
@@ -505,7 +506,7 @@ describe('When holding meta/ctrl key (accel key)', () => {
 		editor.pointerDown(-100, -100) // outside of any shapes
 		editor.pointerMove(99, 99) // next to box1 AND in box2
 
-		jest.advanceTimersByTime(16)
+		vi.advanceTimersByTime(16)
 		expect(editor.getInstanceState().scribbles.length).toBe(1)
 
 		// Should include all shapes hit initially
@@ -558,7 +559,7 @@ describe('When holding meta/ctrl key (accel key)', () => {
 		editor.pointerDown(-100, -100) // outside of any shapes
 		editor.pointerMove(99, 99) // next to box1 AND in box2
 
-		jest.advanceTimersByTime(16)
+		vi.advanceTimersByTime(16)
 		expect(editor.getInstanceState().scribbles.length).toBe(1)
 
 		// Should include all shapes hit initially
@@ -589,7 +590,7 @@ describe('When holding meta/ctrl key (accel key)', () => {
 		editor.pointerDown(-100, -100) // outside of any shapes
 		editor.pointerMove(99, 99) // next to box1 AND in box2
 
-		jest.advanceTimersByTime(16)
+		vi.advanceTimersByTime(16)
 		expect(editor.getInstanceState().scribbles.length).toBe(1)
 
 		// Should include all shapes hit initially

package/src/test/HandTool.test.ts

@@ -1,3 +1,4 @@
+import { vi } from 'vitest'
 import { HandTool } from '../lib/tools/HandTool/HandTool'
 import { TestEditor, createDefaultShapes } from './TestEditor'
 
@@ -14,7 +15,7 @@ afterEach(() => {
 	editor?.dispose()
 })
 
-jest.useFakeTimers()
+vi.useFakeTimers()
 
 describe(HandTool, () => {
 	it('Double taps to zoom in', () => {
@@ -22,9 +23,9 @@ describe(HandTool, () => {
 		expect(editor.getZoomLevel()).toBe(1)
 		editor.click()
 		editor.click() // double click!
-		jest.advanceTimersByTime(300)
+		vi.advanceTimersByTime(300)
 		expect(editor.getZoomLevel()).not.toBe(1) // animating
-		jest.advanceTimersByTime(300)
+		vi.advanceTimersByTime(300)
 		expect(editor.getZoomLevel()).toBe(2) // all done
 	})
 
@@ -34,9 +35,9 @@ describe(HandTool, () => {
 		editor.click()
 		editor.click()
 		editor.click() // triple click!
-		jest.advanceTimersByTime(300)
+		vi.advanceTimersByTime(300)
 		expect(editor.getZoomLevel()).not.toBe(1) // animating
-		jest.advanceTimersByTime(300)
+		vi.advanceTimersByTime(300)
 		expect(editor.getZoomLevel()).toBe(0.5) // all done
 	})
 
@@ -48,9 +49,9 @@ describe(HandTool, () => {
 		editor.click()
 		editor.click()
 		editor.click() // quad click!
-		jest.advanceTimersByTime(300)
+		vi.advanceTimersByTime(300)
 		expect(editor.getZoomLevel()).not.toBe(2) // animating
-		jest.advanceTimersByTime(300)
+		vi.advanceTimersByTime(300)
 		expect(editor.getZoomLevel()).toBe(1) // all done
 	})
 
@@ -62,9 +63,9 @@ describe(HandTool, () => {
 		editor.click()
 		editor.click()
 		editor.click() // quad click!
-		jest.advanceTimersByTime(300)
+		vi.advanceTimersByTime(300)
 		expect(editor.getZoomLevel()).not.toBe(1) // animating
-		jest.advanceTimersByTime(300)
+		vi.advanceTimersByTime(300)
 		const z = editor.getZoomLevel()
 		editor.zoomToFit() // call zoom to fit manually to compare
 		expect(editor.getZoomLevel()).toBe(z) // zoom should not have changed

package/src/test/HighlightShape.test.ts

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

package/src/test/SelectTool.test.ts

@@ -7,6 +7,7 @@ import {
 	createShapeId,
 	toRichText,
 } from '@tldraw/editor'
+import { vi } from 'vitest'
 import { TestEditor } from './TestEditor'
 
 let editor: TestEditor
@@ -18,7 +19,7 @@ const ids = {
 	arrow1: createShapeId('arrow1'),
 }
 
-jest.useFakeTimers()
+vi.useFakeTimers()
 
 beforeEach(() => {
 	editor = new TestEditor()
@@ -160,7 +161,7 @@ describe('TLSelectTool.Translating', () => {
 		// There's a timer here! We shouldn't end the clone until the timer is done
 		expect(editor.getCurrentPageShapes().length).toBe(2)
 
-		jest.advanceTimersByTime(250) // tick tock
+		vi.advanceTimersByTime(250) // tick tock
 
 		// Timer is done! We should have ended the clone.
 		expect(editor.getCurrentPageShapes().length).toBe(1)

package/src/test/TLUserPreferences.test.ts

@@ -1,4 +1,5 @@
 import { TLUserPreferences, atom, createTLUser } from '@tldraw/editor'
+import { vi } from 'vitest'
 import { TestEditor } from './TestEditor'
 
 let editor: TestEditor
@@ -59,7 +60,7 @@ describe('TLUserPreferences', () => {
 			locale: null,
 			name: null,
 		})
-		const setUserPreferences = jest.fn((preferences) => userPreferences.set(preferences))
+		const setUserPreferences = vi.fn((preferences) => userPreferences.set(preferences))
 
 		editor = new TestEditor({
 			user: createTLUser({
@@ -80,7 +81,7 @@ describe('TLUserPreferences', () => {
 			id: '123',
 			name: 'blah',
 		})
-		const setUserPreferences = jest.fn((preferences) => userPreferences.set(preferences))
+		const setUserPreferences = vi.fn((preferences) => userPreferences.set(preferences))
 
 		editor = new TestEditor({
 			user: createTLUser({
@@ -101,7 +102,7 @@ describe('TLUserPreferences', () => {
 			id: '123',
 			name: 'blah',
 		})
-		const setUserPreferences = jest.fn((preferences) => userPreferences.set(preferences))
+		const setUserPreferences = vi.fn((preferences) => userPreferences.set(preferences))
 
 		editor = new TestEditor({
 			user: createTLUser({

package/src/test/TestEditor.ts

@@ -34,6 +34,7 @@ import {
 	rotateSelectionHandle,
 	tlenv,
 } from '@tldraw/editor'
+import { vi } from 'vitest'
 import { defaultBindingUtils } from '../lib/defaultBindingUtils'
 import { defaultShapeTools } from '../lib/defaultShapeTools'
 import { defaultShapeUtils } from '../lib/defaultShapeUtils'
@@ -42,7 +43,14 @@ import { defaultTools } from '../lib/defaultTools'
 import { defaultAddFontsFromNode, tipTapDefaultExtensions } from '../lib/utils/text/richText'
 import { shapesFromJsx } from './test-jsx'
 
-jest.useFakeTimers()
+declare module 'vitest' {
+	// eslint-disable-next-line @typescript-eslint/no-unused-vars
+	interface Matchers<T = any> {
+		toCloselyMatchObject(expected: any, roundToNearest?: number): void
+	}
+}
+
+vi.useFakeTimers()
 
 Object.assign(navigator, {
 	clipboard: {
@@ -55,16 +63,6 @@ Object.assign(navigator, {
 // @ts-expect-error
 window.ClipboardItem = class {}
 
-declare global {
-	// eslint-disable-next-line @typescript-eslint/no-namespace
-	namespace jest {
-		// eslint-disable-next-line @typescript-eslint/no-unused-vars
-		interface Matchers<R> {
-			toCloselyMatchObject(value: any, precision?: number): void
-		}
-	}
-}
-
 export class TestEditor extends Editor {
 	constructor(
 		options: Partial<Omit<TLEditorOptions, 'store'>> = {},
@@ -82,14 +80,20 @@ export class TestEditor extends Editor {
 			right: 1080,
 		}
 		// make the app full screen for the sake of the insets property
-		jest.spyOn(document.body, 'scrollWidth', 'get').mockImplementation(() => bounds.width)
-		jest.spyOn(document.body, 'scrollHeight', 'get').mockImplementation(() => bounds.height)
+		vi.spyOn(document.body, 'scrollWidth', 'get').mockImplementation(() => bounds.width)
+		vi.spyOn(document.body, 'scrollHeight', 'get').mockImplementation(() => bounds.height)
 
 		elm.tabIndex = 0
 		elm.getBoundingClientRect = () => bounds as DOMRect
 
-		const shapeUtilsWithDefaults = [...defaultShapeUtils, ...(options.shapeUtils ?? [])]
-		const bindingUtilsWithDefaults = [...defaultBindingUtils, ...(options.bindingUtils ?? [])]
+		const shapeUtilsWithDefaults = [
+			...defaultShapeUtils.filter((s) => !options.shapeUtils?.some((su) => su.type === s.type)),
+			...(options.shapeUtils ?? []),
+		]
+		const bindingUtilsWithDefaults = [
+			...defaultBindingUtils.filter((b) => !options.bindingUtils?.some((bu) => bu.type === b.type)),
+			...(options.bindingUtils ?? []),
+		]
 
 		super({
 			...options,
@@ -272,12 +276,12 @@ export class TestEditor extends Editor {
 	 * methods, or call mockRestore() to restore the actual implementation (e.g.
 	 * _transformPointerDownSpy.mockRestore())
 	 */
-	_transformPointerDownSpy = jest
+	_transformPointerDownSpy = vi
 		.spyOn(this._clickManager, 'handlePointerEvent')
 		.mockImplementation((info) => {
 			return info
 		})
-	_transformPointerUpSpy = jest
+	_transformPointerUpSpy = vi
 		.spyOn(this._clickManager, 'handlePointerEvent')
 		.mockImplementation((info) => {
 			return info

package/src/test/TldrawEditor.test.tsx

@@ -12,6 +12,7 @@ import {
 	noop,
 } from '@tldraw/editor'
 import { StrictMode } from 'react'
+import { vi } from 'vitest'
 import { defaultShapeUtils } from '../lib/defaultShapeUtils'
 import { defaultTools } from '../lib/defaultTools'
 import { GeoShapeUtil } from '../lib/shapes/geo/GeoShapeUtil'
@@ -89,7 +90,7 @@ describe('<TldrawEditor />', () => {
 	})
 
 	it('throws if the store has different shapes to the ones passed in', async () => {
-		const spy = jest.spyOn(console, 'error').mockImplementation(noop)
+		const spy = vi.spyOn(console, 'error').mockImplementation(noop)
 		// expect(() =>
 		// 	render(
 		// 		<TldrawEditor
@@ -129,7 +130,7 @@ describe('<TldrawEditor />', () => {
 
 	it('Accepts fresh versions of store and calls `onMount` for each one', async () => {
 		const initialStore = createTLStore({ shapeUtils: [], bindingUtils: [] })
-		const onMount = jest.fn()
+		const onMount = vi.fn()
 		const rendered = await renderTldrawComponent(
 			<TldrawEditor
 				initialState="select"
@@ -139,8 +140,8 @@ describe('<TldrawEditor />', () => {
 			/>,
 			{ waitForPatterns: false }
 		)
-		const initialEditor = onMount.mock.lastCall[0]
-		jest.spyOn(initialEditor, 'dispose')
+		const initialEditor = onMount.mock.lastCall![0]
+		vi.spyOn(initialEditor, 'dispose')
 		expect(initialEditor.store).toBe(initialStore)
 		// re-render with the same store:
 		rendered.rerender(
@@ -161,7 +162,7 @@ describe('<TldrawEditor />', () => {
 		await rendered.findAllByTestId('canvas')
 		expect(initialEditor.dispose).toHaveBeenCalledTimes(1)
 		expect(onMount).toHaveBeenCalledTimes(2)
-		expect(onMount.mock.lastCall[0].store).toBe(newStore)
+		expect(onMount.mock.lastCall![0].store).toBe(newStore)
 	})
 
 	it('Renders the canvas and shapes', async () => {
@@ -227,7 +228,7 @@ describe('<TldrawEditor />', () => {
 
 	it('renders correctly in strict mode', async () => {
 		const editorInstances = new Set<Editor>()
-		const onMount = jest.fn((editor: Editor) => {
+		const onMount = vi.fn((editor: Editor) => {
 			editorInstances.add(editor)
 		})
 		await renderTldrawComponent(
@@ -245,7 +246,7 @@ describe('<TldrawEditor />', () => {
 
 	it('allows updating camera options without re-creating the editor', async () => {
 		const editors: Editor[] = []
-		const onMount = jest.fn((editor: Editor) => {
+		const onMount = vi.fn((editor: Editor) => {
 			if (!editors.includes(editor)) editors.push(editor)
 		})
 
@@ -361,7 +362,7 @@ describe('<TldrawEditor />', () => {
 	})
 
 	it('passes through the `assets` prop when creating its own in-memory store', async () => {
-		const myUploadFn = jest.fn()
+		const myUploadFn = vi.fn()
 		const assetStore: TLAssetStore = { upload: myUploadFn }
 
 		const { editor } = await renderTldrawComponentWithEditor(
@@ -375,7 +376,7 @@ describe('<TldrawEditor />', () => {
 	})
 
 	it('passes through the `assets` prop when using `persistenceKey`', async () => {
-		const myUploadFn = jest.fn()
+		const myUploadFn = vi.fn()
 		const assetStore: TLAssetStore = { upload: myUploadFn }
 
 		const { editor } = await renderTldrawComponentWithEditor(
@@ -394,7 +395,7 @@ describe('<TldrawEditor />', () => {
 	})
 
 	it('will not re-create the editor if re-rendered with identical options', async () => {
-		const onMount = jest.fn()
+		const onMount = vi.fn()
 
 		const renderer = await renderTldrawComponent(
 			<TldrawEditor onMount={onMount} options={{ maxPages: 1 }} />,

package/src/test/ZoomTool.test.ts

@@ -1,4 +1,5 @@
 import { createShapeId } from '@tldraw/editor'
+import { vi } from 'vitest'
 import { TestEditor } from './TestEditor'
 
 let editor: TestEditor
@@ -7,7 +8,7 @@ const ids = {
 	box1: createShapeId('box1'),
 }
 
-jest.useFakeTimers()
+vi.useFakeTimers()
 
 beforeEach(() => {
 	editor = new TestEditor()
@@ -44,7 +45,7 @@ describe('TLSelectTool.Zooming', () => {
 		expect(editor.getViewportPageCenter()).toMatchObject({ x: 540, y: 360 })
 		editor.click()
 		editor.expectToBeIn('zoom.idle')
-		jest.advanceTimersByTime(300)
+		vi.advanceTimersByTime(300)
 		expect(editor.getZoomLevel()).toBe(2)
 	})
 
@@ -55,7 +56,7 @@ describe('TLSelectTool.Zooming', () => {
 		expect(editor.getViewportPageBounds()).toMatchObject({ x: -0, y: -0, w: 1080, h: 720 })
 		expect(editor.getViewportPageCenter()).toMatchObject({ x: 540, y: 360 })
 		editor.click()
-		jest.advanceTimersByTime(300)
+		vi.advanceTimersByTime(300)
 		expect(editor.getZoomLevel()).toBe(0.5)
 	})
 
@@ -122,7 +123,7 @@ describe('TLSelectTool.Zooming', () => {
 		editor.expectToBeIn('zoom.zoom_brushing')
 		editor.pointerUp(change, change)
 		editor.expectToBeIn('zoom.idle')
-		jest.advanceTimersByTime(300)
+		vi.advanceTimersByTime(300)
 		expect(editor.getZoomLevel()).toBe(2)
 		expect(editor.getViewportPageBounds()).toMatchObject({
 			x: change / 2,
@@ -156,7 +157,7 @@ describe('TLSelectTool.Zooming', () => {
 			h: newBoundsHeight,
 		})
 		editor.pointerUp(newBoundsX + newBoundsWidth, newBoundsY + newBoundsHeight)
-		jest.advanceTimersByTime(300)
+		vi.advanceTimersByTime(300)
 		expect(editor.getZoomLevel()).toBeCloseTo(1.64)
 		expect(editor.getViewportPageBounds()).toMatchInlineSnapshot(`
 		Box {
@@ -195,7 +196,7 @@ describe('TLSelectTool.Zooming', () => {
 			h: newBoundsHeight,
 		})
 		editor.pointerUp()
-		jest.advanceTimersByTime(500)
+		vi.advanceTimersByTime(500)
 		expect(editor.getZoomLevel()).toBeCloseTo(originalZoomLevel / 2)
 		expect(editor.getViewportPageBounds()).toMatchObject({
 			x: -440,

package/src/test/__snapshots__/drawing.test.ts.snap

@@ -1,6 +1,6 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`Draws a bunch: draw shape 1`] = `
+exports[`Draws a bunch > draw shape 1`] = `
 {
   "index": "a1",
   "isLocked": false,

package/src/test/__snapshots__/groups.test.tsx.snap

@@ -1,6 +1,6 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`creating new shapes pencil lines will reisze the group appropriately if the new shape changes the group bounds: box shape after second resize 1`] = `
+exports[`creating new shapes > pencil > lines > will reisze the group appropriately if the new shape changes the group bounds > box shape after second resize 1`] = `
 {
   "h": 40,
   "w": 40,
@@ -9,7 +9,7 @@ exports[`creating new shapes pencil lines will reisze the group appropriately if
 }
 `;
 
-exports[`creating new shapes pencil lines will reisze the group appropriately if the new shape changes the group bounds: group shape after second resize 1`] = `
+exports[`creating new shapes > pencil > lines > will reisze the group appropriately if the new shape changes the group bounds > group shape after second resize 1`] = `
 {
   "h": 120,
   "w": 120,
@@ -18,7 +18,7 @@ exports[`creating new shapes pencil lines will reisze the group appropriately if
 }
 `;
 
-exports[`creating new shapes pencil lines will reisze the group appropriately if the new shape changes the group bounds: group with line shape 1`] = `
+exports[`creating new shapes > pencil > lines > will reisze the group appropriately if the new shape changes the group bounds > group with line shape 1`] = `
 Box {
   "h": 110,
   "w": 110,
@@ -27,7 +27,7 @@ Box {
 }
 `;
 
-exports[`creating new shapes pencil lines works if the shape drawing begins outside of the current group bounds: box shape after resize 1`] = `
+exports[`creating new shapes > pencil > lines > works if the shape drawing begins outside of the current group bounds > box shape after resize 1`] = `
 {
   "h": 50,
   "w": 50,
@@ -36,7 +36,7 @@ exports[`creating new shapes pencil lines works if the shape drawing begins outs
 }
 `;
 
-exports[`creating new shapes pencil lines works if the shape drawing begins outside of the current group bounds: group with line 1`] = `
+exports[`creating new shapes > pencil > lines > works if the shape drawing begins outside of the current group bounds > group with line 1`] = `
 {
   "h": 200,
   "w": 200,

package/src/test/__snapshots__/resizing.test.ts.snap

@@ -1,6 +1,6 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`When resizing a shape with children Resizes a rotated draw shape: draw shape after rotating 1`] = `
+exports[`When resizing a shape with children > Resizes a rotated draw shape > draw shape after rotating 1`] = `
 {
   "id": "shape:lineA",
   "index": "a3",

package/src/test/arrows-megabus.test.tsx

@@ -1,4 +1,5 @@
 import { TLArrowShape, TLShapeId, Vec, createShapeId } from '@tldraw/editor'
+import { vi } from 'vitest'
 import { getArrowBindings } from '../lib/shapes/arrow/shared'
 import { TestEditor } from './TestEditor'
 import { TL } from './test-jsx'
@@ -208,7 +209,7 @@ describe('When binding an arrow to a shape', () => {
 
 		editor.keyUp('Control')
 		expect(bindings().end).toBeUndefined() // there's a short delay here, it should still be a point
-		jest.advanceTimersByTime(1000) // once the timer runs out...
+		vi.advanceTimersByTime(1000) // once the timer runs out...
 		expect(bindings().end).toBeDefined()
 
 		editor.keyDown('Control') // no delay when pressing control again though
@@ -216,7 +217,7 @@ describe('When binding an arrow to a shape', () => {
 
 		editor.keyUp('Control')
 		editor.pointerUp()
-		jest.advanceTimersByTime(1000) // once the timer runs out...
+		vi.advanceTimersByTime(1000) // once the timer runs out...
 		expect(bindings().end).toBeUndefined() // still a point because interaction ended before timer ended
 	})
 
@@ -237,7 +238,7 @@ describe('When binding an arrow to a shape', () => {
 		// Releasing ctrl should restore binding (after timer)
 		editor.keyUp('Control')
 		expect(bindings().end).toBeUndefined() // Still no binding immediately
-		jest.advanceTimersByTime(1000)
+		vi.advanceTimersByTime(1000)
 		expect(bindings().end).toBeDefined()
 	})
 })
@@ -409,7 +410,7 @@ describe('When starting an arrow inside of multiple shapes', () => {
 		editor.pointerDown(20, 20) // upper left
 		expect(editor.getCurrentPageShapes().length).toBe(1)
 		expect(arrow()).toBe(null)
-		jest.advanceTimersByTime(1000)
+		vi.advanceTimersByTime(1000)
 		editor.pointerMove(25, 20)
 		expect(editor.getCurrentPageShapes().length).toBe(2)
 		expect(arrow()).toMatchObject({ x: 20, y: 20 })

package/src/test/bindings.test.tsx

@@ -11,6 +11,7 @@ import {
 	createBindingId,
 	createShapeId,
 } from '@tldraw/editor'
+import { vi } from 'vitest'
 import { TestEditor } from './TestEditor'
 import { TL } from './test-jsx'
 
@@ -23,37 +24,19 @@ const ids = {
 	box4: createShapeId('box4'),
 }
 
-const mockOnOperationComplete = jest.fn() as jest.Mock<void, []>
-const mockOnBeforeDelete = jest.fn() as jest.Mock<void, [BindingOnDeleteOptions<TLUnknownBinding>]>
-const mockOnAfterDelete = jest.fn() as jest.Mock<void, [BindingOnDeleteOptions<TLUnknownBinding>]>
-const mockOnBeforeFromShapeDelete = jest.fn() as jest.Mock<
-	void,
-	[BindingOnShapeDeleteOptions<TLUnknownBinding>]
->
-const mockOnBeforeToShapeDelete = jest.fn() as jest.Mock<
-	void,
-	[BindingOnShapeDeleteOptions<TLUnknownBinding>]
->
-const mockOnBeforeFromShapeIsolate = jest.fn() as jest.Mock<
-	void,
-	[BindingOnShapeIsolateOptions<TLUnknownBinding>]
->
-const mockOnBeforeToShapeIsolate = jest.fn() as jest.Mock<
-	void,
-	[BindingOnShapeIsolateOptions<TLUnknownBinding>]
->
-const mockOnBeforeCreate = jest.fn() as jest.Mock<void, [BindingOnCreateOptions<TLUnknownBinding>]>
-const mockOnAfterCreate = jest.fn() as jest.Mock<void, [BindingOnCreateOptions<TLUnknownBinding>]>
-const mockOnBeforeChange = jest.fn() as jest.Mock<void, [BindingOnChangeOptions<TLUnknownBinding>]>
-const mockOnAfterChange = jest.fn() as jest.Mock<void, [BindingOnChangeOptions<TLUnknownBinding>]>
-const mockOnAfterChangeFromShape = jest.fn() as jest.Mock<
-	void,
-	[BindingOnShapeChangeOptions<TLUnknownBinding>]
->
-const mockOnAfterChangeToShape = jest.fn() as jest.Mock<
-	void,
-	[BindingOnShapeChangeOptions<TLUnknownBinding>]
->
+const mockOnOperationComplete = vi.fn()
+const mockOnBeforeDelete = vi.fn()
+const mockOnAfterDelete = vi.fn()
+const mockOnBeforeFromShapeDelete = vi.fn()
+const mockOnBeforeToShapeDelete = vi.fn()
+const mockOnBeforeFromShapeIsolate = vi.fn()
+const mockOnBeforeToShapeIsolate = vi.fn()
+const mockOnBeforeCreate = vi.fn()
+const mockOnAfterCreate = vi.fn()
+const mockOnBeforeChange = vi.fn()
+const mockOnAfterChange = vi.fn()
+const mockOnAfterChangeFromShape = vi.fn()
+const mockOnAfterChangeToShape = vi.fn()
 
 const calls: string[] = []
 
@@ -273,9 +256,11 @@ test('copying the to shape on its own does trigger the unbind operation', () =>
 })
 
 test('cascading deletes in beforeFromShapeDelete are handled correctly', () => {
-	mockOnBeforeFromShapeDelete.mockImplementation((options) => {
-		editor.deleteShape(options.binding.toId)
-	})
+	mockOnBeforeFromShapeDelete.mockImplementation(
+		(options: BindingOnShapeDeleteOptions<TLUnknownBinding>) => {
+			editor.deleteShape(options.binding.toId)
+		}
+	)
 
 	bindShapes(ids.box1, ids.box2)
 	bindShapes(ids.box2, ids.box3)
@@ -316,9 +301,11 @@ test('cascading deletes in beforeFromShapeDelete are handled correctly', () => {
 })
 
 test('cascading deletes in beforeToShapeDelete are handled correctly', () => {
-	mockOnBeforeToShapeDelete.mockImplementation((options) => {
-		editor.deleteShape(options.binding.fromId)
-	})
+	mockOnBeforeToShapeDelete.mockImplementation(
+		(options: BindingOnShapeDeleteOptions<TLUnknownBinding>) => {
+			editor.deleteShape(options.binding.fromId)
+		}
+	)
 
 	bindShapes(ids.box1, ids.box2)
 	bindShapes(ids.box2, ids.box3)

package/src/test/bookmark-shapes.test.ts

@@ -1,8 +1,5 @@
 import { TLBookmarkShape, createShapeId } from '@tldraw/editor'
-import {
-	BookmarkShapeUtil,
-	getHumanReadableAddress,
-} from '../lib/shapes/bookmark/BookmarkShapeUtil'
+import { getHumanReadableAddress } from '../lib/shapes/bookmark/BookmarkShapeUtil'
 import { TestEditor } from './TestEditor'
 
 let editor: TestEditor
@@ -14,10 +11,6 @@ afterEach(() => {
 	editor?.dispose()
 })
 
-describe(BookmarkShapeUtil, () => {
-	return
-})
-
 describe('The URL formatter', () => {
 	it('Formats URLs as human-readable', () => {
 		const ids = {