tldraw 3.16.0-canary.acb40a76700b → 3.16.0-canary.b33662a7aefb

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (164) hide show
  1. package/dist-cjs/index.d.ts +93 -2
  2. package/dist-cjs/index.js +9 -1
  3. package/dist-cjs/index.js.map +2 -2
  4. package/dist-cjs/lib/Tldraw.js +12 -2
  5. package/dist-cjs/lib/Tldraw.js.map +2 -2
  6. package/dist-cjs/lib/defaultExternalContentHandlers.js +5 -4
  7. package/dist-cjs/lib/defaultExternalContentHandlers.js.map +2 -2
  8. package/dist-cjs/lib/shapes/frame/FrameShapeUtil.js +6 -0
  9. package/dist-cjs/lib/shapes/frame/FrameShapeUtil.js.map +2 -2
  10. package/dist-cjs/lib/shapes/image/ImageShapeUtil.js +3 -0
  11. package/dist-cjs/lib/shapes/image/ImageShapeUtil.js.map +2 -2
  12. package/dist-cjs/lib/shapes/shared/freehand/svg.js.map +2 -2
  13. package/dist-cjs/lib/ui/TldrawUi.js +13 -12
  14. package/dist-cjs/lib/ui/TldrawUi.js.map +2 -2
  15. package/dist-cjs/lib/ui/assetUrls.js +13 -10
  16. package/dist-cjs/lib/ui/assetUrls.js.map +2 -2
  17. package/dist-cjs/lib/ui/components/{FollowingIndicator.js → DefaultFollowingIndicator.js} +6 -6
  18. package/dist-cjs/lib/ui/components/DefaultFollowingIndicator.js.map +7 -0
  19. package/dist-cjs/lib/ui/components/KeyboardShortcutsDialog/DefaultKeyboardShortcutsDialogContent.js +6 -6
  20. package/dist-cjs/lib/ui/components/KeyboardShortcutsDialog/DefaultKeyboardShortcutsDialogContent.js.map +1 -1
  21. package/dist-cjs/lib/ui/components/StylePanel/DropdownPicker.js +1 -1
  22. package/dist-cjs/lib/ui/components/StylePanel/DropdownPicker.js.map +2 -2
  23. package/dist-cjs/lib/ui/components/primitives/TldrawUiTooltip.js +31 -37
  24. package/dist-cjs/lib/ui/components/primitives/TldrawUiTooltip.js.map +2 -2
  25. package/dist-cjs/lib/ui/components/primitives/menus/TldrawUiMenuItem.js +2 -1
  26. package/dist-cjs/lib/ui/components/primitives/menus/TldrawUiMenuItem.js.map +2 -2
  27. package/dist-cjs/lib/ui/context/actions.js +16 -2
  28. package/dist-cjs/lib/ui/context/actions.js.map +2 -2
  29. package/dist-cjs/lib/ui/context/components.js +2 -0
  30. package/dist-cjs/lib/ui/context/components.js.map +2 -2
  31. package/dist-cjs/lib/ui/context/events.js.map +1 -1
  32. package/dist-cjs/lib/ui/hooks/useTranslation/TLUiTranslationKey.js.map +1 -1
  33. package/dist-cjs/lib/ui/hooks/useTranslation/defaultTranslation.js +1 -0
  34. package/dist-cjs/lib/ui/hooks/useTranslation/defaultTranslation.js.map +2 -2
  35. package/dist-cjs/lib/ui/kbd-utils.js +9 -3
  36. package/dist-cjs/lib/ui/kbd-utils.js.map +2 -2
  37. package/dist-cjs/lib/ui/version.js +3 -3
  38. package/dist-cjs/lib/ui/version.js.map +1 -1
  39. package/dist-esm/index.d.mts +93 -2
  40. package/dist-esm/index.mjs +11 -2
  41. package/dist-esm/index.mjs.map +2 -2
  42. package/dist-esm/lib/Tldraw.mjs +14 -4
  43. package/dist-esm/lib/Tldraw.mjs.map +2 -2
  44. package/dist-esm/lib/defaultExternalContentHandlers.mjs +5 -4
  45. package/dist-esm/lib/defaultExternalContentHandlers.mjs.map +2 -2
  46. package/dist-esm/lib/shapes/frame/FrameShapeUtil.mjs +6 -0
  47. package/dist-esm/lib/shapes/frame/FrameShapeUtil.mjs.map +2 -2
  48. package/dist-esm/lib/shapes/image/ImageShapeUtil.mjs +3 -0
  49. package/dist-esm/lib/shapes/image/ImageShapeUtil.mjs.map +2 -2
  50. package/dist-esm/lib/shapes/shared/freehand/svg.mjs.map +2 -2
  51. package/dist-esm/lib/ui/TldrawUi.mjs +13 -12
  52. package/dist-esm/lib/ui/TldrawUi.mjs.map +2 -2
  53. package/dist-esm/lib/ui/assetUrls.mjs +13 -10
  54. package/dist-esm/lib/ui/assetUrls.mjs.map +2 -2
  55. package/dist-esm/lib/ui/components/{FollowingIndicator.mjs → DefaultFollowingIndicator.mjs} +3 -3
  56. package/dist-esm/lib/ui/components/DefaultFollowingIndicator.mjs.map +7 -0
  57. package/dist-esm/lib/ui/components/KeyboardShortcutsDialog/DefaultKeyboardShortcutsDialogContent.mjs +6 -6
  58. package/dist-esm/lib/ui/components/KeyboardShortcutsDialog/DefaultKeyboardShortcutsDialogContent.mjs.map +1 -1
  59. package/dist-esm/lib/ui/components/StylePanel/DropdownPicker.mjs +1 -1
  60. package/dist-esm/lib/ui/components/StylePanel/DropdownPicker.mjs.map +2 -2
  61. package/dist-esm/lib/ui/components/primitives/TldrawUiTooltip.mjs +31 -37
  62. package/dist-esm/lib/ui/components/primitives/TldrawUiTooltip.mjs.map +2 -2
  63. package/dist-esm/lib/ui/components/primitives/menus/TldrawUiMenuItem.mjs +2 -1
  64. package/dist-esm/lib/ui/components/primitives/menus/TldrawUiMenuItem.mjs.map +2 -2
  65. package/dist-esm/lib/ui/context/actions.mjs +16 -2
  66. package/dist-esm/lib/ui/context/actions.mjs.map +2 -2
  67. package/dist-esm/lib/ui/context/components.mjs +2 -0
  68. package/dist-esm/lib/ui/context/components.mjs.map +2 -2
  69. package/dist-esm/lib/ui/context/events.mjs.map +1 -1
  70. package/dist-esm/lib/ui/hooks/useTranslation/defaultTranslation.mjs +1 -0
  71. package/dist-esm/lib/ui/hooks/useTranslation/defaultTranslation.mjs.map +2 -2
  72. package/dist-esm/lib/ui/kbd-utils.mjs +9 -3
  73. package/dist-esm/lib/ui/kbd-utils.mjs.map +2 -2
  74. package/dist-esm/lib/ui/version.mjs +3 -3
  75. package/dist-esm/lib/ui/version.mjs.map +1 -1
  76. package/package.json +11 -34
  77. package/src/index.ts +6 -1
  78. package/src/lib/Tldraw.tsx +15 -2
  79. package/src/lib/defaultExternalContentHandlers.ts +12 -4
  80. package/src/lib/shapes/arrow/ArrowShapeOptions.test.ts +2 -1
  81. package/src/lib/shapes/arrow/ArrowShapeTool.test.ts +4 -3
  82. package/src/lib/shapes/arrow/ArrowShapeUtil.test.ts +7 -6
  83. package/src/lib/shapes/draw/DrawShapeTool.test.ts +0 -5
  84. package/src/lib/shapes/frame/FrameShapeUtil.tsx +8 -0
  85. package/src/lib/shapes/image/ImageShapeUtil.tsx +3 -0
  86. package/src/lib/shapes/line/LineShapeUtil.test.tsx +4 -3
  87. package/src/lib/shapes/line/__snapshots__/LineShapeUtil.test.tsx.snap +2 -2
  88. package/src/lib/shapes/shared/freehand/svg.ts +2 -0
  89. package/src/lib/shapes/text/TextShapeTool.test.ts +6 -5
  90. package/src/lib/ui/TldrawUi.tsx +16 -10
  91. package/src/lib/ui/assetUrls.ts +13 -10
  92. package/src/lib/ui/components/{FollowingIndicator.tsx → DefaultFollowingIndicator.tsx} +2 -1
  93. package/src/lib/ui/components/KeyboardShortcutsDialog/DefaultKeyboardShortcutsDialogContent.tsx +6 -6
  94. package/src/lib/ui/components/StylePanel/DropdownPicker.tsx +1 -1
  95. package/src/lib/ui/components/primitives/TldrawUiTooltip.tsx +20 -22
  96. package/src/lib/ui/components/primitives/menus/TldrawUiMenuItem.tsx +3 -2
  97. package/src/lib/ui/context/actions.tsx +16 -2
  98. package/src/lib/ui/context/components.tsx +3 -0
  99. package/src/lib/ui/context/events.tsx +1 -1
  100. package/src/lib/ui/hooks/useTranslation/TLUiTranslationKey.ts +1 -0
  101. package/src/lib/ui/hooks/useTranslation/defaultTranslation.ts +1 -0
  102. package/src/lib/ui/kbd-utils.ts +10 -3
  103. package/src/lib/ui/version.ts +3 -3
  104. package/src/lib/ui.css +3 -0
  105. package/src/lib/utils/excalidraw/__snapshots__/putExcalidrawContent.test.tsx.snap +5 -5
  106. package/src/lib/utils/tldr/__snapshots__/buildFromV1Document.test.ts.snap +4 -4
  107. package/src/test/A11y.test.tsx +3 -2
  108. package/src/test/ClickManager.test.ts +7 -6
  109. package/src/test/Editor.test.tsx +20 -19
  110. package/src/test/EraserTool.test.ts +12 -11
  111. package/src/test/HandTool.test.ts +10 -9
  112. package/src/test/HighlightShape.test.ts +2 -1
  113. package/src/test/SelectTool.test.ts +3 -2
  114. package/src/test/TLUserPreferences.test.ts +4 -3
  115. package/src/test/TestEditor.ts +13 -15
  116. package/src/test/TldrawEditor.test.tsx +11 -10
  117. package/src/test/ZoomTool.test.ts +7 -6
  118. package/src/test/__snapshots__/drawing.test.ts.snap +2 -2
  119. package/src/test/__snapshots__/groups.test.tsx.snap +6 -6
  120. package/src/test/__snapshots__/resizing.test.ts.snap +2 -2
  121. package/src/test/arrows-megabus.test.tsx +5 -4
  122. package/src/test/bindings.test.tsx +24 -37
  123. package/src/test/bookmark-shapes.test.ts +1 -8
  124. package/src/test/commands/__snapshots__/getSvgString.test.ts.snap +23 -7
  125. package/src/test/commands/__snapshots__/packShapes.test.ts.snap +8 -8
  126. package/src/test/commands/__snapshots__/zoomToFit.test.ts.snap +2 -2
  127. package/src/test/commands/alignShapes.test.tsx +25 -24
  128. package/src/test/commands/animationSpeed.test.ts +2 -1
  129. package/src/test/commands/centerOnPoint.test.ts +3 -2
  130. package/src/test/commands/clipboard.test.ts +3 -2
  131. package/src/test/commands/createShapes.test.ts +2 -1
  132. package/src/test/commands/deleteShapes.test.ts +2 -1
  133. package/src/test/commands/distributeShapes.test.tsx +11 -10
  134. package/src/test/commands/getSvgString.test.ts +2 -1
  135. package/src/test/commands/packShapes.test.ts +5 -4
  136. package/src/test/commands/resizeShape.test.ts +2 -1
  137. package/src/test/commands/rotateShapes.test.ts +7 -6
  138. package/src/test/commands/setCamera.test.ts +4 -3
  139. package/src/test/commands/setCurrentPage.test.ts +3 -2
  140. package/src/test/commands/stackShapes.test.ts +11 -10
  141. package/src/test/commands/stretch.test.tsx +13 -12
  142. package/src/test/createDeepLink.test.tsx +2 -1
  143. package/src/test/cropping.test.ts +3 -2
  144. package/src/test/custom-clipping.test.ts +436 -0
  145. package/src/test/drawing.test.ts +2 -1
  146. package/src/test/flipShapes.test.ts +4 -3
  147. package/src/test/frames.test.ts +25 -24
  148. package/src/test/getCulledShapes.test.tsx +3 -2
  149. package/src/test/groups.test.tsx +1 -1
  150. package/src/test/handleDeepLink.test.tsx +2 -1
  151. package/src/test/maxShapes.test.ts +3 -2
  152. package/src/test/modifiers.test.ts +5 -4
  153. package/src/test/navigation.test.ts +12 -11
  154. package/src/test/panning.test.ts +2 -1
  155. package/src/test/perf/perf.test.ts +2 -1
  156. package/src/test/registerDeepLinkListener.test.tsx +10 -9
  157. package/src/test/resizing.test.ts +39 -38
  158. package/src/test/select.test.tsx +4 -3
  159. package/src/test/selection-omnibus.test.ts +11 -10
  160. package/src/test/shapeutils.test.ts +4 -3
  161. package/src/test/translating.test.ts +9 -8
  162. package/tldraw.css +11 -0
  163. package/dist-cjs/lib/ui/components/FollowingIndicator.js.map +0 -7
  164. package/dist-esm/lib/ui/components/FollowingIndicator.mjs.map +0 -7
