tldraw 3.16.0-internal.51e99e128bd4 → 3.16.0-internal.a478398270c6

package/src/lib/ui/context/actions.tsx

@@ -28,7 +28,6 @@ import { fitFrameToContent, removeFrame } from '../../utils/frames/frames'
 import { generateShapeAnnouncementMessage } from '../components/A11y'
 import { EditLinkDialog } from '../components/EditLinkDialog'
 import { EmbedDialog } from '../components/EmbedDialog'
-import { DefaultKeyboardShortcutsDialog } from '../components/KeyboardShortcutsDialog/DefaultKeyboardShortcutsDialog'
 import { useShowCollaborationUi } from '../hooks/useCollaborationStatus'
 import { flattenShapesToImages } from '../hooks/useFlatten'
 import { TLUiTranslationKey } from '../hooks/useTranslation/TLUiTranslationKey'
@@ -43,13 +42,12 @@ export interface TLUiActionItem<
 	TransationKey extends string = string,
 	IconType extends string = string,
 > {
-	icon?: IconType | React.ReactElement
+	icon?: IconType
 	id: string
 	kbd?: string
 	label?: TransationKey | { [key: string]: TransationKey }
 	readonlyOk?: boolean
 	checkbox?: boolean
-	isRequiredA11yAction?: boolean
 	onSelect(source: TLUiEventSource): Promise<void> | void
 }
 
@@ -170,15 +168,6 @@ export function ActionsProvider({ overrides, children }: ActionsProviderProps) {
 					helpers.addDialog({ component: EmbedDialog })
 				},
 			},
-			{
-				id: 'open-kbd-shortcuts',
-				label: 'action.open-kbd-shortcuts',
-				kbd: 'cmd+alt+/,ctrl+alt+/',
-				onSelect(source) {
-					trackEvent('open-kbd-shortcuts', { source })
-					helpers.addDialog({ component: DefaultKeyboardShortcutsDialog })
-				},
-			},
 			{
 				id: 'insert-media',
 				label: 'action.insert-media',
@@ -513,6 +502,7 @@ export function ActionsProvider({ overrides, children }: ActionsProviderProps) {
 								}
 					}
 
+					if (!editor.canCreateShapes(ids)) return
 					editor.markHistoryStoppingPoint('duplicate shapes')
 					editor.duplicateShapes(ids, offset)
 
