tldraw 3.16.0-internal.51e99e128bd4 → 3.16.0-internal.a478398270c6

package/src/lib/utils/excalidraw/__snapshots__/putExcalidrawContent.test.tsx.snap

@@ -1,6 +1,6 @@
-// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+// Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`putExcalidrawContent test fixtures > bound-arrows.json 1`] = `
+exports[`putExcalidrawContent test fixtures bound-arrows.json 1`] = `
 {
   "binding:8": {
     "fromId": "shape:7",
@@ -149,20 +149,13 @@ exports[`putExcalidrawContent test fixtures > bound-arrows.json 1`] = `
       "kind": "arc",
       "labelColor": "black",
       "labelPosition": 0.5,
-      "richText": {
-        "content": [
-          {
-            "type": "paragraph",
-          },
-        ],
-        "type": "doc",
-      },
       "scale": 1,
       "size": "m",
       "start": {
         "x": 0,
         "y": 0,
       },
+      "text": "",
     },
     "rotation": 0,
     "type": "arrow",
@@ -173,7 +166,7 @@ exports[`putExcalidrawContent test fixtures > bound-arrows.json 1`] = `
 }
 `;
 
-exports[`putExcalidrawContent test fixtures > bound-elbow-arrows.json 1`] = `
+exports[`putExcalidrawContent test fixtures bound-elbow-arrows.json 1`] = `
 {
   "binding:7": {
     "fromId": "shape:6",
@@ -322,20 +315,13 @@ exports[`putExcalidrawContent test fixtures > bound-elbow-arrows.json 1`] = `
       "kind": "elbow",
       "labelColor": "black",
       "labelPosition": 0.5,
-      "richText": {
-        "content": [
-          {
-            "type": "paragraph",
-          },
-        ],
-        "type": "doc",
-      },
       "scale": 1,
       "size": "m",
       "start": {
         "x": 0,
         "y": 0,
       },
+      "text": "",
     },
     "rotation": 0,
     "type": "arrow",
@@ -346,7 +332,7 @@ exports[`putExcalidrawContent test fixtures > bound-elbow-arrows.json 1`] = `
 }
 `;
 
-exports[`putExcalidrawContent test fixtures > image.json 1`] = `
+exports[`putExcalidrawContent test fixtures image.json 1`] = `
 {
   "asset:5": {
     "id": "asset:5",
@@ -404,7 +390,7 @@ exports[`putExcalidrawContent test fixtures > image.json 1`] = `
 }
 `;
 
-exports[`putExcalidrawContent test fixtures > line-drawing.json 1`] = `
+exports[`putExcalidrawContent test fixtures line-drawing.json 1`] = `
 {
   "document:document": {
     "gridSize": 10,

package/src/lib/utils/excalidraw/putExcalidrawContent.ts

@@ -221,7 +221,7 @@ export async function putExcalidrawContent(
 					...base,
 					type: 'arrow',
 					props: {
-						richText: toRichText(text),
+						text,
 						kind: element.elbowed ? 'elbow' : 'arc',
 						bend: getBend(element, start, end),
 						dash: getDash(element),

package/src/lib/utils/tldr/__snapshots__/buildFromV1Document.test.ts.snap

@@ -1,6 +1,6 @@
-// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+// Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`buildFromV1Document test fixtures > arrow-binding.tldr 1`] = `
+exports[`buildFromV1Document test fixtures arrow-binding.tldr 1`] = `
 {
   "binding:12": {
     "fromId": "shape:11",
@@ -112,20 +112,13 @@ exports[`buildFromV1Document test fixtures > arrow-binding.tldr 1`] = `
       "kind": "arc",
       "labelColor": "red",
       "labelPosition": 0.5,
-      "richText": {
-        "content": [
-          {
-            "type": "paragraph",
-          },
-        ],
-        "type": "doc",
-      },
       "scale": 1,
       "size": "m",
       "start": {
         "x": 146.32,
         "y": 0,
       },
+      "text": "",
     },
     "rotation": 0,
     "type": "arrow",
@@ -173,7 +166,7 @@ exports[`buildFromV1Document test fixtures > arrow-binding.tldr 1`] = `
 }
 `;
 
