@tldraw/editor 3.8.0-canary.fc0f484388e4 → 3.8.0-canary.ff19d0d907b9

package/src/index.ts

@@ -240,21 +240,9 @@ export {
 	type UiEventType,
 } from './lib/editor/types/event-types'
 export {
-	type TLBaseExternalContent,
-	type TLEmbedExternalContent,
-	type TLErrorExternalContentSource,
-	type TLExcalidrawExternalContentSource,
-	type TLExternalAsset,
+	type TLExternalAssetContent,
 	type TLExternalContent,
 	type TLExternalContentSource,
-	type TLFileExternalAsset,
-	type TLFilesExternalContent,
-	type TLSvgTextExternalContent,
-	type TLTextExternalContent,
-	type TLTextExternalContentSource,
-	type TLTldrawExternalContentSource,
-	type TLUrlExternalAsset,
-	type TLUrlExternalContent,
 } from './lib/editor/types/external-content'
 export {
 	type TLHistoryBatchOptions,

package/src/lib/config/TLSessionStateSnapshot.ts

@@ -50,9 +50,7 @@ function iOS() {
  * @public
  */
 export const TAB_ID: string = window
-	? (window[tabIdKey] ??
-		getFromSessionStorage(tabIdKey) ??
-		`TLDRAW_INSTANCE_STATE_V1_` + uniqueId())
+	? window[tabIdKey] ?? getFromSessionStorage(tabIdKey) ?? `TLDRAW_INSTANCE_STATE_V1_` + uniqueId()
 	: '<error>'
 if (window) {
 	window[tabIdKey] = TAB_ID

package/src/lib/editor/Editor.ts

@@ -155,7 +155,7 @@ import {
 	TLPointerEventInfo,
 	TLWheelEventInfo,
 } from './types/event-types'
-import { TLExternalAsset, TLExternalContent } from './types/external-content'
+import { TLExternalAssetContent, TLExternalContent } from './types/external-content'
 import { TLHistoryBatchOptions } from './types/history-types'
 import {
 	OptionalKeys,
@@ -1681,7 +1681,7 @@ export class Editor extends EventEmitter<TLEventMap> {
 	 * @public
 	 */
 	isAncestorSelected(shape: TLShape | TLShapeId): boolean {
-		const id = typeof shape === 'string' ? shape : (shape?.id ?? null)
+		const id = typeof shape === 'string' ? shape : shape?.id ?? null
 		const _shape = this.getShape(id)
 		if (!_shape) return false
 		const selectedShapeIds = this.getSelectedShapeIds()
@@ -1938,7 +1938,7 @@ export class Editor extends EventEmitter<TLEventMap> {
 	 * @public
 	 */
 	setFocusedGroup(shape: TLShapeId | TLGroupShape | null): this {
-		const id = typeof shape === 'string' ? shape : (shape?.id ?? null)
+		const id = typeof shape === 'string' ? shape : shape?.id ?? null
 
 		if (id !== null) {
 			const shape = this.getShape(id)
@@ -2021,7 +2021,7 @@ export class Editor extends EventEmitter<TLEventMap> {
 	 * @public
 	 */
 	setEditingShape(shape: TLShapeId | TLShape | null): this {
-		const id = typeof shape === 'string' ? shape : (shape?.id ?? null)
+		const id = typeof shape === 'string' ? shape : shape?.id ?? null
 		if (id !== this.getEditingShapeId()) {
 			if (id) {
 				const shape = this.getShape(id)
@@ -2082,7 +2082,7 @@ export class Editor extends EventEmitter<TLEventMap> {
 	 * @public
 	 */
 	setHoveredShape(shape: TLShapeId | TLShape | null): this {
-		const id = typeof shape === 'string' ? shape : (shape?.id ?? null)
+		const id = typeof shape === 'string' ? shape : shape?.id ?? null
 		if (id === this.getHoveredShapeId()) return this
 		this.run(
 			() => {
@@ -2231,7 +2231,7 @@ export class Editor extends EventEmitter<TLEventMap> {
 	 * @public
 	 */
 	setCroppingShape(shape: TLShapeId | TLShape | null): this {
-		const id = typeof shape === 'string' ? shape : (shape?.id ?? null)
+		const id = typeof shape === 'string' ? shape : shape?.id ?? null
 		if (id !== this.getCroppingShapeId()) {
 			this.run(
 				() => {
@@ -7975,8 +7975,10 @@ export class Editor extends EventEmitter<TLEventMap> {
 
 	/** @internal */
 	externalAssetContentHandlers: {
-		[K in TLExternalAsset['type']]: {
-			[Key in K]: null | ((info: TLExternalAsset & { type: Key }) => Promise<TLAsset | undefined>)
+		[K in TLExternalAssetContent['type']]: {
+			[Key in K]:
+				| null
+				| ((info: TLExternalAssetContent & { type: Key }) => Promise<TLAsset | undefined>)
 		}[K]
 	} = {
 		file: null,
@@ -8005,9 +8007,9 @@ export class Editor extends EventEmitter<TLEventMap> {
 	 *
 	 * @public
 	 */
-	registerExternalAssetHandler<T extends TLExternalAsset['type']>(
+	registerExternalAssetHandler<T extends TLExternalAssetContent['type']>(
 		type: T,
-		handler: null | ((info: TLExternalAsset & { type: T }) => Promise<TLAsset>)
+		handler: null | ((info: TLExternalAssetContent & { type: T }) => Promise<TLAsset>)
 	): this {
 		this.externalAssetContentHandlers[type] = handler as any
 		return this
@@ -8075,11 +8077,11 @@ export class Editor extends EventEmitter<TLEventMap> {
 	 * @param info - Info about the external content.
 	 * @returns The asset.
 	 */
-	async getAssetForExternalContent(info: TLExternalAsset): Promise<TLAsset | undefined> {
+	async getAssetForExternalContent(info: TLExternalAssetContent): Promise<TLAsset | undefined> {
 		return await this.externalAssetContentHandlers[info.type]?.(info as any)
 	}
 
-	hasExternalAssetHandler(type: TLExternalAsset['type']): boolean {
+	hasExternalAssetHandler(type: TLExternalAssetContent['type']): boolean {
 		return !!this.externalAssetContentHandlers[type]
 	}
 
@@ -8801,8 +8803,8 @@ export class Editor extends EventEmitter<TLEventMap> {
 							// If our pointer moved only because we're following some other user, then don't
 							// update our last activity timestamp; otherwise, update it to the current timestamp.
 							info.type === 'pointer' && info.pointerId === INTERNAL_POINTER_IDS.CAMERA_MOVE
-								? (this.store.unsafeGetWithoutCapture(TLPOINTER_ID)?.lastActivityTimestamp ??
-									this._tickManager.now)
+								? this.store.unsafeGetWithoutCapture(TLPOINTER_ID)?.lastActivityTimestamp ??
+									this._tickManager.now
 								: this._tickManager.now,
 						meta: {},
 					},
@@ -9367,8 +9369,6 @@ export class Editor extends EventEmitter<TLEventMap> {
 		// todo: replace with new readonly mode?
 		if (this.getCrashingError()) return this
 
-		this.emit('before-event', info)
-
 		const { inputs } = this
 		const { type } = info
 

package/src/lib/editor/managers/SnapManager/BoundsSnaps.ts

@@ -390,8 +390,8 @@ export class BoundsSnaps {
 
 		// at the same time, calculate how far we need to nudge the shape to 'snap' to the target point(s)
 		const nudge = new Vec(
-			lockedAxis === 'x' ? 0 : (nearestSnapsX[0]?.nudge ?? 0),
-			lockedAxis === 'y' ? 0 : (nearestSnapsY[0]?.nudge ?? 0)
+			lockedAxis === 'x' ? 0 : nearestSnapsX[0]?.nudge ?? 0,
+			lockedAxis === 'y' ? 0 : nearestSnapsY[0]?.nudge ?? 0
 		)
 
 		// ok we've figured out how much the box should be nudged, now let's find all the snap points
@@ -504,8 +504,8 @@ export class BoundsSnaps {
 
 		// at the same time, calculate how far we need to nudge the shape to 'snap' to the target point(s)
 		const nudge = new Vec(
-			isXLocked ? 0 : (nearestSnapsX[0]?.nudge ?? 0),
-			isYLocked ? 0 : (nearestSnapsY[0]?.nudge ?? 0)
+			isXLocked ? 0 : nearestSnapsX[0]?.nudge ?? 0,
+			isYLocked ? 0 : nearestSnapsY[0]?.nudge ?? 0
 		)
 
 		if (isAspectRatioLocked && isSelectionCorner(handle) && nudge.len() !== 0) {

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

@@ -230,7 +230,6 @@ export class TextManager {
 		elm.style.setProperty('font-weight', opts.fontWeight)
 		elm.style.setProperty('line-height', `${opts.lineHeight * opts.fontSize}px`)
 		elm.style.setProperty('text-align', textAlignmentsForLtr[opts.textAlign])
-		elm.style.setProperty('font-style', opts.fontStyle)
 
 		const shouldTruncateToFirstLine =
 			opts.overflow === 'truncate-ellipsis' || opts.overflow === 'truncate-clip'

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

@@ -12,7 +12,6 @@ export interface TLEventMap {
 	crash: [{ error: unknown }]
 	'stop-camera-animation': []
 	'stop-following': []
-	'before-event': [TLEventInfo]
 	event: [TLEventInfo]
 	tick: [number]
 	frame: [number]

package/src/lib/editor/types/external-content.ts

@@ -2,97 +2,57 @@ import { TLAssetId } from '@tldraw/tlschema'
 import { VecLike } from '../../primitives/Vec'
 import { TLContent } from './clipboard-types'
 
-/** @public */
-export interface TLTldrawExternalContentSource {
-	type: 'tldraw'
-	data: TLContent
-}
-
-/** @public */
-export interface TLExcalidrawExternalContentSource {
-	type: 'excalidraw'
-	data: any
-}
-
-/** @public */
-export interface TLTextExternalContentSource {
-	type: 'text'
-	data: string
-	subtype: 'json' | 'html' | 'text' | 'url'
-}
-
-/** @public */
-export interface TLErrorExternalContentSource {
-	type: 'error'
-	data: string | null
-	reason: string
-}
-
 /** @public */
 export type TLExternalContentSource =
-	| TLTldrawExternalContentSource
-	| TLExcalidrawExternalContentSource
-	| TLTextExternalContentSource
-	| TLErrorExternalContentSource
-
-/** @public */
-export interface TLBaseExternalContent {
+	| {
+			type: 'tldraw'
+			data: TLContent
+	  }
+	| {
+			type: 'excalidraw'
+			data: any
+	  }
+	| {
+			type: 'text'
+			data: string
+			subtype: 'json' | 'html' | 'text' | 'url'
+	  }
+	| {
+			type: 'error'
+			data: string | null
+			reason: string
+	  }
+
+/** @public */
+export type TLExternalContent<EmbedDefinition> = {
 	sources?: TLExternalContentSource[]
 	point?: VecLike
-}
-
-/** @public */
-export interface TLTextExternalContent extends TLBaseExternalContent {
-	type: 'text'
-	text: string
-}
-
-/** @public */
-export interface TLFilesExternalContent extends TLBaseExternalContent {
-	type: 'files'
-	files: File[]
-	ignoreParent: boolean
-}
-
-/** @public */
-export interface TLUrlExternalContent extends TLBaseExternalContent {
-	type: 'url'
-	url: string
-}
-
-/** @public */
-export interface TLSvgTextExternalContent extends TLBaseExternalContent {
-	type: 'svg-text'
-	text: string
-}
-
-/** @public */
-export interface TLEmbedExternalContent<EmbedDefinition> extends TLBaseExternalContent {
-	type: 'embed'
-	url: string
-	embed: EmbedDefinition
-}
-
-/** @public */
-export type TLExternalContent<EmbedDefinition> =
-	| TLTextExternalContent
-	| TLFilesExternalContent
-	| TLUrlExternalContent
-	| TLSvgTextExternalContent
-	| TLEmbedExternalContent<EmbedDefinition>
-
-/** @public */
-export interface TLFileExternalAsset {
-	type: 'file'
-	file: File
-	assetId?: TLAssetId
-}
-
-/** @public */
-export interface TLUrlExternalAsset {
-	type: 'url'
-	url: string
-}
-
-/** @public */
-export type TLExternalAsset = TLFileExternalAsset | TLUrlExternalAsset
+} & (
+	| {
+			type: 'text'
+			text: string
+	  }
+	| {
+			type: 'files'
+			files: File[]
+			ignoreParent: boolean
+	  }
+	| {
+			type: 'url'
+			url: string
+	  }
+	| {
+			type: 'svg-text'
+			text: string
+	  }
+	| {
+			type: 'embed'
+			url: string
+			embed: EmbedDefinition
+	  }
+)
+
+/** @public */
+export type TLExternalAssetContent =
+	| { type: 'file'; file: File; assetId?: TLAssetId }
+	| { type: 'url'; url: string }

package/src/lib/exports/StyleEmbedder.ts

@@ -54,7 +54,7 @@ export class StyleEmbedder {
 			: NO_STYLES
 
 		const parentStyles = shouldSkipInheritedParentStyles
-			? (this.styles.get(element.parentElement as Element)?.self ?? NO_STYLES)
+			? this.styles.get(element.parentElement as Element)?.self ?? NO_STYLES
 			: NO_STYLES
 
 		const info: ElementStyleInfo = {

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 = '3.8.0-canary.fc0f484388e4'
+export const version = '3.8.0-canary.ff19d0d907b9'
 export const publishDates = {
 	major: '2024-09-13T14:36:29.063Z',
-	minor: '2025-01-30T15:44:39.992Z',
-	patch: '2025-01-30T15:44:39.992Z',
+	minor: '2025-01-29T10:42:55.894Z',
+	patch: '2025-01-29T10:42:55.894Z',
 }