tldraw 4.2.0-next.3abbdad51d2e → 4.2.0-next.67908ea044c6

package/src/test/TldrawEditor.test.tsx

@@ -6,16 +6,17 @@ import {
 	HTMLContainer,
 	TLAssetStore,
 	TLBaseShape,
+	TLShapeId,
 	TldrawEditor,
 	createShapeId,
 	createTLStore,
 	noop,
+	toRichText,
 } 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'
 import { defaultAddFontsFromNode, tipTapDefaultExtensions } from '../lib/utils/text/richText'
 import {
 	renderTldrawComponent,
@@ -169,7 +170,7 @@ describe('<TldrawEditor />', () => {
 		let editor = {} as Editor
 		await renderTldrawComponent(
 			<TldrawEditor
-				shapeUtils={[GeoShapeUtil]}
+				shapeUtils={defaultShapeUtils}
 				initialState="select"
 				tools={defaultTools}
 				onMount={(editorApp) => {
@@ -185,39 +186,83 @@ describe('<TldrawEditor />', () => {
 			editor.updateInstanceState({ screenBounds: { x: 0, y: 0, w: 1080, h: 720 } })
 		})
 
-		const id = createShapeId()
-
-		await act(async () => {
-			editor.createShapes([
-				{
-					id,
-					type: 'geo',
-					props: { w: 100, h: 100 },
+		// Test all shape types except group
+		const shapeTypesToTest = [
+			{ type: 'arrow' as const, props: { start: { x: 0, y: 0 }, end: { x: 100, y: 100 } } },
+			{ type: 'bookmark' as const, props: { w: 100, h: 100, url: 'https://example.com' } },
+			{
+				type: 'draw' as const,
+				props: { segments: [{ type: 'free' as const, points: [{ x: 0, y: 0, z: 0.5 }] }] },
+			},
+			{ type: 'embed' as const, props: { w: 100, h: 100, url: 'https://example.com' } },
+			{ type: 'frame' as const, props: { w: 100, h: 100 } },
+			{ type: 'geo' as const, props: { w: 100, h: 100, geo: 'rectangle' } },
+			{
+				type: 'highlight' as const,
+				props: { segments: [{ type: 'free' as const, points: [{ x: 0, y: 0, z: 0.5 }] }] },
+			},
+			{ type: 'image' as const, props: { w: 100, h: 100 } },
+			{
+				type: 'line' as const,
+				props: {
+					points: {
+						a1: { id: 'a1', index: 'a1', x: 0, y: 0 },
+						a2: { id: 'a2', index: 'a2', x: 100, y: 100 },
+					},
 				},
-			])
-		})
+			},
+			{ type: 'note' as const, props: { richText: toRichText('test') } },
+			{ type: 'text' as const, props: { w: 100, richText: toRichText('test') } },
+			{ type: 'video' as const, props: { w: 100, h: 100 } },
+		]
+
+		const shapeIds: TLShapeId[] = []
+
+		for (let i = 0; i < shapeTypesToTest.length; i++) {
+			const shapeConfig = shapeTypesToTest[i]
+			const id = createShapeId()
+			shapeIds.push(id)
+
+			await act(async () => {
+				editor.createShapes([
+					{
+						id,
+						type: shapeConfig.type,
+						x: i * 150, // Space them out horizontally
+						y: 0,
+						props: shapeConfig.props,
+					},
+				])
+			})
+
+			// Does the shape exist?
+			const shape = editor.getShape(id)
+			expect(shape).toBeTruthy()
+			expect(shape?.type).toBe(shapeConfig.type)
+
+			// Check that all shapes rendered without error boundaries
+			expect(
+				document.querySelectorAll('.tl-shape-error-boundary'),
+				`${shapeConfig.type} had an error while rendering`
+			).toHaveLength(0)
+		}
 
-		// Does the shape exist?
-		expect(editor.getShape(id)).toMatchObject({
-			id,
-			type: 'geo',
-			x: 0,
-			y: 0,
-			opacity: 1,
-			props: { geo: 'rectangle', w: 100, h: 100 },
-		})
+		// Check that all shape components are rendering
+		expect(document.querySelectorAll('.tl-shape').length).toBeGreaterThanOrEqual(
+			shapeTypesToTest.length
+		)
 
-		// Is the shape's component rendering?
-		expect(document.querySelectorAll('.tl-shape')).toHaveLength(1)
-		// though indicator should be display none
-		expect(document.querySelectorAll('.tl-shape-indicator')).toHaveLength(1)
+		// Check that all shape indicators are present
+		expect(document.querySelectorAll('.tl-shape-indicator').length).toBeGreaterThanOrEqual(
+			shapeTypesToTest.length
+		)
 
-		// Select the shape
-		await act(async () => editor.select(id))
+		// Select one of the shapes (the note shape)
+		const noteShapeId = shapeIds[9] // note is at index 9
+		await act(async () => editor.select(noteShapeId))
 
 		expect(editor.getSelectedShapeIds().length).toBe(1)
-		// though indicator it should be visible
-		expect(document.querySelectorAll('.tl-shape-indicator')).toHaveLength(1)
+		expect(editor.getSelectedShapeIds()[0]).toBe(noteShapeId)
 
 		// Select the eraser tool...
 		await act(async () => editor.setCurrentTool('eraser'))

package/src/test/customSnapping.test.tsx

@@ -2,6 +2,7 @@ import {
 	BaseBoxShapeUtil,
 	IndexKey,
 	Polyline2d,
+	ShapeUtil,
 	TLAnyShapeUtilConstructor,
 	TLBaseShape,
 	TLHandle,
@@ -541,3 +542,187 @@ describe('custom handle snapping', () => {
 		})
 	})
 })
+
+describe('custom adjacent handle for shift snapping', () => {
+	type BezierShape = TLBaseShape<
+		'bezier',
+		{
+			start: VecModel
+			cp1: VecModel
+			cp2: VecModel
+			end: VecModel
+		}
+	>
+
+	class BezierShapeUtil extends ShapeUtil<BezierShape> {
+		static override type = 'bezier'
+		override getDefaultProps() {
+			return {
+				start: { x: 0, y: 0 },
+				cp1: { x: 50, y: 0 },
+				cp2: { x: 50, y: 100 },
+				end: { x: 100, y: 100 },
+			}
+		}
+		override component() {
+			throw new Error('Method not implemented.')
+		}
+		override indicator() {
+			throw new Error('Method not implemented.')
+		}
+		override getGeometry() {
+			return new Polyline2d({ points: [] })
+		}
+
+		override getHandles(shape: BezierShape): TLHandle[] {
+			return [
+				{
+					id: 'start',
+					type: 'vertex',
+					index: 'a0' as IndexKey,
+					x: shape.props.start.x,
+					y: shape.props.start.y,
+				},
+				{
+					id: 'cp1',
+					type: 'vertex',
+					index: 'a1' as IndexKey,
+					x: shape.props.cp1.x,
+					y: shape.props.cp1.y,
+					snapReferenceHandleId: 'start', // cp1 snaps relative to start
+				},
+				{
+					id: 'cp2',
+					type: 'vertex',
+					index: 'a2' as IndexKey,
+					x: shape.props.cp2.x,
+					y: shape.props.cp2.y,
+					snapReferenceHandleId: 'end', // cp2 snaps relative to end
+				},
+				{
+					id: 'end',
+					type: 'vertex',
+					index: 'a3' as IndexKey,
+					x: shape.props.end.x,
+					y: shape.props.end.y,
+				},
+			]
+		}
+
+		override onHandleDrag(shape: BezierShape, { handle }: TLHandleDragInfo<BezierShape>) {
+			return {
+				...shape,
+				props: {
+					...shape.props,
+					[handle.id]: { x: handle.x, y: handle.y },
+				},
+			}
+		}
+	}
+
+	const shapeUtils = [BezierShapeUtil] as TLAnyShapeUtilConstructor[]
+
+	let editor: TestEditor
+	let ids: Record<string, TLShapeId>
+
+	beforeEach(() => {
+		editor = new TestEditor({ shapeUtils })
+		ids = editor.createShapesFromJsx([
+			<TL.bezier
+				ref="bezier"
+				x={0}
+				y={0}
+				w={100}
+				h={100}
+				start={{ x: 0, y: 0 }}
+				cp1={{ x: 50, y: 0 }}
+				cp2={{ x: 50, y: 100 }}
+				end={{ x: 100, y: 100 }}
+			/>,
+		])
+	})
+
+	test('cp1 snaps angle relative to start point when using custom adjacent handle', () => {
+		editor.select(ids.bezier)
+		const bezier = editor.getShape<BezierShape>(ids.bezier)!
+		const cp1Handle = editor.getShapeHandles(bezier)!.find((h) => h.id === 'cp1')!
+
+		// Start dragging cp1 handle
+		editor.pointerDown(cp1Handle.x, cp1Handle.y, {
+			target: 'handle',
+			shape: bezier,
+			handle: cp1Handle,
+		})
+
+		// Move with shift key - should snap angle relative to start (0, 0) not cp2
+		editor.pointerMove(60, 20, { shiftKey: true })
+
+		const updatedBezier = editor.getShape<BezierShape>(ids.bezier)!
+		const cp1Pos = updatedBezier.props.cp1
+		const startPos = updatedBezier.props.start
+
+		// The angle from start to cp1 should be snapped to nearest 15 degrees
+		const angle = Math.atan2(cp1Pos.y - startPos.y, cp1Pos.x - startPos.x)
+		const degrees = (angle * 180) / Math.PI
+
+		// Should snap to a multiple of 15 degrees (snapAngle uses 24 divisions = 15 degrees)
+		const remainder = ((degrees % 15) + 15) % 15
+		expect(Math.min(remainder, 15 - remainder)).toBeLessThan(1)
+	})
+
+	test('cp2 snaps angle relative to end point when using custom adjacent handle', () => {
+		editor.select(ids.bezier)
+		const bezier = editor.getShape<BezierShape>(ids.bezier)!
+		const cp2Handle = editor.getShapeHandles(bezier)!.find((h) => h.id === 'cp2')!
+
+		// Start dragging cp2 handle
+		editor.pointerDown(cp2Handle.x, cp2Handle.y, {
+			target: 'handle',
+			shape: bezier,
+			handle: cp2Handle,
+		})
+
+		// Move with shift key - should snap angle relative to end (100, 100)
+		editor.pointerMove(80, 80, { shiftKey: true })
+
+		const updatedBezier = editor.getShape<BezierShape>(ids.bezier)!
+		const cp2Pos = updatedBezier.props.cp2
+		const endPos = updatedBezier.props.end
+
+		// The angle from end to cp2 should be snapped to nearest 15 degrees
+		const angle = Math.atan2(cp2Pos.y - endPos.y, cp2Pos.x - endPos.x)
+		const degrees = (angle * 180) / Math.PI
+
+		// Should snap to a multiple of 15 degrees
+		const remainder = ((degrees % 15) + 15) % 15
+		expect(Math.min(remainder, 15 - remainder)).toBeLessThan(1)
+	})
+
+	test('default handles use default adjacent handle logic', () => {
+		editor.select(ids.bezier)
+		const bezier = editor.getShape<BezierShape>(ids.bezier)!
+		const startHandle = editor.getShapeHandles(bezier)!.find((h) => h.id === 'start')!
+
+		// Start dragging start handle
+		editor.pointerDown(startHandle.x, startHandle.y, {
+			target: 'handle',
+			shape: bezier,
+			handle: startHandle,
+		})
+
+		// Move with shift key - should use default logic (next vertex handle = cp1)
+		editor.pointerMove(10, 10, { shiftKey: true })
+
+		const updatedBezier = editor.getShape<BezierShape>(ids.bezier)!
+		const startPos = updatedBezier.props.start
+		const cp1Pos = updatedBezier.props.cp1
+
+		// The angle from cp1 to start should be snapped to nearest 15 degrees
+		const angle = Math.atan2(startPos.y - cp1Pos.y, startPos.x - cp1Pos.x)
+		const degrees = (angle * 180) / Math.PI
+
+		// Should snap to a multiple of 15 degrees
+		const remainder = ((degrees % 15) + 15) % 15
+		expect(Math.min(remainder, 15 - remainder)).toBeLessThan(1)
+	})
+})