@tldraw/editor 3.9.0-internal.7f0e15f4f7d9 → 3.10.0-canary.3bf31007c5a7

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

@@ -1,4 +1,5 @@
-import { atom, Atom, EMPTY_ARRAY, transact } from '@tldraw/state'
+import { computed, EMPTY_ARRAY, transact } from '@tldraw/state'
+import { AtomMap } from '@tldraw/store'
 import { TLShape, TLShapeId } from '@tldraw/tlschema'
 import {
 	areArraysShallowEqual,
@@ -96,13 +97,18 @@ export class FontManager {
 			{ areResultsEqual: areArraysShallowEqual }
 		)
 
-		this.shapeFontLoadStateCache = editor.store.createComputedCache(
-			'shape font load state',
-			(shape: TLShape) => {
-				const states = this.getShapeFontFaces(shape).map((face) => this.getFontState(face))
-				return states
-			},
-			{ areResultsEqual: areArraysShallowEqual }
+		this.shapeFontLoadStateCache = editor.store.createCache<(FontState | null)[], TLShape>(
+			(id: TLShapeId) => {
+				const fontFacesComputed = computed('font faces', () => this.getShapeFontFaces(id))
+				return computed(
+					'font load state',
+					() => {
+						const states = fontFacesComputed.get().map((face) => this.getFontState(face))
+						return states
+					},
+					{ isEqual: areArraysShallowEqual }
+				)
+			}
 		)
 	}
 
@@ -135,40 +141,33 @@ export class FontManager {
 		await Promise.all(promises)
 	}
 
-	private readonly fontStates = atom<ReadonlyMap<TLFontFace, Atom<FontState>>>(
-		'font states',
-		new Map()
-	)
+	private readonly fontStates = new AtomMap<TLFontFace, FontState>('font states')
 	private getFontState(font: TLFontFace): FontState | null {
-		return this.fontStates.get().get(font)?.get() ?? null
+		return this.fontStates.get(font) ?? null
 	}
 
 	ensureFontIsLoaded(font: TLFontFace): Promise<void> {
-		const state = this.getFontState(font)
-		if (state) return state.loadingPromise
+		const existingState = this.getFontState(font)
+		if (existingState) return existingState.loadingPromise
 
 		const instance = this.findOrCreateFontFace(font)
-		const stateAtom = atom<FontState>('font state', {
+		const state: FontState = {
 			state: 'loading',
 			instance,
 			loadingPromise: instance
 				.load()
 				.then(() => {
 					document.fonts.add(instance)
-					stateAtom.update((s) => ({ ...s, state: 'ready' }))
+					this.fontStates.update(font, (s) => ({ ...s, state: 'ready' }))
 				})
 				.catch((err) => {
 					console.error(err)
-					stateAtom.update((s) => ({ ...s, state: 'error' }))
+					this.fontStates.update(font, (s) => ({ ...s, state: 'error' }))
 				}),
-		})
-		this.fontStates.update((map) => {
-			const newMap = new Map(map)
-			newMap.set(font, stateAtom)
-			return newMap
-		})
+		}
 
-		return stateAtom.get().loadingPromise
+		this.fontStates.set(font, state)
+		return state.loadingPromise
 	}
 
 	private fontsToLoad = new Set<TLFontFace>()
@@ -224,8 +223,7 @@ export class FontManager {
 		]).join(' ')
 		return compact([
 			`@font-face {`,
-			`  font-family: ${font.family};`,
-			`  src: ${src};`,
+			`  font-family: "${font.family}";`,
 			font.ascentOverride ? `  ascent-override: ${font.ascentOverride};` : null,
 			font.descentOverride ? `  descent-override: ${font.descentOverride};` : null,
 			font.stretch ? `  font-stretch: ${font.stretch};` : null,
@@ -234,6 +232,7 @@ export class FontManager {
 			font.featureSettings ? `  font-feature-settings: ${font.featureSettings};` : null,
 			font.lineGapOverride ? `  line-gap-override: ${font.lineGapOverride};` : null,
 			font.unicodeRange ? `  unicode-range: ${font.unicodeRange};` : null,
+			`  src: ${src};`,
 			`}`,
 		]).join('\n')
 	}

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

