@tldraw/editor 3.8.0-canary.d24380aab845 → 3.8.0-canary.d4f1bcb032ef

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/lib/hooks/usePassThroughWheelEvents.ts

@@ -11,13 +11,6 @@ export function usePassThroughWheelEvents(ref: RefObject<HTMLElement>) {
 	useEffect(() => {
 		function onWheel(e: WheelEvent) {
 			if ((e as any).isSpecialRedispatchedEvent) return
-
-			// if the element is scrollable, don't redispatch the event
-			const elm = ref.current
-			if (elm && elm.scrollHeight > elm.clientHeight) {
-				return
-			}
-
 			preventDefault(e)
 			const cvs = container.querySelector('.tl-canvas')
 			if (!cvs) return

package/src/lib/options.ts

@@ -66,15 +66,6 @@ export interface TldrawOptions {
 	 * external context providers. By default, this is `React.Fragment`.
 	 */
 	readonly exportProvider: ComponentType<{ children: React.ReactNode }>
-	/**
-	 * How should the note shape resize? By default it does not resize (except automatically based on its text content),
-	 * but you can set it to be user-resizable using scale.
-	 */
-	readonly noteShapeResizeMode: 'none' | 'scale'
-	/**
-	 * By default, the toolbar items are accessible via number shortcuts according to their order. To disable this, set this option to false.
-	 */
-	readonly enableToolbarKeyboardShortcuts: boolean
 }
 
 /** @public */
@@ -120,6 +111,4 @@ export const defaultTldrawOptions = {
 	actionShortcutsLocation: 'swap',
 	createTextOnCanvasDoubleClick: true,
 	exportProvider: Fragment,
-	noteShapeResizeMode: 'none',
-	enableToolbarKeyboardShortcuts: true,
 } as const satisfies TldrawOptions

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.d24380aab845'
+export const version = '3.8.0-canary.d4f1bcb032ef'
 export const publishDates = {
 	major: '2024-09-13T14:36:29.063Z',
-	minor: '2025-02-06T11:31:14.527Z',
-	patch: '2025-02-06T11:31:14.527Z',
+	minor: '2025-01-28T10:33:45.853Z',
+	patch: '2025-01-28T10:33:45.853Z',
 }

package/dist-cjs/lib/editor/shapes/shared/resizeScaled.js

@@ -1,66 +0,0 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var resizeScaled_exports = {};
-__export(resizeScaled_exports, {
-  resizeScaled: () => resizeScaled
-});
-module.exports = __toCommonJS(resizeScaled_exports);
-var import_utils = require("@tldraw/utils");
-var import_Vec = require("../../../primitives/Vec");
-function resizeScaled(shape, { initialBounds, scaleX, scaleY, newPoint, handle }) {
-  let scaleDelta;
-  switch (handle) {
-    case "bottom_left":
-    case "bottom_right":
-    case "top_left":
-    case "top_right": {
-      scaleDelta = Math.max(0.01, Math.max(Math.abs(scaleX), Math.abs(scaleY)));
-      break;
-    }
-    case "left":
-    case "right": {
-      scaleDelta = Math.max(0.01, Math.abs(scaleX));
-      break;
-    }
-    case "bottom":
-    case "top": {
-      scaleDelta = Math.max(0.01, Math.abs(scaleY));
-      break;
-    }
-    default: {
-      throw (0, import_utils.exhaustiveSwitchError)(handle);
-    }
-  }
-  const offset = new import_Vec.Vec(0, 0);
-  if (scaleX < 0) {
-    offset.x = -(initialBounds.width * scaleDelta);
-  }
-  if (scaleY < 0) {
-    offset.y = -(initialBounds.height * scaleDelta);
-  }
-  const { x, y } = import_Vec.Vec.Add(newPoint, offset.rot(shape.rotation));
-  return {
-    x,
-    y,
-    props: {
-      scale: scaleDelta * shape.props.scale
-    }
-  };
-}
-//# sourceMappingURL=resizeScaled.js.map

package/dist-cjs/lib/editor/shapes/shared/resizeScaled.js.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../../../src/lib/editor/shapes/shared/resizeScaled.ts"],
-  "sourcesContent": ["import { TLBaseShape } from '@tldraw/tlschema'\nimport { exhaustiveSwitchError } from '@tldraw/utils'\nimport { Vec } from '../../../primitives/Vec'\nimport { TLResizeInfo } from '../ShapeUtil'\n\n/**\n * Resize a shape that has a scale prop.\n *\n * @param shape - The shape to resize\n * @param info - The resize info\n *\n * @public */\nexport function resizeScaled(\n\tshape: TLBaseShape<any, { scale: number }>,\n\t{ initialBounds, scaleX, scaleY, newPoint, handle }: TLResizeInfo<any>\n) {\n\tlet scaleDelta: number\n\tswitch (handle) {\n\t\tcase 'bottom_left':\n\t\tcase 'bottom_right':\n\t\tcase 'top_left':\n\t\tcase 'top_right': {\n\t\t\tscaleDelta = Math.max(0.01, Math.max(Math.abs(scaleX), Math.abs(scaleY)))\n\t\t\tbreak\n\t\t}\n\t\tcase 'left':\n\t\tcase 'right': {\n\t\t\tscaleDelta = Math.max(0.01, Math.abs(scaleX))\n\t\t\tbreak\n\t\t}\n\t\tcase 'bottom':\n\t\tcase 'top': {\n\t\t\tscaleDelta = Math.max(0.01, Math.abs(scaleY))\n\t\t\tbreak\n\t\t}\n\t\tdefault: {\n\t\t\tthrow exhaustiveSwitchError(handle)\n\t\t}\n\t}\n\n\t// Compute the offset (if flipped X or flipped Y)\n\tconst offset = new Vec(0, 0)\n\n\tif (scaleX < 0) {\n\t\toffset.x = -(initialBounds.width * scaleDelta)\n\t}\n\tif (scaleY < 0) {\n\t\toffset.y = -(initialBounds.height * scaleDelta)\n\t}\n\n\t// Apply the offset to the new point\n\tconst { x, y } = Vec.Add(newPoint, offset.rot(shape.rotation))\n\n\treturn {\n\t\tx,\n\t\ty,\n\t\tprops: {\n\t\t\tscale: scaleDelta * shape.props.scale,\n\t\t},\n\t}\n}\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,mBAAsC;AACtC,iBAAoB;AAUb,SAAS,aACf,OACA,EAAE,eAAe,QAAQ,QAAQ,UAAU,OAAO,GACjD;AACD,MAAI;AACJ,UAAQ,QAAQ;AAAA,IACf,KAAK;AAAA,IACL,KAAK;AAAA,IACL,KAAK;AAAA,IACL,KAAK,aAAa;AACjB,mBAAa,KAAK,IAAI,MAAM,KAAK,IAAI,KAAK,IAAI,MAAM,GAAG,KAAK,IAAI,MAAM,CAAC,CAAC;AACxE;AAAA,IACD;AAAA,IACA,KAAK;AAAA,IACL,KAAK,SAAS;AACb,mBAAa,KAAK,IAAI,MAAM,KAAK,IAAI,MAAM,CAAC;AAC5C;AAAA,IACD;AAAA,IACA,KAAK;AAAA,IACL,KAAK,OAAO;AACX,mBAAa,KAAK,IAAI,MAAM,KAAK,IAAI,MAAM,CAAC;AAC5C;AAAA,IACD;AAAA,IACA,SAAS;AACR,gBAAM,oCAAsB,MAAM;AAAA,IACnC;AAAA,EACD;AAGA,QAAM,SAAS,IAAI,eAAI,GAAG,CAAC;AAE3B,MAAI,SAAS,GAAG;AACf,WAAO,IAAI,EAAE,cAAc,QAAQ;AAAA,EACpC;AACA,MAAI,SAAS,GAAG;AACf,WAAO,IAAI,EAAE,cAAc,SAAS;AAAA,EACrC;AAGA,QAAM,EAAE,GAAG,EAAE,IAAI,eAAI,IAAI,UAAU,OAAO,IAAI,MAAM,QAAQ,CAAC;AAE7D,SAAO;AAAA,IACN;AAAA,IACA;AAAA,IACA,OAAO;AAAA,MACN,OAAO,aAAa,MAAM,MAAM;AAAA,IACjC;AAAA,EACD;AACD;",
-  "names": []
-}

package/dist-esm/lib/editor/shapes/shared/resizeScaled.mjs

@@ -1,46 +0,0 @@
-import { exhaustiveSwitchError } from "@tldraw/utils";
-import { Vec } from "../../../primitives/Vec.mjs";
-function resizeScaled(shape, { initialBounds, scaleX, scaleY, newPoint, handle }) {
-  let scaleDelta;
-  switch (handle) {
-    case "bottom_left":
-    case "bottom_right":
-    case "top_left":
-    case "top_right": {
-      scaleDelta = Math.max(0.01, Math.max(Math.abs(scaleX), Math.abs(scaleY)));
-      break;
-    }
-    case "left":
-    case "right": {
-      scaleDelta = Math.max(0.01, Math.abs(scaleX));
-      break;
-    }
-    case "bottom":
-    case "top": {
-      scaleDelta = Math.max(0.01, Math.abs(scaleY));
-      break;
-    }
-    default: {
-      throw exhaustiveSwitchError(handle);
-    }
-  }
-  const offset = new Vec(0, 0);
-  if (scaleX < 0) {
-    offset.x = -(initialBounds.width * scaleDelta);
-  }
-  if (scaleY < 0) {
-    offset.y = -(initialBounds.height * scaleDelta);
-  }
-  const { x, y } = Vec.Add(newPoint, offset.rot(shape.rotation));
-  return {
-    x,
-    y,
-    props: {
-      scale: scaleDelta * shape.props.scale
-    }
-  };
-}
-export {
-  resizeScaled
-};
-//# sourceMappingURL=resizeScaled.mjs.map

package/dist-esm/lib/editor/shapes/shared/resizeScaled.mjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../../../src/lib/editor/shapes/shared/resizeScaled.ts"],
-  "sourcesContent": ["import { TLBaseShape } from '@tldraw/tlschema'\nimport { exhaustiveSwitchError } from '@tldraw/utils'\nimport { Vec } from '../../../primitives/Vec'\nimport { TLResizeInfo } from '../ShapeUtil'\n\n/**\n * Resize a shape that has a scale prop.\n *\n * @param shape - The shape to resize\n * @param info - The resize info\n *\n * @public */\nexport function resizeScaled(\n\tshape: TLBaseShape<any, { scale: number }>,\n\t{ initialBounds, scaleX, scaleY, newPoint, handle }: TLResizeInfo<any>\n) {\n\tlet scaleDelta: number\n\tswitch (handle) {\n\t\tcase 'bottom_left':\n\t\tcase 'bottom_right':\n\t\tcase 'top_left':\n\t\tcase 'top_right': {\n\t\t\tscaleDelta = Math.max(0.01, Math.max(Math.abs(scaleX), Math.abs(scaleY)))\n\t\t\tbreak\n\t\t}\n\t\tcase 'left':\n\t\tcase 'right': {\n\t\t\tscaleDelta = Math.max(0.01, Math.abs(scaleX))\n\t\t\tbreak\n\t\t}\n\t\tcase 'bottom':\n\t\tcase 'top': {\n\t\t\tscaleDelta = Math.max(0.01, Math.abs(scaleY))\n\t\t\tbreak\n\t\t}\n\t\tdefault: {\n\t\t\tthrow exhaustiveSwitchError(handle)\n\t\t}\n\t}\n\n\t// Compute the offset (if flipped X or flipped Y)\n\tconst offset = new Vec(0, 0)\n\n\tif (scaleX < 0) {\n\t\toffset.x = -(initialBounds.width * scaleDelta)\n\t}\n\tif (scaleY < 0) {\n\t\toffset.y = -(initialBounds.height * scaleDelta)\n\t}\n\n\t// Apply the offset to the new point\n\tconst { x, y } = Vec.Add(newPoint, offset.rot(shape.rotation))\n\n\treturn {\n\t\tx,\n\t\ty,\n\t\tprops: {\n\t\t\tscale: scaleDelta * shape.props.scale,\n\t\t},\n\t}\n}\n"],
-  "mappings": "AACA,SAAS,6BAA6B;AACtC,SAAS,WAAW;AAUb,SAAS,aACf,OACA,EAAE,eAAe,QAAQ,QAAQ,UAAU,OAAO,GACjD;AACD,MAAI;AACJ,UAAQ,QAAQ;AAAA,IACf,KAAK;AAAA,IACL,KAAK;AAAA,IACL,KAAK;AAAA,IACL,KAAK,aAAa;AACjB,mBAAa,KAAK,IAAI,MAAM,KAAK,IAAI,KAAK,IAAI,MAAM,GAAG,KAAK,IAAI,MAAM,CAAC,CAAC;AACxE;AAAA,IACD;AAAA,IACA,KAAK;AAAA,IACL,KAAK,SAAS;AACb,mBAAa,KAAK,IAAI,MAAM,KAAK,IAAI,MAAM,CAAC;AAC5C;AAAA,IACD;AAAA,IACA,KAAK;AAAA,IACL,KAAK,OAAO;AACX,mBAAa,KAAK,IAAI,MAAM,KAAK,IAAI,MAAM,CAAC;AAC5C;AAAA,IACD;AAAA,IACA,SAAS;AACR,YAAM,sBAAsB,MAAM;AAAA,IACnC;AAAA,EACD;AAGA,QAAM,SAAS,IAAI,IAAI,GAAG,CAAC;AAE3B,MAAI,SAAS,GAAG;AACf,WAAO,IAAI,EAAE,cAAc,QAAQ;AAAA,EACpC;AACA,MAAI,SAAS,GAAG;AACf,WAAO,IAAI,EAAE,cAAc,SAAS;AAAA,EACrC;AAGA,QAAM,EAAE,GAAG,EAAE,IAAI,IAAI,IAAI,UAAU,OAAO,IAAI,MAAM,QAAQ,CAAC;AAE7D,SAAO;AAAA,IACN;AAAA,IACA;AAAA,IACA,OAAO;AAAA,MACN,OAAO,aAAa,MAAM,MAAM;AAAA,IACjC;AAAA,EACD;AACD;",
-  "names": []
-}

package/src/lib/editor/shapes/shared/resizeScaled.ts

@@ -1,61 +0,0 @@
-import { TLBaseShape } from '@tldraw/tlschema'
-import { exhaustiveSwitchError } from '@tldraw/utils'
-import { Vec } from '../../../primitives/Vec'
-import { TLResizeInfo } from '../ShapeUtil'
-
-/**
- * Resize a shape that has a scale prop.
- *
- * @param shape - The shape to resize
- * @param info - The resize info
- *
- * @public */
-export function resizeScaled(
-	shape: TLBaseShape<any, { scale: number }>,
-	{ initialBounds, scaleX, scaleY, newPoint, handle }: TLResizeInfo<any>
-) {
-	let scaleDelta: number
-	switch (handle) {
-		case 'bottom_left':
-		case 'bottom_right':
-		case 'top_left':
-		case 'top_right': {
-			scaleDelta = Math.max(0.01, Math.max(Math.abs(scaleX), Math.abs(scaleY)))
-			break
-		}
-		case 'left':
-		case 'right': {
-			scaleDelta = Math.max(0.01, Math.abs(scaleX))
-			break
-		}
-		case 'bottom':
-		case 'top': {
-			scaleDelta = Math.max(0.01, Math.abs(scaleY))
-			break
-		}
-		default: {
-			throw exhaustiveSwitchError(handle)
-		}
-	}
-
-	// Compute the offset (if flipped X or flipped Y)
-	const offset = new Vec(0, 0)
-
-	if (scaleX < 0) {
-		offset.x = -(initialBounds.width * scaleDelta)
-	}
-	if (scaleY < 0) {
-		offset.y = -(initialBounds.height * scaleDelta)
-	}
-
-	// Apply the offset to the new point
-	const { x, y } = Vec.Add(newPoint, offset.rot(shape.rotation))
-
-	return {
-		x,
-		y,
-		props: {
-			scale: scaleDelta * shape.props.scale,
-		},
-	}
-}