@tldraw/editor 3.13.0-canary.c0afd1f5aa1e → 3.13.0-canary.c4135f4903f5

package/editor.css

@@ -157,7 +157,6 @@
 	--color-panel-contrast: hsl(0, 0%, 100%);
 	--color-panel-overlay: hsl(0, 0%, 100%, 82%);
 	--color-panel: hsl(0, 0%, 99%);
-	--color-panel-transparent: hsla(0, 0%, 99%, 0%);
 	--color-focus: hsl(219, 65%, 50%);
 	--color-selected: hsl(214, 84%, 56%);
 	--color-selected-contrast: hsl(0, 0%, 100%);
@@ -209,7 +208,6 @@
 	--color-panel-contrast: hsl(245, 12%, 23%);
 	--color-panel: hsl(235, 6.8%, 13.5%);
 	--color-panel-overlay: hsl(210, 10%, 24%, 82%);
-	--color-panel-transparent: hsla(235, 6.8%, 13.5%, 0%);
 	--color-focus: hsl(217, 76%, 80%);
 	--color-selected: hsl(217, 89%, 61%);
 	--color-selected-contrast: hsl(0, 0%, 100%);
@@ -602,36 +600,6 @@ input,
 	}
 }
 
-.tl-rotate-corner:not(:hover),
-.tl-resize-handle:not(:hover) {
-	cursor: none;
-}
-
-/* --------------------- Arrow Hints -------------------- */
-
-.tl-arrow-hint-handle {
-	fill: var(--color-selected-contrast);
-	stroke: var(--color-selection-stroke);
-	stroke-width: calc(1.5px * var(--tl-scale));
-	r: calc(4px * var(--tl-scale));
-}
-
-.tl-arrow-hint-snap {
-	stroke: transparent;
-	fill: var(--color-selection-fill);
-	r: calc(12px * var(--tl-scale));
-}
-
-.tl-arrow-hint-snap__none,
-.tl-arrow-hint-snap__center,
-.tl-arrow-hint-snap__axis {
-	display: none;
-}
-
-.tl-arrow-hint-snap__edge {
-	r: calc(8px * var(--tl-scale));
-}
-
 /* ------------------ Bounds Detail ----------------- */
 
 .tl-image,
@@ -1001,8 +969,6 @@ input,
 
 .tl-rich-text p {
 	margin: 0;
-	/* Depending on the extensions, <p> tags can be empty, without a <br />. */
-	min-height: 1lh;
 }
 
 .tl-rich-text ul,
@@ -1010,8 +976,6 @@ input,
 	text-align: left;
 	margin: 0;
 	padding-left: 3.25ch;
-	/* Some resets, like Tailwind, nix the list styling. */
-	list-style: revert;
 }
 
 .tl-rich-text ol:has(> li:nth-child(10)) {
@@ -1389,6 +1353,10 @@ input,
 	opacity: 0;
 }
 