@@ -38,7 +38,7 @@ export interface TLShapeUtilConstructor<
  *
  * @public
  */
-export interface TLShapeUtilCanBindOpts<Shape extends TLUnknownShape = TLShape> {
+export interface TLShapeUtilCanBindOpts<Shape extends TLUnknownShape = TLUnknownShape> {
 	/** The type of shape referenced by the `fromId` of the binding. */
 	fromShapeType: string
 	/** The type of shape referenced by the `toId` of the binding. */
@@ -47,6 +47,27 @@ export interface TLShapeUtilCanBindOpts<Shape extends TLUnknownShape = TLShape>
 	bindingType: string
 }
 
+/**
+ * Options passed to {@link ShapeUtil.canBeLaidOut}.
+ *
+ * @public
+ */
+export interface TLShapeUtilCanBeLaidOutOpts {
+	/** The type of action causing the layout. */
+	type?: 'align' | 'distribute' | 'pack' | 'stack' | 'flip' | 'stretch'
+	/** The other shapes being laid out */
+	shapes?: TLShape[]
+}
+
+/** Additional options for the {@link ShapeUtil.getGeometry} method.
+ *
+ * @public
+ */
+export interface TLGeometryOpts {
+	/** The context in which the geometry is being requested. */
+	context?: string
+}
+
 /** @public */
 export interface TLShapeUtilCanvasSvgDef {
 	key: string
@@ -130,9 +151,10 @@ export abstract class ShapeUtil<Shape extends TLUnknownShape = TLUnknownShape> {
 	 * Get the shape's geometry.
 	 *
 	 * @param shape - The shape.
+	 * @param opts - Additional options for the request.
 	 * @public
 	 */
-	abstract getGeometry(shape: Shape): Geometry2d
+	abstract getGeometry(shape: Shape, opts?: TLGeometryOpts): Geometry2d
 
 	/**
 	 * Get a JSX element for the shape (as an HTML element).
@@ -164,6 +186,7 @@ export abstract class ShapeUtil<Shape extends TLUnknownShape = TLUnknownShape> {
 	/**
 	 * Whether the shape can be snapped to by another shape.
 	 *
+	 * @param shape - The shape.
 	 * @public
 	 */
 	canSnap(_shape: Shape): boolean {
@@ -184,7 +207,7 @@ export abstract class ShapeUtil<Shape extends TLUnknownShape = TLUnknownShape> {
 	 *
 	 * @public
 	 */
-	canBind(_opts: TLShapeUtilCanBindOpts<Shape>): boolean {
+	canBind(_opts: TLShapeUtilCanBindOpts): boolean {
 		return true
 	}
 
@@ -225,11 +248,15 @@ export abstract class ShapeUtil<Shape extends TLUnknownShape = TLUnknownShape> {
 	}
 
 	/**
-	 * Whether the shape participates in stacking, aligning, and distributing.
+	 * Whether the shape can participate in layout functions such as alignment or distribution.
+	 *
+	 * @param shape - The shape.
+	 * @param info - Additional context information: the type of action causing the layout and the
+	 * @public
 	 *
 	 * @public
 	 */
-	canBeLaidOut(_shape: Shape): boolean {
+	canBeLaidOut(_shape: Shape, _info: TLShapeUtilCanBeLaidOutOpts): boolean {
 		return true
 	}
 

package/src/lib/exports/getSvgJsx.tsx

@@ -206,6 +206,7 @@ function SvgExport({
 		;(async () => {
 			const shapeDefs: Record<string, { pending: false; element: ReactElement }> = {}
 
+			// Then render everything. The shapes with assets should all hit the cache
 			const unorderedShapeElementPromises = renderingShapes.map(
 				async ({ id, opacity, index, backgroundIndex }) => {
 					// Don't render the frame if we're only exporting a single frame and it's children

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.9.0-internal.7f0e15f4f7d9'
+export const version = '3.10.0-canary.3bf31007c5a7'
 export const publishDates = {
 	major: '2024-09-13T14:36:29.063Z',
-	minor: '2025-02-25T14:10:40.799Z',
-	patch: '2025-02-25T14:10:40.799Z',
+	minor: '2025-03-03T14:30:27.310Z',
+	patch: '2025-03-03T14:30:27.310Z',
 }