tldraw 4.3.0-canary.fd6b7f2a8adc → 4.3.0-next.2b3bfbba757b

package/src/lib/tools/SelectTool/childStates/ScribbleBrushing.ts

@@ -1,6 +1,8 @@
 import {
 	Geometry2d,
 	StateNode,
+	TLFrameShape,
+	TLGroupShape,
 	TLShape,
 	TLShapeId,
 	Vec,
@@ -102,7 +104,7 @@ export class ScribbleBrushing extends StateNode {
 
 			// If the shape is a group or is already selected or locked, don't select it
 			if (
-				editor.isShapeOfType(shape, 'group') ||
+				editor.isShapeOfType<TLGroupShape>(shape, 'group') ||
 				newlySelectedShapeIds.has(shape.id) ||
 				editor.isShapeOrAncestorLocked(shape)
 			) {
@@ -113,7 +115,7 @@ export class ScribbleBrushing extends StateNode {
 
 			// If the scribble started inside of the frame, don't select it
 			if (
-				editor.isShapeOfType(shape, 'frame') &&
+				editor.isShapeOfType<TLFrameShape>(shape, 'frame') &&
 				geometry.bounds.containsPoint(editor.getPointInShapeSpace(shape, originPagePoint))
 			) {
 				continue

package/src/lib/tools/SelectTool/childStates/Translating.ts

@@ -407,7 +407,9 @@ function getTranslatingSnapshot(editor: Editor) {
 	const { originPagePoint } = editor.inputs
 
 	const allHoveredNotes = shapeSnapshots.filter(
-		(s) => editor.isShapeOfType(s.shape, 'note') && editor.isPointInShape(s.shape, originPagePoint)
+		(s) =>
+			editor.isShapeOfType<TLNoteShape>(s.shape, 'note') &&
+			editor.isPointInShape(s.shape, originPagePoint)
 	) as (MovingShapeSnapshot & { shape: TLNoteShape })[]
 
 	if (allHoveredNotes.length === 0) {

package/src/lib/ui/components/EditLinkDialog.tsx

@@ -1,4 +1,4 @@
-import { ExtractShapeByProps, T, TLShape, track, useEditor } from '@tldraw/editor'
+import { T, TLBaseShape, track, useEditor } from '@tldraw/editor'
 import { useCallback, useEffect, useRef, useState } from 'react'
 import { TLUiDialogProps } from '../context/dialogs'
 import { useTranslation } from '../hooks/useTranslation/useTranslation'
@@ -25,28 +25,20 @@ function validateUrl(url: string) {
 	return { isValid: false, hasProtocol: false }
 }
 
-type ShapeWithUrl = ExtractShapeByProps<{ url: string }>
-
-function isShapeWithUrl(shape: TLShape | null | undefined): shape is ShapeWithUrl {
-	return !!(shape && 'url' in shape.props && typeof shape.props.url === 'string')
-}
-
-function assertShapeWithUrl(shape: TLShape | null | undefined): asserts shape is ShapeWithUrl {
-	if (!isShapeWithUrl(shape)) {
-		throw new Error('Shape is not a valid ShapeWithUrl')
-	}
-}
+type ShapeWithUrl = TLBaseShape<string, { url: string }>
 
 export const EditLinkDialog = track(function EditLinkDialog({ onClose }: TLUiDialogProps) {
 	const editor = useEditor()
 
 	const selectedShape = editor.getOnlySelectedShape()
 
-	if (!isShapeWithUrl(selectedShape)) {
+	if (
+		!(selectedShape && 'url' in selectedShape.props && typeof selectedShape.props.url === 'string')
+	) {
 		return null
 	}
 
-	return <EditLinkDialogInner onClose={onClose} selectedShape={selectedShape} />
+	return <EditLinkDialogInner onClose={onClose} selectedShape={selectedShape as ShapeWithUrl} />
 })
 
 export const EditLinkDialogInner = track(function EditLinkDialogInner({
@@ -106,7 +98,6 @@ export const EditLinkDialogInner = track(function EditLinkDialogInner({
 	const handleClear = useCallback(() => {
 		const onlySelectedShape = editor.getOnlySelectedShape()
 		if (!onlySelectedShape) return
-		assertShapeWithUrl(onlySelectedShape)
 		editor.updateShapes([
 			{ id: onlySelectedShape.id, type: onlySelectedShape.type, props: { url: '' } },
 		])
@@ -117,7 +108,6 @@ export const EditLinkDialogInner = track(function EditLinkDialogInner({
 		const onlySelectedShape = editor.getOnlySelectedShape()
 
 		if (!onlySelectedShape) return
-		assertShapeWithUrl(onlySelectedShape)
 
 		// ? URL is a magic value
 		if (onlySelectedShape && 'url' in onlySelectedShape.props) {

package/src/lib/ui/components/Toolbar/AltTextEditor.tsx

@@ -1,4 +1,4 @@
-import { ExtractShapeByProps, preventDefault, TLShape, TLShapeId, useEditor } from '@tldraw/editor'
+import { preventDefault, TLShape, TLShapeId, useEditor } from '@tldraw/editor'
 import { useCallback, useEffect, useRef, useState } from 'react'
 import { useUiEvents } from '../../context/events'
 import { useTranslation } from '../../hooks/useTranslation/useTranslation'
@@ -31,7 +31,7 @@ export function AltTextEditor({ shapeId, onClose, source }: AltTextEditorProps)
 
 	const handleComplete = () => {
 		trackEvent('set-alt-text', { source })
-		const shape = editor.getShape<ExtractShapeByProps<{ altText: string }>>(shapeId)
+		const shape = editor.getShape<TLShape & { props: { altText: string } }>(shapeId)
 		if (!shape) return
 		editor.updateShapes([
 			{

package/src/lib/ui/components/menu-items.tsx

@@ -1,4 +1,12 @@
-import { TLPageId, useEditor, useValue } from '@tldraw/editor'
+import {
+	TLBookmarkShape,
+	TLEmbedShape,
+	TLFrameShape,
+	TLImageShape,
+	TLPageId,
+	useEditor,
+	useValue,
+} from '@tldraw/editor'
 import { supportsDownloadingOriginal } from '../context/actions'
 import { useUiEvents } from '../context/events'
 import { useToasts } from '../context/toasts'
@@ -56,7 +64,7 @@ export function FlattenMenuItem() {
 			const selectedShapeIds = editor.getSelectedShapeIds()
 			if (selectedShapeIds.length === 0) return false
 			const onlySelectedShape = editor.getOnlySelectedShape()
-			if (onlySelectedShape && editor.isShapeOfType(onlySelectedShape, 'image')) {
+			if (onlySelectedShape && editor.isShapeOfType<TLImageShape>(onlySelectedShape, 'image')) {
 				return false
 			}
 			return true
@@ -109,7 +117,7 @@ export function RemoveFrameMenuItem() {
 		() => {
 			const selectedShapes = editor.getSelectedShapes()
 			if (selectedShapes.length === 0) return false
-			return selectedShapes.every((shape) => editor.isShapeOfType(shape, 'frame'))
+			return selectedShapes.every((shape) => editor.isShapeOfType<TLFrameShape>(shape, 'frame'))
 		},
 		[editor]
 	)
@@ -127,7 +135,7 @@ export function FitFrameToContentMenuItem() {
 			const onlySelectedShape = editor.getOnlySelectedShape()
 			if (!onlySelectedShape) return false
 			return (
-				editor.isShapeOfType(onlySelectedShape, 'frame') &&
+				editor.isShapeOfType<TLFrameShape>(onlySelectedShape, 'frame') &&
 				editor.getSortedChildIdsForParent(onlySelectedShape).length > 0
 			)
 		},
@@ -510,7 +518,7 @@ export function ConvertToBookmarkMenuItem() {
 			const onlySelectedShape = editor.getOnlySelectedShape()
 			if (!onlySelectedShape) return false
 			return !!(
-				editor.isShapeOfType(onlySelectedShape, 'embed') &&
+				editor.isShapeOfType<TLEmbedShape>(onlySelectedShape, 'embed') &&
 				onlySelectedShape.props.url &&
 				!editor.isShapeOrAncestorLocked(onlySelectedShape)
 			)
@@ -534,7 +542,7 @@ export function ConvertToEmbedMenuItem() {
 			const onlySelectedShape = editor.getOnlySelectedShape()
 			if (!onlySelectedShape) return false
 			return !!(
-				editor.isShapeOfType(onlySelectedShape, 'bookmark') &&
+				editor.isShapeOfType<TLBookmarkShape>(onlySelectedShape, 'bookmark') &&
 				onlySelectedShape.props.url &&
 				getEmbedDefinition(onlySelectedShape.props.url) &&
 				!editor.isShapeOrAncestorLocked(onlySelectedShape)

package/src/lib/ui/context/actions.tsx

@@ -6,7 +6,10 @@ import {
 	HALF_PI,
 	PageRecordType,
 	Result,
+	TLBookmarkShape,
 	TLEmbedShape,
+	TLFrameShape,
+	TLGroupShape,
 	TLImageShape,
 	TLShape,
 	TLShapeId,
@@ -324,7 +327,7 @@ export function ActionsProvider({ overrides, children }: ActionsProviderProps) {
 							.getSelectedShapes()
 							.filter(
 								(shape): shape is TLTextShape =>
-									editor.isShapeOfType(shape, 'text') && shape.props.autoSize === false
+									editor.isShapeOfType<TLTextShape>(shape, 'text') && shape.props.autoSize === false
 							)
 						editor.updateShapes(
 							shapes.map((shape) => {
@@ -359,7 +362,7 @@ export function ActionsProvider({ overrides, children }: ActionsProviderProps) {
 						return
 					}
 					const shape = editor.getShape(ids[0])
-					if (!shape || !editor.isShapeOfType(shape, 'embed')) {
+					if (!shape || !editor.isShapeOfType<TLEmbedShape>(shape, 'embed')) {
 						console.error(warnMsg)
 						return
 					}
@@ -398,7 +401,8 @@ export function ActionsProvider({ overrides, children }: ActionsProviderProps) {
 					const creationPromises: Promise<Result<any, any>>[] = []
 
 					for (const shape of shapes) {
-						if (!shape || !editor.isShapeOfType(shape, 'embed') || !shape.props.url) continue
+						if (!shape || !editor.isShapeOfType<TLEmbedShape>(shape, 'embed') || !shape.props.url)
+							continue
 
 						const center = editor.getShapePageBounds(shape)?.center
 
@@ -437,7 +441,7 @@ export function ActionsProvider({ overrides, children }: ActionsProviderProps) {
 						const createList: TLShapePartial[] = []
 						const deleteList: TLShapeId[] = []
 						for (const shape of shapes) {
-							if (!editor.isShapeOfType(shape, 'bookmark')) continue
+							if (!editor.isShapeOfType<TLBookmarkShape>(shape, 'bookmark')) continue
 
 							const { url } = shape.props
 
@@ -548,7 +552,7 @@ export function ActionsProvider({ overrides, children }: ActionsProviderProps) {
 
 					trackEvent('group-shapes', { source })
 					const onlySelectedShape = editor.getOnlySelectedShape()
-					if (onlySelectedShape && editor.isShapeOfType(onlySelectedShape, 'group')) {
+					if (onlySelectedShape && editor.isShapeOfType<TLGroupShape>(onlySelectedShape, 'group')) {
 						editor.markHistoryStoppingPoint('ungroup')
 						editor.ungroupShapes(editor.getSelectedShapeIds())
 					} else {
@@ -568,7 +572,7 @@ export function ActionsProvider({ overrides, children }: ActionsProviderProps) {
 					const selectedShapes = editor.getSelectedShapes()
 					if (
 						selectedShapes.length > 0 &&
-						selectedShapes.every((shape) => editor.isShapeOfType(shape, 'frame'))
+						selectedShapes.every((shape) => editor.isShapeOfType<TLFrameShape>(shape, 'frame'))
 					) {
 						editor.markHistoryStoppingPoint('remove-frame')
 						removeFrame(
@@ -586,7 +590,7 @@ export function ActionsProvider({ overrides, children }: ActionsProviderProps) {
 
 					trackEvent('fit-frame-to-content', { source })
 					const onlySelectedShape = editor.getOnlySelectedShape()
-					if (onlySelectedShape && editor.isShapeOfType(onlySelectedShape, 'frame')) {
+					if (onlySelectedShape && editor.isShapeOfType<TLFrameShape>(onlySelectedShape, 'frame')) {
 						editor.markHistoryStoppingPoint('fit-frame-to-content')
 						fitFrameToContent(editor, onlySelectedShape.id)
 					}
@@ -1595,8 +1599,8 @@ export function ActionsProvider({ overrides, children }: ActionsProviderProps) {
 					const onlySelectedShape = editor.getOnlySelectedShape()
 					if (
 						onlySelectedShape &&
-						(editor.isShapeOfType(onlySelectedShape, 'image') ||
-							editor.isShapeOfType(onlySelectedShape, 'video'))
+						(editor.isShapeOfType<TLImageShape>(onlySelectedShape, 'image') ||
+							editor.isShapeOfType<TLVideoShape>(onlySelectedShape, 'video'))
 					) {
 						const firstToolbarButton = editor
 							.getContainer()

package/src/lib/ui/hooks/menu-hooks.ts

@@ -1,4 +1,14 @@
-import { Editor, useEditor, useValue } from '@tldraw/editor'
+import {
+	Editor,
+	TLArrowShape,
+	TLDrawShape,
+	TLGroupShape,
+	TLImageShape,
+	TLLineShape,
+	TLTextShape,
+	useEditor,
+	useValue,
+} from '@tldraw/editor'
 import { getArrowBindings } from '../../shapes/arrow/shared'
 
 function shapesWithUnboundArrows(editor: Editor) {
@@ -9,7 +19,7 @@ function shapesWithUnboundArrows(editor: Editor) {
 
 	return selectedShapes.filter((shape) => {
 		if (!shape) return false
-		if (editor.isShapeOfType(shape, 'arrow')) {
+		if (editor.isShapeOfType<TLArrowShape>(shape, 'arrow')) {
 			const bindings = getArrowBindings(editor, shape)
 			if (bindings.start || bindings.end) return false
 		}
@@ -42,7 +52,7 @@ export const useAllowGroup = () => {
 			if (selectedShapes.length < 2) return false
 
 			for (const shape of selectedShapes) {
-				if (editor.isShapeOfType(shape, 'arrow')) {
+				if (editor.isShapeOfType<TLArrowShape>(shape, 'arrow')) {
 					const bindings = getArrowBindings(editor, shape)
 					if (bindings.start) {
 						// if the other shape is not among the selected shapes...
@@ -153,7 +163,7 @@ export function useShowAutoSizeToggle() {
 			const selectedShapes = editor.getSelectedShapes()
 			return (
 				selectedShapes.length === 1 &&
-				editor.isShapeOfType(selectedShapes[0], 'text') &&
+				editor.isShapeOfType<TLTextShape>(selectedShapes[0], 'text') &&
 				selectedShapes[0].props.autoSize === false
 			)
 		},
@@ -186,11 +196,11 @@ export function useOnlyFlippableShape() {
 			const shape = editor.getOnlySelectedShape()
 			return (
 				shape &&
-				(editor.isShapeOfType(shape, 'group') ||
-					editor.isShapeOfType(shape, 'image') ||
-					editor.isShapeOfType(shape, 'arrow') ||
-					editor.isShapeOfType(shape, 'line') ||
-					editor.isShapeOfType(shape, 'draw'))
+				(editor.isShapeOfType<TLGroupShape>(shape, 'group') ||
+					editor.isShapeOfType<TLImageShape>(shape, 'image') ||
+					editor.isShapeOfType<TLArrowShape>(shape, 'arrow') ||
+					editor.isShapeOfType<TLLineShape>(shape, 'line') ||
+					editor.isShapeOfType<TLDrawShape>(shape, 'draw'))
 			)
 		},
 		[editor]

package/src/lib/ui/hooks/useFlatten.ts

@@ -3,6 +3,7 @@ import {
 	Editor,
 	IndexKey,
 	TLImageAsset,
+	TLImageShape,
 	TLShape,
 	TLShapeId,
 	Vec,
@@ -165,7 +166,7 @@ export async function flattenShapesToImages(
 			const shapeId = createShapeId()
 
 			// create an image shape in the same place as the shapes
-			editor.createShape({
+			editor.createShape<TLImageShape>({
 				id: shapeId,
 				type: 'image',
 				index,

package/src/lib/ui/hooks/useTools.tsx

@@ -4,6 +4,7 @@ import {
 	Editor,
 	GeoShapeGeoStyle,
 	getIndicesBetween,
+	TLLineShape,
 	TLPointerEventInfo,
 	TLShapeId,
 	toRichText,
@@ -194,7 +195,7 @@ export function ToolsProvider({ overrides, children }: TLUiToolsProviderProps) {
 					onDragFromToolbarToCreateShape(editor, info, {
 						createShape: (id) => {
 							const [start, end] = getIndicesBetween(null, null, 2)
-							editor.createShape({
+							editor.createShape<TLLineShape>({
 								id,
 								type: 'line',
 								props: {

package/src/lib/ui/version.ts

@@ -1,9 +1,9 @@
 // This file is automatically generated by internal/scripts/refresh-assets.ts.
 // Do not edit manually. Or do, I'm a comment, not a cop.
 
-export const version = '4.3.0-canary.fd6b7f2a8adc'
+export const version = '4.3.0-next.2b3bfbba757b'
 export const publishDates = {
 	major: '2025-09-18T14:39:22.803Z',
-	minor: '2025-11-24T22:53:38.801Z',
-	patch: '2025-11-24T22:53:38.801Z',
+	minor: '2025-11-25T08:43:48.918Z',
+	patch: '2025-11-25T08:43:48.918Z',
 }

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

@@ -133,7 +133,6 @@ export async function putExcalidrawContent(
 					...base,
 					type: 'geo',
 					props: {
-						...editor.getShapeUtil('geo').getDefaultProps(),
 						geo: element.type,
 						url: element.link ?? '',
 						w: element.width,
@@ -153,7 +152,6 @@ export async function putExcalidrawContent(
 					...base,
 					type: 'draw',
 					props: {
-						...editor.getShapeUtil('draw').getDefaultProps(),
 						dash: getDash(element),
 						size: strokeWidthsToSizes[element.strokeWidth],
 						color: colorsToColors[element.strokeColor] ?? 'black',
@@ -182,7 +180,6 @@ export async function putExcalidrawContent(
 					...base,
 					type: 'line',
 					props: {
-						...editor.getShapeUtil('line').getDefaultProps(),
 						dash: getDash(element),
 						size: strokeWidthsToSizes[element.strokeWidth],
 						color: colorsToColors[element.strokeColor] ?? 'black',
@@ -224,7 +221,6 @@ export async function putExcalidrawContent(
 					...base,
 					type: 'arrow',
 					props: {
-						...editor.getShapeUtil('arrow').getDefaultProps(),
 						richText: toRichText(text),
 						kind: element.elbowed ? 'elbow' : 'arc',
 						bend: getBend(element, start, end),
@@ -247,7 +243,6 @@ export async function putExcalidrawContent(
 						toId: startTargetId,
 						props: {
 							terminal: 'start',
-							snap: 'none',
 							normalizedAnchor: { x: 0.5, y: 0.5 },
 							isPrecise: false,
 							isExact: false,
@@ -264,7 +259,6 @@ export async function putExcalidrawContent(
 						toId: endTargetId,
 						props: {
 							terminal: 'end',
-							snap: 'none',
 							normalizedAnchor: { x: 0.5, y: 0.5 },
 							isPrecise: false,
 							isExact: false,
@@ -281,7 +275,6 @@ export async function putExcalidrawContent(
 					...base,
 					type: 'text',
 					props: {
-						...editor.getShapeUtil('text').getDefaultProps(),
 						size,
 						scale,
 						font: fontFamilyToFontType[element.fontFamily] ?? 'draw',
@@ -317,7 +310,6 @@ export async function putExcalidrawContent(
 					...base,
 					type: 'image',
 					props: {
-						...editor.getShapeUtil('image').getDefaultProps(),
 						w: element.width,
 						h: element.height,
 						assetId,

package/src/lib/utils/export/exportAs.ts

@@ -1,4 +1,11 @@
-import { Editor, sanitizeId, TLExportType, TLImageExportOptions, TLShapeId } from '@tldraw/editor'
+import {
+	Editor,
+	sanitizeId,
+	TLExportType,
+	TLFrameShape,
+	TLImageExportOptions,
+	TLShapeId,
+} from '@tldraw/editor'
 
 /** @public */
 export interface ExportAsOptions extends TLImageExportOptions {
@@ -28,7 +35,7 @@ export async function exportAs(
 		name = `shapes at ${getTimestamp()}`
 		if (ids.length === 1) {
 			const first = editor.getShape(ids[0])!
-			if (editor.isShapeOfType(first, 'frame')) {
+			if (editor.isShapeOfType<TLFrameShape>(first, 'frame')) {
 				name = first.props.name || 'frame'
 			} else {
 				name = `${sanitizeId(first.id)} at ${getTimestamp()}`

package/src/lib/utils/frames/frames.ts

@@ -22,7 +22,7 @@ export function removeFrame(editor: Editor, ids: TLShapeId[]) {
 	const frames = compact(
 		ids
 			.map((id) => editor.getShape<TLFrameShape>(id))
-			.filter((f) => f && editor.isShapeOfType(f, 'frame'))
+			.filter((f) => f && editor.isShapeOfType<TLFrameShape>(f, 'frame'))
 	)
 	if (!frames.length) return
 

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

@@ -12,9 +12,14 @@ import {
 	TLDefaultHorizontalAlignStyle,
 	TLDefaultSizeStyle,
 	TLDefaultTextAlignStyle,
+	TLDrawShape,
 	TLGeoShape,
+	TLImageShape,
+	TLNoteShape,
 	TLPageId,
 	TLShapeId,
+	TLTextShape,
+	TLVideoShape,
 	Vec,
 	VecModel,
 	clamp,
@@ -182,7 +187,7 @@ export function buildFromV1Document(editor: Editor, _document: unknown) {
 
 					switch (v1Shape.type) {
 						case TLV1ShapeType.Sticky: {
-							editor.createShapes([
+							editor.createShapes<TLNoteShape>([
 								{
 									...inCommon,
 									type: 'note',
@@ -198,7 +203,7 @@ export function buildFromV1Document(editor: Editor, _document: unknown) {
 							break
 						}
 						case TLV1ShapeType.Rectangle: {
-							editor.createShapes([
+							editor.createShapes<TLGeoShape>([
 								{
 									...inCommon,
 									type: 'geo',
@@ -220,7 +225,7 @@ export function buildFromV1Document(editor: Editor, _document: unknown) {
 
 							const pageBoundsBeforeLabel = editor.getShapePageBounds(inCommon.id)!
 
-							editor.updateShapes([
+							editor.updateShapes<TLGeoShape>([
 								{
 									id: inCommon.id,
 									type: 'geo',
@@ -254,7 +259,7 @@ export function buildFromV1Document(editor: Editor, _document: unknown) {
 							break
 						}
 						case TLV1ShapeType.Triangle: {
-							editor.createShapes([
+							editor.createShapes<TLGeoShape>([
 								{
 									...inCommon,
 									type: 'geo',
@@ -275,7 +280,7 @@ export function buildFromV1Document(editor: Editor, _document: unknown) {
 
 							const pageBoundsBeforeLabel = editor.getShapePageBounds(inCommon.id)!
 
-							editor.updateShapes([
+							editor.updateShapes<TLGeoShape>([
 								{
 									id: inCommon.id,
 									type: 'geo',
@@ -309,7 +314,7 @@ export function buildFromV1Document(editor: Editor, _document: unknown) {
 							break
 						}
 						case TLV1ShapeType.Ellipse: {
-							editor.createShapes([
+							editor.createShapes<TLGeoShape>([
 								{
 									...inCommon,
 									type: 'geo',
@@ -330,7 +335,7 @@ export function buildFromV1Document(editor: Editor, _document: unknown) {
 
 							const pageBoundsBeforeLabel = editor.getShapePageBounds(inCommon.id)!
 
-							editor.updateShapes([
+							editor.updateShapes<TLGeoShape>([
 								{
 									id: inCommon.id,
 									type: 'geo',
@@ -370,7 +375,7 @@ export function buildFromV1Document(editor: Editor, _document: unknown) {
 								break
 							}
 
-							editor.createShapes([
+							editor.createShapes<TLDrawShape>([
 								{
 									...inCommon,
 									type: 'draw',
@@ -395,7 +400,7 @@ export function buildFromV1Document(editor: Editor, _document: unknown) {
 							const v2Bend = (dist * -v1Bend) / 2
 
 							// Could also be a line... but we'll use it as an arrow anyway
-							editor.createShapes([
+							editor.createShapes<TLArrowShape>([
 								{
 									...inCommon,
 									type: 'arrow',
@@ -424,7 +429,7 @@ export function buildFromV1Document(editor: Editor, _document: unknown) {
 							break
 						}
 						case TLV1ShapeType.Text: {
-							editor.createShapes([
+							editor.createShapes<TLTextShape>([
 								{
 									...inCommon,
 									type: 'text',
@@ -448,7 +453,7 @@ export function buildFromV1Document(editor: Editor, _document: unknown) {
 								return
 							}
 
-							editor.createShapes([
+							editor.createShapes<TLImageShape>([
 								{
 									...inCommon,
 									type: 'image',
@@ -469,7 +474,7 @@ export function buildFromV1Document(editor: Editor, _document: unknown) {
 								return
 							}
 
-							editor.createShapes([
+							editor.createShapes<TLVideoShape>([
 								{
 									...inCommon,
 									type: 'video',

package/src/test/Editor.test.tsx

@@ -472,20 +472,12 @@ describe('isFocused', () => {
 	})
 })
 
-const BLORG_TYPE = 'blorg'
-
-declare module '@tldraw/tlschema' {
-	export interface TLGlobalShapePropsMap {
-		[BLORG_TYPE]: { w: number; h: number }
-	}
-}
-
 describe('getShapeUtil', () => {
 	let myUtil: any
 
 	beforeEach(() => {
 		class _MyFakeShapeUtil extends BaseBoxShapeUtil<any> {
-			static override type = BLORG_TYPE
+			static override type = 'blorg'
 
 			getDefaultProps() {
 				return {
@@ -527,22 +519,16 @@ describe('getShapeUtil', () => {
 	})
 
 	it('throws if that shape type isnt registered', () => {
-		const myMissingShape = { type: 'missing' }
-		expect(() =>
-			editor.getShapeUtil(
-				// @ts-expect-error
-				myMissingShape
-			)
-		).toThrowErrorMatchingInlineSnapshot(`[Error: No shape util found for type "missing"]`)
+		const myMissingShape = { type: 'missing' } as TLShape
+		expect(() => editor.getShapeUtil(myMissingShape)).toThrowErrorMatchingInlineSnapshot(
+			`[Error: No shape util found for type "missing"]`
+		)
 	})
 
 	it('throws if that type isnt registered', () => {
-		expect(() =>
-			editor.getShapeUtil(
-				// @ts-expect-error
-				'missing'
-			)
-		).toThrowErrorMatchingInlineSnapshot(`[Error: No shape util found for type "missing"]`)
+		expect(() => editor.getShapeUtil('missing')).toThrowErrorMatchingInlineSnapshot(
+			`[Error: No shape util found for type "missing"]`
+		)
 	})
 })
 
@@ -880,19 +866,9 @@ describe('instance.isReadonly', () => {
 	})
 })
 
-const MY_CUSTOM_SHAPE_TYPE = 'myCustomShape'
-
-type MyCustomShape = TLShape<typeof MY_CUSTOM_SHAPE_TYPE>
-
-declare module '@tldraw/tlschema' {
-	export interface TLGlobalShapePropsMap {
-		[MY_CUSTOM_SHAPE_TYPE]: { w: number; h: number }
-	}
-}
-
 describe('the geometry cache', () => {
-	class CustomShapeUtil extends BaseBoxShapeUtil<MyCustomShape> {
-		static override type = MY_CUSTOM_SHAPE_TYPE
+	class CustomShapeUtil extends BaseBoxShapeUtil<any> {
+		static override type = 'custom'
 
 		getDefaultProps() {
 			return {
@@ -918,11 +894,9 @@ describe('the geometry cache', () => {
 		editor = new TestEditor({
 			shapeUtils: [CustomShapeUtil],
 		})
-		const { A } = editor.createShapesFromJsx([
-			<TL.myCustomShape ref="A" x={0} y={0} w={100} h={100} />,
-		])
+		const { A } = editor.createShapesFromJsx([<TL.custom ref="A" x={0} y={0} w={100} h={100} />])
 		expect(editor.getShapePageBounds(A)!.width).toBe(100)
-		editor.updateShape({ id: A, type: 'myCustomShape', meta: { double: true } })
+		editor.updateShape({ id: A, type: 'custom', meta: { double: true } })
 		expect(editor.getShapePageBounds(A)!.width).toBe(200)
 	})
 })