tldraw 3.16.0-canary.654b4007a087 → 3.16.0-canary.66da2a5c5813

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 (200) hide show
  1. package/dist-cjs/index.d.ts +153 -102
  2. package/dist-cjs/index.js +29 -14
  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/PlainTextLabel.js +1 -3
  13. package/dist-cjs/lib/shapes/shared/PlainTextLabel.js.map +2 -2
  14. package/dist-cjs/lib/shapes/shared/useEditablePlainText.js +0 -2
  15. package/dist-cjs/lib/shapes/shared/useEditablePlainText.js.map +2 -2
  16. package/dist-cjs/lib/shapes/shared/useImageOrVideoAsset.js +0 -2
  17. package/dist-cjs/lib/shapes/shared/useImageOrVideoAsset.js.map +2 -2
  18. package/dist-cjs/lib/ui/TldrawUi.js +13 -12
  19. package/dist-cjs/lib/ui/TldrawUi.js.map +2 -2
  20. package/dist-cjs/lib/ui/assetUrls.js +13 -10
  21. package/dist-cjs/lib/ui/assetUrls.js.map +2 -2
  22. package/dist-cjs/lib/ui/components/{FollowingIndicator.js → DefaultFollowingIndicator.js} +6 -6
  23. package/dist-cjs/lib/ui/components/DefaultFollowingIndicator.js.map +7 -0
  24. package/dist-cjs/lib/ui/components/KeyboardShortcutsDialog/DefaultKeyboardShortcutsDialogContent.js +6 -6
  25. package/dist-cjs/lib/ui/components/KeyboardShortcutsDialog/DefaultKeyboardShortcutsDialogContent.js.map +1 -1
  26. package/dist-cjs/lib/ui/components/StylePanel/DefaultStylePanel.js +9 -4
  27. package/dist-cjs/lib/ui/components/StylePanel/DefaultStylePanel.js.map +2 -2
  28. package/dist-cjs/lib/ui/components/StylePanel/DefaultStylePanelContent.js +255 -316
  29. package/dist-cjs/lib/ui/components/StylePanel/DefaultStylePanelContent.js.map +2 -2
  30. package/dist-cjs/lib/ui/components/{primitives/TldrawUiButtonPicker.js → StylePanel/StylePanelButtonPicker.js} +52 -45
  31. package/dist-cjs/lib/ui/components/StylePanel/StylePanelButtonPicker.js.map +7 -0
  32. package/dist-cjs/lib/ui/components/StylePanel/StylePanelContext.js +68 -0
  33. package/dist-cjs/lib/ui/components/StylePanel/StylePanelContext.js.map +7 -0
  34. package/dist-cjs/lib/ui/components/StylePanel/{DoubleDropdownPicker.js → StylePanelDoubleDropdownPicker.js} +23 -22
  35. package/dist-cjs/lib/ui/components/StylePanel/StylePanelDoubleDropdownPicker.js.map +7 -0
  36. package/dist-cjs/lib/ui/components/StylePanel/{DropdownPicker.js → StylePanelDropdownPicker.js} +24 -21
  37. package/dist-cjs/lib/ui/components/StylePanel/StylePanelDropdownPicker.js.map +7 -0
  38. package/dist-cjs/lib/ui/components/StylePanel/StylePanelSubheading.js +28 -0
  39. package/dist-cjs/lib/ui/components/StylePanel/StylePanelSubheading.js.map +7 -0
  40. package/dist-cjs/lib/ui/components/Toolbar/AltTextEditor.js +3 -2
  41. package/dist-cjs/lib/ui/components/Toolbar/AltTextEditor.js.map +2 -2
  42. package/dist-cjs/lib/ui/components/Toolbar/DefaultImageToolbarContent.js +38 -9
  43. package/dist-cjs/lib/ui/components/Toolbar/DefaultImageToolbarContent.js.map +2 -2
  44. package/dist-cjs/lib/ui/components/Toolbar/DefaultVideoToolbarContent.js +15 -3
  45. package/dist-cjs/lib/ui/components/Toolbar/DefaultVideoToolbarContent.js.map +2 -2
  46. package/dist-cjs/lib/ui/components/Toolbar/LinkEditor.js +3 -3
  47. package/dist-cjs/lib/ui/components/Toolbar/LinkEditor.js.map +2 -2
  48. package/dist-cjs/lib/ui/components/primitives/TldrawUiContextualToolbar.js +10 -1
  49. package/dist-cjs/lib/ui/components/primitives/TldrawUiContextualToolbar.js.map +2 -2
  50. package/dist-cjs/lib/ui/components/primitives/TldrawUiSlider.js +17 -4
  51. package/dist-cjs/lib/ui/components/primitives/TldrawUiSlider.js.map +2 -2
  52. package/dist-cjs/lib/ui/components/primitives/TldrawUiToolbar.js +2 -0
  53. package/dist-cjs/lib/ui/components/primitives/TldrawUiToolbar.js.map +2 -2
  54. package/dist-cjs/lib/ui/components/primitives/TldrawUiTooltip.js +35 -37
  55. package/dist-cjs/lib/ui/components/primitives/TldrawUiTooltip.js.map +2 -2
  56. package/dist-cjs/lib/ui/context/actions.js +23 -10
  57. package/dist-cjs/lib/ui/context/actions.js.map +2 -2
  58. package/dist-cjs/lib/ui/context/components.js +2 -0
  59. package/dist-cjs/lib/ui/context/components.js.map +2 -2
  60. package/dist-cjs/lib/ui/context/events.js.map +1 -1
  61. package/dist-cjs/lib/ui/hooks/useExportAs.js +3 -2
  62. package/dist-cjs/lib/ui/hooks/useExportAs.js.map +2 -2
  63. package/dist-cjs/lib/ui/hooks/useTranslation/TLUiTranslationKey.js.map +1 -1
  64. package/dist-cjs/lib/ui/hooks/useTranslation/defaultTranslation.js +2 -0
  65. package/dist-cjs/lib/ui/hooks/useTranslation/defaultTranslation.js.map +2 -2
  66. package/dist-cjs/lib/ui/kbd-utils.js +9 -3
  67. package/dist-cjs/lib/ui/kbd-utils.js.map +2 -2
  68. package/dist-cjs/lib/ui/version.js +3 -3
  69. package/dist-cjs/lib/ui/version.js.map +1 -1
  70. package/dist-cjs/lib/utils/export/copyAs.js +1 -2
  71. package/dist-cjs/lib/utils/export/copyAs.js.map +2 -2
  72. package/dist-cjs/lib/utils/export/export.js +0 -20
  73. package/dist-cjs/lib/utils/export/export.js.map +2 -2
  74. package/dist-cjs/lib/utils/export/exportAs.js +1 -2
  75. package/dist-cjs/lib/utils/export/exportAs.js.map +2 -2
  76. package/dist-esm/index.d.mts +153 -102
  77. package/dist-esm/index.mjs +57 -29
  78. package/dist-esm/index.mjs.map +2 -2
  79. package/dist-esm/lib/Tldraw.mjs +14 -4
  80. package/dist-esm/lib/Tldraw.mjs.map +2 -2
  81. package/dist-esm/lib/defaultExternalContentHandlers.mjs +5 -4
  82. package/dist-esm/lib/defaultExternalContentHandlers.mjs.map +2 -2
  83. package/dist-esm/lib/shapes/frame/FrameShapeUtil.mjs +6 -0
  84. package/dist-esm/lib/shapes/frame/FrameShapeUtil.mjs.map +2 -2
  85. package/dist-esm/lib/shapes/image/ImageShapeUtil.mjs +3 -0
  86. package/dist-esm/lib/shapes/image/ImageShapeUtil.mjs.map +2 -2
  87. package/dist-esm/lib/shapes/shared/PlainTextLabel.mjs +1 -3
  88. package/dist-esm/lib/shapes/shared/PlainTextLabel.mjs.map +2 -2
  89. package/dist-esm/lib/shapes/shared/useEditablePlainText.mjs +0 -2
  90. package/dist-esm/lib/shapes/shared/useEditablePlainText.mjs.map +2 -2
  91. package/dist-esm/lib/shapes/shared/useImageOrVideoAsset.mjs +0 -2
  92. package/dist-esm/lib/shapes/shared/useImageOrVideoAsset.mjs.map +2 -2
  93. package/dist-esm/lib/ui/TldrawUi.mjs +13 -12
  94. package/dist-esm/lib/ui/TldrawUi.mjs.map +2 -2
  95. package/dist-esm/lib/ui/assetUrls.mjs +13 -10
  96. package/dist-esm/lib/ui/assetUrls.mjs.map +2 -2
  97. package/dist-esm/lib/ui/components/{FollowingIndicator.mjs → DefaultFollowingIndicator.mjs} +3 -3
  98. package/dist-esm/lib/ui/components/DefaultFollowingIndicator.mjs.map +7 -0
  99. package/dist-esm/lib/ui/components/KeyboardShortcutsDialog/DefaultKeyboardShortcutsDialogContent.mjs +6 -6
  100. package/dist-esm/lib/ui/components/KeyboardShortcutsDialog/DefaultKeyboardShortcutsDialogContent.mjs.map +1 -1
  101. package/dist-esm/lib/ui/components/StylePanel/DefaultStylePanel.mjs +14 -5
  102. package/dist-esm/lib/ui/components/StylePanel/DefaultStylePanel.mjs.map +2 -2
  103. package/dist-esm/lib/ui/components/StylePanel/DefaultStylePanelContent.mjs +257 -320
  104. package/dist-esm/lib/ui/components/StylePanel/DefaultStylePanelContent.mjs.map +2 -2
  105. package/dist-esm/lib/ui/components/{primitives/TldrawUiButtonPicker.mjs → StylePanel/StylePanelButtonPicker.mjs} +54 -43
  106. package/dist-esm/lib/ui/components/StylePanel/StylePanelButtonPicker.mjs.map +7 -0
  107. package/dist-esm/lib/ui/components/StylePanel/StylePanelContext.mjs +48 -0
  108. package/dist-esm/lib/ui/components/StylePanel/StylePanelContext.mjs.map +7 -0
  109. package/dist-esm/lib/ui/components/StylePanel/{DoubleDropdownPicker.mjs → StylePanelDoubleDropdownPicker.mjs} +20 -19
  110. package/dist-esm/lib/ui/components/StylePanel/StylePanelDoubleDropdownPicker.mjs.map +7 -0
  111. package/dist-esm/lib/ui/components/StylePanel/{DropdownPicker.mjs → StylePanelDropdownPicker.mjs} +21 -18
  112. package/dist-esm/lib/ui/components/StylePanel/StylePanelDropdownPicker.mjs.map +7 -0
  113. package/dist-esm/lib/ui/components/StylePanel/StylePanelSubheading.mjs +8 -0
  114. package/dist-esm/lib/ui/components/StylePanel/StylePanelSubheading.mjs.map +7 -0
  115. package/dist-esm/lib/ui/components/Toolbar/AltTextEditor.mjs +3 -2
  116. package/dist-esm/lib/ui/components/Toolbar/AltTextEditor.mjs.map +2 -2
  117. package/dist-esm/lib/ui/components/Toolbar/DefaultImageToolbarContent.mjs +38 -9
  118. package/dist-esm/lib/ui/components/Toolbar/DefaultImageToolbarContent.mjs.map +2 -2
  119. package/dist-esm/lib/ui/components/Toolbar/DefaultVideoToolbarContent.mjs +15 -3
  120. package/dist-esm/lib/ui/components/Toolbar/DefaultVideoToolbarContent.mjs.map +2 -2
  121. package/dist-esm/lib/ui/components/Toolbar/LinkEditor.mjs +3 -3
  122. package/dist-esm/lib/ui/components/Toolbar/LinkEditor.mjs.map +2 -2
  123. package/dist-esm/lib/ui/components/primitives/TldrawUiContextualToolbar.mjs +10 -1
  124. package/dist-esm/lib/ui/components/primitives/TldrawUiContextualToolbar.mjs.map +2 -2
  125. package/dist-esm/lib/ui/components/primitives/TldrawUiSlider.mjs +17 -4
  126. package/dist-esm/lib/ui/components/primitives/TldrawUiSlider.mjs.map +2 -2
  127. package/dist-esm/lib/ui/components/primitives/TldrawUiToolbar.mjs +2 -0
  128. package/dist-esm/lib/ui/components/primitives/TldrawUiToolbar.mjs.map +2 -2
  129. package/dist-esm/lib/ui/components/primitives/TldrawUiTooltip.mjs +35 -37
  130. package/dist-esm/lib/ui/components/primitives/TldrawUiTooltip.mjs.map +2 -2
  131. package/dist-esm/lib/ui/context/actions.mjs +23 -10
  132. package/dist-esm/lib/ui/context/actions.mjs.map +2 -2
  133. package/dist-esm/lib/ui/context/components.mjs +2 -0
  134. package/dist-esm/lib/ui/context/components.mjs.map +2 -2
  135. package/dist-esm/lib/ui/context/events.mjs.map +1 -1
  136. package/dist-esm/lib/ui/hooks/useExportAs.mjs +3 -2
  137. package/dist-esm/lib/ui/hooks/useExportAs.mjs.map +2 -2
  138. package/dist-esm/lib/ui/hooks/useTranslation/defaultTranslation.mjs +2 -0
  139. package/dist-esm/lib/ui/hooks/useTranslation/defaultTranslation.mjs.map +2 -2
  140. package/dist-esm/lib/ui/kbd-utils.mjs +9 -3
  141. package/dist-esm/lib/ui/kbd-utils.mjs.map +2 -2
  142. package/dist-esm/lib/ui/version.mjs +3 -3
  143. package/dist-esm/lib/ui/version.mjs.map +1 -1
  144. package/dist-esm/lib/utils/export/copyAs.mjs +1 -2
  145. package/dist-esm/lib/utils/export/copyAs.mjs.map +2 -2
  146. package/dist-esm/lib/utils/export/export.mjs +0 -20
  147. package/dist-esm/lib/utils/export/export.mjs.map +2 -2
  148. package/dist-esm/lib/utils/export/exportAs.mjs +1 -2
  149. package/dist-esm/lib/utils/export/exportAs.mjs.map +2 -2
  150. package/package.json +5 -4
  151. package/src/index.ts +41 -22
  152. package/src/lib/Tldraw.tsx +15 -2
  153. package/src/lib/defaultExternalContentHandlers.ts +12 -4
  154. package/src/lib/shapes/frame/FrameShapeUtil.tsx +8 -0
  155. package/src/lib/shapes/image/ImageShapeUtil.tsx +3 -0
  156. package/src/lib/shapes/shared/PlainTextLabel.tsx +0 -6
  157. package/src/lib/shapes/shared/useEditablePlainText.ts +0 -6
  158. package/src/lib/shapes/shared/useImageOrVideoAsset.ts +0 -7
  159. package/src/lib/ui/TldrawUi.tsx +16 -10
  160. package/src/lib/ui/assetUrls.ts +13 -10
  161. package/src/lib/ui/components/{FollowingIndicator.tsx → DefaultFollowingIndicator.tsx} +2 -1
  162. package/src/lib/ui/components/KeyboardShortcutsDialog/DefaultKeyboardShortcutsDialogContent.tsx +6 -6
  163. package/src/lib/ui/components/StylePanel/DefaultStylePanel.tsx +27 -13
  164. package/src/lib/ui/components/StylePanel/DefaultStylePanelContent.tsx +260 -381
  165. package/src/lib/ui/components/{primitives/TldrawUiButtonPicker.tsx → StylePanel/StylePanelButtonPicker.tsx} +63 -50
  166. package/src/lib/ui/components/StylePanel/StylePanelContext.tsx +63 -0
  167. package/src/lib/ui/components/StylePanel/{DoubleDropdownPicker.tsx → StylePanelDoubleDropdownPicker.tsx} +28 -19
  168. package/src/lib/ui/components/StylePanel/StylePanelDropdownPicker.tsx +119 -0
  169. package/src/lib/ui/components/StylePanel/StylePanelSubheading.tsx +9 -0
  170. package/src/lib/ui/components/Toolbar/AltTextEditor.tsx +4 -3
  171. package/src/lib/ui/components/Toolbar/DefaultImageToolbarContent.tsx +32 -15
  172. package/src/lib/ui/components/Toolbar/DefaultVideoToolbarContent.tsx +12 -4
  173. package/src/lib/ui/components/Toolbar/LinkEditor.tsx +5 -5
  174. package/src/lib/ui/components/primitives/TldrawUiContextualToolbar.tsx +6 -1
  175. package/src/lib/ui/components/primitives/TldrawUiSlider.tsx +50 -30
  176. package/src/lib/ui/components/primitives/TldrawUiToolbar.tsx +3 -0
  177. package/src/lib/ui/components/primitives/TldrawUiTooltip.tsx +26 -22
  178. package/src/lib/ui/context/actions.tsx +23 -10
  179. package/src/lib/ui/context/components.tsx +3 -0
  180. package/src/lib/ui/context/events.tsx +1 -1
  181. package/src/lib/ui/hooks/useExportAs.ts +3 -2
  182. package/src/lib/ui/hooks/useTranslation/TLUiTranslationKey.ts +2 -0
  183. package/src/lib/ui/hooks/useTranslation/defaultTranslation.ts +2 -0
  184. package/src/lib/ui/kbd-utils.ts +10 -3
  185. package/src/lib/ui/version.ts +3 -3
  186. package/src/lib/ui.css +19 -2
  187. package/src/lib/utils/export/copyAs.ts +1 -24
  188. package/src/lib/utils/export/export.ts +0 -36
  189. package/src/lib/utils/export/exportAs.ts +1 -32
  190. package/src/test/custom-clipping.test.ts +436 -0
  191. package/tldraw.css +27 -2
  192. package/dist-cjs/lib/ui/components/FollowingIndicator.js.map +0 -7
  193. package/dist-cjs/lib/ui/components/StylePanel/DoubleDropdownPicker.js.map +0 -7
  194. package/dist-cjs/lib/ui/components/StylePanel/DropdownPicker.js.map +0 -7
  195. package/dist-cjs/lib/ui/components/primitives/TldrawUiButtonPicker.js.map +0 -7
  196. package/dist-esm/lib/ui/components/FollowingIndicator.mjs.map +0 -7
  197. package/dist-esm/lib/ui/components/StylePanel/DoubleDropdownPicker.mjs.map +0 -7
  198. package/dist-esm/lib/ui/components/StylePanel/DropdownPicker.mjs.map +0 -7
  199. package/dist-esm/lib/ui/components/primitives/TldrawUiButtonPicker.mjs.map +0 -7
  200. package/src/lib/ui/components/StylePanel/DropdownPicker.tsx +0 -110