@@ -1037,20 +1027,17 @@ export function ActionsProvider({ overrides, children }: ActionsProviderProps) {
 				id: 'rotate-cw',
 				label: 'action.rotate-cw',
 				icon: 'rotate-cw',
-				kbd: 'shift+.,shift+alt+.',
 				onSelect(source) {
 					if (!canApplySelectionAction()) return
 					if (mustGoBackToSelectToolFirst()) return
 
-					const isFine = editor.inputs.altKey
-					trackEvent('rotate-cw', { source, fine: isFine })
+					trackEvent('rotate-cw', { source })
 					editor.markHistoryStoppingPoint('rotate-cw')
 					editor.run(() => {
-						const rotation = HALF_PI / (isFine ? 96 : 6)
-						const offset = editor.getSelectionRotation() % rotation
-						const dontUseOffset = approximately(offset, 0) || approximately(offset, rotation)
+						const offset = editor.getSelectionRotation() % (HALF_PI / 2)
+						const dontUseOffset = approximately(offset, 0) || approximately(offset, HALF_PI / 2)
 						const selectedShapeIds = editor.getSelectedShapeIds()
-						editor.rotateShapesBy(selectedShapeIds, rotation - (dontUseOffset ? 0 : offset))
+						editor.rotateShapesBy(selectedShapeIds, HALF_PI / 2 - (dontUseOffset ? 0 : offset))
 						kickoutOccludedShapes(editor, selectedShapeIds)
 					})
 				},
@@ -1059,21 +1046,17 @@ export function ActionsProvider({ overrides, children }: ActionsProviderProps) {
 				id: 'rotate-ccw',
 				label: 'action.rotate-ccw',
 				icon: 'rotate-ccw',
-				// omg double comma
-				kbd: 'shift+,,shift+alt+,',
 				onSelect(source) {
 					if (!canApplySelectionAction()) return
 					if (mustGoBackToSelectToolFirst()) return
 
-					const isFine = editor.inputs.altKey
-					trackEvent('rotate-ccw', { source, fine: isFine })
+					trackEvent('rotate-ccw', { source })
 					editor.markHistoryStoppingPoint('rotate-ccw')
 					editor.run(() => {
-						const rotation = HALF_PI / (isFine ? 96 : 6)
-						const offset = editor.getSelectionRotation() % rotation
+						const offset = editor.getSelectionRotation() % (HALF_PI / 2)
 						const offsetCloseToZero = approximately(offset, 0)
 						const selectedShapeIds = editor.getSelectedShapeIds()
-						editor.rotateShapesBy(selectedShapeIds, offsetCloseToZero ? -rotation : -offset)
+						editor.rotateShapesBy(selectedShapeIds, offsetCloseToZero ? -(HALF_PI / 2) : -offset)
 						kickoutOccludedShapes(editor, selectedShapeIds)
 					})
 				},
@@ -1251,36 +1234,6 @@ export function ActionsProvider({ overrides, children }: ActionsProviderProps) {
 				},
 				checkbox: true,
 			},
-			{
-				id: 'toggle-keyboard-shortcuts',
-				label: {
-					default: 'action.toggle-keyboard-shortcuts',
-					menu: 'action.toggle-keyboard-shortcuts.menu',
-				},
-				readonlyOk: true,
-				onSelect(source) {
-					trackEvent('toggle-keyboard-shortcuts', { source })
-					editor.user.updateUserPreferences({
-						areKeyboardShortcutsEnabled: !editor.user.getAreKeyboardShortcutsEnabled(),
-					})
-				},
-				checkbox: true,
-			},
-			{
-				id: 'toggle-ui-labels',
-				label: {
-					default: 'action.toggle-ui-labels',
-					menu: 'action.toggle-ui-labels.menu',
-				},
-				readonlyOk: true,
-				onSelect(source) {
-					trackEvent('toggle-ui-labels', { source })
-					editor.user.updateUserPreferences({
-						showUiLabels: !editor.user.getShowUiLabels(),
-					})
-				},
-				checkbox: true,
-			},
 			{
 				id: 'toggle-edge-scrolling',
 				label: {
@@ -1577,7 +1530,6 @@ export function ActionsProvider({ overrides, children }: ActionsProviderProps) {
 				id: 'adjust-shape-styles',
 				label: 'a11y.adjust-shape-styles',
 				kbd: 'cmd+Enter,ctrl+Enter',
-				isRequiredA11yAction: true,
 				onSelect: async (source) => {
 					if (!canApplySelectionAction()) return
 
@@ -1591,7 +1543,6 @@ export function ActionsProvider({ overrides, children }: ActionsProviderProps) {
 			{
 				id: 'a11y-open-context-menu',
 				kbd: 'cmd+shift+Enter,ctrl+shift+Enter',
-				isRequiredA11yAction: true,
 				readonlyOk: true,
 				onSelect: async (source) => {
 					if (!canApplySelectionAction()) return
@@ -1644,7 +1595,6 @@ export function ActionsProvider({ overrides, children }: ActionsProviderProps) {
 				id: 'a11y-repeat-shape-announce',
 				kbd: 'alt+r',
 				label: 'a11y.repeat-shape',
-				isRequiredA11yAction: true,
 				readonlyOk: true,
 				onSelect: async (source) => {
 					const selectedShapeIds = editor.getSelectedShapeIds()

package/src/lib/ui/context/events.tsx

@@ -76,8 +76,8 @@ export interface TLUiEventMap {
 	'delete-shapes': null
 	'select-all-shapes': null
 	'select-none-shapes': null
-	'rotate-ccw': { fine: boolean }
-	'rotate-cw': { fine: boolean }
+	'rotate-ccw': null
+	'rotate-cw': null
 	'zoom-in': { towardsCursor: boolean }
 	'zoom-out': { towardsCursor: boolean }
 	'zoom-to-fit': null
@@ -107,8 +107,6 @@ export interface TLUiEventMap {
 	'toggle-paste-at-cursor': null
 	'toggle-lock': null
 	'toggle-reduce-motion': null
-	'toggle-keyboard-shortcuts': null
-	'toggle-ui-labels': null
 	'toggle-edge-scrolling': null
 	'color-scheme': { value: string }
 	'exit-pen-mode': null
@@ -127,10 +125,8 @@ export interface TLUiEventMap {
 	'open-context-menu': null
 	'adjust-shape-styles': null
 	'copy-link': null
-	'drag-tool': { id: string }
 	'image-replace': null
 	'video-replace': null
-	'open-kbd-shortcuts': null
 	'rich-text': {
 		operation:
 			| 'bold'

package/src/lib/ui/hooks/menu-hooks.ts

@@ -123,7 +123,6 @@ export function useAnySelectedShapesCount(min?: number, max?: number) {
 
 /**
  * Returns true if the number of UNLOCKED selected shapes is at least min or at most max.
- * @public
  */
 export function useUnlockedSelectedShapesCount(min?: number, max?: number) {
 	const editor = useEditor()

package/src/lib/ui/hooks/useKeyboardShortcuts.ts

@@ -61,7 +61,7 @@ export function useKeyboardShortcuts() {
 			if (SKIP_KBDS.includes(action.id)) continue
 
 			hot(getHotkeysStringFromKbd(action.kbd), (event) => {
-				if (areShortcutsDisabled(editor) && !action.isRequiredA11yAction) return
+				if (areShortcutsDisabled(editor)) return
 				preventDefault(event)
 				action.onSelect('kbd')
 			})
@@ -149,8 +149,7 @@ export function areShortcutsDisabled(editor: Editor) {
 	return (
 		editor.menus.hasAnyOpenMenus() ||
 		editor.getEditingShapeId() !== null ||
-		editor.getCrashingError() ||
-		!editor.user.getAreKeyboardShortcutsEnabled()
+		editor.getCrashingError()
 	)
 }
 

package/src/lib/ui/hooks/useTools.tsx

@@ -1,18 +1,6 @@
-import {
-	assertExists,
-	createShapeId,
-	Editor,
-	GeoShapeGeoStyle,
-	getIndicesBetween,
-	TLLineShape,
-	TLPointerEventInfo,
-	TLShapeId,
-	toRichText,
-	useMaybeEditor,
-} from '@tldraw/editor'
+import { Editor, GeoShapeGeoStyle, useMaybeEditor } from '@tldraw/editor'
 import * as React from 'react'
 import { EmbedDialog } from '../components/EmbedDialog'
-import { TLUiIconJsx } from '../components/primitives/TldrawUiIcon'
 import { useA11y } from '../context/a11y'
 import { TLUiEventSource, useUiEvents } from '../context/events'
 import { TLUiIconType } from '../icon-types'
@@ -28,9 +16,8 @@ export interface TLUiToolItem<
 	id: string
 	label: TranslationKey
 	shortcutsLabel?: TranslationKey
-	icon: IconType | TLUiIconJsx
+	icon: IconType
 	onSelect(source: TLUiEventSource): void
-	onDragStart?(source: TLUiEventSource, info: TLPointerEventInfo): void
 	/**
 	 * The keyboard shortcut for this tool. This is a string that can be a single key,
 	 * or a combination of keys.
@@ -138,28 +125,21 @@ export function ToolsProvider({ overrides, children }: TLUiToolsProviderProps) {
 					onToolSelect(source, this)
 				},
 			},
-			...[...GeoShapeGeoStyle.values].map((geo) => ({
-				id: geo,
-				label: `tool.${geo}` as TLUiTranslationKey,
+			...[...GeoShapeGeoStyle.values].map((id) => ({
+				id,
+				label: `tool.${id}` as TLUiTranslationKey,
 				meta: {
-					geo,
+					geo: id,
 				},
-				kbd: geo === 'rectangle' ? 'r' : geo === 'ellipse' ? 'o' : undefined,
-				icon: ('geo-' + geo) as TLUiIconType,
+				kbd: id === 'rectangle' ? 'r' : id === 'ellipse' ? 'o' : undefined,
+				icon: ('geo-' + id) as TLUiIconType,
 				onSelect(source: TLUiEventSource) {
 					editor.run(() => {
-						editor.setStyleForNextShapes(GeoShapeGeoStyle, geo)
+						editor.setStyleForNextShapes(GeoShapeGeoStyle, id)
 						editor.setCurrentTool('geo')
-						onToolSelect(source, this, `geo-${geo}`)
+						onToolSelect(source, this, `geo-${id}`)
 					})
 				},
-				onDragStart(source: TLUiEventSource, info: TLPointerEventInfo) {
-					onDragFromToolbarToCreateShape(editor, info, {
-						createShape: (id) =>
-							editor.createShape({ id, type: 'geo', props: { w: 200, h: 200, geo } }),
-					})
-					trackEvent('drag-tool', { source, id: 'geo' })
-				},
 			})),
 			{
 				id: 'arrow',
@@ -170,17 +150,6 @@ export function ToolsProvider({ overrides, children }: TLUiToolsProviderProps) {
 					editor.setCurrentTool('arrow')
 					onToolSelect(source, this)
 				},
-				onDragStart(source: TLUiEventSource, info: TLPointerEventInfo) {
-					onDragFromToolbarToCreateShape(editor, info, {
-						createShape: (id) =>
-							editor.createShape({
-								id,
-								type: 'arrow',
-								props: { start: { x: 0, y: 0 }, end: { x: 200, y: 0 } },
-							}),
-					})
-					trackEvent('drag-tool', { source, id: 'arrow' })
-				},
 			},
 			{
 				id: 'line',
@@ -191,24 +160,6 @@ export function ToolsProvider({ overrides, children }: TLUiToolsProviderProps) {
 					editor.setCurrentTool('line')
 					onToolSelect(source, this)
 				},
-				onDragStart(source, info) {
-					onDragFromToolbarToCreateShape(editor, info, {
-						createShape: (id) => {
-							const [start, end] = getIndicesBetween(null, null, 2)
-							editor.createShape<TLLineShape>({
-								id,
-								type: 'line',
-								props: {
-									points: {
-										[start]: { id: start, index: start, x: 0, y: 200 },
-										[end]: { id: end, index: end, x: 200, y: 0 },
-									},
-								},
-							})
-						},
-					})
-					trackEvent('drag-tool', { source, id: 'line' })
-				},
 			},
 			{
 				id: 'frame',
@@ -219,12 +170,6 @@ export function ToolsProvider({ overrides, children }: TLUiToolsProviderProps) {
 					editor.setCurrentTool('frame')
 					onToolSelect(source, this)
 				},
-				onDragStart(source, info) {
-					onDragFromToolbarToCreateShape(editor, info, {
-						createShape: (id) => editor.createShape({ id, type: 'frame' }),
-					})
-					trackEvent('drag-tool', { source, id: 'frame' })
-				},
 			},
 			{
 				id: 'text',
@@ -235,17 +180,6 @@ export function ToolsProvider({ overrides, children }: TLUiToolsProviderProps) {
 					editor.setCurrentTool('text')
 					onToolSelect(source, this)
 				},
-				onDragStart(source, info) {
-					onDragFromToolbarToCreateShape(editor, info, {
-						createShape: (id) =>
-							editor.createShape({ id, type: 'text', props: { richText: toRichText('Text') } }),
-						onDragEnd: (id) => {
-							editor.setEditingShape(id)
-							editor.emit('select-all-text', { shapeId: id })
-						},
-					})
-					trackEvent('drag-tool', { source, id: 'text' })
-				},
 			},
 			{
 				id: 'asset',
@@ -266,16 +200,6 @@ export function ToolsProvider({ overrides, children }: TLUiToolsProviderProps) {
 					editor.setCurrentTool('note')
 					onToolSelect(source, this)
 				},
-				onDragStart(source, info) {
-					onDragFromToolbarToCreateShape(editor, info, {
-						createShape: (id) => editor.createShape({ id, type: 'note' }),
-						onDragEnd: (id) => {
-							editor.setEditingShape(id)
-							editor.emit('select-all-text', { shapeId: id })
-						},
-					})
-					trackEvent('drag-tool', { source, id: 'note' })
-				},
 			},
 			{
 				id: 'laser',
@@ -319,7 +243,7 @@ export function ToolsProvider({ overrides, children }: TLUiToolsProviderProps) {
 		}
 
 		return tools
-	}, [overrides, editor, helpers, onToolSelect, trackEvent])
+	}, [overrides, editor, helpers, onToolSelect])
 
 	return <ToolsContext.Provider value={tools}>{children}</ToolsContext.Provider>
 }
@@ -334,58 +258,3 @@ export function useTools() {
 
 	return ctx
 }
-
-/**
- * Options for {@link onDragFromToolbarToCreateShape}.
- * @public
- */
-export interface OnDragFromToolbarToCreateShapesOpts {
-	/**
-	 * Create the shape being dragged. You don't need to worry about positioning it, as it'll be
-	 * immediately updated with the correct position.
-	 */
-	createShape(id: TLShapeId): void
-	/**
-	 * Called once the drag interaction has finished.
-	 */
-	onDragEnd?(id: TLShapeId): void
-}
-
-/**
- * A helper method to use in {@link TLUiToolItem#onDragStart} to create a shape by dragging it from
- * the toolbar.
- * @public
- */
-export function onDragFromToolbarToCreateShape(
-	editor: Editor,
-	info: TLPointerEventInfo,
-	opts: OnDragFromToolbarToCreateShapesOpts
-) {
-	const { x, y } = editor.inputs.currentPagePoint
-
-	const stoppingPoint = editor.markHistoryStoppingPoint('drag shape tool')
-	editor.setCurrentTool('select.translating')
-
-	const id = createShapeId()
-	opts.createShape(id)
-	const shape = assertExists(editor.getShape(id), 'Shape not found')
-
-	const { w, h } = editor.getShapePageBounds(id)!
-	editor.updateShape({ id, type: shape.type, x: x - w / 2, y: y - h / 2 })
-	editor.select(id)
-
-	editor.setCurrentTool('select.translating', {
-		...info,
-		target: 'shape',
-		shape: editor.getShape(id),
-		isCreating: true,
-		creatingMarkId: stoppingPoint,
-		onCreate() {
-			editor.setCurrentTool('select.idle')
-			editor.select(id)
-			opts.onDragEnd?.(id)
-		},
-	})
-
-	editor.getCurrentTool().setCurrentToolIdMask(shape.type)
-}

package/src/lib/ui/hooks/useTranslation/TLUiTranslationKey.ts

@@ -55,7 +55,6 @@ export type TLUiTranslationKey =
 	| 'action.new-project'
 	| 'action.new-shared-project'
 	| 'action.open-cursor-chat'
-	| 'action.open-kbd-shortcuts'
 	| 'action.open-file'
 	| 'action.pack'
 	| 'action.paste'
@@ -91,10 +90,6 @@ export type TLUiTranslationKey =
 	| 'action.toggle-wrap-mode'
 	| 'action.toggle-reduce-motion.menu'
 	| 'action.toggle-reduce-motion'
-	| 'action.toggle-keyboard-shortcuts.menu'
-	| 'action.toggle-keyboard-shortcuts'
-	| 'action.toggle-ui-labels.menu'
-	| 'action.toggle-ui-labels'
 	| 'action.toggle-edge-scrolling.menu'
 	| 'action.toggle-edge-scrolling'
 	| 'action.toggle-debug-mode.menu'
@@ -288,19 +283,13 @@ export type TLUiTranslationKey =
 	| 'a11y.repeat-shape'
 	| 'a11y.move-shape'
 	| 'a11y.move-shape-faster'
-	| 'a11y.rotate-shape-cw'
-	| 'a11y.rotate-shape-ccw'
-	| 'a11y.rotate-shape-cw-fine'
-	| 'a11y.rotate-shape-ccw-fine'
 	| 'a11y.enlarge-shape'
 	| 'a11y.shrink-shape'
 	| 'a11y.pan-camera'
 	| 'a11y.adjust-shape-styles'
 	| 'a11y.open-context-menu'
-	| 'a11y.open-keyboard-shortcuts'
 	| 'menu.title'
 	| 'menu.theme'
-	| 'menu.accessibility'
 	| 'menu.copy-as'
 	| 'menu.edit'
 	| 'menu.export-as'

package/src/lib/ui/hooks/useTranslation/defaultTranslation.ts

@@ -55,7 +55,6 @@ export const DEFAULT_TRANSLATION = {
 	'action.new-project': 'New project',
 	'action.new-shared-project': 'New shared project',
 	'action.open-cursor-chat': 'Cursor chat',
-	'action.open-kbd-shortcuts': 'Open keyboard shortcuts',
 	'action.open-file': 'Open file',
 	'action.pack': 'Pack',
 	'action.paste': 'Paste',
@@ -92,10 +91,6 @@ export const DEFAULT_TRANSLATION = {
 	'action.toggle-wrap-mode': 'Toggle Select on wrap',
 	'action.toggle-reduce-motion.menu': 'Reduce motion',
 	'action.toggle-reduce-motion': 'Toggle reduce motion',
-	'action.toggle-keyboard-shortcuts.menu': 'Keyboard shortcuts',
-	'action.toggle-keyboard-shortcuts': 'Toggle keyboard shortcuts',
-	'action.toggle-ui-labels.menu': 'UI labels',
-	'action.toggle-ui-labels': 'Toggle UI labels',
 	'action.toggle-edge-scrolling.menu': 'Edge scrolling',
 	'action.toggle-edge-scrolling': 'Toggle edge scrolling',
 	'action.toggle-debug-mode.menu': 'Debug mode',
@@ -289,19 +284,13 @@ export const DEFAULT_TRANSLATION = {
 	'a11y.repeat-shape': 'Repeat shape',
 	'a11y.move-shape': 'Move shape',
 	'a11y.move-shape-faster': 'Move shape faster',
-	'a11y.rotate-shape-cw': 'Rotate shape clockwise',
-	'a11y.rotate-shape-ccw': 'Rotate shape counterclockwise',
-	'a11y.rotate-shape-cw-fine': 'Rotate shape clockwise (fine)',
-	'a11y.rotate-shape-ccw-fine': 'Rotate shape counterclockwise (fine)',
 	'a11y.enlarge-shape': 'Enlarge shape',
 	'a11y.shrink-shape': 'Shrink shape',
 	'a11y.pan-camera': 'Pan camera',
 	'a11y.adjust-shape-styles': 'Adjust shape styles',
 	'a11y.open-context-menu': 'Open context menu',
-	'a11y.open-keyboard-shortcuts': 'Open keyboard shortcuts',
 	'menu.title': 'Menu',
 	'menu.theme': 'Theme',
-	'menu.accessibility': 'Accessibility',
 	'menu.copy-as': 'Copy as',
 	'menu.edit': 'Edit',
 	'menu.export-as': 'Export as',

package/src/lib/ui/kbd-utils.ts

@@ -2,7 +2,6 @@ import { tlenv } from '@tldraw/editor'
 
 // N.B. We rework these Windows placeholders down below.
 const cmdKey = tlenv.isDarwin ? '⌘' : '__CTRL__'
-const ctrlKey = tlenv.isDarwin ? '⌃' : '__CTRL__'
 const altKey = tlenv.isDarwin ? '⌥' : '__ALT__'
 
 /** @public */
@@ -20,7 +19,7 @@ export function kbd(str: string) {
 					? s.replace(/[[\]]/g, '')
 					: s
 							.replace(/cmd\+/g, cmdKey)
-							.replace(/ctrl\+/g, ctrlKey)
+							.replace(/ctrl\+/g, cmdKey)
 							.replace(/alt\+/g, altKey)
 							.replace(/shift\+/g, '⇧')
 							// Backwards compatibility with the old system.

package/src/lib/ui/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.16.0-internal.51e99e128bd4'
+export const version = '3.16.0-internal.a478398270c6'
 export const publishDates = {
 	major: '2024-09-13T14:36:29.063Z',
-	minor: '2025-08-19T10:06:54.740Z',
-	patch: '2025-08-19T10:06:54.740Z',
+	minor: '2025-08-19T10:21:26.717Z',
+	patch: '2025-08-19T10:21:26.717Z',
 }