@tldraw/editor 3.16.0-internal.51e99e128bd4 → 3.16.0-internal.a478398270c6

package/src/lib/editor/Editor.ts

@@ -176,10 +176,8 @@ import {
 	RequiredKeys,
 	TLCameraMoveOptions,
 	TLCameraOptions,
-	TLGetShapeAtPointOptions,
 	TLImageExportOptions,
 	TLSvgExportOptions,
-	TLUpdatePointerOptions,
 } from './types/misc-types'
 import { TLAdjacentDirection, TLResizeHandle } from './types/selection-types'
 
@@ -1805,9 +1803,7 @@ export class Editor extends EventEmitter<TLEventMap> {
 	}
 
 	/**
-	 * Select all shapes. If the user has selected shapes that share a parent,
-	 * select all shapes within that parent. If the user has not selected any shapes,
-	 * or if the shapes shapes are only on select all shapes on the current page.
+	 * Select all direct children of the current page.
 	 *
 	 * @example
 	 * ```ts
@@ -1817,34 +1813,11 @@ export class Editor extends EventEmitter<TLEventMap> {
 	 * @public
 	 */
 	selectAll(): this {
-		let parentToSelectWithinId: TLParentId | null = null
-
-		const selectedShapeIds = this.getSelectedShapeIds()
-
-		// If we have selected shapes, try to find a parent to select within
-		if (selectedShapeIds.length > 0) {
-			for (const id of selectedShapeIds) {
-				const shape = this.getShape(id)
-				if (!shape) continue
-				if (parentToSelectWithinId === null) {
-					// If we haven't found a parent yet, set this parent as the parent to select within
-					parentToSelectWithinId = shape.parentId
-				} else if (parentToSelectWithinId !== shape.parentId) {
-					// If we've found two different parents, we can't select all, do nothing
-					return this
-				}
-			}
-		}
-
-		// If we haven't found a parent from our selected shapes, select the current page
-		if (!parentToSelectWithinId) {
-			parentToSelectWithinId = this.getCurrentPageId()
-		}
-
-		// Select all the unlocked shapes within the parent
-		const ids = this.getSortedChildIdsForParent(parentToSelectWithinId)
+		const ids = this.getSortedChildIdsForParent(this.getCurrentPageId())
+		// page might have no shapes
 		if (ids.length <= 0) return this
 		this.setSelectedShapes(this._getUnlockedShapeIds(ids))
+
 		return this
 	}
 
