@tldraw/editor 4.3.0-canary.da35795ba8e2 → 4.3.0-canary.e52fa5385f86

package/src/lib/editor/shapes/ShapeUtil.ts

@@ -26,10 +26,7 @@ import { TLClickEventInfo } from '../types/event-types'
 import { TLResizeHandle } from '../types/selection-types'
 
 /** @public */
-export interface TLShapeUtilConstructor<
-	T extends TLUnknownShape,
-	U extends ShapeUtil<T> = ShapeUtil<T>,
-> {
+export interface TLShapeUtilConstructor<T extends TLShape, U extends ShapeUtil<T> = ShapeUtil<T>> {
 	new (editor: Editor): U
 	type: T['type']
 	props?: RecordProps<T>
@@ -42,11 +39,11 @@ export interface TLShapeUtilConstructor<
  *
  * @public
  */
-export interface TLShapeUtilCanBindOpts<Shape extends TLUnknownShape = TLUnknownShape> {
+export interface TLShapeUtilCanBindOpts<Shape extends TLShape = TLShape> {
 	/** The type of shape referenced by the `fromId` of the binding. */
-	fromShapeType: string
+	fromShapeType: TLShape['type']
 	/** The type of shape referenced by the `toId` of the binding. */
-	toShapeType: string
+	toShapeType: TLShape['type']
 	/** The type of binding. */
 	bindingType: string
 }
@@ -79,7 +76,7 @@ export interface TLShapeUtilCanvasSvgDef {
 }
 
 /** @public */
-export abstract class ShapeUtil<Shape extends TLUnknownShape = TLUnknownShape> {
+export abstract class ShapeUtil<Shape extends TLShape = TLShape> {
 	/** Configure this shape utils {@link ShapeUtil.options | `options`}. */
 	static configure<T extends TLShapeUtilConstructor<any, any>>(
 		this: T,

package/src/lib/editor/shapes/group/GroupShapeUtil.tsx

@@ -55,9 +55,7 @@ export class GroupShapeUtil extends ShapeUtil<TLGroupShape> {
 		const isHintingOtherGroup =
 			hintingShapeIds.length > 0 &&
 			hintingShapeIds.some(
-				(id) =>
-					id !== shape.id &&
-					this.editor.isShapeOfType<TLGroupShape>(this.editor.getShape(id)!, 'group')
+				(id) => id !== shape.id && this.editor.isShapeOfType(this.editor.getShape(id)!, 'group')
 			)
 
 		const isFocused = this.editor.getCurrentPageState().focusedGroupId !== shape.id

package/src/lib/editor/tools/BaseBoxShapeTool/BaseBoxShapeTool.ts

@@ -1,4 +1,5 @@
 import { TLShape } from '@tldraw/tlschema'
+import { TLBaseBoxShape } from '../../shapes/BaseBoxShapeUtil'
 import { StateNode, TLStateNodeConstructor } from '../StateNode'
 import { Idle } from './children/Idle'
 import { Pointing } from './children/Pointing'
@@ -11,7 +12,7 @@ export abstract class BaseBoxShapeTool extends StateNode {
 		return [Idle, Pointing]
 	}
 
-	abstract override shapeType: string
+	abstract override shapeType: TLBaseBoxShape['type']
 
 	onCreate?(_shape: TLShape | null): void | null
 }

package/src/lib/editor/tools/BaseBoxShapeTool/children/Pointing.ts

@@ -23,7 +23,7 @@ export class Pointing extends StateNode {
 			const newPoint = maybeSnapToGrid(originPagePoint, editor)
 
 			// Allow this to trigger the max shapes reached alert
-			this.editor.createShapes<TLBaseBoxShape>([
+			this.editor.createShapes([
 				{
 					id,
 					type: shapeType,
@@ -88,7 +88,7 @@ export class Pointing extends StateNode {
 
 		// Allow this to trigger the max shapes reached alert
 		// todo: add scale here when dynamic size is enabled (is this still needed?)
-		this.editor.createShapes<TLBaseBoxShape>([
+		this.editor.createShapes([
 			{
 				id,
 				type: shapeType,
@@ -127,7 +127,7 @@ export class Pointing extends StateNode {
 			;(next as TLBaseBoxShape & { props: { scale: number } }).props.scale = scale
 		}
 
-		this.editor.updateShape<TLBaseBoxShape>(next)
+		this.editor.updateShape(next)
 
 		this.editor.setSelectedShapes([id])
 

package/src/lib/editor/types/emit-types.ts

@@ -1,5 +1,5 @@
 import { HistoryEntry } from '@tldraw/store'
-import { TLPageId, TLRecord, TLShapeId } from '@tldraw/tlschema'
+import { BoxModel, TLPageId, TLRecord, TLShapeId } from '@tldraw/tlschema'
 import { TLEventInfo } from './event-types'
 
 /** @public */
@@ -16,12 +16,14 @@ export interface TLEventMap {
 	event: [TLEventInfo]
 	tick: [number]
 	frame: [number]
+	resize: [BoxModel]
 	'select-all-text': [{ shapeId: TLShapeId }]
 	'place-caret': [{ shapeId: TLShapeId; point: { x: number; y: number } }]
 	'created-shapes': [TLRecord[]]
 	'edited-shapes': [TLRecord[]]
 	'deleted-shapes': [TLShapeId[]]
 	edit: []
+	dispose: []
 }
 
 /** @public */

package/src/lib/exports/getSvgJsx.test.ts

@@ -1,30 +1,21 @@
-import {
-	Geometry2d,
-	RecordProps,
-	Rectangle2d,
-	ShapeUtil,
-	T,
-	TLBaseShape,
-	createShapeId,
-} from '../..'
+import { Geometry2d, RecordProps, Rectangle2d, ShapeUtil, T, TLShape, createShapeId } from '../..'
 import { createTLStore } from '../config/createTLStore'
 import { Editor } from '../editor/Editor'
 import { Box } from '../primitives/Box'
 import { getExportDefaultBounds } from './getSvgJsx'
 
-type ITestShape = TLBaseShape<
-	'test-shape',
-	{
-		w: number
-		h: number
-		x: number
-		y: number
-		isContainer?: boolean
+const TEST_SHAPE_TYPE = 'test-shape'
+
+declare module '@tldraw/tlschema' {
+	export interface TLGlobalShapePropsMap {
+		[TEST_SHAPE_TYPE]: { w: number; h: number; x: number; y: number; isContainer?: boolean }
 	}
->
+}
+
+type ITestShape = TLShape<typeof TEST_SHAPE_TYPE>
 
 class TestShape extends ShapeUtil<ITestShape> {
-	static override type = 'test-shape' as const
+	static override type = TEST_SHAPE_TYPE
 	static override props: RecordProps<ITestShape> = {
 		w: T.number,
 		h: T.number,

package/src/lib/exports/getSvgJsx.tsx

@@ -1,7 +1,6 @@
 import { useAtom, useValue } from '@tldraw/state-react'
 import {
 	TLFrameShape,
-	TLGroupShape,
 	TLShape,
 	TLShapeId,
 	getColorValue,
@@ -58,9 +57,7 @@ export function getSvgJsx(editor: Editor, ids: TLShapeId[], opts: TLImageExportO
 
 	// --- Common bounding box of all shapes
 	const singleFrameShapeId =
-		ids.length === 1 && editor.isShapeOfType<TLFrameShape>(editor.getShape(ids[0])!, 'frame')
-			? ids[0]
-			: null
+		ids.length === 1 && editor.isShapeOfType(editor.getShape(ids[0])!, 'frame') ? ids[0] : null
 
 	let bbox: null | Box = null
 	if (opts.bounds) {
@@ -272,7 +269,7 @@ function SvgExport({
 
 					const shape = editor.getShape(id)!
 
-					if (editor.isShapeOfType<TLGroupShape>(shape, 'group')) return []
+					if (editor.isShapeOfType(shape, 'group')) return []
 
 					const elements = []
 					const util = editor.getShapeUtil(shape)

package/src/lib/globals/environment.ts

@@ -1,5 +1,9 @@
+import { atom } from '@tldraw/state'
+
 /**
  * An object that contains information about the current device and environment.
+ * This object is not reactive and will not update automatically when the environment changes,
+ * so only include values that are fixed, such as the user's browser and operating system.
  *
  * @public
  */
@@ -14,15 +18,66 @@ const tlenv = {
 	hasCanvasSupport: false,
 }
 
-if (typeof window !== 'undefined' && 'navigator' in window) {
-	tlenv.isSafari = /^((?!chrome|android).)*safari/i.test(navigator.userAgent)
-	tlenv.isIos = !!navigator.userAgent.match(/iPad/i) || !!navigator.userAgent.match(/iPhone/i)
-	tlenv.isChromeForIos = /crios.*safari/i.test(navigator.userAgent)
-	tlenv.isFirefox = /firefox/i.test(navigator.userAgent)
-	tlenv.isAndroid = /android/i.test(navigator.userAgent)
-	tlenv.isDarwin = window.navigator.userAgent.toLowerCase().indexOf('mac') > -1
-	tlenv.hasCanvasSupport =
-		typeof window !== 'undefined' && 'Promise' in window && 'HTMLCanvasElement' in window
+let isForcedFinePointer = false
+
+if (typeof window !== 'undefined') {
+	if ('navigator' in window) {
+		tlenv.isSafari = /^((?!chrome|android).)*safari/i.test(navigator.userAgent)
+		tlenv.isIos = !!navigator.userAgent.match(/iPad/i) || !!navigator.userAgent.match(/iPhone/i)
+		tlenv.isChromeForIos = /crios.*safari/i.test(navigator.userAgent)
+		tlenv.isFirefox = /firefox/i.test(navigator.userAgent)
+		tlenv.isAndroid = /android/i.test(navigator.userAgent)
+		tlenv.isDarwin = window.navigator.userAgent.toLowerCase().indexOf('mac') > -1
+	}
+	tlenv.hasCanvasSupport = 'Promise' in window && 'HTMLCanvasElement' in window
+	isForcedFinePointer = tlenv.isFirefox && !tlenv.isAndroid && !tlenv.isIos
+}
+
+/**
+ * An atom that contains information about the current device and environment.
+ * This object is reactive and will update automatically when the environment changes.
+ * Use it for values that may change over time, such as the pointer type.
+ *
+ * @public
+ */
+const tlenvReactive = atom('tlenvReactive', {
+	// Whether the user's device has a coarse pointer. This is dynamic on many systems, especially
+	// on touch-screen laptops, which will become "coarse" if the user touches the screen.
+	// See https://developer.mozilla.org/en-US/docs/Web/CSS/Reference/At-rules/@media/pointer#coarse
+	isCoarsePointer: false,
+})
+
+if (typeof window !== 'undefined' && !isForcedFinePointer) {
+	const mql = window.matchMedia && window.matchMedia('(any-pointer: coarse)')
+
+	const isCurrentCoarsePointer = () => tlenvReactive.__unsafe__getWithoutCapture().isCoarsePointer
+
+	if (mql) {
+		// 1. Update the coarse pointer automatically when the media query changes
+		const updateIsCoarsePointer = () => {
+			const isCoarsePointer = mql.matches
+			if (isCoarsePointer !== isCurrentCoarsePointer()) {
+				tlenvReactive.update((prev) => ({ ...prev, isCoarsePointer: isCoarsePointer }))
+			}
+		}
+		updateIsCoarsePointer()
+		mql.addEventListener('change', updateIsCoarsePointer)
+	}
+
+	// 2. Also update the coarse pointer state when a pointer down event occurs. We need `capture: true`
+	// here because the tldraw component itself stops propagation on pointer events it receives.
+	window.addEventListener(
+		'pointerdown',
+		(e: PointerEvent) => {
+			// when the user interacts with a mouse, we assume they have a fine pointer.
+			// otherwise, we assume they have a coarse pointer.
+			const isCoarseEvent = e.pointerType !== 'mouse'
+			if (isCoarseEvent !== isCurrentCoarsePointer()) {
+				tlenvReactive.update((prev) => ({ ...prev, isCoarsePointer: isCoarseEvent }))
+			}
+		},
+		{ capture: true }
+	)
 }
 
-export { tlenv }
+export { tlenv, tlenvReactive }

package/src/lib/globals/menus.ts

@@ -148,7 +148,7 @@ export const tlmenus = {
 	 * @public
 	 */
 	isMenuOpen(id: string, contextId?: string): boolean {
-		return this.getOpenMenus(contextId).includes(id)
+		return this.getOpenMenus(contextId).includes(`${id}-${contextId}`)
 	},
 
 	/**

package/src/lib/hooks/useCoarsePointer.ts

@@ -1,66 +1,23 @@
-import { useEffect } from 'react'
-import { tlenv } from '../globals/environment'
+import { unsafe__withoutCapture } from '@tldraw/state'
+import { useReactor } from '@tldraw/state-react'
+import { tlenvReactive } from '../globals/environment'
 import { useEditor } from './useEditor'
 
 /** @internal */
 export function useCoarsePointer() {
 	const editor = useEditor()
 
-	useEffect(() => {
-		// We'll track our own state for the pointer type
-		let isCoarse = editor.getInstanceState().isCoarsePointer
-
-		// 1.
-		// We'll use pointer events to detect coarse pointer.
-
-		const handlePointerDown = (e: PointerEvent) => {
-			// when the user interacts with a mouse, we assume they have a fine pointer.
-			// otherwise, we assume they have a coarse pointer.
-			const isCoarseEvent = e.pointerType !== 'mouse'
-			if (isCoarse === isCoarseEvent) return
-			isCoarse = isCoarseEvent
-			editor.updateInstanceState({ isCoarsePointer: isCoarseEvent })
-		}
-
-		// we need `capture: true` here because the tldraw component itself stops propagation on
-		// pointer events it receives.
-		window.addEventListener('pointerdown', handlePointerDown, { capture: true })
-
-		// 2.
-		// We can also use the media query to detect / set the initial pointer type
-		// and update the state if the pointer type changes.
-
-		// We want the touch / mouse events to run even if the browser does not
-		// support matchMedia. We'll have to handle the media query changes
-		// conditionally in the code below.
-		const mql = window.matchMedia && window.matchMedia('(any-pointer: coarse)')
-
-		// This is a workaround for a Firefox bug where we don't correctly
-		// detect coarse VS fine pointer. For now, let's assume that you have a fine
-		// pointer if you're on Firefox on desktop.
-		const isForcedFinePointer = tlenv.isFirefox && !tlenv.isAndroid && !tlenv.isIos
-
-		const handleMediaQueryChange = () => {
-			const next = isForcedFinePointer ? false : mql.matches // get the value from the media query
-			if (isCoarse !== next) return // bail if the value hasn't changed
-			isCoarse = next // update the local value
-			editor.updateInstanceState({ isCoarsePointer: next }) // update the value in state
-		}
-
-		if (mql) {
-			// set up the listener
-			mql.addEventListener('change', handleMediaQueryChange)
-
-			// and run the handler once to set the initial value
-			handleMediaQueryChange()
-		}
-
-		return () => {
-			window.removeEventListener('pointerdown', handlePointerDown, { capture: true })
-
-			if (mql) {
-				mql.removeEventListener('change', handleMediaQueryChange)
-			}
-		}
-	}, [editor])
+	// When the coarse pointer state changes, update the instance state
+	useReactor(
+		'coarse pointer change',
+		() => {
+			const isCoarsePointer = tlenvReactive.get().isCoarsePointer
+			const isInstanceStateCoarsePointer = unsafe__withoutCapture(
+				() => editor.getInstanceState().isCoarsePointer
+			)
+			if (isCoarsePointer === isInstanceStateCoarsePointer) return
+			editor.updateInstanceState({ isCoarsePointer: isCoarsePointer })
+		},
+		[editor]
+	)
 }

package/src/lib/utils/reparenting.ts

@@ -95,8 +95,8 @@ export function kickoutOccludedShapes(
 		if (remainingShapesToReparent.size > 0) {
 			// The remaining shapes are going to be reparented to the old parent's containing group, if there was one, or else to the page
 			const newParentId =
-				editor.findShapeAncestor(prevParent, (s) => editor.isShapeOfType<TLGroupShape>(s, 'group'))
-					?.id ?? editor.getCurrentPageId()
+				editor.findShapeAncestor(prevParent, (s) => editor.isShapeOfType(s, 'group'))?.id ??
+				editor.getCurrentPageId()
 
 			remainingShapesToReparent.forEach((shape) => {
 				if (!parentsToNewChildren[newParentId]) {
@@ -211,7 +211,7 @@ export function getDroppedShapesToNewParents(
 
 	for (const shape of shapes) {
 		const parent = editor.getShapeParent(shape)
-		if (parent && editor.isShapeOfType<TLGroupShape>(parent, 'group')) {
+		if (parent && editor.isShapeOfType(parent, 'group')) {
 			if (!movingGroups.has(parent)) {
 				movingGroups.add(parent)
 			}
@@ -248,7 +248,7 @@ export function getDroppedShapesToNewParents(
 	parentCheck: for (let i = potentialParentShapes.length - 1; i >= 0; i--) {
 		const parentShape = potentialParentShapes[i]
 		const parentShapeContainingGroupId = editor.findShapeAncestor(parentShape, (s) =>
-			editor.isShapeOfType<TLGroupShape>(s, 'group')
+			editor.isShapeOfType(s, 'group')
 		)?.id
 
 		const parentGeometry = editor.getShapeGeometry(parentShape)
@@ -274,7 +274,7 @@ export function getDroppedShapesToNewParents(
 			if (!shapeGroupIds.has(shape.id)) {
 				shapeGroupIds.set(
 					shape.id,
-					editor.findShapeAncestor(shape, (s) => editor.isShapeOfType<TLGroupShape>(s, 'group'))?.id
+					editor.findShapeAncestor(shape, (s) => editor.isShapeOfType(s, 'group'))?.id
 				)
 			}
 

package/src/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.da35795ba8e2'
+export const version = '4.3.0-canary.e52fa5385f86'
 export const publishDates = {
 	major: '2025-09-18T14:39:22.803Z',
-	minor: '2025-11-19T15:43:54.030Z',
-	patch: '2025-11-19T15:43:54.030Z',
+	minor: '2025-12-05T21:53:17.454Z',
+	patch: '2025-12-05T21:53:17.454Z',
 }