@@ -7,6 +7,7 @@ import {
7
7
  sortByIndex,
8
8
  structuredClone,
9
9
  } from '@tldraw/editor'
10
+ import { vi } from 'vitest'
10
11
  import { TestEditor } from '../../../test/TestEditor'
11
12
  import { TL } from '../../../test/test-jsx'
12
13
 
@@ -16,7 +17,7 @@ mockUniqueId(() => 'id' + nextId++)
16
17
  let editor: TestEditor
17
18
  const id = createShapeId('line1')
18
19
 
19
- jest.useFakeTimers()
20
+ vi.useFakeTimers()
20
21
 
21
22
  beforeEach(() => {
22
23
  editor = new TestEditor()
@@ -338,12 +339,12 @@ describe('Misc', () => {
338
339
 
339
340
  expect(editor.getShapePageBounds(box)!.maxX).not.toEqual(editor.getShapePageBounds(line)!.maxX)
340
341
  editor.alignShapes(editor.getSelectedShapeIds(), 'right')
341
- jest.advanceTimersByTime(1000)
342
+ vi.advanceTimersByTime(1000)
342
343
  expect(editor.getShapePageBounds(box)!.maxX).toEqual(editor.getShapePageBounds(line)!.maxX)
343
344
 
344
345
  expect(editor.getShapePageBounds(box)!.maxY).not.toEqual(editor.getShapePageBounds(line)!.maxY)
345
346
  editor.alignShapes(editor.getSelectedShapeIds(), 'bottom')
346
- jest.advanceTimersByTime(1000)
347
+ vi.advanceTimersByTime(1000)
347
348
  expect(editor.getShapePageBounds(box)!.maxY).toEqual(editor.getShapePageBounds(line)!.maxY)
348
349
  })
349
350
 
@@ -1,6 +1,6 @@
1
- // Jest Snapshot v1, https://goo.gl/fbAQLP
1
+ // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
2
2
 
3
- exports[`Misc resizes: line shape after resize 1`] = `
3
+ exports[`Misc > resizes > line shape after resize 1`] = `
4
4
  {
5
5
  "id": "shape:line1",
6
6
  "index": "a1",
@@ -6,6 +6,8 @@ import { StrokePoint } from './types'
6
6
  *
7
7
  * @param points - The stroke points returned from perfect-freehand
8
8
  * @param closed - Whether the shape is closed
9
+ *
10
+ * @public
9
11
  */
10
12
  export function getSvgPathFromStrokePoints(points: StrokePoint[], closed = false): string {
11
13
  const len = points.length
@@ -1,9 +1,10 @@
1
1
  import { DefaultTextAlignStyle, TLTextShape, toRichText } from '@tldraw/editor'
2
+ import { vi } from 'vitest'
2
3
  import { TestEditor } from '../../../test/TestEditor'
3
4
  import { TextShapeTool } from './TextShapeTool'
4
5
 
5
6
  let editor: TestEditor
6
- jest.useFakeTimers()
7
+ vi.useFakeTimers()
7
8
 
8
9
  beforeEach(() => {
9
10
  editor = new TestEditor()
@@ -115,7 +116,7 @@ describe('When in the pointing state', () => {
115
116
 
116
117
  // Go back to start and wait a little to satisfy the time requirement
117
118
  editor.pointerMove(0, 0)
118
- jest.advanceTimersByTime(200)
119
+ vi.advanceTimersByTime(200)
119
120
 
120
121
  // y axis doesn't matter
121
122
  editor.pointerMove(0, 100)
@@ -187,7 +188,7 @@ describe('When resizing', () => {
187
188
  it('bails on escape while resizing and returns to text.idle', () => {
188
189
  editor.setCurrentTool('text')
189
190
  editor.pointerDown(0, 0)
190
- jest.advanceTimersByTime(200)
191
+ vi.advanceTimersByTime(200)
191
192
  editor.pointerMove(100, 100)
192
193
  editor.expectToBeIn('select.resizing')
193
194
  editor.cancel()
@@ -198,7 +199,7 @@ describe('When resizing', () => {
198
199
  it('does not bails on interrupt while resizing', () => {
199
200
  editor.setCurrentTool('text')
200
201
  editor.pointerDown(0, 0)
201
- jest.advanceTimersByTime(200)
202
+ vi.advanceTimersByTime(200)
202
203
  editor.pointerMove(100, 100)
203
204
  editor.expectToBeIn('select.resizing')
204
205
  editor.interrupt()
@@ -210,7 +211,7 @@ describe('When resizing', () => {
210
211
  const x = 0
211
212
  const y = 0
212
213
  editor.pointerDown(x, y)
213
- jest.advanceTimersByTime(200)
214
+ vi.advanceTimersByTime(200)
214
215
  editor.pointerMove(x + 100, y + 100)
215
216
  expect(editor.getCurrentPageShapes()[0]).toMatchObject({
216
217
  x,
@@ -3,7 +3,6 @@ import classNames from 'classnames'
3
3
  import React, { ReactNode, useMemo, useRef, useState } from 'react'
4
4
  import { TLUiAssetUrlOverrides } from './assetUrls'
5
5
  import { SkipToMainContent } from './components/A11y'
6
- import { FollowingIndicator } from './components/FollowingIndicator'
7
6
  import { TldrawUiButton } from './components/primitives/Button/TldrawUiButton'
8
7
  import { TldrawUiButtonIcon } from './components/primitives/Button/TldrawUiButtonIcon'
9
8
  import { PORTRAIT_BREAKPOINT, PORTRAIT_BREAKPOINTS } from './constants'
@@ -108,10 +107,6 @@ const TldrawUiContent = React.memo(function TldrawUI() {
108
107
  NavigationPanel,
109
108
  HelperButtons,
110
109
  DebugPanel,
111
- CursorChatBubble,
112
- RichTextToolbar,
113
- ImageToolbar,
114
- VideoToolbar,
115
110
  Toasts,
116
111
  Dialogs,
117
112
  A11y,
@@ -223,13 +218,24 @@ const TldrawUiContent = React.memo(function TldrawUI() {
223
218
  </div>
224
219
  </>
225
220
  )}
226
- {RichTextToolbar && <RichTextToolbar />}
227
- {ImageToolbar && <ImageToolbar />}
228
- {VideoToolbar && <VideoToolbar />}
229
221
  {Toasts && <Toasts />}
230
222
  {Dialogs && <Dialogs />}
231
- <FollowingIndicator />
232
- {CursorChatBubble && <CursorChatBubble />}
233
223
  </div>
234
224
  )
235
225
  })
226
+
227
+ /** @public @react */
228
+ export function TldrawUiInFrontOfTheCanvas() {
229
+ const { RichTextToolbar, ImageToolbar, VideoToolbar, CursorChatBubble, FollowingIndicator } =
230
+ useTldrawUiComponents()
231
+
232
+ return (
233
+ <>
234
+ {RichTextToolbar && <RichTextToolbar />}
235
+ {ImageToolbar && <ImageToolbar />}
236
+ {VideoToolbar && <VideoToolbar />}
237
+ {FollowingIndicator && <FollowingIndicator />}
238
+ {CursorChatBubble && <CursorChatBubble />}
239
+ </>
240
+ )
241
+ }
@@ -1,4 +1,5 @@
1
1
  import { LANGUAGES, RecursivePartial, getDefaultCdnBaseUrl } from '@tldraw/editor'
2
+ import { useMemo } from 'react'
2
3
  import { DEFAULT_EMBED_DEFINITIONS } from '../defaultEmbedDefinitions'
3
4
  import { TLEditorAssetUrls, defaultEditorAssetUrls } from '../utils/static-assets/assetUrls'
4
5
  import { TLUiIconType, iconTypes } from './icon-types'
@@ -41,15 +42,17 @@ export function setDefaultUiAssetUrls(urls: TLUiAssetUrls) {
41
42
  export function useDefaultUiAssetUrlsWithOverrides(
42
43
  overrides?: TLUiAssetUrlOverrides
43
44
  ): TLUiAssetUrls {
44
- if (!overrides) return defaultUiAssetUrls
45
+ return useMemo(() => {
46
+ if (!overrides) return defaultUiAssetUrls
45
47
 
46
- return {
47
- fonts: Object.assign({ ...defaultUiAssetUrls.fonts }, { ...overrides?.fonts }),
48
- icons: Object.assign({ ...defaultUiAssetUrls.icons }, { ...overrides?.icons }),
49
- embedIcons: Object.assign({ ...defaultUiAssetUrls.embedIcons }, { ...overrides?.embedIcons }),
50
- translations: Object.assign(
51
- { ...defaultUiAssetUrls.translations },
52
- { ...overrides?.translations }
53
- ),
54
- }
48
+ return {
49
+ fonts: Object.assign({ ...defaultUiAssetUrls.fonts }, { ...overrides?.fonts }),
50
+ icons: Object.assign({ ...defaultUiAssetUrls.icons }, { ...overrides?.icons }),
51
+ embedIcons: Object.assign({ ...defaultUiAssetUrls.embedIcons }, { ...overrides?.embedIcons }),
52
+ translations: Object.assign(
53
+ { ...defaultUiAssetUrls.translations },
54
+ { ...overrides?.translations }
55
+ ),
56
+ }
57
+ }, [overrides])
55
58
  }
@@ -1,6 +1,7 @@
1
1
  import { useEditor, usePresence, useValue } from '@tldraw/editor'
2
2
 
3
- export function FollowingIndicator() {
3
+ /** @public @react */
4
+ export function DefaultFollowingIndicator() {
4
5
  const editor = useEditor()
5
6
  const followingUserId = useValue('follow', () => editor.getInstanceState().followingUserId, [
6
7
  editor,
@@ -123,7 +123,7 @@ export function DefaultKeyboardShortcutsDialogContent() {
123
123
  <TldrawUiMenuItem
124
124
  id="text-header"
125
125
  label="tool.rich-text-header"
126
- kbd="cmd+shift+[[1-6]]"
126
+ kbd="cmd+alt+[[1-6]]"
127
127
  onSelect={() => {
128
128
  /* do nothing */
129
129
  }}
@@ -157,7 +157,7 @@ export function DefaultKeyboardShortcutsDialogContent() {
157
157
  <TldrawUiMenuItem
158
158
  id="a11y-select-next-shape-direction"
159
159
  label="a11y.select-shape-direction"
160
- kbd="cmd+↑→↓←"
160
+ kbd="cmd+[[↑→↓←]]"
161
161
  onSelect={() => {
162
162
  /* do nothing */
163
163
  }}
@@ -165,7 +165,7 @@ export function DefaultKeyboardShortcutsDialogContent() {
165
165
  <TldrawUiMenuItem
166
166
  id="a11y-select-next-shape-container"
167
167
  label="a11y.enter-leave-container"
168
- kbd="cmd+shift+↑→"
168
+ kbd="cmd+shift+[[↑→]]"
169
169
  onSelect={() => {
170
170
  /* do nothing */
171
171
  }}
@@ -173,7 +173,7 @@ export function DefaultKeyboardShortcutsDialogContent() {
173
173
  <TldrawUiMenuItem
174
174
  id="a11y-pan-camera"
175
175
  label="a11y.pan-camera"
176
- kbd="[[Space]]+↑→↓←"
176
+ kbd="[[Space]]+[[↑→↓←]]"
177
177
  onSelect={() => {
178
178
  /* do nothing */
179
179
  }}
@@ -197,7 +197,7 @@ export function DefaultKeyboardShortcutsDialogContent() {
197
197
  <TldrawUiMenuItem
198
198
  id="a11y-move-shape"
199
199
  label="a11y.move-shape"
200
- kbd="↑→↓←"
200
+ kbd="[[↑→↓←]]"
201
201
  onSelect={() => {
202
202
  /* do nothing */
203
203
  }}
@@ -205,7 +205,7 @@ export function DefaultKeyboardShortcutsDialogContent() {
205
205
  <TldrawUiMenuItem
206
206
  id="a11y-move-shape-faster"
207
207
  label="a11y.move-shape-faster"
208
- kbd="shift+↑→↓←"
208
+ kbd="shift+[[↑→↓←]]"
209
209
  onSelect={() => {
210
210
  /* do nothing */
211
211
  }}
@@ -74,7 +74,7 @@ function DropdownPickerInner<T extends string>({
74
74
  </TldrawUiToolbarButton>
75
75
  </TldrawUiPopoverTrigger>
76
76
  <TldrawUiPopoverContent side="left" align="center">
77
- <TldrawUiToolbar orientation="grid" label={labelStr}>
77
+ <TldrawUiToolbar orientation={items.length > 4 ? 'grid' : 'horizontal'} label={labelStr}>
78
78
  <TldrawUiMenuContextProvider type="icons" sourceId="style-panel">
79
79
  {items.map((item) => {
80
80
  return (
@@ -34,7 +34,7 @@ class TooltipManager {
34
34
  sideOffset: number
35
35
  showOnMobile: boolean
36
36
  targetElement: HTMLElement
37
- delayDuration: number | undefined
37
+ delayDuration: number
38
38
  } | null>('current tooltip', null)
39
39
  private destroyTimeoutId: number | null = null
40
40
 
@@ -52,7 +52,7 @@ class TooltipManager {
52
52
  side: 'top' | 'right' | 'bottom' | 'left',
53
53
  sideOffset: number,
54
54
  showOnMobile: boolean,
55
- delayDuration: number | undefined
55
+ delayDuration: number
56
56
  ) {
57
57
  // Clear any existing destroy timeout
58
58
  if (this.destroyTimeoutId) {
@@ -139,11 +139,9 @@ export function TldrawUiTooltipProvider({ children }: TldrawUiTooltipProviderPro
139
139
 
140
140
  // The singleton tooltip component that renders once
141
141
  function TooltipSingleton() {
142
- const editor = useMaybeEditor()
143
142
  const [isOpen, setIsOpen] = useState(false)
144
143
  const triggerRef = useRef<HTMLDivElement>(null)
145
144
  const isFirstShowRef = useRef(true)
146
- const showTimeoutRef = useRef<number | null>(null)
147
145
 
148
146
  const currentTooltip = useValue(
149
147
  'current tooltip',
@@ -153,12 +151,7 @@ function TooltipSingleton() {
153
151
 
154
152
  // Update open state and trigger position
155
153
  useEffect(() => {
156
- // Clear any existing show timeout
157
- if (showTimeoutRef.current) {
158
- clearTimeout(showTimeoutRef.current)
159
- showTimeoutRef.current = null
160
- }
161
-
154
+ let timer: ReturnType<typeof setTimeout> | null = null
162
155
  if (currentTooltip && triggerRef.current) {
163
156
  // Position the invisible trigger element over the active element
164
157
  const activeRect = currentTooltip.targetElement.getBoundingClientRect()
@@ -173,11 +166,12 @@ function TooltipSingleton() {
173
166
  trigger.style.zIndex = '9999'
174
167
 
175
168
  // Handle delay for first show
176
- if (isFirstShowRef.current && editor) {
177
- showTimeoutRef.current = editor.timers.setTimeout(() => {
169
+ if (isFirstShowRef.current) {
170
+ // eslint-disable-next-line no-restricted-globals
171
+ timer = setTimeout(() => {
178
172
  setIsOpen(true)
179
173
  isFirstShowRef.current = false
180
- }, currentTooltip.delayDuration ?? editor.options.tooltipDelayMs)
174
+ }, currentTooltip.delayDuration)
181
175
  } else {
182
176
  // Subsequent tooltips show immediately
183
177
  setIsOpen(true)
@@ -188,7 +182,13 @@ function TooltipSingleton() {
188
182
  // Reset first show state after tooltip is hidden
189
183
  isFirstShowRef.current = true
190
184
  }
191
- }, [editor, currentTooltip])
185
+
186
+ return () => {
187
+ if (timer !== null) {
188
+ clearTimeout(timer)
189
+ }
190
+ }
191
+ }, [currentTooltip])
192
192
 
193
193
  if (!currentTooltip) {
194
194
  return null
@@ -249,15 +249,13 @@ export const TldrawUiTooltip = forwardRef<HTMLButtonElement, TldrawUiTooltipProp
249
249
  return <>{children}</>
250
250
  }
251
251
 
252
+ const delayDurationToUse =
253
+ delayDuration ?? (editor?.options.tooltipDelayMs || DEFAULT_TOOLTIP_DELAY_MS)
254
+
252
255
  // Fallback to old behavior if no provider
253
256
  if (!hasProvider) {
254
257
  return (
255
- <_Tooltip.Root
256
- delayDuration={
257
- delayDuration ?? (editor?.options.tooltipDelayMs || DEFAULT_TOOLTIP_DELAY_MS)
258
- }
259
- disableHoverableContent
260
- >
258
+ <_Tooltip.Root delayDuration={delayDurationToUse} disableHoverableContent>
261
259
  <_Tooltip.Trigger asChild ref={ref}>
262
260
  {children}
263
261
  </_Tooltip.Trigger>
@@ -288,7 +286,7 @@ export const TldrawUiTooltip = forwardRef<HTMLButtonElement, TldrawUiTooltipProp
288
286
  sideToUse,
289
287
  sideOffset,
290
288
  showOnMobile,
291
- delayDuration
289
+ delayDurationToUse
292
290
  )
293
291
  }
294
292
 
@@ -306,7 +304,7 @@ export const TldrawUiTooltip = forwardRef<HTMLButtonElement, TldrawUiTooltipProp
306
304
  sideToUse,
307
305
  sideOffset,
308
306
  showOnMobile,
309
- delayDuration
307
+ delayDurationToUse
310
308
  )
311
309
  }
312
310
 
@@ -316,8 +316,8 @@ function useDraggableEvents(
316
316
  if (
317
317
  distanceSq >
318
318
  (editor.getInstanceState().isCoarsePointer
319
- ? editor.options.coarseDragDistanceSquared
320
- : editor.options.dragDistanceSquared)
319
+ ? editor.options.uiCoarseDragDistanceSquared
320
+ : editor.options.uiDragDistanceSquared)
321
321
  ) {
322
322
  const screenSpaceStart = state.screenSpaceStart
323
323
  state = {
@@ -350,6 +350,7 @@ function useDraggableEvents(
350
350
  })
351
351
 
352
352
  tooltipManager.hideAllTooltips()
353
+ editor.getContainer().focus()
353
354
  })
354
355
  }
355
356
  }
@@ -36,6 +36,7 @@ import { useTranslation } from '../hooks/useTranslation/useTranslation'
36
36
  import { TLUiIconType } from '../icon-types'
37
37
  import { TLUiOverrideHelpers, useDefaultHelpers } from '../overrides'
38
38
  import { useA11y } from './a11y'
39
+ import { useTldrawUiComponents } from './components'
39
40
  import { TLUiEventSource, useUiEvents } from './events'
40
41
 
41
42
  /** @public */
@@ -98,6 +99,7 @@ export function ActionsProvider({ overrides, children }: ActionsProviderProps) {
98
99
  const _editor = useMaybeEditor()
99
100
  const showCollaborationUi = useShowCollaborationUi()
100
101
  const helpers = useDefaultHelpers()
102
+ const components = useTldrawUiComponents()
101
103
  const trackEvent = useUiEvents()
102
104
  const a11y = useA11y()
103
105
  const msg = useTranslation()
@@ -176,7 +178,9 @@ export function ActionsProvider({ overrides, children }: ActionsProviderProps) {
176
178
  kbd: 'cmd+alt+/,ctrl+alt+/',
177
179
  onSelect(source) {
178
180
  trackEvent('open-kbd-shortcuts', { source })
179
- helpers.addDialog({ component: DefaultKeyboardShortcutsDialog })
181
+ helpers.addDialog({
182
+ component: components.KeyboardShortcutsDialog ?? DefaultKeyboardShortcutsDialog,
183
+ })
180
184
  },
181
185
  },
182
186
  {
@@ -1755,7 +1759,17 @@ export function ActionsProvider({ overrides, children }: ActionsProviderProps) {
1755
1759
  }
1756
1760
 
1757
1761
  return actions
1758
- }, [helpers, _editor, trackEvent, overrides, defaultDocumentName, showCollaborationUi, msg, a11y])
1762
+ }, [
1763
+ helpers,
1764
+ _editor,
1765
+ trackEvent,
1766
+ overrides,
1767
+ defaultDocumentName,
1768
+ showCollaborationUi,
1769
+ msg,
1770
+ a11y,
1771
+ components,
1772
+ ])
1759
1773
 
1760
1774
  return <ActionsContext.Provider value={asActions(actions)}>{children}</ActionsContext.Provider>
1761
1775
  }
@@ -12,6 +12,7 @@ import {
12
12
  import { CursorChatBubble } from '../components/CursorChatBubble'
13
13
  import { DefaultDebugMenu } from '../components/DebugMenu/DefaultDebugMenu'
14
14
  import { DefaultDebugPanel } from '../components/DefaultDebugPanel'
15
+ import { DefaultFollowingIndicator } from '../components/DefaultFollowingIndicator'
15
16
  import { DefaultMenuPanel } from '../components/DefaultMenuPanel'
16
17
  import { DefaultDialogs } from '../components/Dialogs'
17
18
  import { TLUiHelpMenuProps } from '../components/HelpMenu/DefaultHelpMenu'
@@ -72,6 +73,7 @@ export interface TLUiComponents {
72
73
  Dialogs?: ComponentType | null
73
74
  Toasts?: ComponentType | null
74
75
  A11y?: ComponentType | null
76
+ FollowingIndicator?: ComponentType | null
75
77
  }
76
78
 
77
79
  const TldrawUiComponentsContext = createContext<TLUiComponents | null>(null)
@@ -119,6 +121,7 @@ export function TldrawUiComponentsProvider({
119
121
  Dialogs: DefaultDialogs,
120
122
  Toasts: DefaultToasts,
121
123
  A11y: DefaultA11yAnnouncer,
124
+ FollowingIndicator: DefaultFollowingIndicator,
122
125
  ..._overrides,
123
126
  }),
124
127
  [_overrides, showCollaborationUi]
@@ -123,7 +123,7 @@ export interface TLUiEventMap {
123
123
  'shrink-shapes': null
124
124
  'flatten-to-image': null
125
125
  'a11y-repeat-shape-announce': null
126
- 'open-url': { url: string }
126
+ 'open-url': { destinationUrl: string }
127
127
  'open-context-menu': null
128
128
  'adjust-shape-styles': null
129
129
  'copy-link': null
@@ -186,6 +186,7 @@ export type TLUiTranslationKey =
186
186
  | 'geo-style.pentagon'
187
187
  | 'geo-style.rectangle'
188
188
  | 'geo-style.rhombus'
189
+ | 'geo-style.rhombus-2'
189
190
  | 'geo-style.star'
190
191
  | 'geo-style.trapezoid'
191
192
  | 'geo-style.triangle'
@@ -187,6 +187,7 @@ export const DEFAULT_TRANSLATION = {
187
187
  'geo-style.pentagon': 'Pentagon',
188
188
  'geo-style.rectangle': 'Rectangle',
189
189
  'geo-style.rhombus': 'Rhombus',
190
+ 'geo-style.rhombus-2': 'Rhombus left',
190
191
  'geo-style.star': 'Star',
191
192
  'geo-style.trapezoid': 'Trapezoid',
192
193
  'geo-style.triangle': 'Triangle',
@@ -31,9 +31,16 @@ export function kbd(str: string) {
31
31
  )
32
32
  .flat()
33
33
  .map((sub, index) => {
34
- if (sub === '__CTRL__') return 'Ctrl'
35
- if (sub === '__ALT__') return 'Alt'
36
- const modifiedKey = sub[0].toUpperCase() + sub.slice(1)
34
+ if (sub[0] === '+') return []
35
+
36
+ let modifiedKey
37
+ if (sub === '__CTRL__') {
38
+ modifiedKey = 'Ctrl'
39
+ } else if (sub === '__ALT__') {
40
+ modifiedKey = 'Alt'
41
+ } else {
42
+ modifiedKey = sub[0].toUpperCase() + sub.slice(1)
43
+ }
37
44
  return tlenv.isDarwin || !index ? modifiedKey : ['+', modifiedKey]
38
45
  })
39
46
  .flat()
@@ -1,9 +1,9 @@
1
1
  // This file is automatically generated by internal/scripts/refresh-assets.ts.
2
2
  // Do not edit manually. Or do, I'm a comment, not a cop.
3
3
 
4
- export const version = '3.16.0-canary.acb40a76700b'
4
+ export const version = '3.16.0-canary.b33662a7aefb'
5
5
  export const publishDates = {
6
6
  major: '2024-09-13T14:36:29.063Z',
7
- minor: '2025-08-14T14:04:21.487Z',
8
- patch: '2025-08-14T14:04:21.487Z',
7
+ minor: '2025-08-28T11:52:40.857Z',
8
+ patch: '2025-08-28T11:52:40.857Z',
9
9
  }
package/src/lib/ui.css CHANGED
@@ -1047,6 +1047,9 @@
1047
1047
  }
1048
1048
 
1049
1049
  @media (hover: hover) {
1050
+ .tlui-style-panel .tlui-button[aria-expanded='true'] {
1051
+ background: none;
1052
+ }
1050
1053
  .tlui-style-panel .tlui-button[data-state='open']:not(:hover)::after {
1051
1054
  opacity: 1;
1052
1055
  background: linear-gradient(270deg, rgba(144, 144, 144, 0) 0%, var(--tl-color-muted-2) 100%);
@@ -1,6 +1,6 @@
1
- // Jest Snapshot v1, https://goo.gl/fbAQLP
1
+ // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
2
2
 
3
- exports[`putExcalidrawContent test fixtures bound-arrows.json 1`] = `
3
+ exports[`putExcalidrawContent test fixtures > bound-arrows.json 1`] = `
4
4
  {
5
5
  "binding:8": {
6
6
  "fromId": "shape:7",
@@ -173,7 +173,7 @@ exports[`putExcalidrawContent test fixtures bound-arrows.json 1`] = `
173
173
  }
174
174
  `;
175
175
 
176
- exports[`putExcalidrawContent test fixtures bound-elbow-arrows.json 1`] = `
176
+ exports[`putExcalidrawContent test fixtures > bound-elbow-arrows.json 1`] = `
177
177
  {
178
178
  "binding:7": {
179
179
  "fromId": "shape:6",
@@ -346,7 +346,7 @@ exports[`putExcalidrawContent test fixtures bound-elbow-arrows.json 1`] = `
346
346
  }
347
347
  `;
348
348
 
349
- exports[`putExcalidrawContent test fixtures image.json 1`] = `
349
+ exports[`putExcalidrawContent test fixtures > image.json 1`] = `
350
350
  {
351
351
  "asset:5": {
352
352
  "id": "asset:5",
@@ -404,7 +404,7 @@ exports[`putExcalidrawContent test fixtures image.json 1`] = `
404
404
  }
405
405
  `;
406
406
 
407
- exports[`putExcalidrawContent test fixtures line-drawing.json 1`] = `
407
+ exports[`putExcalidrawContent test fixtures > line-drawing.json 1`] = `
408
408
  {
409
409
  "document:document": {
410
410
  "gridSize": 10,
@@ -1,6 +1,6 @@
1
- // Jest Snapshot v1, https://goo.gl/fbAQLP
1
+ // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
2
2
 
3
- exports[`buildFromV1Document test fixtures arrow-binding.tldr 1`] = `
3
+ exports[`buildFromV1Document test fixtures > arrow-binding.tldr 1`] = `
4
4
  {
5
5
  "binding:12": {
6
6
  "fromId": "shape:11",
@@ -173,7 +173,7 @@ exports[`buildFromV1Document test fixtures arrow-binding.tldr 1`] = `
173
173
  }
174
174
  `;
175
175
 
176
- exports[`buildFromV1Document test fixtures exact-arrow-binding.tldr 1`] = `
176
+ exports[`buildFromV1Document test fixtures > exact-arrow-binding.tldr 1`] = `
177
177
  {
178
178
  "binding:11": {
179
179
  "fromId": "shape:10",
@@ -346,7 +346,7 @@ exports[`buildFromV1Document test fixtures exact-arrow-binding.tldr 1`] = `
346
346
  }
347
347
  `;
348
348
 
349
- exports[`buildFromV1Document test fixtures incorrect-arrow-binding.tldr 1`] = `
349
+ exports[`buildFromV1Document test fixtures > incorrect-arrow-binding.tldr 1`] = `
350
350
  {
351
351
  "binding:11": {
352
352
  "fromId": "shape:10",
@@ -1,16 +1,17 @@
1
1
  import { createShapeId, toRichText } from '@tldraw/editor'
2
+ import { Mock, vi } from 'vitest'
2
3
  import { generateShapeAnnouncementMessage } from '../lib/ui/components/A11y'
3
4
  import { TestEditor } from './TestEditor'
4
5
 
5
6
  describe('A11y Shape Announcements', () => {
6
7
  let editor: TestEditor
7
- let mockTranslate: jest.Mock
8
+ let mockTranslate: Mock
8
9
 
9
10
  beforeEach(() => {
10
11
  editor = new TestEditor()
11
12
 
12
13
  // Create a simple translation mock
13
- mockTranslate = jest.fn((key) => {
14
+ mockTranslate = vi.fn((key) => {
14
15
  if (key === 'a11y.multiple-shapes') return '{num} shapes selected'
15
16
  if (key === 'a11y.shape') return 'Shape'
16
17
  if (key === 'a11y.text') return 'Text'