@@ -1,7 +1,9 @@
1
+ import { tltime } from '@tldraw/editor'
1
2
  import { Slider as _Slider } from 'radix-ui'
2
3
  import React, { useCallback, useEffect, useState } from 'react'
3
4
  import { TLUiTranslationKey } from '../../hooks/useTranslation/TLUiTranslationKey'
4
5
  import { useTranslation } from '../../hooks/useTranslation/useTranslation'
6
+ import { TldrawUiTooltip, tooltipManager } from './TldrawUiTooltip'
5
7
 
6
8
  /** @public */
7
9
  export interface TLUiSliderProps {
@@ -32,6 +34,7 @@ export const TldrawUiSlider = React.forwardRef<HTMLDivElement, TLUiSliderProps>(
32
34
  ref
33
35
  ) {
34
36
  const msg = useTranslation()
37
+ const [titleAndLabel, setTitleAndLabel] = useState('')
35
38
 
36
39
  // XXX: Radix starts out our slider with a tabIndex of 0
37
40
  // This causes some tab focusing issues, most prevelant in MobileStylePanel,
@@ -49,9 +52,25 @@ export const TldrawUiSlider = React.forwardRef<HTMLDivElement, TLUiSliderProps>(
49
52
  )
50
53
 
51
54
  const handlePointerDown = useCallback(() => {
55
+ tooltipManager.hideAllTooltips()
52
56
  onHistoryMark('click slider')
53
57
  }, [onHistoryMark])
54
58
 
59
+ // N.B. This is a bit silly. The Radix slider auto-focuses which
60
+ // triggers TldrawUiTooltip handleFocus when we dbl-click to edit an image,
61
+ // which in turn makes the tooltip display prematurely.
62
+ // This makes it wait until we've focused to show the tooltip.
63
+ useEffect(() => {
64
+ const timeout = tltime.setTimeout(
65
+ 'set title and label',
66
+ () => {
67
+ setTitleAndLabel(title + ' — ' + msg(label as TLUiTranslationKey))
68
+ },
69
+ 0
70
+ )
71
+ return () => clearTimeout(timeout)
72
+ }, [label, msg, title])
73
+
55
74
  // N.B. Annoying. For a11y purposes, we need Tab to work.
56
75
  // For some reason, Radix has some custom behavior here
57
76
  // that interferes with tabbing past the slider and then
@@ -64,36 +83,37 @@ export const TldrawUiSlider = React.forwardRef<HTMLDivElement, TLUiSliderProps>(
64
83
 
65
84
  return (
66
85
  <div className="tlui-slider__container">
67
- <_Slider.Root
68
- data-testid={testId}
69
- className="tlui-slider"
70
- dir="ltr"
71
- min={min ?? 0}
72
- max={steps}
73
- step={1}
74
- value={value !== null ? [value] : undefined}
75
- onPointerDown={handlePointerDown}
76
- onValueChange={handleValueChange}
77
- onKeyDownCapture={handleKeyEvent}
78
- onKeyUpCapture={handleKeyEvent}
79
- title={title + ' — ' + msg(label as TLUiTranslationKey)}
80
- >
81
- <_Slider.Track className="tlui-slider__track" dir="ltr">
82
- {value !== null && <_Slider.Range className="tlui-slider__range" dir="ltr" />}
83
- </_Slider.Track>
84
- {value !== null && (
85
- <_Slider.Thumb
86
- aria-valuemin={(min ?? 0) * ariaValueModifier}
87
- aria-valuenow={value * ariaValueModifier}
88
- aria-valuemax={steps * ariaValueModifier}
89
- aria-label={title + ' — ' + msg(label as TLUiTranslationKey)}
90
- className="tlui-slider__thumb"
91
- dir="ltr"
92
- ref={ref}
93
- tabIndex={tabIndex}
94
- />
95
- )}
96
- </_Slider.Root>
86
+ <TldrawUiTooltip content={titleAndLabel}>
87
+ <_Slider.Root
88
+ data-testid={testId}
89
+ className="tlui-slider"
90
+ dir="ltr"
91
+ min={min ?? 0}
92
+ max={steps}
93
+ step={1}
94
+ value={value !== null ? [value] : undefined}
95
+ onPointerDown={handlePointerDown}
96
+ onValueChange={handleValueChange}
97
+ onKeyDownCapture={handleKeyEvent}
98
+ onKeyUpCapture={handleKeyEvent}
99
+ >
100
+ <_Slider.Track className="tlui-slider__track" dir="ltr">
101
+ {value !== null && <_Slider.Range className="tlui-slider__range" dir="ltr" />}
102
+ </_Slider.Track>
103
+ {value !== null && (
104
+ <_Slider.Thumb
105
+ aria-valuemin={(min ?? 0) * ariaValueModifier}
106
+ aria-valuenow={value * ariaValueModifier}
107
+ aria-valuemax={steps * ariaValueModifier}
108
+ aria-label={titleAndLabel}
109
+ className="tlui-slider__thumb"
110
+ dir="ltr"
111
+ ref={ref}
112
+ tabIndex={tabIndex}
113
+ />
114
+ )}
115
+ </_Slider.Root>
116
+ </TldrawUiTooltip>
97
117
  </div>
98
118
  )
99
119
  })
@@ -94,6 +94,7 @@ export interface TLUiToolbarToggleGroupProps extends React.HTMLAttributes<HTMLDi
94
94
  // TODO: fix up this type later
95
95
  defaultValue?: any
96
96
  type: 'single' | 'multiple'
97
+ asChild?: boolean
97
98
  }
