tldraw 3.15.0-canary.c4b9179d0b38 → 3.15.0-canary.c5c8f9bb0ec2

package/src/index.ts

@@ -24,6 +24,7 @@ export { usePrefersReducedMotion } from './lib/shapes/shared/usePrefersReducedMo
 export { DefaultA11yAnnouncer, useSelectedShapesAnnouncer } from './lib/ui/components/A11y'
 export { ColorSchemeMenu } from './lib/ui/components/ColorSchemeMenu'
 export { DefaultDialogs } from './lib/ui/components/Dialogs'
+export { DefaultToasts } from './lib/ui/components/Toasts'
 export {
 	TldrawUiMenuActionCheckboxItem,
 	type TLUiMenuActionCheckboxItemProps,
@@ -36,10 +37,11 @@ export {
 	TldrawUiMenuToolItem,
 	type TLUiMenuToolItemProps,
 } from './lib/ui/components/primitives/menus/TldrawUiMenuToolItem'
-export { DefaultToasts } from './lib/ui/components/Toasts'
 export { TldrawUiTranslationProvider } from './lib/ui/hooks/useTranslation/useTranslation'
 // eslint-disable-next-line local/no-export-star
 export * from '@tldraw/editor'
+export { Tldraw, type TLComponents, type TldrawBaseProps, type TldrawProps } from './lib/Tldraw'
+export { TldrawImage, type TldrawImageProps } from './lib/TldrawImage'
 export { ArrowBindingUtil } from './lib/bindings/arrow/ArrowBindingUtil'
 export { TldrawHandles } from './lib/canvas/TldrawHandles'
 export { TldrawArrowHints, TldrawOverlays } from './lib/canvas/TldrawOverlays'
@@ -57,11 +59,11 @@ export {
 	type TLEmbedShapePermissions,
 } from './lib/defaultEmbedDefinitions'
 export {
+	DEFAULT_MAX_ASSET_SIZE,
+	DEFAULT_MAX_IMAGE_DIMENSION,
 	centerSelectionAroundPoint,
 	createEmptyBookmarkShape,
 	createShapesForAssets,
-	DEFAULT_MAX_ASSET_SIZE,
-	DEFAULT_MAX_IMAGE_DIMENSION,
 	defaultHandleExternalEmbedContent,
 	defaultHandleExternalExcalidrawContent,
 	defaultHandleExternalFileAsset,
@@ -80,6 +82,8 @@ export { defaultShapeTools } from './lib/defaultShapeTools'
 export { defaultShapeUtils } from './lib/defaultShapeUtils'
 export { registerDefaultSideEffects } from './lib/defaultSideEffects'
 export { defaultTools } from './lib/defaultTools'
+export { ArrowShapeTool } from './lib/shapes/arrow/ArrowShapeTool'
+export { ArrowShapeUtil } from './lib/shapes/arrow/ArrowShapeUtil'
 export {
 	type ArrowShapeOptions,
 	type TLArcArrowInfo,
@@ -89,8 +93,6 @@ export {
 	type TLElbowArrowInfo,
 	type TLStraightArrowInfo,
 } from './lib/shapes/arrow/arrow-types'
-export { ArrowShapeTool } from './lib/shapes/arrow/ArrowShapeTool'
-export { ArrowShapeUtil } from './lib/shapes/arrow/ArrowShapeUtil'
 export {
 	type ElbowArrowBox,
 	type ElbowArrowBoxEdges,
@@ -130,6 +132,17 @@ export { LineShapeTool } from './lib/shapes/line/LineShapeTool'
 export { LineShapeUtil } from './lib/shapes/line/LineShapeUtil'
 export { NoteShapeTool } from './lib/shapes/note/NoteShapeTool'
 export { NoteShapeUtil, type NoteShapeOptions } from './lib/shapes/note/NoteShapeUtil'
+export {
+	PlainTextLabel,
+	TextLabel,
+	type PlainTextLabelProps,
+} from './lib/shapes/shared/PlainTextLabel'
+export {
+	RichTextLabel,
+	RichTextSVG,
+	type RichTextLabelProps,
+	type RichTextSVGProps,
+} from './lib/shapes/shared/RichTextLabel'
 export {
 	ASPECT_RATIO_OPTIONS,
 	ASPECT_RATIO_TO_VALUE,
@@ -148,22 +161,11 @@ export {
 	TEXT_PROPS,
 } from './lib/shapes/shared/default-shape-constants'
 export {
-	allDefaultFontFaces,
 	DefaultFontFaces,
+	allDefaultFontFaces,
 	type TLDefaultFont,
 	type TLDefaultFonts,
 } from './lib/shapes/shared/defaultFonts'
-export {
-	PlainTextLabel,
-	TextLabel,
-	type PlainTextLabelProps,
-} from './lib/shapes/shared/PlainTextLabel'
-export {
-	RichTextLabel,
-	RichTextSVG,
-	type RichTextLabelProps,
-	type RichTextSVGProps,
-} from './lib/shapes/shared/RichTextLabel'
 export { useDefaultColorTheme } from './lib/shapes/shared/useDefaultColorTheme'
 export { useEditablePlainText, useEditableText } from './lib/shapes/shared/useEditablePlainText'
 export { useEditableRichText } from './lib/shapes/shared/useEditableRichText'
@@ -178,13 +180,12 @@ export { TextShapeTool } from './lib/shapes/text/TextShapeTool'
 export { TextShapeUtil, type TextShapeOptions } from './lib/shapes/text/TextShapeUtil'
 export { VideoShapeUtil, type VideoShapeOptions } from './lib/shapes/video/VideoShapeUtil'
 export { type StyleValuesForUi } from './lib/styles'
-export { Tldraw, type TLComponents, type TldrawBaseProps, type TldrawProps } from './lib/Tldraw'
-export { TldrawImage, type TldrawImageProps } from './lib/TldrawImage'
 export { EraserTool } from './lib/tools/EraserTool/EraserTool'
 export { HandTool } from './lib/tools/HandTool/HandTool'
 export { LaserTool } from './lib/tools/LaserTool/LaserTool'
 export { SelectTool } from './lib/tools/SelectTool/SelectTool'
 export { ZoomTool } from './lib/tools/ZoomTool/ZoomTool'
+export { TldrawUi, type TldrawUiProps } from './lib/ui/TldrawUi'
 export {
 	setDefaultUiAssetUrls,
 	type TLUiAssetUrlOverrides,
@@ -222,11 +223,6 @@ export {
 	type ExampleDialogProps,
 } from './lib/ui/components/DebugMenu/DefaultDebugMenuContent'
 export { DefaultMenuPanel } from './lib/ui/components/DefaultMenuPanel'
-export {
-	DefaultHelperButtons,
-	type TLUiHelperButtonsProps,
-} from './lib/ui/components/HelperButtons/DefaultHelperButtons'
-export { DefaultHelperButtonsContent } from './lib/ui/components/HelperButtons/DefaultHelperButtonsContent'
 export {
 	DefaultHelpMenu,
 	type TLUiHelpMenuProps,
@@ -235,6 +231,11 @@ export {
 	DefaultHelpMenuContent,
 	KeyboardShortcutsMenuItem,
 } from './lib/ui/components/HelpMenu/DefaultHelpMenuContent'
+export {
+	DefaultHelperButtons,
+	type TLUiHelperButtonsProps,
+} from './lib/ui/components/HelperButtons/DefaultHelperButtons'
+export { DefaultHelperButtonsContent } from './lib/ui/components/HelperButtons/DefaultHelperButtonsContent'
 export {
 	DefaultKeyboardShortcutsDialog,
 	type TLUiKeyboardShortcutsDialogProps,
@@ -255,6 +256,116 @@ export {
 	UndoRedoGroup,
 	ViewSubmenu,
 } from './lib/ui/components/MainMenu/DefaultMainMenuContent'
+export { DefaultMinimap } from './lib/ui/components/Minimap/DefaultMinimap'
+export { MobileStylePanel } from './lib/ui/components/MobileStylePanel'
+export { DefaultNavigationPanel } from './lib/ui/components/NavigationPanel/DefaultNavigationPanel'
+export { OfflineIndicator } from './lib/ui/components/OfflineIndicator/OfflineIndicator'
+export { DefaultPageMenu } from './lib/ui/components/PageMenu/DefaultPageMenu'
+export { PageItemInput, type PageItemInputProps } from './lib/ui/components/PageMenu/PageItemInput'
+export {
+	PageItemSubmenu,
+	type PageItemSubmenuProps,
+} from './lib/ui/components/PageMenu/PageItemSubmenu'
+export {
+	DefaultQuickActions,
+	type TLUiQuickActionsProps,
+} from './lib/ui/components/QuickActions/DefaultQuickActions'
+export { DefaultQuickActionsContent } from './lib/ui/components/QuickActions/DefaultQuickActionsContent'
+export { DefaultSharePanel } from './lib/ui/components/SharePanel/DefaultSharePanel'
+export { PeopleMenu, type PeopleMenuProps } from './lib/ui/components/SharePanel/PeopleMenu'
+export { Spinner } from './lib/ui/components/Spinner'
+export {
+	DefaultStylePanel,
+	type TLUiStylePanelProps,
+} from './lib/ui/components/StylePanel/DefaultStylePanel'
+export {
+	ArrowheadStylePickerSet,
+	CommonStylePickerSet,
+	DefaultStylePanelContent,
+	GeoStylePickerSet,
+	OpacitySlider,
+	SplineStylePickerSet,
+	TextStylePickerSet,
+	type StylePickerSetProps,
+	type TLUiStylePanelContentProps,
+	type ThemeStylePickerSetProps,
+} from './lib/ui/components/StylePanel/DefaultStylePanelContent'
+export {
+	DefaultImageToolbar,
+	type TLUiImageToolbarProps,
+} from './lib/ui/components/Toolbar/DefaultImageToolbar'
+export {
+	DefaultImageToolbarContent,
+	type DefaultImageToolbarContentProps,
+} from './lib/ui/components/Toolbar/DefaultImageToolbarContent'
+export {
+	DefaultRichTextToolbar,
+	type TLUiRichTextToolbarProps,
+} from './lib/ui/components/Toolbar/DefaultRichTextToolbar'
+export {
+	DefaultRichTextToolbarContent,
+	type DefaultRichTextToolbarContentProps,
+} from './lib/ui/components/Toolbar/DefaultRichTextToolbarContent'
+export {
+	DefaultToolbar,
+	type DefaultToolbarProps,
+} from './lib/ui/components/Toolbar/DefaultToolbar'
+export {
+	ArrowDownToolbarItem,
+	ArrowLeftToolbarItem,
+	ArrowRightToolbarItem,
+	ArrowToolbarItem,
+	ArrowUpToolbarItem,
+	AssetToolbarItem,
+	CheckBoxToolbarItem,
+	CloudToolbarItem,
+	DefaultToolbarContent,
+	DiamondToolbarItem,
+	DrawToolbarItem,
+	EllipseToolbarItem,
+	EraserToolbarItem,
+	FrameToolbarItem,
+	HandToolbarItem,
+	HexagonToolbarItem,
+	HighlightToolbarItem,
+	LaserToolbarItem,
+	LineToolbarItem,
+	NoteToolbarItem,
+	OvalToolbarItem,
+	RectangleToolbarItem,
+	RhombusToolbarItem,
+	SelectToolbarItem,
+	StarToolbarItem,
+	TextToolbarItem,
+	ToolbarItem,
+	TrapezoidToolbarItem,
+	TriangleToolbarItem,
+	XBoxToolbarItem,
+	useIsToolSelected,
+	type ToolbarItemProps,
+} from './lib/ui/components/Toolbar/DefaultToolbarContent'
+export {
+	DefaultVideoToolbar,
+	type TLUiVideoToolbarProps,
+} from './lib/ui/components/Toolbar/DefaultVideoToolbar'
+export {
+	DefaultVideoToolbarContent,
+	type DefaultVideoToolbarContentProps,
+} from './lib/ui/components/Toolbar/DefaultVideoToolbarContent'
+export {
+	OverflowingToolbar,
+	type OverflowingToolbarProps,
+} from './lib/ui/components/Toolbar/OverflowingToolbar'
+export {
+	CenteredTopPanelContainer,
+	type CenteredTopPanelContainerProps,
+} from './lib/ui/components/TopPanel/CenteredTopPanelContainer'
+export { DefaultTopPanel } from './lib/ui/components/TopPanel/DefaultTopPanel'
+export {
+	DefaultZoomMenu,
+	type TLUiZoomMenuProps,
+} from './lib/ui/components/ZoomMenu/DefaultZoomMenu'
+export { DefaultZoomMenuContent } from './lib/ui/components/ZoomMenu/DefaultZoomMenuContent'
 export {
 	ArrangeMenuSubmenu,
 	ClipboardMenuGroup,
@@ -283,7 +394,6 @@ export {
 	ToggleEdgeScrollingItem,
 	ToggleFocusModeItem,
 	ToggleGridItem,
-	ToggleKeyboardShortcutsItem,
 	ToggleLockMenuItem,
 	TogglePasteAtCursorItem,
 	ToggleReduceMotionItem,
@@ -297,16 +407,6 @@ export {
 	ZoomToFitMenuItem,
 	ZoomToSelectionMenuItem,
 } from './lib/ui/components/menu-items'
-export { DefaultMinimap } from './lib/ui/components/Minimap/DefaultMinimap'
-export { MobileStylePanel } from './lib/ui/components/MobileStylePanel'
-export { DefaultNavigationPanel } from './lib/ui/components/NavigationPanel/DefaultNavigationPanel'
-export { OfflineIndicator } from './lib/ui/components/OfflineIndicator/OfflineIndicator'
-export { DefaultPageMenu } from './lib/ui/components/PageMenu/DefaultPageMenu'
-export { PageItemInput, type PageItemInputProps } from './lib/ui/components/PageMenu/PageItemInput'
-export {
-	PageItemSubmenu,
-	type PageItemSubmenuProps,
-} from './lib/ui/components/PageMenu/PageItemSubmenu'
 export {
 	TldrawUiButton,
 	type TLUiButtonProps,
@@ -323,27 +423,6 @@ export {
 	TldrawUiButtonLabel,
 	type TLUiButtonLabelProps,
 } from './lib/ui/components/primitives/Button/TldrawUiButtonLabel'
-export {
-	TldrawUiMenuCheckboxItem,
-	type TLUiMenuCheckboxItemProps,
-} from './lib/ui/components/primitives/menus/TldrawUiMenuCheckboxItem'
-export {
-	TldrawUiMenuContextProvider,
-	type TLUiMenuContextProviderProps,
-	type TLUiMenuContextType,
-} from './lib/ui/components/primitives/menus/TldrawUiMenuContext'
-export {
-	TldrawUiMenuGroup,
-	type TLUiMenuGroupProps,
-} from './lib/ui/components/primitives/menus/TldrawUiMenuGroup'
-export {
-	TldrawUiMenuItem,
-	type TLUiMenuItemProps,
-} from './lib/ui/components/primitives/menus/TldrawUiMenuItem'
-export {
-	TldrawUiMenuSubmenu,
-	type TLUiMenuSubmenuProps,
-} from './lib/ui/components/primitives/menus/TldrawUiMenuSubmenu'
 export {
 	TldrawUiButtonPicker,
 	type TLUiButtonPickerProps,
@@ -405,106 +484,31 @@ export {
 	type TLUiToolbarToggleItemProps,
 } from './lib/ui/components/primitives/TldrawUiToolbar'
 export {
-	DefaultQuickActions,
-	type TLUiQuickActionsProps,
-} from './lib/ui/components/QuickActions/DefaultQuickActions'
-export { DefaultQuickActionsContent } from './lib/ui/components/QuickActions/DefaultQuickActionsContent'
-export { DefaultSharePanel } from './lib/ui/components/SharePanel/DefaultSharePanel'
-export { PeopleMenu, type PeopleMenuProps } from './lib/ui/components/SharePanel/PeopleMenu'
-export { Spinner } from './lib/ui/components/Spinner'
-export {
-	DefaultStylePanel,
-	type TLUiStylePanelProps,
-} from './lib/ui/components/StylePanel/DefaultStylePanel'
-export {
-	ArrowheadStylePickerSet,
-	CommonStylePickerSet,
-	DefaultStylePanelContent,
-	GeoStylePickerSet,
-	OpacitySlider,
-	SplineStylePickerSet,
-	TextStylePickerSet,
-	type StylePickerSetProps,
-	type ThemeStylePickerSetProps,
-	type TLUiStylePanelContentProps,
-} from './lib/ui/components/StylePanel/DefaultStylePanelContent'
-export {
-	DefaultImageToolbar,
-	type TLUiImageToolbarProps,
-} from './lib/ui/components/Toolbar/DefaultImageToolbar'
-export {
-	DefaultImageToolbarContent,
-	type DefaultImageToolbarContentProps,
-} from './lib/ui/components/Toolbar/DefaultImageToolbarContent'
-export {
-	DefaultRichTextToolbar,
-	type TLUiRichTextToolbarProps,
-} from './lib/ui/components/Toolbar/DefaultRichTextToolbar'
-export {
-	DefaultRichTextToolbarContent,
-	type DefaultRichTextToolbarContentProps,
-} from './lib/ui/components/Toolbar/DefaultRichTextToolbarContent'
-export {
-	DefaultToolbar,
-	type DefaultToolbarProps,
-} from './lib/ui/components/Toolbar/DefaultToolbar'
-export {
-	ArrowDownToolbarItem,
-	ArrowLeftToolbarItem,
-	ArrowRightToolbarItem,
-	ArrowToolbarItem,
-	ArrowUpToolbarItem,
-	AssetToolbarItem,
-	CheckBoxToolbarItem,
-	CloudToolbarItem,
-	DefaultToolbarContent,
-	DiamondToolbarItem,
-	DrawToolbarItem,
-	EllipseToolbarItem,
-	EraserToolbarItem,
-	FrameToolbarItem,
-	HandToolbarItem,
-	HexagonToolbarItem,
-	HighlightToolbarItem,
-	LaserToolbarItem,
-	LineToolbarItem,
-	NoteToolbarItem,
-	OvalToolbarItem,
-	RectangleToolbarItem,
-	RhombusToolbarItem,
-	SelectToolbarItem,
-	StarToolbarItem,
-	TextToolbarItem,
-	ToolbarItem,
-	TrapezoidToolbarItem,
-	TriangleToolbarItem,
-	useIsToolSelected,
-	XBoxToolbarItem,
-	type ToolbarItemProps,
-} from './lib/ui/components/Toolbar/DefaultToolbarContent'
-export {
-	DefaultVideoToolbar,
-	type TLUiVideoToolbarProps,
-} from './lib/ui/components/Toolbar/DefaultVideoToolbar'
+	TldrawUiMenuCheckboxItem,
+	type TLUiMenuCheckboxItemProps,
+} from './lib/ui/components/primitives/menus/TldrawUiMenuCheckboxItem'
 export {
-	DefaultVideoToolbarContent,
-	type DefaultVideoToolbarContentProps,
-} from './lib/ui/components/Toolbar/DefaultVideoToolbarContent'
+	TldrawUiMenuContextProvider,
+	type TLUiMenuContextProviderProps,
+	type TLUiMenuContextType,
+} from './lib/ui/components/primitives/menus/TldrawUiMenuContext'
 export {
-	OverflowingToolbar,
-	type OverflowingToolbarProps,
-} from './lib/ui/components/Toolbar/OverflowingToolbar'
+	TldrawUiMenuGroup,
+	type TLUiMenuGroupProps,
+} from './lib/ui/components/primitives/menus/TldrawUiMenuGroup'
 export {
-	CenteredTopPanelContainer,
-	type CenteredTopPanelContainerProps,
-} from './lib/ui/components/TopPanel/CenteredTopPanelContainer'
-export { DefaultTopPanel } from './lib/ui/components/TopPanel/DefaultTopPanel'
+	TldrawUiMenuItem,
+	type TLUiMenuItemProps,
+} from './lib/ui/components/primitives/menus/TldrawUiMenuItem'
 export {
-	DefaultZoomMenu,
-	type TLUiZoomMenuProps,
-} from './lib/ui/components/ZoomMenu/DefaultZoomMenu'
-export { DefaultZoomMenuContent } from './lib/ui/components/ZoomMenu/DefaultZoomMenuContent'
+	TldrawUiMenuSubmenu,
+	type TLUiMenuSubmenuProps,
+} from './lib/ui/components/primitives/menus/TldrawUiMenuSubmenu'
 export { PORTRAIT_BREAKPOINT } from './lib/ui/constants'
+export {
+	TldrawUiContextProvider,
+	type TLUiContextProviderProps,
+} from './lib/ui/context/TldrawUiContextProvider'
 export {
 	TldrawUiA11yProvider,
 	useA11y,
@@ -550,10 +554,6 @@ export {
 	type TLUiEventMap,
 	type TLUiEventSource,
 } from './lib/ui/context/events'
-export {
-	TldrawUiContextProvider,
-	type TLUiContextProviderProps,
-} from './lib/ui/context/TldrawUiContextProvider'
 export {
 	TldrawUiToastsProvider,
 	useToasts,
@@ -592,7 +592,6 @@ export {
 } from './lib/ui/hooks/useTranslation/useTranslation'
 export { type TLUiIconType } from './lib/ui/icon-types'
 export { useDefaultHelpers, type TLUiOverrideHelpers, type TLUiOverrides } from './lib/ui/overrides'
-export { TldrawUi, type TldrawUiProps } from './lib/ui/TldrawUi'
 export { containBoxSize, downsizeImage, type BoxWidthHeight } from './lib/utils/assets/assets'
 export { preloadFont, type TLTypeFace } from './lib/utils/assets/preload-font'
 export { getEmbedInfo, type TLEmbedResult } from './lib/utils/embeds/embeds'
@@ -607,8 +606,8 @@ export {
 	type TLEditorAssetUrls,
 } from './lib/utils/static-assets/assetUrls'
 export {
-	defaultAddFontsFromNode,
 	KeyboardShiftEnterTweakExtension,
+	defaultAddFontsFromNode,
 	renderHtmlFromRichText,
 	renderHtmlFromRichTextForMeasurement,
 	renderPlaintextFromRichText,
@@ -618,7 +617,6 @@ export {
 export { truncateStringWithEllipsis } from './lib/utils/text/text'
 export { TextDirection } from './lib/utils/text/textDirection'
 export {
-	buildFromV1Document,
 	TLV1AlignStyle,
 	TLV1AssetType,
 	TLV1ColorStyle,
@@ -627,6 +625,7 @@ export {
 	TLV1FontStyle,
 	TLV1ShapeType,
 	TLV1SizeStyle,
+	buildFromV1Document,
 	type TLV1ArrowBinding,
 	type TLV1ArrowShape,
 	type TLV1Asset,
@@ -654,11 +653,11 @@ export {
 	type TLV1VideoShape,
 } from './lib/utils/tldr/buildFromV1Document'
 export {
+	TLDRAW_FILE_EXTENSION,
 	parseAndLoadDocument,
 	parseTldrawJsonFile,
 	serializeTldrawJson,
 	serializeTldrawJsonBlob,
-	TLDRAW_FILE_EXTENSION,
 	type TldrawFile,
 	type TldrawFileParseError,
 } from './lib/utils/tldr/file'

package/src/lib/shapes/frame/FrameShapeUtil.tsx

@@ -219,6 +219,9 @@ export class FrameShapeUtil extends BaseBoxShapeUtil<TLFrameShape> {
 			[shape.id]
 		)
 
+		// eslint-disable-next-line react-hooks/rules-of-hooks
+		const zoomLevel = useValue('zoom level', () => this.editor.getZoomLevel(), [this.editor])
+
 		const showFrameColors = this.options.showColors
 
 		const color = theme[shape.props.color]
@@ -233,13 +236,12 @@ export class FrameShapeUtil extends BaseBoxShapeUtil<TLFrameShape> {
 				<SVGContainer>
 					<rect
 						className={classNames('tl-frame__body', { 'tl-frame__creating': isCreating })}
+						width={shape.props.w + 1 / zoomLevel}
+						height={shape.props.h + 1 / zoomLevel}
 						fill={frameFill}
 						stroke={frameStroke}
-						style={{
-							width: `calc(${shape.props.w}px + 1px / var(--tl-zoom))`,
-							height: `calc(${shape.props.h}px + 1px / var(--tl-zoom))`,
-							transform: `translate(calc(-0.5px / var(--tl-zoom)), calc(-0.5px / var(--tl-zoom)))`,
-						}}
+						y={-0.5 / zoomLevel}
+						x={-0.5 / zoomLevel}
 					/>
 				</SVGContainer>
 				{isCreating ? null : (

package/src/lib/shapes/text/TextShapeUtil.tsx

@@ -303,26 +303,33 @@ export class TextShapeUtil extends ShapeUtil<TLTextShape> {
 }
 
 function getTextSize(editor: Editor, props: TLTextShape['props']) {
-	const { font, richText, size, w } = props
+	const { font, richText, autoSize, size, w } = props
 
-	const minWidth = 16
+	const minWidth = autoSize ? 16 : Math.max(16, w)
 	const fontSize = FONT_SIZES[size]
 
-	const maybeFixedWidth = props.autoSize ? null : Math.max(minWidth, Math.floor(w))
+	const cw = autoSize
+		? null
+		: // `measureText` floors the number so we need to do the same here to avoid issues.
+			Math.floor(Math.max(minWidth, w))
 
 	const html = renderHtmlFromRichTextForMeasurement(editor, richText)
 	const result = editor.textMeasure.measureHtml(html, {
 		...TEXT_PROPS,
 		fontFamily: FONT_FAMILIES[font],
 		fontSize: fontSize,
-		maxWidth: maybeFixedWidth,
+		maxWidth: cw,
 	})
 
 	// If we're autosizing the measureText will essentially `Math.floor`
 	// the numbers so `19` rather than `19.3`, this means we must +1 to
 	// whatever we get to avoid wrapping.
+	if (autoSize) {
+		result.w += 1
+	}
+
 	return {
-		width: maybeFixedWidth ?? Math.max(minWidth, result.w + 1),
+		width: Math.max(minWidth, result.w),
 		height: Math.max(fontSize, result.h),
 	}
 }

package/src/lib/ui/components/KeyboardShortcutsDialog/DefaultKeyboardShortcutsDialogContent.tsx

@@ -213,14 +213,6 @@ export function DefaultKeyboardShortcutsDialogContent() {
 				<TldrawUiMenuActionItem actionId="enlarge-shapes" />
 				<TldrawUiMenuActionItem actionId="shrink-shapes" />
 				<TldrawUiMenuActionItem actionId="a11y-repeat-shape-announce" />
-				<TldrawUiMenuItem
-					id="a11y-open-keyboard-shortcuts"
-					label="a11y.open-keyboard-shortcuts"
-					kbd="cmd+alt+/"
-					onSelect={() => {
-						/* do nothing */
-					}}
-				/>
 			</TldrawUiMenuGroup>
 			{showCollaborationUi && (
 				<TldrawUiMenuGroup label="shortcuts-dialog.collaboration" id="collaboration">

package/src/lib/ui/components/MainMenu/DefaultMainMenuContent.tsx

@@ -19,7 +19,6 @@ import {
 	ToggleEdgeScrollingItem,
 	ToggleFocusModeItem,
 	ToggleGridItem,
-	ToggleKeyboardShortcutsItem,
 	ToggleLockMenuItem,
 	TogglePasteAtCursorItem,
 	ToggleReduceMotionItem,
@@ -162,7 +161,6 @@ export function PreferencesGroup() {
 					<ToggleFocusModeItem />
 					<ToggleEdgeScrollingItem />
 					<ToggleReduceMotionItem />
-					<ToggleKeyboardShortcutsItem />
 					<ToggleDynamicSizeModeItem />
 					<TogglePasteAtCursorItem />
 					<ToggleDebugModeItem />

package/src/lib/ui/components/menu-items.tsx

@@ -634,23 +634,6 @@ export function ToggleReduceMotionItem() {
 	)
 }
 
-/** @public @react */
-export function ToggleKeyboardShortcutsItem() {
-	const editor = useEditor()
-	const keyboardShortcuts = useValue(
-		'keyboardShortcuts',
-		() => editor.user.getAreKeyboardShortcutsEnabled(),
-		[editor]
-	)
-
-	return (
-		<TldrawUiMenuActionCheckboxItem
-			actionId="toggle-keyboard-shortcuts"
-			checked={keyboardShortcuts}
-		/>
-	)
-}
-
 /** @public @react */
 export function ToggleDebugModeItem() {
 	const editor = useEditor()

package/src/lib/ui/components/primitives/menus/TldrawUiMenuItem.tsx

@@ -218,6 +218,7 @@ export function TldrawUiMenuItem<
 						preventDefault(e)
 						onSelect('toolbar')
 					}}
+					role="option"
 					title={titleStr}
 					type="tool"
 				>
@@ -236,6 +237,7 @@ export function TldrawUiMenuItem<
 					data-value={id}
 					disabled={disabled}
 					onClick={() => onSelect('toolbar')}
+					role="option"
 					title={titleStr}
 					type="icon"
 				>