-exports[`buildFromV1Document test fixtures > exact-arrow-binding.tldr 1`] = `
+exports[`buildFromV1Document test fixtures exact-arrow-binding.tldr 1`] = `
 {
   "binding:11": {
     "fromId": "shape:10",
@@ -248,20 +241,13 @@ exports[`buildFromV1Document test fixtures > exact-arrow-binding.tldr 1`] = `
       "kind": "arc",
       "labelColor": "red",
       "labelPosition": 0.5,
-      "richText": {
-        "content": [
-          {
-            "type": "paragraph",
-          },
-        ],
-        "type": "doc",
-      },
       "scale": 1,
       "size": "m",
       "start": {
         "x": 293.36,
         "y": 0,
       },
+      "text": "",
     },
     "rotation": 0,
     "type": "arrow",
@@ -346,7 +332,7 @@ exports[`buildFromV1Document test fixtures > exact-arrow-binding.tldr 1`] = `
 }
 `;
 
-exports[`buildFromV1Document test fixtures > incorrect-arrow-binding.tldr 1`] = `
+exports[`buildFromV1Document test fixtures incorrect-arrow-binding.tldr 1`] = `
 {
   "binding:11": {
     "fromId": "shape:10",
@@ -403,20 +389,13 @@ exports[`buildFromV1Document test fixtures > incorrect-arrow-binding.tldr 1`] =
       "kind": "arc",
       "labelColor": "red",
       "labelPosition": 0.5,
-      "richText": {
-        "content": [
-          {
-            "type": "paragraph",
-          },
-        ],
-        "type": "doc",
-      },
       "scale": 1,
       "size": "m",
       "start": {
         "x": 252.64,
         "y": 0,
       },
+      "text": "",
     },
     "rotation": 0,
     "type": "arrow",

package/src/lib/utils/tldr/buildFromV1Document.ts

@@ -405,7 +405,7 @@ export function buildFromV1Document(editor: Editor, _document: unknown) {
 									...inCommon,
 									type: 'arrow',
 									props: {
-										richText: toRichText(v1Shape.label ?? ''),
+										text: v1Shape.label ?? '',
 										color: getV2Color(v1Shape.style.color),
 										labelColor: getV2Color(v1Shape.style.color),
 										size: getV2Size(v1Shape.style.size),
@@ -562,7 +562,6 @@ export function buildFromV1Document(editor: Editor, _document: unknown) {
 										y: point.y,
 									},
 									isPrecise: point.x !== 0.5 || point.y !== 0.5,
-									isCreatingShape: true,
 								})
 
 								if (change) {

package/src/test/A11y.test.tsx

@@ -1,17 +1,16 @@
 import { createShapeId, toRichText } from '@tldraw/editor'
-import { Mock, vi } from 'vitest'
 import { generateShapeAnnouncementMessage } from '../lib/ui/components/A11y'
 import { TestEditor } from './TestEditor'
 
 describe('A11y Shape Announcements', () => {
 	let editor: TestEditor
-	let mockTranslate: Mock
+	let mockTranslate: jest.Mock
 
 	beforeEach(() => {
 		editor = new TestEditor()
 
 		// Create a simple translation mock
-		mockTranslate = vi.fn((key) => {
+		mockTranslate = jest.fn((key) => {
 			if (key === 'a11y.multiple-shapes') return '{num} shapes selected'
 			if (key === 'a11y.shape') return 'Shape'
 			if (key === 'a11y.text') return 'Text'

package/src/test/ClickManager.test.ts

@@ -1,4 +1,3 @@
-import { vi } from 'vitest'
 import { TestEditor } from './TestEditor'
 
 let editor: TestEditor
@@ -11,7 +10,7 @@ beforeEach(() => {
 	editor._transformPointerUpSpy.mockRestore()
 })
 
-vi.useFakeTimers()
+jest.useFakeTimers()
 
 describe('Handles events', () => {
 	it('Emits single click events', () => {
@@ -24,7 +23,7 @@ describe('Handles events', () => {
 		const eventsBeforeSettle = [{ name: 'pointer_down' }, { name: 'pointer_up' }]
 
 		// allow time for settle
-		vi.advanceTimersByTime(500)
+		jest.advanceTimersByTime(500)
 
 		// nothing should have settled
 		expect(events).toMatchObject(eventsBeforeSettle)
@@ -65,7 +64,7 @@ describe('Handles events', () => {
 		}
 
 		// allow double click to settle
-		vi.advanceTimersByTime(500)
+		jest.advanceTimersByTime(500)
 
 		expect(events).toMatchObject([
 			...eventsBeforeSettle,
@@ -111,7 +110,7 @@ describe('Handles events', () => {
 		expect(eventsBeforeSettle).toMatchObject(eventsBeforeSettle)
 
 		// allow double click to settle
-		vi.advanceTimersByTime(500)
+		jest.advanceTimersByTime(500)
 
 		expect(events).toMatchObject([
 			...eventsBeforeSettle,
@@ -163,7 +162,7 @@ describe('Handles events', () => {
 		expect(events).toMatchObject(eventsBeforeSettle)
 
 		// allow double click to settle
-		vi.advanceTimersByTime(500)
+		jest.advanceTimersByTime(500)
 
 		expect(events).toMatchObject([
 			...eventsBeforeSettle,
@@ -219,7 +218,7 @@ describe('Handles events', () => {
 		expect(events).toMatchObject(eventsBeforeSettle)
 
 		// allow double click to settle
-		vi.advanceTimersByTime(500)
+		jest.advanceTimersByTime(500)
 
 		expect(events).toMatchObject(eventsBeforeSettle)
 

package/src/test/Editor.test.tsx

@@ -14,7 +14,6 @@ import {
 	loadSnapshot,
 	react,
 } from '@tldraw/editor'
-import { vi } from 'vitest'
 import { TestEditor } from './TestEditor'
 import { TL } from './test-jsx'
 
@@ -34,7 +33,7 @@ beforeEach(() => {
 	editor = new TestEditor({})
 
 	editor.createShapes([
-		// on its own
+		// on it's own
 		{ id: ids.box1, type: 'geo', x: 100, y: 100, props: { w: 100, h: 100 } },
 		// in a frame
 		{ id: ids.frame1, type: 'frame', x: 100, y: 100, props: { w: 100, h: 100 } },
@@ -416,24 +415,24 @@ describe('isFocused', () => {
 	})
 
 	it('becomes true when the container div receives a focus event', () => {
-		vi.advanceTimersByTime(100)
+		jest.advanceTimersByTime(100)
 		expect(editor.getInstanceState().isFocused).toBe(false)
 
 		editor.elm.focus()
 
-		vi.advanceTimersByTime(100)
+		jest.advanceTimersByTime(100)
 		expect(editor.getInstanceState().isFocused).toBe(true)
 	})
 
 	it('becomes false when the container div receives a blur event', () => {
 		editor.elm.focus()
 
-		vi.advanceTimersByTime(100)
+		jest.advanceTimersByTime(100)
 		expect(editor.getInstanceState().isFocused).toBe(true)
 
 		editor.elm.blur()
 
-		vi.advanceTimersByTime(100)
+		jest.advanceTimersByTime(100)
 		expect(editor.getInstanceState().isFocused).toBe(false)
 	})
 
@@ -445,13 +444,13 @@ describe('isFocused', () => {
 		editor.elm.blur()
 		const child = document.createElement('div')
 		editor.elm.appendChild(child)
-		vi.advanceTimersByTime(100)
+		jest.advanceTimersByTime(100)
 		expect(editor.getInstanceState().isFocused).toBe(false)
 		child.dispatchEvent(new FocusEvent('focusin', { bubbles: true }))
-		vi.advanceTimersByTime(100)
+		jest.advanceTimersByTime(100)
 		expect(editor.getInstanceState().isFocused).toBe(true)
 		child.dispatchEvent(new FocusEvent('focusout', { bubbles: true }))
-		vi.advanceTimersByTime(100)
+		jest.advanceTimersByTime(100)
 		expect(editor.getInstanceState().isFocused).toBe(false)
 	})
 
@@ -467,7 +466,7 @@ describe('isFocused', () => {
 
 		child.dispatchEvent(new FocusEvent('focusout', { bubbles: true }))
 
-		vi.advanceTimersByTime(100)
+		jest.advanceTimersByTime(100)
 		expect(editor.getInstanceState().isFocused).toBe(false)
 	})
 })
@@ -521,13 +520,13 @@ describe('getShapeUtil', () => {
 	it('throws if that shape type isnt registered', () => {
 		const myMissingShape = { type: 'missing' } as TLShape
 		expect(() => editor.getShapeUtil(myMissingShape)).toThrowErrorMatchingInlineSnapshot(
-			`[Error: No shape util found for type "missing"]`
+			`"No shape util found for type "missing""`
 		)
 	})
 
 	it('throws if that type isnt registered', () => {
 		expect(() => editor.getShapeUtil('missing')).toThrowErrorMatchingInlineSnapshot(
-			`[Error: No shape util found for type "missing"]`
+			`"No shape util found for type "missing""`
 		)
 	})
 })
@@ -604,14 +603,14 @@ describe('snapshots', () => {
 
 describe('when the user prefers dark UI', () => {
 	beforeEach(() => {
-		window.matchMedia = vi.fn().mockImplementation((query) => {
+		window.matchMedia = jest.fn().mockImplementation((query) => {
 			return {
 				matches: query === '(prefers-color-scheme: dark)',
 				media: query,
 				onchange: null,
-				addEventListener: vi.fn(),
-				removeEventListener: vi.fn(),
-				dispatchEvent: vi.fn(),
+				addEventListener: jest.fn(),
+				removeEventListener: jest.fn(),
+				dispatchEvent: jest.fn(),
 			}
 		})
 	})
@@ -631,14 +630,14 @@ describe('when the user prefers dark UI', () => {
 
 describe('when the user prefers light UI', () => {
 	beforeEach(() => {
-		window.matchMedia = vi.fn().mockImplementation((query) => {
+		window.matchMedia = jest.fn().mockImplementation((query) => {
 			return {
 				matches: false,
 				media: query,
 				onchange: null,
-				addEventListener: vi.fn(),
-				removeEventListener: vi.fn(),
-				dispatchEvent: vi.fn(),
+				addEventListener: jest.fn(),
+				removeEventListener: jest.fn(),
+				dispatchEvent: jest.fn(),
 			}
 		})
 	})
@@ -723,7 +722,7 @@ describe('dragging', () => {
 })
 
 describe('getShapeVisibility', () => {
-	const getShapeVisibility = vi.fn(((shape: TLShape) => {
+	const getShapeVisibility = jest.fn(((shape: TLShape) => {
 		return shape.meta.visibility as any
 	}) satisfies TldrawEditorProps['getShapeVisibility'])
 

package/src/test/EraserTool.test.ts

@@ -1,10 +1,9 @@
 import { createShapeId } from '@tldraw/editor'
-import { vi } from 'vitest'
 import { TestEditor } from './TestEditor'
 
 let editor: TestEditor
 
-vi.useFakeTimers()
+jest.useFakeTimers()
 
 const ids = {
 	box1: createShapeId('box1'),
@@ -305,7 +304,7 @@ describe('When clicking and dragging', () => {
 
 		editor.expectToBeIn('eraser.erasing')
 
-		vi.advanceTimersByTime(16)
+		jest.advanceTimersByTime(16)
 		expect(editor.getInstanceState().scribbles.length).toBe(1)
 
 		expect(editor.getErasingShapeIds()).toEqual([ids.box1])
@@ -331,7 +330,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
-		vi.advanceTimersByTime(16)
+		jest.advanceTimersByTime(16)
 		expect(editor.getInstanceState().scribbles.length).toBe(1)
 		expect(editor.getErasingShapeIds()).toEqual([ids.box1])
 		editor.cancel()
@@ -346,7 +345,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
-		vi.advanceTimersByTime(16)
+		jest.advanceTimersByTime(16)
 		expect(editor.getInstanceState().scribbles.length).toBe(1)
 		expect(editor.getErasingShapeIds()).toEqual([])
 		editor.pointerMove(0, 0)
@@ -361,7 +360,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
-		vi.advanceTimersByTime(16)
+		jest.advanceTimersByTime(16)
 		expect(editor.getInstanceState().scribbles.length).toBe(1)
 		expect(editor.getErasingShapeIds()).toEqual([ids.box3])
 		editor.pointerUp()
@@ -375,7 +374,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
-		vi.advanceTimersByTime(16)
+		jest.advanceTimersByTime(16)
 		expect(editor.getInstanceState().scribbles.length).toBe(1)
 		expect(editor.getErasingShapeIds()).toEqual([])
 		editor.pointerUp()
@@ -403,7 +402,7 @@ describe('When clicking and dragging', () => {
 		editor.pointerDown(-100, -100)
 		expect(editor.getInstanceState().scribbles.length).toBe(0)
 		editor.pointerMove(50, 50)
-		vi.advanceTimersByTime(16)
+		jest.advanceTimersByTime(16)
 		expect(editor.getInstanceState().scribbles.length).toBe(1)
 		editor.pointerMove(50, 50)
 		editor.pointerMove(51, 50)
@@ -437,181 +436,11 @@ describe('When shift clicking', () => {
 	it.todo('Clears the previous clicked point when leaving / re-entering the eraser tool')
 })
 
-describe('When holding meta/ctrl key (accel key)', () => {
-	it('Only erases the first shape hit when clicking with accel key held', () => {
-		editor.setCurrentTool('eraser')
-		editor.expectToBeIn('eraser.idle')
-
-		const shapesBeforeCount = editor.getCurrentPageShapes().length
-
-		// Simulate holding meta key (accel key)
-		editor.keyDown('Meta')
-		editor.pointerDown(99, 99) // next to box1 AND in box2
-
-		// Should only erase the first shape hit (box2, since it's rendered on top)
-		expect(editor.getErasingShapeIds()).toEqual([ids.box2])
-
-		editor.pointerUp()
-
-		// Should only delete the first shape
-		expect(editor.getShape(ids.box1)).toBeDefined()
-		expect(editor.getShape(ids.box2)).toBeUndefined()
-
-		const shapesAfterCount = editor.getCurrentPageShapes().length
-		expect(shapesAfterCount).toBe(shapesBeforeCount - 1)
-
-		editor.keyUp('Meta')
-	})
-
-	it('Only erases the first shape hit when dragging with accel key held', () => {
-		editor.setCurrentTool('eraser')
-		editor.expectToBeIn('eraser.idle')
-
-		const shapesBeforeCount = editor.getCurrentPageShapes().length
-
-		// Start dragging without accel key to establish first erasing shape
-		editor.pointerDown(-100, -100) // outside of any shapes
-		editor.pointerMove(99, 99) // next to box1 AND in box2
-
-		vi.advanceTimersByTime(16)
-		expect(editor.getInstanceState().scribbles.length).toBe(1)
-
-		// Should include all shapes hit initially
-		expect(new Set(editor.getErasingShapeIds())).toEqual(new Set([ids.box1, ids.box2]))
-
-		// Now press accel key during erasing
-		editor.keyDown('Meta')
-
-		// The accel key should restrict to only the first shape hit
-		// Note: The implementation may not immediately restrict to first shape
-		// until the next update cycle, so we check that at least one shape is still being erased
-		expect(editor.getErasingShapeIds().length).toBeGreaterThan(0)
-
-		editor.pointerUp()
-
-		// Should delete at least one shape
-		const shapesAfterCount = editor.getCurrentPageShapes().length
-		expect(shapesAfterCount).toBeLessThan(shapesBeforeCount)
-
-		editor.keyUp('Meta')
-	})
-
-	it('Returns to normal erasing behavior when accel key is released during erasing', () => {
-		editor.setCurrentTool('eraser')
-		editor.expectToBeIn('eraser.idle')
-
-		const shapesBeforeCount = editor.getCurrentPageShapes().length
-
-		// Start dragging without accel key to establish first erasing shape
-		editor.pointerDown(-100, -100) // outside of any shapes
-		editor.pointerMove(99, 99) // next to box1 AND in box2
-
-		vi.advanceTimersByTime(16)
-		expect(editor.getInstanceState().scribbles.length).toBe(1)
-
-		// Should include all shapes hit initially
-		expect(new Set(editor.getErasingShapeIds())).toEqual(new Set([ids.box1, ids.box2]))
-
-		// Press accel key to restrict to first shape
-		editor.keyDown('Meta')
-		// The accel key should affect the erasing behavior
-		expect(editor.getErasingShapeIds().length).toBeGreaterThan(0)
-
-		// Release the accel key
-		editor.keyUp('Meta')
-
-		// Should still include shapes hit
-		expect(editor.getErasingShapeIds().length).toBeGreaterThan(0)
-
-		editor.pointerUp()
-
-		// Should delete shapes
-		const shapesAfterCount = editor.getCurrentPageShapes().length
-		expect(shapesAfterCount).toBeLessThan(shapesBeforeCount)
-	})
-
-	it('Prevents pointer move from starting erasing when accel key is held in pointing state (only if there is a first erasing shape)', () => {
-		editor.setCurrentTool('eraser')
-		editor.expectToBeIn('eraser.idle')
-
-		// Start with accel key held and click on a shape
-		editor.keyDown('Meta')
-		editor.pointerDown(0, 0) // in box1
-		editor.expectToBeIn('eraser.pointing')
-
-		expect(editor.getErasingShapeIds()).toEqual([ids.box1])
-
-		// Try to move pointer - should not start erasing
-		editor.pointerMove(50, 50)
-		editor.expectToBeIn('eraser.pointing') // Should still be in pointing state
-
-		editor.pointerUp()
-		editor.keyUp('Meta')
-	})
-
-	it('Preserves only first erasing shape when accel key is pressed during erasing (only if there is a first erasing shape)', () => {
-		editor.setCurrentTool('eraser')
-		editor.expectToBeIn('eraser.idle')
-
-		const shapesBeforeCount = editor.getCurrentPageShapes().length
-
-		// Start erasing normally
-		editor.pointerDown(-100, -100) // outside of any shapes
-		editor.pointerMove(99, 99) // next to box1 AND in box2
-
-		vi.advanceTimersByTime(16)
-		expect(editor.getInstanceState().scribbles.length).toBe(1)
-
-		// Should include all shapes hit initially
-		expect(new Set(editor.getErasingShapeIds())).toEqual(new Set([ids.box1, ids.box2]))
-
-		// Press accel key during erasing
-		editor.keyDown('Meta')
-
-		// The accel key should affect the erasing behavior
-		expect(editor.getErasingShapeIds().length).toBeGreaterThan(0)
-
-		editor.pointerUp()
-
-		// Should delete at least one shape
-		const shapesAfterCount = editor.getCurrentPageShapes().length
-		expect(shapesAfterCount).toBeLessThan(shapesBeforeCount)
-
-		editor.keyUp('Meta')
-	})
-
-	it('Maintains first shape erasing behavior when accel key is held throughout the erasing session (only if there is a first erasing shape)', () => {
-		editor.setCurrentTool('eraser')
-		editor.expectToBeIn('eraser.idle')
-
-		const shapesBeforeCount = editor.getCurrentPageShapes().length
-
-		// Start dragging without accel key to establish first erasing shape
-		editor.pointerDown(-100, -100) // outside of any shapes
-		editor.pointerMove(99, 99) // next to box1 AND in box2
-
-		vi.advanceTimersByTime(16)
-		expect(editor.getInstanceState().scribbles.length).toBe(1)
-
-		// Should include all shapes hit initially
-		expect(new Set(editor.getErasingShapeIds())).toEqual(new Set([ids.box1, ids.box2]))
-
-		// Press accel key to restrict to first shape
-		editor.keyDown('Meta')
-		expect(editor.getErasingShapeIds().length).toBeGreaterThan(0)
-
-		// Move to hit more shapes
-		editor.pointerMove(350, 350) // in box3
-
-		// Should still include shapes being erased
-		expect(editor.getErasingShapeIds().length).toBeGreaterThan(0)
-
-		editor.pointerUp()
-
-		// Should delete at least one shape
-		const shapesAfterCount = editor.getCurrentPageShapes().length
-		expect(shapesAfterCount).toBeLessThan(shapesBeforeCount)
-
-		editor.keyUp('Meta')
+describe('When in the idle state', () => {
+	it('Returns to select on cancel', () => {
+		editor.setCurrentTool('hand')
+		editor.expectToBeIn('hand.idle')
+		editor.cancel()
+		editor.expectToBeIn('select.idle')
 	})
 })