98
99
 
99
100
  /** @public @react */
@@ -101,10 +102,12 @@ export const TldrawUiToolbarToggleGroup = ({
101
102
  children,
102
103
  className,
103
104
  type,
105
+ asChild,
104
106
  ...props
105
107
  }: TLUiToolbarToggleGroupProps) => {
106
108
  return (
107
109
  <_Toolbar.ToggleGroup
110
+ asChild={asChild}
108
111
  type={type}
109
112
  {...props}
110
113
  // TODO: this fixes a bug in Radix until they fix it.
@@ -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
@@ -235,6 +235,8 @@ export const TldrawUiTooltip = forwardRef<HTMLButtonElement, TldrawUiTooltipProp
235
235
  const orientationCtx = useTldrawUiOrientation()
236
236
  const sideToUse = side ?? orientationCtx.tooltipSide
237
237
 
238
+ const camera = useValue('camera', () => editor?.getCamera(), [])
239
+
238
240
  useEffect(() => {
239
241
  const currentTooltipId = tooltipId.current
240
242
  return () => {
@@ -244,20 +246,22 @@ export const TldrawUiTooltip = forwardRef<HTMLButtonElement, TldrawUiTooltipProp
244
246
  }
245
247
  }, [editor, hasProvider])
246
248
 
249
+ useEffect(() => {
250
+ tooltipManager.hideTooltip(editor, tooltipId.current, true)
251
+ }, [editor, camera])
252
+
247
253
  // Don't show tooltip if disabled, no content, or UI labels are disabled
248
254
  if (disabled || !content) {
249
255
  return <>{children}</>
250
256
  }
251
257
 
258
+ const delayDurationToUse =
259
+ delayDuration ?? (editor?.options.tooltipDelayMs || DEFAULT_TOOLTIP_DELAY_MS)
260
+
252
261
  // Fallback to old behavior if no provider
253
262
  if (!hasProvider) {
254
263
  return (
255
- <_Tooltip.Root
256
- delayDuration={
257
- delayDuration ?? (editor?.options.tooltipDelayMs || DEFAULT_TOOLTIP_DELAY_MS)
258
- }
259
- disableHoverableContent
260
- >
264
+ <_Tooltip.Root delayDuration={delayDurationToUse} disableHoverableContent>
261
265
  <_Tooltip.Trigger asChild ref={ref}>
262
266
  {children}
263
267
  </_Tooltip.Trigger>
@@ -288,7 +292,7 @@ export const TldrawUiTooltip = forwardRef<HTMLButtonElement, TldrawUiTooltipProp
288
292
  sideToUse,
289
293
  sideOffset,
290
294
  showOnMobile,
291
- delayDuration
295
+ delayDurationToUse
292
296
  )
293
297
  }
294
298
 
@@ -306,7 +310,7 @@ export const TldrawUiTooltip = forwardRef<HTMLButtonElement, TldrawUiTooltipProp
306
310
  sideToUse,
307
311
  sideOffset,
308
312
  showOnMobile,
309
- delayDuration
313
+ delayDurationToUse
310
314
  )
311
315
  }
