@tldraw/editor 3.16.0-canary.ffdf566dd0a8 → 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
 				}
@@ -7387,6 +7364,7 @@ export class Editor extends EventEmitter<TLEventMap> {
 			if (
 				!this.getShapeUtil(shape).canBeLaidOut?.(shape, {
 					type: 'stretch',
+					shapes: shapesToStretchFirstPass,
 				})
 			) {
 				continue
@@ -7881,7 +7859,7 @@ export class Editor extends EventEmitter<TLEventMap> {
 
 					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
 					}
@@ -9669,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/UserPreferencesManager/UserPreferencesManager.test.ts

@@ -24,8 +24,6 @@ describe('UserPreferencesManager', () => {
 		color: '#FF802B',
 		locale: 'en',
 		animationSpeed: 1,
-		areKeyboardShortcutsEnabled: true,
-		showUiLabels: false,
 		edgeScrollSpeed: 1,
 		colorScheme: 'light',
 		isSnapMode: false,
@@ -231,8 +229,6 @@ describe('UserPreferencesManager', () => {
 				locale: mockUserPreferences.locale,
 				color: mockUserPreferences.color,
 				animationSpeed: mockUserPreferences.animationSpeed,
-				areKeyboardShortcutsEnabled: mockUserPreferences.areKeyboardShortcutsEnabled,
-				showUiLabels: mockUserPreferences.showUiLabels,
 				isSnapMode: mockUserPreferences.isSnapMode,
 				colorScheme: mockUserPreferences.colorScheme,
 				isDarkMode: false, // light mode
@@ -366,32 +362,6 @@ describe('UserPreferencesManager', () => {
 			})
 		})
 
-		describe('getAreKeyboardShortcutsEnabled', () => {
-			it('should return user keyboard shortcuts', () => {
-				expect(userPreferencesManager.getAreKeyboardShortcutsEnabled()).toBe(
-					mockUserPreferences.areKeyboardShortcutsEnabled
-				)
-			})
-
-			it('should return default keyboard shortcuts when null', () => {
-				userPreferencesAtom.set({ ...mockUserPreferences, areKeyboardShortcutsEnabled: null })
-				expect(userPreferencesManager.getAreKeyboardShortcutsEnabled()).toBe(
-					defaultUserPreferences.areKeyboardShortcutsEnabled
-				)
-			})
-		})
-
-		describe('getShowUiLabels', () => {
-			it('should return user show ui labels setting', () => {
-				expect(userPreferencesManager.getShowUiLabels()).toBe(mockUserPreferences.showUiLabels)
-			})
-
-			it('should return default show ui labels when null', () => {
-				userPreferencesAtom.set({ ...mockUserPreferences, showUiLabels: null })
-				expect(userPreferencesManager.getShowUiLabels()).toBe(defaultUserPreferences.showUiLabels)
-			})
-		})
-
 		describe('getEdgeScrollSpeed', () => {
 			it('should return user edge scroll speed', () => {
 				expect(userPreferencesManager.getEdgeScrollSpeed()).toBe(
@@ -513,7 +483,6 @@ describe('UserPreferencesManager', () => {
 				color: null,
 				locale: null,
 				animationSpeed: null,
-				areKeyboardShortcutsEnabled: null,
 				edgeScrollSpeed: null,
 				isSnapMode: null,
 				isWrapMode: null,
@@ -527,9 +496,6 @@ describe('UserPreferencesManager', () => {
 			expect(userPreferencesManager.getColor()).toBe(defaultUserPreferences.color)
 			expect(userPreferencesManager.getLocale()).toBe(defaultUserPreferences.locale)
 			expect(userPreferencesManager.getAnimationSpeed()).toBe(defaultUserPreferences.animationSpeed)
-			expect(userPreferencesManager.getAreKeyboardShortcutsEnabled()).toBe(
-				defaultUserPreferences.areKeyboardShortcutsEnabled
-			)
 			expect(userPreferencesManager.getEdgeScrollSpeed()).toBe(
 				defaultUserPreferences.edgeScrollSpeed
 			)

package/src/lib/editor/managers/UserPreferencesManager/UserPreferencesManager.ts

@@ -43,13 +43,11 @@ export class UserPreferencesManager {
 			locale: this.getLocale(),
 			color: this.getColor(),
 			animationSpeed: this.getAnimationSpeed(),
-			areKeyboardShortcutsEnabled: this.getAreKeyboardShortcutsEnabled(),
 			isSnapMode: this.getIsSnapMode(),
 			colorScheme: this.user.userPreferences.get().colorScheme,
 			isDarkMode: this.getIsDarkMode(),
 			isWrapMode: this.getIsWrapMode(),
 			isDynamicResizeMode: this.getIsDynamicResizeMode(),
-			showUiLabels: this.getShowUiLabels(),
 		}
 	}
 
@@ -77,13 +75,6 @@ export class UserPreferencesManager {
 		return this.user.userPreferences.get().animationSpeed ?? defaultUserPreferences.animationSpeed
 	}
 
-	@computed getAreKeyboardShortcutsEnabled() {
-		return (
-			this.user.userPreferences.get().areKeyboardShortcutsEnabled ??
-			defaultUserPreferences.areKeyboardShortcutsEnabled
-		)
-	}
-
 	@computed getId() {
 		return this.user.userPreferences.get().id
 	}
@@ -120,8 +111,4 @@ export class UserPreferencesManager {
 			defaultUserPreferences.isPasteAtCursorMode
 		)
 	}
-
-	@computed getShowUiLabels() {
-		return this.user.userPreferences.get().showUiLabels ?? defaultUserPreferences.showUiLabels
-	}
 }

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

@@ -584,15 +584,6 @@ export abstract class ShapeUtil<Shape extends TLUnknownShape = TLUnknownShape> {
 	 */
 	onResizeEnd?(initial: Shape, current: Shape): TLShapePartial<Shape> | void
 
-	/**
-	 * A callback called when a shape resize is cancelled.
-	 *
-	 * @param initial - The shape at the start of the resize.
-	 * @param current - The current shape.
-	 * @public
-	 */
-	onResizeCancel?(initial: Shape, current: Shape): void
-
 	/**
 	 * A callback called when a shape starts being translated.
 	 *
@@ -622,25 +613,6 @@ export abstract class ShapeUtil<Shape extends TLUnknownShape = TLUnknownShape> {
 	 */
 	onTranslateEnd?(initial: Shape, current: Shape): TLShapePartial<Shape> | void
 
-	/**
-	 * A callback called when a shape translation is cancelled.
-	 *
-	 * @param initial - The shape at the start of the translation.
-	 * @param current - The current shape.
-	 * @public
-	 */
-	onTranslateCancel?(initial: Shape, current: Shape): void
-
-	/**
-	 * A callback called when a shape's handle starts being dragged.
-	 *
-	 * @param shape - The shape.
-	 * @param info - An object containing the handle and whether the handle is 'precise' or not.
-	 * @returns A change to apply to the shape, or void.
-	 * @public
-	 */
-	onHandleDragStart?(shape: Shape, info: TLHandleDragInfo<Shape>): TLShapePartial<Shape> | void
-
 	/**
 	 * A callback called when a shape's handle changes.
 	 *
@@ -651,25 +623,6 @@ export abstract class ShapeUtil<Shape extends TLUnknownShape = TLUnknownShape> {
 	 */
 	onHandleDrag?(shape: Shape, info: TLHandleDragInfo<Shape>): TLShapePartial<Shape> | void
 
-	/**
-	 * A callback called when a shape's handle finishes being dragged.
-	 *
-	 * @param current - The current shape.
-	 * @param info - An object containing the handle and whether the handle is 'precise' or not.
-	 * @returns A change to apply to the shape, or void.
-	 * @public
-	 */
-	onHandleDragEnd?(current: Shape, info: TLHandleDragInfo<Shape>): TLShapePartial<Shape> | void
-
-	/**
-	 * A callback called when a shape's handle drag is cancelled.
-	 *
-	 * @param current - The current shape.
-	 * @param info - An object containing the handle and whether the handle is 'precise' or not.
-	 * @public
-	 */
-	onHandleDragCancel?(current: Shape, info: TLHandleDragInfo<Shape>): void
-
 	/**
 	 * A callback called when a shape starts being rotated.
 	 *
@@ -699,15 +652,6 @@ export abstract class ShapeUtil<Shape extends TLUnknownShape = TLUnknownShape> {
 	 */
 	onRotateEnd?(initial: Shape, current: Shape): TLShapePartial<Shape> | void
 
-	/**
-	 * A callback called when a shape rotation is cancelled.
-	 *
-	 * @param initial - The shape at the start of the rotation.
-	 * @param current - The current shape.
-	 * @public
-	 */
-	onRotateCancel?(initial: Shape, current: Shape): void
-
 	/**
 	 * Not currently used.
 	 *
@@ -875,6 +819,5 @@ export interface TLResizeInfo<T extends TLShape> {
 export interface TLHandleDragInfo<T extends TLShape> {
 	handle: TLHandle
 	isPrecise: boolean
-	isCreatingShape: boolean
 	initial?: T | undefined
 }

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

@@ -62,7 +62,7 @@ export abstract class StateNode implements Partial<TLEventHandlers> {
 
 		this.parent = parent ?? ({} as any)
 
-		if (parent) {
+		if (this.parent) {
 			if (children && initial) {
 				this.type = 'branch'
 				this.initial = initial
@@ -238,32 +238,6 @@ export abstract class StateNode implements Partial<TLEventHandlers> {
 		this._currentToolIdMask.set(id)
 	}
 
-	/**
-	 * Add a child node to this state node.
-	 *
-	 * @public
-	 */
-	addChild(childConstructor: TLStateNodeConstructor): this {
-		if (this.type === 'leaf') {
-			throw new Error('StateNode.addChild: cannot add child to a leaf node')
-		}
-
-		// Initialize children if it's undefined (for root nodes without static children)
-		if (!this.children) {
-			this.children = {}
-		}
-
-		const child = new childConstructor(this.editor, this)
-
-		// Check if a child with this ID already exists
-		if (this.children[child.id]) {
-			throw new Error(`StateNode.addChild: a child with id '${child.id}' already exists`)
-		}
-
-		this.children[child.id] = child
-		return this
-	}
-
 	onWheel?(info: TLWheelEventInfo): void
 	onPointerDown?(info: TLPointerEventInfo): void
 	onPointerMove?(info: TLPointerEventInfo): void

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

@@ -1,4 +1,4 @@
-import { BoxModel, TLShape } from '@tldraw/tlschema'
+import { BoxModel } from '@tldraw/tlschema'
 import { Box } from '../../primitives/Box'
 import { VecLike } from '../../primitives/Vec'
 
@@ -187,75 +187,3 @@ export interface TLCameraConstraints {
 				y: 'free' | 'fixed' | 'inside' | 'outside' | 'contain'
 		  }
 }
-
-/** @public */
-export interface TLUpdatePointerOptions {
-	/** Whether to update the pointer immediately, rather than on the next tick. */
-	immediate?: boolean
-	/**
-	 * The point, in screen-space, to update the pointer to. Defaults to the position of the last
-	 * pointer event.
-	 */
-	point?: VecLike
-	pointerId?: number
-	ctrlKey?: boolean
-	altKey?: boolean
-	shiftKey?: boolean
-	metaKey?: boolean
-	accelKey?: boolean
-	isPen?: boolean
-	button?: number
-}
-
-/**
- * Options to {@link Editor.getShapeAtPoint}.
- *
- * @public
- */
-export interface TLGetShapeAtPointOptions {
-	/**
-	 * The margin to apply to the shape.
-	 * If a number, it will be applied to both the inside and outside of the shape.
-	 * If an array, the first element will be applied to the inside of the shape, and the second element will be applied to the outside.
-	 *
-	 * @example
-	 * ```ts
-	 * // Get the shape at the center of the screen
-	 * const shape = editor.getShapeAtProps({
-	 *   margin: 10,
-	 * })
-	 *
-	 * // Get the shape at the center of the screen with a 10px inner margin and a 5px outer margin
-	 * const shape = editor.getShapeAtProps({
-	 *   margin: [10, 5],
-	 * })
-	 * ```
-	 */
-	margin?: number | [number, number]
-	/**
-	 * Whether to register hits inside of shapes (beyond the margin), such as the inside of a solid shape.
-	 */
-	hitInside?: boolean
-	/**
-	 * Whether to register hits on locked shapes.
-	 */
-	hitLocked?: boolean
-	/**
-	 * Whether to register hits on labels.
-	 */
-	hitLabels?: boolean
-	/**
-	 * Whether to only return hits on shapes that are currently being rendered.
-	 * todo: rename this to hitCulled or hitNotRendering
-	 */
-	renderingOnly?: boolean
-	/**
-	 * Whether to register hits on the inside of frame shapes.
-	 * todo: rename this to hitInsideFrames
-	 */
-	hitFrameInside?: boolean
-	/**
-	 * A filter function to apply to the shapes.
-	 */
-	filter?(shape: TLShape): boolean
-}