@@ -1865,11 +1838,10 @@ export class Editor extends EventEmitter<TLEventMap> {
 			firstParentId &&
 			selectedShapeIds.every((shapeId) => this.getShape(shapeId)?.parentId === firstParentId) &&
 			!isPageId(firstParentId)
-		const filteredShapes = isSelectedWithinContainer
-			? this.getCurrentPageShapes().filter((shape) => shape.parentId === firstParentId)
-			: this.getCurrentPageShapes().filter((shape) => isPageId(shape.parentId))
 		const readingOrderShapes = isSelectedWithinContainer
-			? this._getShapesInReadingOrder(filteredShapes)
+			? this._getShapesInReadingOrder(
+					this.getCurrentPageShapes().filter((shape) => shape.parentId === firstParentId)
+				)
 			: this.getCurrentPageShapesInReadingOrder()
 		const currentShapeId: TLShapeId | undefined =
 			selectedShapeIds.length === 1
@@ -1886,7 +1858,7 @@ export class Editor extends EventEmitter<TLEventMap> {
 			adjacentShapeId = shapeIds[adjacentIndex]
 		} else {
 			if (!currentShapeId) return
-			adjacentShapeId = this.getNearestAdjacentShape(filteredShapes, currentShapeId, direction)
+			adjacentShapeId = this.getNearestAdjacentShape(currentShapeId, direction)
 		}
 
 		const shape = this.getShape(adjacentShapeId)
@@ -1985,7 +1957,6 @@ export class Editor extends EventEmitter<TLEventMap> {
 	 * @public
 	 */
 	getNearestAdjacentShape(
-		shapes: TLShape[],
 		currentShapeId: TLShapeId,
 		direction: 'left' | 'right' | 'up' | 'down'
 	): TLShapeId {
@@ -1993,6 +1964,7 @@ export class Editor extends EventEmitter<TLEventMap> {
 		const currentShape = this.getShape(currentShapeId)
 		if (!currentShape) return currentShapeId
 
+		const shapes = this.getCurrentPageShapes()
 		const tabbableShapes = shapes.filter(
 			(shape) => this.getShapeUtil(shape).canTabTo(shape) && shape.id !== currentShapeId
 		)
@@ -3074,6 +3046,7 @@ export class Editor extends EventEmitter<TLEventMap> {
 			// Dispatch a new pointer move because the pointer's page will have changed
 			// (its screen position will compute to a new page position given the new camera position)
 			const { currentScreenPoint, currentPagePoint } = this.inputs
+			const { screenBounds } = this.store.unsafeGetWithoutCapture(TLINSTANCE_ID)!
 
 			// compare the next page point (derived from the current camera) to the current page point
 			if (
@@ -3081,10 +3054,27 @@ export class Editor extends EventEmitter<TLEventMap> {
 				currentScreenPoint.y / z - y !== currentPagePoint.y
 			) {
 				// If it's changed, dispatch a pointer event
-				this.updatePointer({
-					immediate: opts?.immediate,
+				const event: TLPointerEventInfo = {
+					type: 'pointer',
+					target: 'canvas',
+					name: 'pointer_move',
+					// weird but true: we need to put the screen point back into client space
+					point: Vec.AddXY(currentScreenPoint, screenBounds.x, screenBounds.y),
 					pointerId: INTERNAL_POINTER_IDS.CAMERA_MOVE,
-				})
+					ctrlKey: this.inputs.ctrlKey,
+					altKey: this.inputs.altKey,
+					shiftKey: this.inputs.shiftKey,
+					metaKey: this.inputs.metaKey,
+					accelKey: isAccelKey(this.inputs),
+					button: 0,
+					isPen: this.getInstanceState().isPenMode ?? false,
+				}
+
+				if (opts?.immediate) {
+					this._flushEventForTick(event)
+				} else {
+					this.dispatch(event)
+				}
 			}
 
 			this._tickCameraState()
@@ -4405,28 +4395,21 @@ export class Editor extends EventEmitter<TLEventMap> {
 	 */
 	deletePage(page: TLPageId | TLPage): this {
 		const id = typeof page === 'string' ? page : page.id
-		this.run(
-			() => {
-				if (this.getIsReadonly()) return
-				const pages = this.getPages()
-				if (pages.length === 1) return
-
-				const deletedPage = this.getPage(id)
-				if (!deletedPage) return
-
-				if (id === this.getCurrentPageId()) {
-					const index = pages.findIndex((page) => page.id === id)
-					const next = pages[index - 1] ?? pages[index + 1]
-					this.setCurrentPage(next.id)
-				}
+		this.run(() => {
+			if (this.getIsReadonly()) return
+			const pages = this.getPages()
+			if (pages.length === 1) return
 
-				const shapes = this.getSortedChildIdsForParent(deletedPage.id)
-				this.deleteShapes(shapes)
+			const deletedPage = this.getPage(id)
+			if (!deletedPage) return
 
-				this.store.remove([deletedPage.id])
-			},
-			{ ignoreShapeLock: true }
-		)
+			if (id === this.getCurrentPageId()) {
+				const index = pages.findIndex((page) => page.id === id)
+				const next = pages[index - 1] ?? pages[index + 1]
+				this.setCurrentPage(next.id)
+			}
+			this.store.remove([deletedPage.id])
+		})
 		return this
 	}
 
@@ -5155,7 +5138,20 @@ export class Editor extends EventEmitter<TLEventMap> {
 	 *
 	 * @returns The shape at the given point, or undefined if there is no shape at the point.
 	 */
-	getShapeAtPoint(point: VecLike, opts: TLGetShapeAtPointOptions = {}): TLShape | undefined {
+	getShapeAtPoint(
+		point: VecLike,
+		opts = {} as {
+			renderingOnly?: boolean
+			margin?: number
+			hitInside?: boolean
+			hitLocked?: boolean
+			// TODO: we probably need to rename this, we don't quite _always_
+			// respect this esp. in the part below that does "Check labels first"
+			hitLabels?: boolean
+			hitFrameInside?: boolean
+			filter?(shape: TLShape): boolean
+		}
+	): TLShape | undefined {
 		const zoomLevel = this.getZoomLevel()
 		const viewportPageBounds = this.getViewportPageBounds()
 		const {
@@ -5167,8 +5163,6 @@ export class Editor extends EventEmitter<TLEventMap> {
 			hitFrameInside = false,
 		} = opts
 
-		const [innerMargin, outerMargin] = Array.isArray(margin) ? margin : [margin, margin]
-
 		let inHollowSmallestArea = Infinity
 		let inHollowSmallestAreaHit: TLShape | null = null
 
@@ -5188,7 +5182,7 @@ export class Editor extends EventEmitter<TLEventMap> {
 				return false
 			const pageMask = this.getShapeMask(shape)
 			if (pageMask && !pointInPolygon(point, pageMask)) return false
-			if (filter && !filter(shape)) return false
+			if (filter) return filter(shape)
 			return true
 		})
 
@@ -5202,8 +5196,8 @@ export class Editor extends EventEmitter<TLEventMap> {
 			// Check labels first
 			if (
 				this.isShapeOfType<TLFrameShape>(shape, 'frame') ||
+				(this.isShapeOfType<TLArrowShape>(shape, 'arrow') && shape.props.text.trim()) ||
 				((this.isShapeOfType<TLNoteShape>(shape, 'note') ||
-					this.isShapeOfType<TLArrowShape>(shape, 'arrow') ||
 					(this.isShapeOfType<TLGeoShape>(shape, 'geo') && shape.props.fill === 'none')) &&
 					this.getShapeUtil(shape).getText(shape)?.trim())
 			) {
@@ -5214,18 +5208,13 @@ export class Editor extends EventEmitter<TLEventMap> {
 				}
 			}
 
-			if (this.isShapeOfType<TLFrameShape>(shape, 'frame')) {
+			if (this.isShapeOfType(shape, 'frame')) {
 				// On the rare case that we've hit a frame (not its label), test again hitInside to be forced true;
 				// this prevents clicks from passing through the body of a frame to shapes behind it.
 
 				// If the hit is within the frame's outer margin, then select the frame
-				const distance = geometry.distanceToPoint(pointInShapeSpace, hitFrameInside)
-				if (
-					hitFrameInside
-						? (distance > 0 && distance <= outerMargin) ||
-							(distance <= 0 && distance > -innerMargin)
-						: distance > 0 && distance <= outerMargin
-				) {
+				const distance = geometry.distanceToPoint(pointInShapeSpace, hitInside)
+				if (Math.abs(distance) <= margin) {
 					return inMarginClosestToEdgeHit || shape
 				}
 
@@ -5264,11 +5253,11 @@ export class Editor extends EventEmitter<TLEventMap> {
 				// If the margin is zero and the geometry has a very small width or height,
 				// then check the actual distance. This is to prevent a bug where straight
 				// lines would never pass the broad phase (point-in-bounds) check.
-				if (outerMargin === 0 && (geometry.bounds.w < 1 || geometry.bounds.h < 1)) {
+				if (margin === 0 && (geometry.bounds.w < 1 || geometry.bounds.h < 1)) {
 					distance = geometry.distanceToPoint(pointInShapeSpace, hitInside)
 				} else {
 					// Broad phase
-					if (geometry.bounds.containsPoint(pointInShapeSpace, outerMargin)) {
+					if (geometry.bounds.containsPoint(pointInShapeSpace, margin)) {
 						// Narrow phase (actual distance)
 						distance = geometry.distanceToPoint(pointInShapeSpace, hitInside)
 					} else {
@@ -5283,8 +5272,7 @@ export class Editor extends EventEmitter<TLEventMap> {
 				// the shape or negative if inside of the shape. If the distance
 				// is greater than the margin, then it's a miss. Otherwise...
 
-				// Are we close to the shape's edge?
-				if (distance <= outerMargin || (hitInside && distance <= 0 && distance > -innerMargin)) {
+				if (distance <= margin) {
 					if (geometry.isFilled || (isGroup && geometry.children[0].isFilled)) {
 						// If the shape is filled, then it's a hit. Remember, we're
 						// starting from the TOP-MOST shape in z-index order, so any
@@ -5294,21 +5282,11 @@ export class Editor extends EventEmitter<TLEventMap> {
 						// If the shape is bigger than the viewport, then skip it.
 						if (this.getShapePageBounds(shape)!.contains(viewportPageBounds)) continue
 
-						// If we're close to the edge of the shape, and if it's the closest edge among
-						// all the edges that we've gotten close to so far, then we will want to hit the
-						// shape unless we hit something else or closer in later iterations.
-						if (
-							hitInside
-								? // On hitInside, the distance will be negative for hits inside
-									// If the distance is positive, check against the outer margin
-									(distance > 0 && distance <= outerMargin) ||
-									// If the distance is negative, check against the inner margin
-									(distance <= 0 && distance > -innerMargin)
-								: // If hitInside is false, then sadly _we do not know_ whether the
-									// point is inside or outside of the shape, so we check against
-									// the max of the two margins
-									Math.abs(distance) <= Math.max(innerMargin, outerMargin)
-						) {
+						// For hollow shapes...
+						if (Math.abs(distance) < margin) {
+							// We want to preference shapes where we're inside of the
+							// shape margin; and we would want to hit the shape with the
+							// edge closest to the point.
 							if (Math.abs(distance) < inMarginClosestToEdgeDistance) {
 								inMarginClosestToEdgeDistance = Math.abs(distance)
 								inMarginClosestToEdgeHit = shape
@@ -5330,7 +5308,6 @@ export class Editor extends EventEmitter<TLEventMap> {
 			} else {
 				// For open shapes (e.g. lines or draw shapes) always use the margin.
 				// If the distance is less than the margin, return the shape as the hit.
-				// Use the editor's configurable hit test margin.
 				if (distance < this.options.hitTestMargin / zoomLevel) {
 					return shape
 				}
@@ -6333,17 +6310,7 @@ export class Editor extends EventEmitter<TLEventMap> {
 
 			this.createShapes(shapesToCreate)
 			this.createBindings(bindingsToCreate)
-
-			this.setSelectedShapes(
-				compact(
-					ids.map((oldId) => {
-						const newId = shapeIds.get(oldId)
-						if (!newId) return null
-						if (!this.getShape(newId)) return null
-						return newId
-					})
-				)
-			)
+			this.setSelectedShapes(compact(ids.map((id) => shapeIds.get(id))))
 
 			if (offset !== undefined) {
 				// If we've offset the duplicated shapes, check to see whether their new bounds is entirely
@@ -7397,6 +7364,7 @@ export class Editor extends EventEmitter<TLEventMap> {
 			if (
 				!this.getShapeUtil(shape).canBeLaidOut?.(shape, {
 					type: 'stretch',
+					shapes: shapesToStretchFirstPass,
 				})
 			) {
 				continue
@@ -7867,38 +7835,31 @@ export class Editor extends EventEmitter<TLEventMap> {
 				) {
 					let parentId: TLParentId = this.getFocusedGroupId()
 
-					const isPositioned = partial.x !== undefined && partial.y !== undefined
-
-					// If the shape has been explicitly positioned, we'll try to find a parent at
-					// that position. If not, we'll assume the user isn't deliberately placing the
-					// shape and the positioning will be handled later by another system.
-					if (isPositioned) {
-						for (let i = currentPageShapesSorted.length - 1; i >= 0; i--) {
-							const parent = currentPageShapesSorted[i]
-							const util = this.getShapeUtil(parent)
-							if (
-								util.canReceiveNewChildrenOfType(parent, partial.type) &&
-								!this.isShapeHidden(parent) &&
-								this.isPointInShape(
-									parent,
-									// If no parent is provided, then we can treat the
-									// shape's provided x/y as being in the page's space.
-									{ x: partial.x ?? 0, y: partial.y ?? 0 },
-									{
-										margin: 0,
-										hitInside: true,
-									}
-								)
-							) {
-								parentId = parent.id
-								break
-							}
+					for (let i = currentPageShapesSorted.length - 1; i >= 0; i--) {
+						const parent = currentPageShapesSorted[i]
+						const util = this.getShapeUtil(parent)
+						if (
+							util.canReceiveNewChildrenOfType(parent, partial.type) &&
+							!this.isShapeHidden(parent) &&
+							this.isPointInShape(
+								parent,
+								// If no parent is provided, then we can treat the
+								// shape's provided x/y as being in the page's space.
+								{ x: partial.x ?? 0, y: partial.y ?? 0 },
+								{
+									margin: 0,
+									hitInside: true,
+								}
+							)
+						) {
+							parentId = parent.id
+							break
 						}
 					}
 
 					const prevParentId = partial.parentId
 
-					// a shape cannot be its own parent. This was a rare issue with frames/groups in the syncFuzz tests.
+					// a shape cannot be it's own parent. This was a rare issue with frames/groups in the syncFuzz tests.
 					if (parentId === partial.id) {
 						parentId = focusedGroupId
 					}
@@ -9686,52 +9647,6 @@ export class Editor extends EventEmitter<TLEventMap> {
 		return this
 	}
 
-	/**
-	 * Dispatch a pointer move event in the current position of the pointer. This is useful when
-	 * external circumstances have changed (e.g. the camera moved or a shape was moved) and you want
-	 * the current interaction to respond to that change.
-	 *
-	 * @example
-	 * ```ts
-	 * editor.updatePointer()
-	 * ```
-	 *
-	 * @param options - The options for updating the pointer.
-	 * @returns The editor instance.
-	 * @public
-	 */
-	updatePointer(options?: TLUpdatePointerOptions): this {
-		const event: TLPointerEventInfo = {
-			type: 'pointer',
-			target: 'canvas',
-			name: 'pointer_move',
-			point:
-				options?.point ??
-				// weird but true: what `inputs` calls screen-space is actually viewport space. so
-				// we need to convert back into true screen space first. we should fix this...
-				Vec.Add(
-					this.inputs.currentScreenPoint,
-					this.store.unsafeGetWithoutCapture(TLINSTANCE_ID)!.screenBounds
-				),
-			pointerId: options?.pointerId ?? 0,
-			button: options?.button ?? 0,
-			isPen: options?.isPen ?? this.inputs.isPen,
-			shiftKey: options?.shiftKey ?? this.inputs.shiftKey,
-			altKey: options?.altKey ?? this.inputs.altKey,
-			ctrlKey: options?.ctrlKey ?? this.inputs.ctrlKey,
-			metaKey: options?.metaKey ?? this.inputs.metaKey,
-			accelKey: options?.accelKey ?? isAccelKey(this.inputs),
-		}
-
-		if (options?.immediate) {
-			this._flushEventForTick(event)
-		} else {
-			this.dispatch(event)
-		}
-
-		return this
-	}
-
 	/**
 	 * Puts the editor into focused mode.
 	 *

package/src/lib/editor/managers/ClickManager/ClickManager.test.ts

@@ -1,13 +1,12 @@
-import { Mocked, vi } from 'vitest'
 import { Editor } from '../../Editor'
 import { TLClickEventInfo, TLPointerEventInfo } from '../../types/event-types'
 import { ClickManager } from './ClickManager'
 
 // Mock the Editor class
-vi.mock('../../Editor')
+jest.mock('../../Editor')
 
 describe('ClickManager', () => {
-	let editor: Mocked<Editor>
+	let editor: jest.Mocked<Editor>
 	let clickManager: ClickManager
 	let mockTimers: any
 
@@ -30,14 +29,14 @@ describe('ClickManager', () => {
 	})
 
 	beforeEach(() => {
-		vi.useFakeTimers()
+		jest.useFakeTimers()
 		mockTimers = {
-			setTimeout: vi.fn((fn, delay) => setTimeout(fn, delay)),
+			setTimeout: jest.fn((fn, delay) => setTimeout(fn, delay)),
 		}
 
 		editor = {
 			timers: mockTimers,
-			dispatch: vi.fn(),
+			dispatch: jest.fn(),
 			options: {
 				doubleClickDurationMs: 300,
 				multiClickDurationMs: 300,
@@ -47,7 +46,7 @@ describe('ClickManager', () => {
 			inputs: {
 				currentScreenPoint: { x: 0, y: 0 },
 			},
-			getInstanceState: vi.fn(() => ({
+			getInstanceState: jest.fn(() => ({
 				isCoarsePointer: false,
 			})),
 		} as any
@@ -56,8 +55,8 @@ describe('ClickManager', () => {
 	})
 
 	afterEach(() => {
-		vi.useRealTimers()
-		vi.clearAllMocks()
+		jest.useRealTimers()
+		jest.clearAllMocks()
 	})
 
 	describe('constructor and initial state', () => {
@@ -101,7 +100,7 @@ describe('ClickManager', () => {
 			clickManager.handlePointerEvent(pointerEvent)
 			expect(clickManager.clickState).toBe('pendingDouble')
 
-			vi.advanceTimersByTime(350)
+			jest.advanceTimersByTime(350)
 
 			expect(clickManager.clickState).toBe('idle')
 		})
@@ -142,7 +141,7 @@ describe('ClickManager', () => {
 			clickManager.handlePointerEvent(firstDown)
 			clickManager.handlePointerEvent(secondDown)
 
-			vi.advanceTimersByTime(350)
+			jest.advanceTimersByTime(350)
 
 			expect(editor.dispatch).toHaveBeenCalledWith(
 				expect.objectContaining({
@@ -236,7 +235,7 @@ describe('ClickManager', () => {
 			clickManager.handlePointerEvent(pointerDown) // second
 			clickManager.handlePointerEvent(pointerDown) // third
 
-			vi.advanceTimersByTime(350)
+			jest.advanceTimersByTime(350)
 
 			expect(editor.dispatch).toHaveBeenCalledWith(
 				expect.objectContaining({
@@ -256,7 +255,7 @@ describe('ClickManager', () => {
 			clickManager.handlePointerEvent(pointerDown) // third
 			clickManager.handlePointerEvent(pointerDown) // fourth
 
-			vi.advanceTimersByTime(350)
+			jest.advanceTimersByTime(350)
 
 			expect(editor.dispatch).toHaveBeenCalledWith(
 				expect.objectContaining({
@@ -278,7 +277,7 @@ describe('ClickManager', () => {
 				editor.options.doubleClickDurationMs
 			)
 
-			vi.clearAllMocks()
+			jest.clearAllMocks()
 
 			// Second click - should use multiClickDurationMs
 			clickManager.handlePointerEvent(pointerDown)
@@ -393,7 +392,7 @@ describe('ClickManager', () => {
 			clickManager.cancelDoubleClickTimeout()
 
 			// Advance time - should not dispatch settle event
-			vi.advanceTimersByTime(350)
+			jest.advanceTimersByTime(350)
 
 			expect(editor.dispatch).not.toHaveBeenCalled()
 			expect(clickManager.clickState).toBe('idle')

package/src/lib/editor/managers/EdgeScrollManager/EdgeScrollManager.test.ts

@@ -1,20 +1,19 @@
-import { Mock, Mocked, vi } from 'vitest'
 import { Box } from '../../../primitives/Box'
 import { Vec } from '../../../primitives/Vec'
 import { Editor } from '../../Editor'
 import { EdgeScrollManager } from './EdgeScrollManager'
 
 // Mock the Editor class
-vi.mock('../../Editor')
+jest.mock('../../Editor')
 
 describe('EdgeScrollManager', () => {
-	let editor: Mocked<
+	let editor: jest.Mocked<
 		Editor & {
-			user: { getEdgeScrollSpeed: Mock }
-			getCamera: Mock
-			getCameraOptions: Mock
-			getZoomLevel: Mock
-			getViewportScreenBounds: Mock
+			user: { getEdgeScrollSpeed: jest.Mock }
+			getCamera: jest.Mock
+			getCameraOptions: jest.Mock
+			getZoomLevel: jest.Mock
+			getViewportScreenBounds: jest.Mock
 		}
 	>
 	let edgeScrollManager: EdgeScrollManager
@@ -34,33 +33,33 @@ describe('EdgeScrollManager', () => {
 				isPanning: false,
 			},
 			user: {
-				getEdgeScrollSpeed: vi.fn(() => 1),
+				getEdgeScrollSpeed: jest.fn(() => 1),
 			},
-			getViewportScreenBounds: vi.fn(() => new Box(0, 0, 1000, 600)),
-			getInstanceState: vi.fn(
+			getViewportScreenBounds: jest.fn(() => new Box(0, 0, 1000, 600)),
+			getInstanceState: jest.fn(
 				() =>
 					({
 						isCoarsePointer: false,
 						insets: [false, false, false, false], // [top, right, bottom, left]
 					}) as any
 			),
-			getCameraOptions: vi.fn(() => ({
+			getCameraOptions: jest.fn(() => ({
 				isLocked: false,
 				panSpeed: 1,
 				zoomSpeed: 1,
 				zoomSteps: [1],
 				wheelBehavior: 'pan' as const,
 			})),
-			getZoomLevel: vi.fn(() => 1),
-			getCamera: vi.fn(() => new Vec(0, 0, 1)),
-			setCamera: vi.fn(),
+			getZoomLevel: jest.fn(() => 1),
+			getCamera: jest.fn(() => new Vec(0, 0, 1)),
+			setCamera: jest.fn(),
 		} as any
 
 		edgeScrollManager = new EdgeScrollManager(editor as any)
 	})
 
 	afterEach(() => {
-		vi.clearAllMocks()
+		jest.clearAllMocks()
 	})
 
 	describe('constructor and initialization', () => {