312
316
 
@@ -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
  {
@@ -221,7 +225,7 @@ export function ActionsProvider({ overrides, children }: ActionsProviderProps) {
221
225
  if (ids.length === 0) ids = Array.from(editor.getCurrentPageShapeIds().values())
222
226
  if (ids.length === 0) return
223
227
  trackEvent('export-as', { format: 'svg', source })
224
- helpers.exportAs(ids, 'svg', getExportName(editor, defaultDocumentName))
228
+ helpers.exportAs(ids, { format: 'svg', name: getExportName(editor, defaultDocumentName) })
225
229
  },
226
230
  },
227
231
  {
@@ -237,7 +241,7 @@ export function ActionsProvider({ overrides, children }: ActionsProviderProps) {
237
241
  if (ids.length === 0) ids = Array.from(editor.getCurrentPageShapeIds().values())
238
242
  if (ids.length === 0) return
239
243
  trackEvent('export-as', { format: 'png', source })
240
- helpers.exportAs(ids, 'png', getExportName(editor, defaultDocumentName))
244
+ helpers.exportAs(ids, { format: 'png', name: getExportName(editor, defaultDocumentName) })
241
245
  },
242
246
  },
243
247
  {
@@ -253,11 +257,10 @@ export function ActionsProvider({ overrides, children }: ActionsProviderProps) {
253
257
  if (ids.length === 0) ids = Array.from(editor.getCurrentPageShapeIds().values())
254
258
  if (ids.length === 0) return
255
259
  trackEvent('export-all-as', { format: 'svg', source })
256
- helpers.exportAs(
257
- Array.from(editor.getCurrentPageShapeIds()),
258
- 'svg',
259
- getExportName(editor, defaultDocumentName)
260
- )
260
+ helpers.exportAs(Array.from(editor.getCurrentPageShapeIds()), {
261
+ format: 'svg',
262
+ name: getExportName(editor, defaultDocumentName),
263
+ })
261
264
  },
262
265
  },