+.tl-arrow-label[data-isediting='true'] > .tl-arrow-label__inner {
+	background-color: var(--color-background);
+}
+
 .tl-arrow-label__inner {
 	border-radius: var(--radius-1);
 	box-sizing: content-box;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tldraw/editor",
   "description": "A tiny little drawing app (editor).",
-  "version": "3.13.0-canary.c0afd1f5aa1e",
+  "version": "3.13.0-canary.c4135f4903f5",
   "author": {
     "name": "tldraw Inc.",
     "email": "hello@tldraw.com"
@@ -48,12 +48,12 @@
     "@tiptap/core": "^2.9.1",
     "@tiptap/pm": "^2.9.1",
     "@tiptap/react": "^2.9.1",
-    "@tldraw/state": "3.13.0-canary.c0afd1f5aa1e",
-    "@tldraw/state-react": "3.13.0-canary.c0afd1f5aa1e",
-    "@tldraw/store": "3.13.0-canary.c0afd1f5aa1e",
-    "@tldraw/tlschema": "3.13.0-canary.c0afd1f5aa1e",
-    "@tldraw/utils": "3.13.0-canary.c0afd1f5aa1e",
-    "@tldraw/validate": "3.13.0-canary.c0afd1f5aa1e",
+    "@tldraw/state": "3.13.0-canary.c4135f4903f5",
+    "@tldraw/state-react": "3.13.0-canary.c4135f4903f5",
+    "@tldraw/store": "3.13.0-canary.c4135f4903f5",
+    "@tldraw/tlschema": "3.13.0-canary.c4135f4903f5",
+    "@tldraw/utils": "3.13.0-canary.c4135f4903f5",
+    "@tldraw/validate": "3.13.0-canary.c4135f4903f5",
     "@types/core-js": "^2.5.8",
     "@use-gesture/react": "^10.3.1",
     "classnames": "^2.5.1",

package/src/index.ts

@@ -4,11 +4,37 @@ import 'core-js/stable/array/flat-map.js'
 import 'core-js/stable/array/flat.js'
 import 'core-js/stable/string/at.js'
 import 'core-js/stable/string/replace-all.js'
-
-// eslint-disable-next-line local/no-export-star
-export * from '@tldraw/state'
-// eslint-disable-next-line local/no-export-star
-export * from '@tldraw/state-react'
+export {
+	EMPTY_ARRAY,
+	EffectScheduler,
+	atom,
+	computed,
+	react,
+	transact,
+	transaction,
+	whyAmIRunning,
+	type Atom,
+	type Signal,
+} from '@tldraw/state'
+export {
+	track,
+	useAtom,
+	useComputed,
+	useQuickReactor,
+	useReactor,
+	useStateTracking,
+	useValue,
+} from '@tldraw/state-react'
+export { resizeScaled } from './lib/editor/shapes/shared/resizeScaled'
+export {
+	getFontsFromRichText,
+	type RichTextFontVisitor,
+	type RichTextFontVisitorState,
+	type TLTextOptions,
+	type TiptapEditor,
+	type TiptapNode,
+} from './lib/utils/richText'
+export { LocalIndexedDb, Table, type StoreName } from './lib/utils/sync/LocalIndexedDb'
 // eslint-disable-next-line local/no-export-star
 export * from '@tldraw/store'
 // eslint-disable-next-line local/no-export-star
@@ -17,7 +43,6 @@ export * from '@tldraw/tlschema'
 export * from '@tldraw/utils'
 // eslint-disable-next-line local/no-export-star
 export * from '@tldraw/validate'
-
 export {
 	ErrorScreen,
 	LoadingScreen,
@@ -187,7 +212,6 @@ export {
 export { GroupShapeUtil } from './lib/editor/shapes/group/GroupShapeUtil'
 export { getPerfectDashProps } from './lib/editor/shapes/shared/getPerfectDashProps'
 export { resizeBox, type ResizeBoxOptions } from './lib/editor/shapes/shared/resizeBox'
-export { resizeScaled } from './lib/editor/shapes/shared/resizeScaled'
 export { BaseBoxShapeTool } from './lib/editor/tools/BaseBoxShapeTool/BaseBoxShapeTool'
 export { maybeSnapToGrid } from './lib/editor/tools/BaseBoxShapeTool/children/Pointing'
 export { StateNode, type TLStateNodeConstructor } from './lib/editor/tools/StateNode'
@@ -435,21 +459,12 @@ export { hardResetEditor } from './lib/utils/hardResetEditor'
 export { isAccelKey } from './lib/utils/keyboard'
 export { normalizeWheel } from './lib/utils/normalizeWheel'
 export { refreshPage } from './lib/utils/refreshPage'
-export {
-	getFontsFromRichText,
-	type RichTextFontVisitor,
-	type RichTextFontVisitorState,
-	type TLTextOptions,
-	type TiptapEditor,
-	type TiptapNode,
-} from './lib/utils/richText'
 export {
 	applyRotationToSnapshotShapes,
 	getRotationSnapshot,
 	type TLRotationSnapshot,
 } from './lib/utils/rotation'
 export { runtime, setRuntimeOverrides } from './lib/utils/runtime'
-export { LocalIndexedDb, Table, type StoreName } from './lib/utils/sync/LocalIndexedDb'
 export { type TLStoreWithStatus } from './lib/utils/sync/StoreWithStatus'
 export { hardReset } from './lib/utils/sync/hardReset'
 export { uniq } from './lib/utils/uniq'

package/src/lib/components/default-components/DefaultCanvas.tsx

@@ -37,7 +37,7 @@ export interface TLCanvasComponentProps {
 export function DefaultCanvas({ className }: TLCanvasComponentProps) {
 	const editor = useEditor()
 
-	const { SelectionBackground, Background, SvgDefs, ShapeIndicators } = useEditorComponents()
+	const { Background, SvgDefs, ShapeIndicators } = useEditorComponents()
 
 	const rCanvas = useRef<HTMLDivElement>(null)
 	const rHtmlLayer = useRef<HTMLDivElement>(null)
@@ -155,7 +155,7 @@ export function DefaultCanvas({ className }: TLCanvasComponentProps) {
 				<GridWrapper />
 				<div ref={rHtmlLayer} className="tl-html-layer tl-shapes" draggable={false}>
 					<OnTheCanvasWrapper />
-					{SelectionBackground && <SelectionBackgroundWrapper />}
+					<SelectionBackgroundWrapper />
 					{hideShapes ? null : debugSvg ? <ShapesWithSVGs /> : <ShapesToDisplay />}
 				</div>
 				<div className="tl-overlays">
@@ -365,8 +365,7 @@ function HandleWrapper({
 	return (
 		<g
 			role="button"
-			// TODO(mime): handle.label needs to be required in the future.
-			aria-label={handle.label || 'handle'}
+			aria-label="handle"
 			transform={`translate(${handle.x}, ${handle.y})`}
 			{...events}
 		>
@@ -576,13 +575,9 @@ function DebugSvgCopy({ id, mode }: { id: TLShapeId; mode: 'img' | 'iframe' }) {
 
 function SelectionForegroundWrapper() {
 	const editor = useEditor()
-	const selectionRotation = useValue(
-		'selection rotation',
-		function getSelectionRotation() {
-			return editor.getSelectionRotation()
-		},
-		[editor]
-	)
+	const selectionRotation = useValue('selection rotation', () => editor.getSelectionRotation(), [
+		editor,
+	])
 	const selectionBounds = useValue(
 		'selection bounds',
 		() => editor.getSelectionRotatedPageBounds(),

package/src/lib/editor/Editor.test.ts

@@ -52,7 +52,7 @@ beforeEach(() => {
 		shapeUtils: [CustomShape],
 		bindingUtils: [],
 		tools: [],
-		store: createTLStore({ shapeUtils: [CustomShape], bindingUtils: [] }),
+		store: createTLStore({ shapeUtils: [CustomShape] }),
 		getContainer: () => document.body,
 	})
 	editor.setCameraOptions({ isLocked: true })

package/src/lib/editor/Editor.ts

@@ -326,6 +326,7 @@ export class Editor extends EventEmitter<TLEventMap> {
 		this.options = { ...defaultTldrawOptions, ...options }
 
 		this.store = store
+		this.disposables.add(this.store.dispose.bind(this.store))
 		this.history = new HistoryManager<TLRecord>({
 			store,
 			annotateError: (error) => {
@@ -955,7 +956,6 @@ export class Editor extends EventEmitter<TLEventMap> {
 	dispose() {
 		this.disposables.forEach((dispose) => dispose())
 		this.disposables.clear()
-		this.store.dispose()
 		this.isDisposed = true
 	}
 
@@ -1815,28 +1815,9 @@ export class Editor extends EventEmitter<TLEventMap> {
 		return this
 	}
 
-	/**
-	 * Select the next shape in the reading order or in cardinal order.
-	 *
-	 * @example
-	 * ```ts
-	 * editor.selectAdjacentShape('next')
-	 * ```
-	 *
-	 * @public
-	 */
 	selectAdjacentShape(direction: TLAdjacentDirection) {
+		const readingOrderShapes = this.getCurrentPageShapesInReadingOrder()
 		const selectedShapeIds = this.getSelectedShapeIds()
-		const firstParentId = selectedShapeIds[0] ? this.getShape(selectedShapeIds[0])?.parentId : null
-		const isSelectedWithinContainer =
-			firstParentId &&
-			selectedShapeIds.every((shapeId) => this.getShape(shapeId)?.parentId === firstParentId) &&
-			!isPageId(firstParentId)
-		const readingOrderShapes = isSelectedWithinContainer
-			? this._getShapesInReadingOrder(
-					this.getCurrentPageShapes().filter((shape) => shape.parentId === firstParentId)
-				)
-			: this.getCurrentPageShapesInReadingOrder()
 		const currentShapeId: TLShapeId | undefined =
 			selectedShapeIds.length === 1
 				? selectedShapeIds[0]
@@ -1858,7 +1839,13 @@ export class Editor extends EventEmitter<TLEventMap> {
 		const shape = this.getShape(adjacentShapeId)
 		if (!shape) return
 
-		this._selectShapesAndZoom([shape.id])
+		this.setSelectedShapes([shape.id])
+		this.zoomToSelectionIfOffscreen(256, {
+			animation: {
+				duration: this.options.animationMediumMs,
+			},
+			inset: 0,
+		})
 	}
 
 	/**
@@ -1868,14 +1855,10 @@ export class Editor extends EventEmitter<TLEventMap> {
 	 * @public
 	 */
 	@computed getCurrentPageShapesInReadingOrder(): TLShape[] {
-		const shapes = this.getCurrentPageShapes().filter((shape) => isPageId(shape.parentId))
-		return this._getShapesInReadingOrder(shapes)
-	}
-
-	private _getShapesInReadingOrder(shapes: TLShape[]): TLShape[] {
 		const SHALLOW_ANGLE = 20
 		const ROW_THRESHOLD = 100
 
+		const shapes = this.getCurrentPageShapes()
 		const tabbableShapes = shapes.filter((shape) => this.getShapeUtil(shape).canTabTo(shape))
 
 		if (tabbableShapes.length <= 1) return tabbableShapes
@@ -2021,36 +2004,6 @@ export class Editor extends EventEmitter<TLEventMap> {
 		return lowestScoringShape!.shape.id
 	}
 
-	selectParentShape() {
-		const selectedShape = this.getOnlySelectedShape()
-		if (!selectedShape) return
-		const parentShape = this.getShape(selectedShape.parentId)
-		if (!parentShape) return
-		this._selectShapesAndZoom([parentShape.id])
-	}
-
-	selectFirstChildShape() {
-		const selectedShapes = this.getSelectedShapes()
-		if (!selectedShapes.length) return
-		const selectedShape = selectedShapes[0]
-		const children = this.getSortedChildIdsForParent(selectedShape.id)
-			.map((id) => this.getShape(id))
-			.filter((i) => i) as TLShape[]
-		const sortedChildren = this._getShapesInReadingOrder(children)
-		if (sortedChildren.length === 0) return
-		this._selectShapesAndZoom([sortedChildren[0].id])
-	}
-
-	private _selectShapesAndZoom(ids: TLShapeId[]) {
-		this.setSelectedShapes(ids)
-		this.zoomToSelectionIfOffscreen(256, {
-			animation: {
-				duration: this.options.animationMediumMs,
-			},
-			inset: 0,
-		})
-	}
-
 	/**
 	 * Clear the selection.
 	 *
@@ -2323,21 +2276,13 @@ export class Editor extends EventEmitter<TLEventMap> {
 	setEditingShape(shape: TLShapeId | TLShape | null): this {
 		const id = typeof shape === 'string' ? shape : (shape?.id ?? null)
 		this.setRichTextEditor(null)
-		const prevEditingShapeId = this.getEditingShapeId()
-		if (id !== prevEditingShapeId) {
+		if (id !== this.getEditingShapeId()) {
 			if (id) {
 				const shape = this.getShape(id)
 				if (shape && this.getShapeUtil(shape).canEdit(shape)) {
 					this.run(
 						() => {
 							this._updateCurrentPageState({ editingShapeId: id })
-							if (prevEditingShapeId) {
-								const prevEditingShape = this.getShape(prevEditingShapeId)
-								if (prevEditingShape) {
-									this.getShapeUtil(prevEditingShape).onEditEnd?.(prevEditingShape)
-								}
-							}
-							this.getShapeUtil(shape).onEditStart?.(shape)
 						},
 						{ history: 'ignore' }
 					)
@@ -2350,12 +2295,6 @@ export class Editor extends EventEmitter<TLEventMap> {
 				() => {
 					this._updateCurrentPageState({ editingShapeId: null })
 					this._currentRichTextEditor.set(null)
-					if (prevEditingShapeId) {
-						const prevEditingShape = this.getShape(prevEditingShapeId)
-						if (prevEditingShape) {
-							this.getShapeUtil(prevEditingShape).onEditEnd?.(prevEditingShape)
-						}
-					}
 				},
 				{ history: 'ignore' }
 			)
@@ -10404,10 +10343,12 @@ export class Editor extends EventEmitter<TLEventMap> {
 						if (this.inputs.isPanning && this.inputs.isPointing) {
 							// Handle spacebar / middle mouse button panning
 							const { currentScreenPoint, previousScreenPoint } = this.inputs
+							const { panSpeed } = cameraOptions
 							const offset = Vec.Sub(currentScreenPoint, previousScreenPoint)
-							this.setCamera(new Vec(cx + offset.x / cz, cy + offset.y / cz, cz), {
-								immediate: true,
-							})
+							this.setCamera(
+								new Vec(cx + (offset.x * panSpeed) / cz, cy + (offset.y * panSpeed) / cz, cz),
+								{ immediate: true }
+							)
 							this.maybeTrackPerformance('Panning')
 							return
 						}

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

@@ -45,6 +45,7 @@ export interface HandleSnapGeometry {
 
 const defaultGetSelfSnapOutline = () => null
 const defaultGetSelfSnapPoints = () => []
+
 /** @public */
 export class HandleSnaps {
 	readonly editor: Editor

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

@@ -32,7 +32,6 @@ export interface TLMeasureTextSpanOpts {
 	fontStyle: string
 	lineHeight: number
 	textAlign: TLDefaultHorizontalAlignStyle
-	otherStyles?: Record<string, string>
 }
 
 const spaceCharacterRegex = /\s/
@@ -87,7 +86,6 @@ export class TextManager {
 			 */
 			maxWidth: null | number
 			minWidth?: null | number
-			otherStyles?: Record<string, string>
 			padding: string
 			disableOverflowWrapBreaking?: boolean
 		}
@@ -114,11 +112,6 @@ export class TextManager {
 			'overflow-wrap',
 			opts.disableOverflowWrapBreaking ? 'normal' : 'break-word'
 		)
-		if (opts.otherStyles) {
-			for (const [key, value] of Object.entries(opts.otherStyles)) {
-				wrapperElm.style.setProperty(key, value)
-			}
-		}
 
 		const scrollWidth = wrapperElm.scrollWidth
 		const rect = wrapperElm.getBoundingClientRect()
@@ -263,11 +256,6 @@ export class TextManager {
 		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)
-		if (opts.otherStyles) {
-			for (const [key, value] of Object.entries(opts.otherStyles)) {
-				elm.style.setProperty(key, value)
-			}
-		}
 
 		const shouldTruncateToFirstLine =
 			opts.overflow === 'truncate-ellipsis' || opts.overflow === 'truncate-clip'

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

@@ -245,7 +245,7 @@ export abstract class ShapeUtil<Shape extends TLUnknownShape = TLUnknownShape> {
 	 *
 	 * @public
 	 */
-	canEditInReadonly(_shape: Shape): boolean {
+	canEditInReadOnly(_shape: Shape): boolean {
 		return false
 	}
 
@@ -707,15 +707,7 @@ export abstract class ShapeUtil<Shape extends TLUnknownShape = TLUnknownShape> {
 	onClick?(shape: Shape): TLShapePartial<Shape> | void
 
 	/**
-	 * A callback called when a shape starts being edited.
-	 *
-	 * @param shape - The shape.
-	 * @public
-	 */
-	onEditStart?(shape: Shape): void
-
-	/**
-	 * A callback called when a shape finishes being edited.
+	 * A callback called when a shape finishes being editing.
 	 *
 	 * @param shape - The shape.
 	 * @public

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

@@ -12,6 +12,10 @@ export class GroupShapeUtil extends ShapeUtil<TLGroupShape> {
 	static override props = groupShapeProps
 	static override migrations = groupShapeMigrations
 
+	override canTabTo() {
+		return false
+	}
+
 	override hideSelectionBoundsFg() {
 		return true
 	}

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

@@ -4,15 +4,15 @@ import { TLDefaultDashStyle } from '@tldraw/tlschema'
 export function getPerfectDashProps(
 	totalLength: number,
 	strokeWidth: number,
-	opts: {
-		style?: TLDefaultDashStyle
-		snap?: number
-		end?: 'skip' | 'outset' | 'none'
-		start?: 'skip' | 'outset' | 'none'
-		lengthRatio?: number
-		closed?: boolean
-		forceSolid?: boolean
-	} = {}
+	opts = {} as Partial<{
+		style: TLDefaultDashStyle
+		snap: number
+		end: 'skip' | 'outset' | 'none'
+		start: 'skip' | 'outset' | 'none'
+		lengthRatio: number
+		closed: boolean
+		forceSolid: boolean
+	}>
 ): {
 	strokeDasharray: string
 	strokeDashoffset: string

package/src/lib/hooks/useEditorComponents.tsx

@@ -19,7 +19,10 @@ import { DefaultHandle, TLHandleProps } from '../components/default-components/D
 import { DefaultHandles, TLHandlesProps } from '../components/default-components/DefaultHandles'
 import { DefaultLoadingScreen } from '../components/default-components/DefaultLoadingScreen'
 import { DefaultScribble, TLScribbleProps } from '../components/default-components/DefaultScribble'
-import { TLSelectionBackgroundProps } from '../components/default-components/DefaultSelectionBackground'
+import {
+	DefaultSelectionBackground,
+	TLSelectionBackgroundProps,
+} from '../components/default-components/DefaultSelectionBackground'
 import {
 	DefaultSelectionForeground,
 	TLSelectionForegroundProps,
@@ -110,7 +113,7 @@ export function EditorComponentsProvider({
 			OnTheCanvas: null,
 			Overlays: null,
 			Scribble: DefaultScribble,
-			SelectionBackground: null,
+			SelectionBackground: DefaultSelectionBackground,
 			SelectionForeground: DefaultSelectionForeground,
 			ShapeIndicator: DefaultShapeIndicator,
 			ShapeIndicators: DefaultShapeIndicators,

package/src/lib/primitives/Box.ts

@@ -57,11 +57,6 @@ export class Box {
 		this.x = n
 	}
 
-	// eslint-disable-next-line no-restricted-syntax
-	get left() {
-		return this.x
-	}
-
 	// eslint-disable-next-line no-restricted-syntax
 	get midX() {
 		return this.x + this.w / 2
@@ -72,11 +67,6 @@ export class Box {
 		return this.x + this.w
 	}
 
-	// eslint-disable-next-line no-restricted-syntax
-	get right() {
-		return this.x + this.w
-	}
-
 	// eslint-disable-next-line no-restricted-syntax
 	get minY() {
 		return this.y
@@ -87,11 +77,6 @@ export class Box {
 		this.y = n
 	}
 
-	// eslint-disable-next-line no-restricted-syntax
-	get top() {
-		return this.y
-	}
-
 	// eslint-disable-next-line no-restricted-syntax
 	get midY() {
 		return this.y + this.h / 2
@@ -102,11 +87,6 @@ export class Box {
 		return this.y + this.h
 	}
 
-	// eslint-disable-next-line no-restricted-syntax
-	get bottom() {
-		return this.y + this.h
-	}
-
 	// eslint-disable-next-line no-restricted-syntax
 	get width() {
 		return this.w

package/src/lib/primitives/Mat.ts

@@ -157,13 +157,12 @@ export class Mat {
 		return Mat.Compose(Mat.Translate(cx, cy!), rotationMatrix, Mat.Translate(-cx, -cy!))
 	}
 
-	static Scale(x: number, y: number): Mat
-	static Scale(x: number, y: number, cx: number, cy: number): Mat
-	static Scale(x: number, y: number, cx?: number, cy?: number): Mat {
+	static Scale(x: number, y: number): MatModel
+	static Scale(x: number, y: number, cx: number, cy: number): MatModel
+	static Scale(x: number, y: number, cx?: number, cy?: number): MatModel {
 		const scaleMatrix = new Mat(x, 0, 0, y, 0, 0)
 		if (cx === undefined) return scaleMatrix
-
-		return Mat.Translate(cx, cy!).multiply(scaleMatrix).translate(-cx, -cy!)
+		return Mat.Compose(Mat.Translate(cx, cy!), scaleMatrix, Mat.Translate(-cx, -cy!))
 	}
 	static Multiply(m1: MatModel, m2: MatModel): MatModel {
 		return {

package/src/lib/primitives/Vec.ts

@@ -319,11 +319,6 @@ export class Vec {
 		return ((A.y - B.y) ** 2 + (A.x - B.x) ** 2) ** 0.5
 	}
 
-	// Get the Manhattan distance between two points.
-	static ManhattanDist(A: VecLike, B: VecLike): number {
-		return Math.abs(A.x - B.x) + Math.abs(A.y - B.y)
-	}
-
 	// Get whether a distance between two points is less than a number. This is faster to calulate than using `Vec.Dist(a, b) < n`.
 	static DistMin(A: VecLike, B: VecLike, n: number): boolean {
 		return (A.x - B.x) * (A.x - B.x) + (A.y - B.y) * (A.y - B.y) < n ** 2
@@ -470,28 +465,10 @@ export class Vec {
 		return isNaN(A.x) || isNaN(A.y)
 	}
 
-	/**
-	 * Get the angle from position A to position B.
-	 */
 	static Angle(A: VecLike, B: VecLike): number {
 		return Math.atan2(B.y - A.y, B.x - A.x)
 	}
 
-	/**
-	 * Get the angle between vector A and vector B. This will return the smallest angle between the
-	 * two vectors, between -π and π. The sign indicates direction of angle.
-	 */
-	static AngleBetween(A: VecLike, B: VecLike): number {
-		const p = A.x * B.x + A.y * B.y
-		const n = Math.sqrt(
-			(Math.pow(A.x, 2) + Math.pow(A.y, 2)) * (Math.pow(B.x, 2) + Math.pow(B.y, 2))
-		)
-		const sign = A.x * B.y - A.y * B.x < 0 ? -1 : 1
-		const angle = sign * Math.acos(p / n)
-
-		return angle
-	}
-
 	/**
 	 * Linearly interpolate between two points.
 	 * @param A - The first point.