tldraw 4.1.0-canary.e653ec63c99b → 4.1.0-canary.f2f81cd6fe2c

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 (77) hide show
  1. package/dist-cjs/index.d.ts +17 -11
  2. package/dist-cjs/index.js +3 -1
  3. package/dist-cjs/index.js.map +2 -2
  4. package/dist-cjs/lib/defaultEmbedDefinitions.js +2 -25
  5. package/dist-cjs/lib/defaultEmbedDefinitions.js.map +2 -2
  6. package/dist-cjs/lib/defaultExternalContentHandlers.js +9 -32
  7. package/dist-cjs/lib/defaultExternalContentHandlers.js.map +2 -2
  8. package/dist-cjs/lib/shapes/arrow/ArrowShapeUtil.js +3 -0
  9. package/dist-cjs/lib/shapes/arrow/ArrowShapeUtil.js.map +2 -2
  10. package/dist-cjs/lib/shapes/bookmark/BookmarkShapeUtil.js +43 -101
  11. package/dist-cjs/lib/shapes/bookmark/BookmarkShapeUtil.js.map +2 -2
  12. package/dist-cjs/lib/shapes/bookmark/bookmarks.js +138 -0
  13. package/dist-cjs/lib/shapes/bookmark/bookmarks.js.map +7 -0
  14. package/dist-cjs/lib/shapes/embed/EmbedShapeUtil.js +25 -3
  15. package/dist-cjs/lib/shapes/embed/EmbedShapeUtil.js.map +2 -2
  16. package/dist-cjs/lib/shapes/line/LineShapeUtil.js +3 -0
  17. package/dist-cjs/lib/shapes/line/LineShapeUtil.js.map +2 -2
  18. package/dist-cjs/lib/tools/SelectTool/childStates/DraggingHandle.js +9 -1
  19. package/dist-cjs/lib/tools/SelectTool/childStates/DraggingHandle.js.map +2 -2
  20. package/dist-cjs/lib/ui/components/Minimap/MinimapManager.js +5 -0
  21. package/dist-cjs/lib/ui/components/Minimap/MinimapManager.js.map +2 -2
  22. package/dist-cjs/lib/ui/components/SharePanel/PeopleMenu.js +6 -2
  23. package/dist-cjs/lib/ui/components/SharePanel/PeopleMenu.js.map +2 -2
  24. package/dist-cjs/lib/ui/components/StylePanel/StylePanelButtonPicker.js +1 -1
  25. package/dist-cjs/lib/ui/components/StylePanel/StylePanelButtonPicker.js.map +1 -1
  26. package/dist-cjs/lib/ui/context/actions.js +23 -29
  27. package/dist-cjs/lib/ui/context/actions.js.map +2 -2
  28. package/dist-cjs/lib/ui/version.js +3 -3
  29. package/dist-cjs/lib/ui/version.js.map +1 -1
  30. package/dist-esm/index.d.mts +17 -11
  31. package/dist-esm/index.mjs +3 -1
  32. package/dist-esm/index.mjs.map +2 -2
  33. package/dist-esm/lib/defaultEmbedDefinitions.mjs +2 -25
  34. package/dist-esm/lib/defaultEmbedDefinitions.mjs.map +2 -2
  35. package/dist-esm/lib/defaultExternalContentHandlers.mjs +9 -32
  36. package/dist-esm/lib/defaultExternalContentHandlers.mjs.map +2 -2
  37. package/dist-esm/lib/shapes/arrow/ArrowShapeUtil.mjs +3 -0
  38. package/dist-esm/lib/shapes/arrow/ArrowShapeUtil.mjs.map +2 -2
  39. package/dist-esm/lib/shapes/bookmark/BookmarkShapeUtil.mjs +46 -101
  40. package/dist-esm/lib/shapes/bookmark/BookmarkShapeUtil.mjs.map +2 -2
  41. package/dist-esm/lib/shapes/bookmark/bookmarks.mjs +124 -0
  42. package/dist-esm/lib/shapes/bookmark/bookmarks.mjs.map +7 -0
  43. package/dist-esm/lib/shapes/embed/EmbedShapeUtil.mjs +26 -3
  44. package/dist-esm/lib/shapes/embed/EmbedShapeUtil.mjs.map +2 -2
  45. package/dist-esm/lib/shapes/line/LineShapeUtil.mjs +3 -0
  46. package/dist-esm/lib/shapes/line/LineShapeUtil.mjs.map +2 -2
  47. package/dist-esm/lib/tools/SelectTool/childStates/DraggingHandle.mjs +11 -2
  48. package/dist-esm/lib/tools/SelectTool/childStates/DraggingHandle.mjs.map +2 -2
  49. package/dist-esm/lib/ui/components/Minimap/MinimapManager.mjs +5 -0
  50. package/dist-esm/lib/ui/components/Minimap/MinimapManager.mjs.map +2 -2
  51. package/dist-esm/lib/ui/components/SharePanel/PeopleMenu.mjs +6 -2
  52. package/dist-esm/lib/ui/components/SharePanel/PeopleMenu.mjs.map +2 -2
  53. package/dist-esm/lib/ui/components/StylePanel/StylePanelButtonPicker.mjs +1 -1
  54. package/dist-esm/lib/ui/components/StylePanel/StylePanelButtonPicker.mjs.map +1 -1
  55. package/dist-esm/lib/ui/context/actions.mjs +23 -29
  56. package/dist-esm/lib/ui/context/actions.mjs.map +2 -2
  57. package/dist-esm/lib/ui/version.mjs +3 -3
  58. package/dist-esm/lib/ui/version.mjs.map +1 -1
  59. package/package.json +3 -3
  60. package/src/index.ts +1 -0
  61. package/src/lib/defaultEmbedDefinitions.ts +2 -25
  62. package/src/lib/defaultExternalContentHandlers.ts +11 -36
  63. package/src/lib/shapes/arrow/ArrowShapeUtil.tsx +3 -0
  64. package/src/lib/shapes/bookmark/BookmarkShapeUtil.tsx +51 -135
  65. package/src/lib/shapes/bookmark/bookmarks.ts +170 -0
  66. package/src/lib/shapes/embed/EmbedShapeUtil.tsx +28 -2
  67. package/src/lib/shapes/line/LineShapeUtil.tsx +3 -0
  68. package/src/lib/tools/SelectTool/childStates/DraggingHandle.tsx +13 -1
  69. package/src/lib/ui/components/Minimap/MinimapManager.ts +6 -0
  70. package/src/lib/ui/components/SharePanel/PeopleMenu.tsx +6 -2
  71. package/src/lib/ui/components/StylePanel/StylePanelButtonPicker.tsx +1 -1
  72. package/src/lib/ui/context/actions.tsx +27 -31
  73. package/src/lib/ui/version.ts +3 -3
  74. package/src/lib/utils/embeds/embeds.test.ts +16 -34
  75. package/src/test/bookmark-shapes.test.ts +129 -7
  76. package/src/test/customSnapping.test.tsx +55 -11
  77. package/tldraw.css +7 -2