263
266
  {
@@ -272,7 +275,7 @@ export function ActionsProvider({ overrides, children }: ActionsProviderProps) {
272
275
  const ids = Array.from(editor.getCurrentPageShapeIds().values())
273
276
  if (ids.length === 0) return
274
277
  trackEvent('export-all-as', { format: 'png', source })
275
- helpers.exportAs(ids, 'png', getExportName(editor, defaultDocumentName))
278
+ helpers.exportAs(ids, { format: 'png', name: getExportName(editor, defaultDocumentName) })
276
279
  },
277
280
  },
278
281
  {
@@ -1755,7 +1758,17 @@ export function ActionsProvider({ overrides, children }: ActionsProviderProps) {
1755
1758
  }
1756
1759
 
1757
1760
  return actions
1758
- }, [helpers, _editor, trackEvent, overrides, defaultDocumentName, showCollaborationUi, msg, a11y])
1761
+ }, [
1762
+ helpers,
1763
+ _editor,
1764
+ trackEvent,
1765
+ overrides,
1766
+ defaultDocumentName,
1767
+ showCollaborationUi,
1768
+ msg,
1769
+ a11y,
1770
+ components,
1771
+ ])
1759
1772
 
1760
1773
  return <ActionsContext.Provider value={asActions(actions)}>{children}</ActionsContext.Provider>