@@ -31,6 +31,7 @@ import {
31
31
  toRichText,
32
32
  } from '@tldraw/editor'
33
33
  import { EmbedDefinition } from './defaultEmbedDefinitions'
34
+ import { createBookmarkFromUrl } from './shapes/bookmark/bookmarks'
34
35
  import { EmbedShapeUtil } from './shapes/embed/EmbedShapeUtil'
35
36
  import { getCroppedImageDataForReplacedImage } from './shapes/shared/crop'
36
37
  import { FONT_FAMILIES, FONT_SIZES, TEXT_PROPS } from './shapes/shared/default-shape-constants'
@@ -557,7 +558,7 @@ export async function defaultHandleExternalUrlContent(
557
558
  const embedUtil = editor.getShapeUtil('embed') as EmbedShapeUtil | undefined
558
559
  const embedInfo = embedUtil?.getEmbedDefinition(url)
559
560
 
560
- if (embedInfo && embedInfo.definition.embedOnPaste) {
561
+ if (embedInfo && embedInfo.definition.embedOnPaste !== false) {
561
562
  return editor.putExternalContent({
562
563
  type: 'embed',
563
564
  url: embedInfo.url,
@@ -572,42 +573,16 @@ export async function defaultHandleExternalUrlContent(
572
573
  ? editor.inputs.currentPagePoint
573
574
  : editor.getViewportPageBounds().center)
574
575
 
575
- const assetId: TLAssetId = AssetRecordType.createId(getHashForString(url))
576
- const shape = createEmptyBookmarkShape(editor, url, position)
577
-
578
- // Use an existing asset if we have one, or else else create a new one
579
- let asset = editor.getAsset(assetId) as TLAsset
580
- let shouldAlsoCreateAsset = false
581
- if (!asset) {
582
- shouldAlsoCreateAsset = true
583
- try {
584
- const bookmarkAsset = await editor.getAssetForExternalContent({ type: 'url', url })
585
- if (!bookmarkAsset) throw Error('Could not create an asset')
586
- asset = bookmarkAsset
587
- } catch {
588
- toasts.addToast({
589
- title: msg('assets.url.failed'),
590
- severity: 'error',
591
- })
592
- return
593
- }
594
- }
595
-
596
- editor.run(() => {
597
- if (shouldAlsoCreateAsset) {
598
- editor.createAssets([asset])
599
- }
576
+ // Use the new function to create the bookmark
577
+ const result = await createBookmarkFromUrl(editor, { url, center: position })
600
578
 
601
- editor.updateShapes([
602
- {
603
- id: shape.id,
604
- type: shape.type,
605
- props: {
606
- assetId: asset.id,
607
- },
608
- },
609
- ])
610
- })
579
+ if (!result.ok) {
580
+ toasts.addToast({
581
+ title: msg('assets.url.failed'),
582
+ severity: 'error',
583
+ })
584
+ return
585
+ }
611
586
  }
612
587
 
613
588
  /** @public */
@@ -144,6 +144,9 @@ export class ArrowShapeUtil extends ShapeUtil<TLArrowShape> {
144
144
  override hideSelectionBoundsFg() {
145
145
  return true
146
146
  }
147
+ override hideInMinimap() {
148
+ return true
149
+ }
147
150
 
148
151
  override canBeLaidOut(shape: TLArrowShape, info: TLShapeUtilCanBeLaidOutOpts) {
149
152
  if (info.type === 'flip') {
@@ -1,7 +1,5 @@
1
1
  import {
2
- AssetRecordType,
3
2
  BaseBoxShapeUtil,
4
- Editor,
5
3
  HTMLContainer,
6
4
  T,
7
5
  TLAssetId,
@@ -10,8 +8,6 @@ import {
10
8
  TLBookmarkShapeProps,
11
9
  bookmarkShapeMigrations,
12
10
  bookmarkShapeProps,
13
- debounce,
14
- getHashForString,
15
11
  lerp,
16
12
  tlenv,
17
13
  toDomPrecision,
@@ -24,11 +20,13 @@ import { convertCommonTitleHTMLEntities } from '../../utils/text/text'
24
20
  import { HyperlinkButton } from '../shared/HyperlinkButton'
25
21
  import { LINK_ICON } from '../shared/icons-editor'
26
22
  import { getRotatedBoxShadow } from '../shared/rotated-box-shadow'
27
-
28
- const BOOKMARK_WIDTH = 300
29
- const BOOKMARK_HEIGHT = 320
30
- const BOOKMARK_JUST_URL_HEIGHT = 46
31
- const SHORT_BOOKMARK_HEIGHT = 101
23
+ import {
24
+ BOOKMARK_HEIGHT,
25
+ BOOKMARK_WIDTH,
26
+ getHumanReadableAddress,
27
+ setBookmarkHeight,
28
+ updateBookmarkAssetOnUrlChange,
29
+ } from './bookmarks'
32
30
 
33
31
  /** @public */
34
32
  export class BookmarkShapeUtil extends BaseBoxShapeUtil<TLBookmarkShape> {
@@ -71,22 +69,18 @@ export class BookmarkShapeUtil extends BaseBoxShapeUtil<TLBookmarkShape> {
71
69
  }
72
70
 
73
71
  override component(shape: TLBookmarkShape) {
74
- return <BookmarkShapeComponent shape={shape} />
72
+ const { assetId, url, h } = shape.props
73
+ const rotation = this.editor.getShapePageTransform(shape)!.rotation()
74
+
75
+ return <BookmarkShapeComponent assetId={assetId} url={url} h={h} rotation={rotation} />
75
76
  }
76
77
 
77
78
  override indicator(shape: TLBookmarkShape) {
78
- return (
79
- <rect
80
- width={toDomPrecision(shape.props.w)}
81
- height={toDomPrecision(shape.props.h)}
82
- rx="6"
83
- ry="6"
84
- />
85
- )
79
+ return <BookmarkIndicatorComponent w={shape.props.w} h={shape.props.h} />
86
80
  }
87
81
 
88
82
  override onBeforeCreate(next: TLBookmarkShape) {
89
- return getBookmarkSize(this.editor, next)
83
+ return setBookmarkHeight(this.editor, next)
90
84
  }
91
85
 
92
86
  override onBeforeUpdate(prev: TLBookmarkShape, shape: TLBookmarkShape) {
@@ -99,7 +93,7 @@ export class BookmarkShapeUtil extends BaseBoxShapeUtil<TLBookmarkShape> {
99
93
  }
100
94
 
101
95
  if (prev.props.assetId !== shape.props.assetId) {
102
- return getBookmarkSize(this.editor, shape)
96
+ return setBookmarkHeight(this.editor, shape)
103
97
  }
104
98
  }
105
99
  override getInterpolatedProps(
@@ -115,18 +109,30 @@ export class BookmarkShapeUtil extends BaseBoxShapeUtil<TLBookmarkShape> {
115
109
  }
116
110
  }
117
111
 
118
- function BookmarkShapeComponent({ shape }: { shape: TLBookmarkShape }) {
112
+ export function BookmarkIndicatorComponent({ w, h }: { w: number; h: number }) {
113
+ return <rect width={toDomPrecision(w)} height={toDomPrecision(h)} rx="6" ry="6" />
114
+ }
115
+
116
+ export function BookmarkShapeComponent({
117
+ assetId,
118
+ rotation,
119
+ url,
120
+ h,
121
+ showImageContainer = true,
122
+ }: {
123
+ assetId: TLAssetId | null
124
+ rotation: number
125
+ h: number
126
+ url: string
127
+ showImageContainer?: boolean
128
+ }) {
119
129
  const editor = useEditor()
120
130
 
121
- const asset = (
122
- shape.props.assetId ? editor.getAsset(shape.props.assetId) : null
123
- ) as TLBookmarkAsset
131
+ const asset = assetId ? (editor.getAsset(assetId) as TLBookmarkAsset) : null
124
132
 
125
133
  const isSafariExport = !!useSvgExportContext() && tlenv.isSafari
126
134
 
127
- const pageRotation = editor.getShapePageTransform(shape)!.rotation()
128
-
129
- const address = getHumanReadableAddress(shape)
135
+ const address = getHumanReadableAddress(url)
130
136
 
131
137
  const [isFaviconValid, setIsFaviconValid] = useState(true)
132
138
  const onFaviconError = () => setIsFaviconValid(false)
@@ -146,11 +152,11 @@ function BookmarkShapeComponent({ shape }: { shape: TLBookmarkShape }) {
146
152
  isSafariExport && 'tl-bookmark__container--safariExport'
147
153
  )}
148
154
  style={{
149
- boxShadow: isSafariExport ? undefined : getRotatedBoxShadow(pageRotation),
150
- maxHeight: shape.props.h,
155
+ boxShadow: isSafariExport ? undefined : getRotatedBoxShadow(rotation),
156
+ maxHeight: h,
151
157
  }}
152
158
  >
153
- {(!asset || asset.props.image) && (
159
+ {showImageContainer && (!asset || asset.props.image) && (
154
160
  <div className="tl-bookmark__image_container">
155
161
  {asset ? (
156
162
  <img
@@ -163,21 +169,31 @@ function BookmarkShapeComponent({ shape }: { shape: TLBookmarkShape }) {
163
169
  ) : (
164
170
  <div className="tl-bookmark__placeholder" />
165
171
  )}
166
- {asset?.props.image && <HyperlinkButton url={shape.props.url} />}
172
+ {asset?.props.image && <HyperlinkButton url={url} />}
167
173
  </div>
168
174
  )}
169
175
  <div className="tl-bookmark__copy_container">
170
176
  {asset?.props.title ? (
171
- <h2 className="tl-bookmark__heading">
172
- {convertCommonTitleHTMLEntities(asset.props.title)}
173
- </h2>
177
+ <a
178
+ className="tl-bookmark__link"
179
+ href={url || ''}
180
+ target="_blank"
181
+ rel="noopener noreferrer"
182
+ draggable={false}
183
+ onPointerDown={markAsHandledOnShiftKey}
184
+ onPointerUp={markAsHandledOnShiftKey}
185
+ >
186
+ <h2 className="tl-bookmark__heading">
187
+ {convertCommonTitleHTMLEntities(asset.props.title)}
188
+ </h2>
189
+ </a>
174
190
  ) : null}
175
191
  {asset?.props.description && asset?.props.image ? (
176
192
  <p className="tl-bookmark__description">{asset.props.description}</p>
177
193
  ) : null}
178
194
  <a
179
195
  className="tl-bookmark__link"
180
- href={shape.props.url || ''}
196
+ href={url || ''}
181
197
  target="_blank"
182
198
  rel="noopener noreferrer"
183
199
  draggable={false}
@@ -208,103 +224,3 @@ function BookmarkShapeComponent({ shape }: { shape: TLBookmarkShape }) {
208
224
  </HTMLContainer>
209
225
  )
210
226
  }
211
-
212
- function getBookmarkSize(editor: Editor, shape: TLBookmarkShape) {
213
- const asset = (
214
- shape.props.assetId ? editor.getAsset(shape.props.assetId) : null
215
- ) as TLBookmarkAsset
216
-
217
- let h = BOOKMARK_HEIGHT
218
-
219
- if (asset) {
220
- if (!asset.props.image) {
221
- if (!asset.props.title) {
222
- h = BOOKMARK_JUST_URL_HEIGHT
223
- } else {
224
- h = SHORT_BOOKMARK_HEIGHT
225
- }
226
- }
227
- }
228
-
229
- return {
230
- ...shape,
231
- props: {
232
- ...shape.props,
233
- h,
234
- },
235
- }
236
- }
237
-
238
- /** @internal */
239
- export const getHumanReadableAddress = (shape: TLBookmarkShape) => {
240
- try {
241
- const url = new URL(shape.props.url)
242
- // we want the hostname without any www
243
- return url.hostname.replace(/^www\./, '')
244
- } catch {
245
- return shape.props.url
246
- }
247
- }
248
-
249
- function updateBookmarkAssetOnUrlChange(editor: Editor, shape: TLBookmarkShape) {
250
- const { url } = shape.props
251
-
252
- // Derive the asset id from the URL
253
- const assetId: TLAssetId = AssetRecordType.createId(getHashForString(url))
254
-
255
- if (editor.getAsset(assetId)) {
256
- // Existing asset for this URL?
257
- if (shape.props.assetId !== assetId) {
258
- editor.updateShapes<TLBookmarkShape>([
259
- {
260
- id: shape.id,
261
- type: shape.type,
262
- props: { assetId },
263
- },
264
- ])
265
- }
266
- } else {
267
- // No asset for this URL?
268
-
269
- // First, clear out the existing asset reference
270
- editor.updateShapes<TLBookmarkShape>([
271
- {
272
- id: shape.id,
273
- type: shape.type,
274
- props: { assetId: null },
275
- },
276
- ])
277
-
278
- // Then try to asyncronously create a new one
279
- createBookmarkAssetOnUrlChange(editor, shape)
280
- }
281
- }
282
-
283
- const createBookmarkAssetOnUrlChange = debounce(async (editor: Editor, shape: TLBookmarkShape) => {
284
- if (editor.isDisposed) return
285
-
286
- const { url } = shape.props
287
-
288
- // Create the asset using the external content manager's createAssetFromUrl method.
289
- // This may be overwritten by the user (for example, we overwrite it on tldraw.com)
290
- const asset = await editor.getAssetForExternalContent({ type: 'url', url })
291
-
292
- if (!asset) {
293
- // No asset? Just leave the bookmark as a null assetId.
294
- return
295
- }
296
-
297
- editor.run(() => {
298
- // Create the new asset
299
- editor.createAssets([asset])
300
-
301
- // And update the shape
302
- editor.updateShapes<TLBookmarkShape>([
303
- {
304
- id: shape.id,
305
- type: shape.type,
306
- props: { assetId: asset.id },
307
- },
308
- ])
309
- })
310
- }, 500)
@@ -0,0 +1,170 @@
1
+ import {
2
+ AssetRecordType,
3
+ Editor,
4
+ Result,
5
+ TLAssetId,
6
+ TLBookmarkAsset,
7
+ TLBookmarkShape,
8
+ TLShapePartial,
9
+ createShapeId,
10
+ debounce,
11
+ getHashForString,
12
+ } from '@tldraw/editor'
13
+
14
+ export const BOOKMARK_WIDTH = 300
15
+ export const BOOKMARK_HEIGHT = 320
16
+ export const BOOKMARK_JUST_URL_HEIGHT = 46
17
+ const SHORT_BOOKMARK_HEIGHT = 101
18
+
19
+ export function getBookmarkHeight(editor: Editor, assetId?: TLAssetId | null) {
20
+ const asset = (assetId ? editor.getAsset(assetId) : null) as TLBookmarkAsset | null
21
+
22
+ if (asset) {
23
+ if (!asset.props.image) {
24
+ if (!asset.props.title) {
25
+ return BOOKMARK_JUST_URL_HEIGHT
26
+ } else {
27
+ return SHORT_BOOKMARK_HEIGHT
28
+ }
29
+ }
30
+ }
31
+
32
+ return BOOKMARK_HEIGHT
33
+ }
34
+
35
+ export function setBookmarkHeight(editor: Editor, shape: TLBookmarkShape) {
36
+ return {
37
+ ...shape,
38
+ props: { ...shape.props, h: getBookmarkHeight(editor, shape.props.assetId) },
39
+ }
40
+ }
41
+
42
+ /** @internal */
43
+ export const getHumanReadableAddress = (url: string) => {
44
+ try {
45
+ const objUrl = new URL(url)
46
+ // we want the hostname without any www
47
+ return objUrl.hostname.replace(/^www\./, '')
48
+ } catch {
49
+ return url
50
+ }
51
+ }
52
+
53
+ export function updateBookmarkAssetOnUrlChange(editor: Editor, shape: TLBookmarkShape) {
54
+ const { url } = shape.props
55
+
56
+ // Derive the asset id from the URL
57
+ const assetId: TLAssetId = AssetRecordType.createId(getHashForString(url))
58
+
59
+ if (editor.getAsset(assetId)) {
60
+ // Existing asset for this URL?
61
+ if (shape.props.assetId !== assetId) {
62
+ editor.updateShapes<TLBookmarkShape>([
63
+ {
64
+ id: shape.id,
65
+ type: shape.type,
66
+ props: { assetId },
67
+ },
68
+ ])
69
+ }
70
+ } else {
71
+ // No asset for this URL?
72
+
73
+ // First, clear out the existing asset reference
74
+ editor.updateShapes<TLBookmarkShape>([
75
+ {
76
+ id: shape.id,
77
+ type: shape.type,
78
+ props: { assetId: null },
79
+ },
80
+ ])
81
+
82
+ // Then try to asyncronously create a new one
83
+ createBookmarkAssetOnUrlChange(editor, shape)
84
+ }
85
+ }
86
+
87
+ const createBookmarkAssetOnUrlChange = debounce(async (editor: Editor, shape: TLBookmarkShape) => {
88
+ if (editor.isDisposed) return
89
+
90
+ const { url } = shape.props
91
+
92
+ // Create the asset using the external content manager's createAssetFromUrl method.
93
+ // This may be overwritten by the user (for example, we overwrite it on tldraw.com)
94
+ const asset = await editor.getAssetForExternalContent({ type: 'url', url })
95
+
96
+ if (!asset) {
97
+ // No asset? Just leave the bookmark as a null assetId.
98
+ return
99
+ }
100
+
101
+ editor.run(() => {
102
+ // Create the new asset
103
+ editor.createAssets([asset])
104
+
105
+ // And update the shape
106
+ editor.updateShapes<TLBookmarkShape>([
107
+ {
108
+ id: shape.id,
109
+ type: shape.type,
110
+ props: { assetId: asset.id },
111
+ },
112
+ ])
113
+ })
114
+ }, 500)
115
+
116
+ /**
117
+ * Creates a bookmark shape from a URL with unfurled metadata.
118
+ *
119
+ * @returns A Result containing the created bookmark shape or an error
120
+ * @public
121
+ */
122
+
123
+ export async function createBookmarkFromUrl(
124
+ editor: Editor,
125
+ {
126
+ url,
127
+ center = editor.getViewportPageBounds().center,
128
+ }: {
129
+ url: string
130
+ center?: { x: number; y: number }
131
+ }
132
+ ): Promise<Result<TLBookmarkShape, string>> {
133
+ try {
134
+ // Create the bookmark asset with unfurled metadata
135
+ const asset = await editor.getAssetForExternalContent({ type: 'url', url })
136
+
137
+ // Create the bookmark shape
138
+ const shapeId = createShapeId()
139
+ const shapePartial: TLShapePartial<TLBookmarkShape> = {
140
+ id: shapeId,
141
+ type: 'bookmark',
142
+ x: center.x - BOOKMARK_WIDTH / 2,
143
+ y: center.y - BOOKMARK_HEIGHT / 2,
144
+ rotation: 0,
145
+ opacity: 1,
146
+ props: {
147
+ url,
148
+ assetId: asset?.id || null,
149
+ w: BOOKMARK_WIDTH,
150
+ h: getBookmarkHeight(editor, asset?.id),
151
+ },
152
+ }
153
+
154
+ editor.run(() => {
155
+ // Create the asset if we have one
156
+ if (asset) {
157
+ editor.createAssets([asset])
158
+ }
159
+
160
+ // Create the shape
161
+ editor.createShapes([shapePartial])
162
+ })
163
+
164
+ // Get the created shape
165
+ const createdShape = editor.getShape(shapeId) as TLBookmarkShape
166
+ return Result.ok(createdShape)
167
+ } catch (error) {
168
+ return Result.err(error instanceof Error ? error.message : 'Failed to create bookmark')
169
+ }
170
+ }
@@ -3,6 +3,7 @@
3
3
  import {
4
4
  BaseBoxShapeUtil,
5
5
  HTMLContainer,
6
+ Rectangle2d,
6
7
  TLEmbedShape,
7
8
  TLEmbedShapeProps,
8
9
  TLResizeInfo,
@@ -24,6 +25,8 @@ import {
24
25
  embedShapePermissionDefaults,
25
26
  } from '../../defaultEmbedDefinitions'
26
27
  import { TLEmbedResult, getEmbedInfo } from '../../utils/embeds/embeds'
28
+ import { BookmarkIndicatorComponent, BookmarkShapeComponent } from '../bookmark/BookmarkShapeUtil'
29
+ import { BOOKMARK_JUST_URL_HEIGHT, BOOKMARK_WIDTH } from '../bookmark/bookmarks'
27
30
  import { getRotatedBoxShadow } from '../shared/rotated-box-shadow'
28
31
 
29
32
  const getSandboxPermissions = (permissions: TLEmbedShapePermissions) => {
@@ -82,6 +85,18 @@ export class EmbedShapeUtil extends BaseBoxShapeUtil<TLEmbedShape> {
82
85
  }
83
86
  }
84
87
 
88
+ override getGeometry(shape: TLEmbedShape) {
89
+ const embedInfo = this.getEmbedDefinition(shape.props.url)
90
+ if (!embedInfo?.definition) {
91
+ return new Rectangle2d({
92
+ width: BOOKMARK_WIDTH,
93
+ height: BOOKMARK_JUST_URL_HEIGHT,
94
+ isFilled: true,
95
+ })
96
+ }
97
+ return super.getGeometry(shape)
98
+ }
99
+
85
100
  override isAspectRatioLocked(shape: TLEmbedShape) {
86
101
  const embedInfo = this.getEmbedDefinition(shape.props.url)
87
102
  return embedInfo?.definition.isAspectRatioLocked ?? false
@@ -206,20 +221,31 @@ export class EmbedShapeUtil extends BaseBoxShapeUtil<TLEmbedShape> {
206
221
  background: embedInfo?.definition.backgroundColor,
207
222
  }}
208
223
  />
209
- ) : null}
224
+ ) : (
225
+ <BookmarkShapeComponent
226
+ url={url}
227
+ h={h}
228
+ rotation={pageRotation}
229
+ assetId={null}
230
+ showImageContainer={false}
231
+ />
232
+ )}
210
233
  </HTMLContainer>
211
234
  )
212
235
  }
213
236
 
214
237
  override indicator(shape: TLEmbedShape) {
215
238
  const embedInfo = this.getEmbedDefinition(shape.props.url)
216
- return (
239
+
240
+ return embedInfo?.definition ? (
217
241
  <rect
218
242
  width={toDomPrecision(shape.props.w)}
219
243
  height={toDomPrecision(shape.props.h)}
220
244
  rx={embedInfo?.definition.overrideOutlineRadius ?? 8}
221
245
  ry={embedInfo?.definition.overrideOutlineRadius ?? 8}
222
246
  />
247
+ ) : (
248
+ <BookmarkIndicatorComponent w={BOOKMARK_WIDTH} h={BOOKMARK_JUST_URL_HEIGHT} />
223
249
  )
224
250
  }
225
251
  override getInterpolatedProps(
@@ -48,6 +48,9 @@ export class LineShapeUtil extends ShapeUtil<TLLineShape> {
48
48
  override hideSelectionBoundsBg() {
49
49
  return true
50
50
  }
51
+ override hideInMinimap() {
52
+ return true
53
+ }
51
54
 
52
55
  override getDefaultProps(): TLLineShape['props'] {
53
56
  const [start, end] = getIndices(2)
@@ -12,6 +12,7 @@ import {
12
12
  snapAngle,
13
13
  sortByIndex,
14
14
  structuredClone,
15
+ warnOnce,
15
16
  } from '@tldraw/editor'
16
17
  import { ArrowShapeUtil } from '../../../shapes/arrow/ArrowShapeUtil'
17
18
  import { clearArrowTargetState } from '../../../shapes/arrow/arrowTargetState'
@@ -294,7 +295,18 @@ export class DraggingHandle extends StateNode {
294
295
 
295
296
  let nextHandle = { ...initialHandle, x: point.x, y: point.y }
296
297
 
297
- if (initialHandle.canSnap && (isSnapMode ? !ctrlKey : ctrlKey)) {
298
+ let canSnap = false
299
+ // eslint-disable-next-line @typescript-eslint/no-deprecated
300
+ if (initialHandle.canSnap && initialHandle.snapType) {
301
+ warnOnce(
302
+ 'canSnap is deprecated. Cannot use both canSnap and snapType together - snapping disabled. Please use only snapType.'
303
+ )
304
+ } else {
305
+ // eslint-disable-next-line @typescript-eslint/no-deprecated
306
+ canSnap = initialHandle.canSnap || initialHandle.snapType !== undefined
307
+ }
308
+
309
+ if (canSnap && (isSnapMode ? !ctrlKey : ctrlKey)) {
298
310
  // We're snapping
299
311
  const pageTransform = editor.getShapePageTransform(shape.id)
300
312
  if (!pageTransform) throw Error('Expected a page transform')
@@ -249,6 +249,12 @@ export class MinimapManager {
249
249
 
250
250
  const len = geometry.length
251
251
 
252
+ const shape = this.editor.getShape(shapeId)
253
+ if (shape) {
254
+ const shapeUtil = this.editor.getShapeUtil(shape.type)
255
+ if (shapeUtil.hideInMinimap?.(shape)) continue
256
+ }
257
+
252
258
  if (selectedShapes.has(shapeId)) {
253
259
  appendVertices(this.gl.selectedShapes, selectedShapeOffset, geometry)
254
260
  selectedShapeOffset += len
@@ -1,6 +1,8 @@
1
1
  import { useContainer, useEditor, usePeerIds, useValue } from '@tldraw/editor'
2
2
  import { Popover as _Popover } from 'radix-ui'
3
3
  import { ReactNode } from 'react'
4
+ import { PORTRAIT_BREAKPOINT } from '../../constants'
5
+ import { useBreakpoint } from '../../context/breakpoints'
4
6
  import { useMenuIsOpen } from '../../hooks/useMenuIsOpen'
5
7
  import { useTranslation } from '../../hooks/useTranslation/useTranslation'
6
8
  import { PeopleMenuAvatar } from './PeopleMenuAvatar'
@@ -25,6 +27,8 @@ export function PeopleMenu({ children }: PeopleMenuProps) {
25
27
  const userName = useValue('user', () => editor.user.getName(), [editor])
26
28
 
27
29
  const [isOpen, onOpenChange] = useMenuIsOpen('people menu')
30
+ const breakpoint = useBreakpoint()
31
+ const maxAvatars = breakpoint <= PORTRAIT_BREAKPOINT.MOBILE_XS ? 1 : 5
28
32
 
29
33
  if (!userIds.length) return null
30
34
 
@@ -33,7 +37,7 @@ export function PeopleMenu({ children }: PeopleMenuProps) {
33
37
  <_Popover.Trigger dir="ltr" asChild>
34
38
  <button className="tlui-people-menu__avatars-button" title={msg('people-menu.title')}>
35
39
  <div className="tlui-people-menu__avatars">
36
- {userIds.slice(-5).map((userId) => (
40
+ {userIds.slice(-maxAvatars).map((userId) => (
37
41
  <PeopleMenuAvatar key={userId} userId={userId} />
38
42
  ))}
39
43
  {userIds.length > 0 && (
@@ -46,7 +50,7 @@ export function PeopleMenu({ children }: PeopleMenuProps) {
46
50
  {userName?.[0] ?? ''}
47
51
  </div>
48
52
  )}
49
- {userIds.length > 5 && <PeopleMenuMore count={userIds.length - 5} />}
53
+ {userIds.length > maxAvatars && <PeopleMenuMore count={userIds.length - maxAvatars} />}
50
54
  </div>
51
55
  </button>
52
56
  </_Popover.Trigger>
@@ -132,7 +132,7 @@ export const StylePanelButtonPicker = memo(function StylePanelButtonPicker<T ext
132
132
  <TldrawUiToolbarToggleGroup
133
133
  data-testid={`style.${uiType}`}
134
134
  type="single"
135
- value={value.type === 'shared' ? value.value : undefined}
135
+ value={value.type === 'shared' ? value.value : null}
136
136
  asChild
137
137
  >
138
138
  <Layout>