1761
1774
  }
@@ -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
@@ -11,12 +11,13 @@ export function useExportAs() {
11
11
  const msg = useTranslation()
12
12
 
13
13
  return useCallback(
14
- (ids: TLShapeId[], format: TLExportType = 'png', name: string | undefined) => {
14
+ (ids: TLShapeId[], opts: { format?: TLExportType; name?: string; scale?: number } = {}) => {
15
15
  assert(editor, 'useExportAs: editor is required')
16
+ const { format = 'png', name, scale = 1 } = opts
16
17
  exportAs(editor, ids, {
17
18
  format,
18
19
  name,
19
- scale: 1,
20
+ scale,
20
21
  }).catch((e) => {
21
22
  console.error(e.message)
22
23
  addToast({
@@ -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'
@@ -260,6 +261,7 @@ export type TLUiTranslationKey =
260
261
  | 'tool.aspect-ratio.wide'
261
262
  | 'tool.image-toolbar-title'
262
263
  | 'tool.image-crop'
264
+ | 'tool.image-crop-confirm'
263
265
  | 'tool.media-alt-text'
264
266
  | 'tool.media-alt-text-desc'
265
267
  | 'tool.media-alt-text-confirm'
@@ -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',
@@ -261,6 +262,7 @@ export const DEFAULT_TRANSLATION = {
261
262
  'tool.aspect-ratio.wide': 'Wide (16:9)',
262
263
  'tool.image-toolbar-title': 'Image tools',
263
264
  'tool.image-crop': 'Crop image',
265
+ 'tool.image-crop-confirm': 'Confirm',
264
266
  'tool.media-alt-text': 'Alternative text',
265
267
  'tool.media-alt-text-desc': 'Give a description…',
266
268
  'tool.media-alt-text-confirm': 'Confirm',
@@ -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.654b4007a087'
4
+ export const version = '3.16.0-canary.66da2a5c5813'
5
5
  export const publishDates = {
6
6
  major: '2024-09-13T14:36:29.063Z',
7
- minor: '2025-08-15T13:47:42.351Z',
8
- patch: '2025-08-15T13:47:42.351Z',
7
+ minor: '2025-09-02T14:51:14.201Z',
8
+ patch: '2025-09-02T14:51:14.201Z',
9
9
  }
package/src/lib/ui.css CHANGED
@@ -1007,9 +1007,23 @@
1007
1007
  flex-direction: column;
1008
1008
  }
1009
1009
 
1010
- .tlui-style-panel__section:nth-of-type(n + 2):not(:last-child) {
1010
+ /*
1011
+ add a border to the bottom of all but the last section. we have to handle empty sections too, which
1012
+ are hidden and shouldn't be counted
1013
+ */
1014
+ .tlui-style-panel__section:not(:nth-last-child(-n + 1 of .tlui-style-panel__section:not(:empty))) {
1011
1015
  border-bottom: 1px solid var(--tl-color-divider);
1012
1016
  }
1017
+ /*
1018
+ if a section ends with a slider and we're adding a border, we need some extra space for visual
1019
+ balance. we need to handle empty sections as above. is this the most complex css selector in all of
1020
+ tldraw? probably.
1021
+ */
1022
+ .tlui-style-panel__section:has(.tlui-slider__container:last-child):not(
1023
+ :nth-last-child(-n + 1 of .tlui-style-panel__section:not(:empty))
1024
+ ) {
1025
+ margin-bottom: 7px;
1026
+ }
1013
1027
 
1014
1028
  .tlui-style-panel__section:empty {
1015
1029
  display: none;
@@ -1021,7 +1035,7 @@
1021
1035
  }
1022
1036
 
1023
1037
  .tlui-style-panel__dropdown-picker:only-child {
1024
- width: 100%;
1038
+ flex: 1;
1025
1039
  }
1026
1040
 
1027
1041
  .tlui-style-panel__double-select-picker {
@@ -1047,6 +1061,9 @@
1047
1061
  }
1048
1062
 
1049
1063
  @media (hover: hover) {
1064
+ .tlui-style-panel .tlui-button[aria-expanded='true'] {
1065
+ background: none;
1066
+ }
1050
1067
  .tlui-style-panel .tlui-button[data-state='open']:not(:hover)::after {
1051
1068
  opacity: 1;
1052
1069
  background: linear-gradient(270deg, rgba(144, 144, 144, 0) 0%, var(--tl-color-muted-2) 100%);
@@ -31,30 +31,7 @@ export interface CopyAsOptions extends TLImageExportOptions {
31
31
  *
32
32
  * @public
33
33
  */
34
- export function copyAs(editor: Editor, ids: TLShapeId[], opts: CopyAsOptions): Promise<void>
35
- /**
36
- * @deprecated The format parameter is now part of the opts object.
37
- * @public
38
- */
39
- export function copyAs(
40
- editor: Editor,
41
- ids: TLShapeId[],
42
- format: TLCopyType,
43
- opts?: TLImageExportOptions & { format?: undefined }
44
- ): Promise<void>
45
- export function copyAs(
46
- ...args:
47
- | [editor: Editor, ids: TLShapeId[], opts: TLImageExportOptions & { format: TLCopyType }]
48
- | [
49
- editor: Editor,
50
- ids: TLShapeId[],
51
- format: TLCopyType,
52
- opts?: TLImageExportOptions & { format?: undefined },
53
- ]
54
- ) {
55
- const [editor, ids, opts] =
56
- typeof args[2] === 'string' ? [args[0], args[1], { ...args[3], format: args[2] }] : args
57
-
34
+ export function copyAs(editor: Editor, ids: TLShapeId[], opts: CopyAsOptions): Promise<void> {
58
35
  // Note: it's important that this function itself isn't async and doesn't really use promises -
59
36
  // we need to create the relevant `ClipboardItem`s and call navigator.clipboard.write
60
37
  // synchronously to make sure safari knows that the user _wants_ to copy See
@@ -1,7 +1,6 @@
1
1
  import {
2
2
  Editor,
3
3
  FileHelpers,
4
- TLExportType,
5
4
  TLImageExportOptions,
6
5
  TLShapeId,
7
6
  exhaustiveSwitchError,
@@ -35,41 +34,6 @@ export async function exportToString(
35
34
  }
36
35
  }
37
36
 
38
- /**
39
- * Export the given shapes as a blob.
40
- * @param editor - The editor instance.
41
- * @param ids - The ids of the shapes to export.
42
- * @param format - The format to export as.
43
- * @param opts - Rendering options.
44
- * @returns A promise that resolves to a blob.
45
- * @deprecated Use {@link @tldraw/editor#Editor.toImage} instead.
46
- * @public
47
- */
48
- export async function exportToBlob({
49
- editor,
50
- ids,
51
- format,
52
- opts = {},
53
- }: {
54
- editor: Editor
55
- ids: TLShapeId[]
56
- format: TLExportType
57
- opts?: TLImageExportOptions
58
- }): Promise<Blob> {
59
- const idsToUse = ids?.length ? ids : [...editor.getCurrentPageShapeIds()]
60
- switch (format) {
61
- case 'jpeg':
62
- case 'png':
63
- case 'webp':
64
- case 'svg': {
65
- return (await editor.toImage(idsToUse, { ...opts, format })).blob
66
- }
67
- default: {
68
- exhaustiveSwitchError(format)
69
- }
70
- }
71
- }
72
-
73
37
  const clipboardMimeTypesByFormat = {
74
38
  jpeg: 'image/jpeg',
75
39
  png: 'image/png',
@@ -28,38 +28,7 @@ export async function exportAs(
28
28
  editor: Editor,
29
29
  ids: TLShapeId[],
30
30
  opts: ExportAsOptions
31
- ): Promise<void>
32
- /**
33
- * @deprecated The format & name parameters are now part of the opts object.
34
- * @public
35
- */
36
- export async function exportAs(
37
- editor: Editor,
38
- ids: TLShapeId[],
39
- format?: TLExportType,
40
- name?: string,
41
- opts?: TLImageExportOptions
42
- ): Promise<void>
43
- export async function exportAs(
44
- ...args:
45
- | [
46
- editor: Editor,
47
- ids: TLShapeId[],
48
- opts: TLImageExportOptions & { format: TLExportType; name?: string },
49
- ]
50
- | [
51
- editor: Editor,
52
- ids: TLShapeId[],
53
- format?: TLExportType,
54
- name?: string,
55
- opts?: TLImageExportOptions,
56
- ]
57
- ) {
58
- const [editor, ids, opts] =
59
- typeof args[2] === 'object'
60
- ? args
61
- : [args[0], args[1], { ...args[4], format: args[2] ?? 'png', name: args[3] }]
62
-
31
+ ): Promise<void> {
63
32
  // If we don't get name then use a predefined one
64
33
  let name = opts.name
65
34
  if (!name) {