@tldraw/editor 4.6.0-internal.e29318c66fb0 → 4.6.0-next.0c36db38afea
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.
- package/dist-cjs/index.d.ts +184 -24
- package/dist-cjs/index.js +5 -4
- package/dist-cjs/index.js.map +2 -2
- package/dist-cjs/lib/TldrawEditor.js +4 -2
- package/dist-cjs/lib/TldrawEditor.js.map +2 -2
- package/dist-cjs/lib/components/default-components/DefaultCanvas.js +1 -1
- package/dist-cjs/lib/components/default-components/DefaultCanvas.js.map +2 -2
- package/dist-cjs/lib/components/default-components/DefaultCollaboratorHint.js +1 -1
- package/dist-cjs/lib/components/default-components/DefaultCollaboratorHint.js.map +2 -2
- package/dist-cjs/lib/config/{createTLUser.js → createTLCurrentUser.js} +9 -9
- package/dist-cjs/lib/config/createTLCurrentUser.js.map +7 -0
- package/dist-cjs/lib/config/createTLStore.js +24 -1
- package/dist-cjs/lib/config/createTLStore.js.map +2 -2
- package/dist-cjs/lib/config/defaultShapes.js.map +2 -2
- package/dist-cjs/lib/editor/Editor.js +115 -8
- package/dist-cjs/lib/editor/Editor.js.map +3 -3
- package/dist-cjs/lib/editor/managers/EdgeScrollManager/EdgeScrollManager.js +1 -1
- package/dist-cjs/lib/editor/managers/EdgeScrollManager/EdgeScrollManager.js.map +2 -2
- package/dist-cjs/lib/editor/managers/SnapManager/BoundsSnaps.js +1 -1
- package/dist-cjs/lib/editor/managers/SnapManager/BoundsSnaps.js.map +2 -2
- package/dist-cjs/lib/editor/managers/SnapManager/HandleSnaps.js.map +2 -2
- package/dist-cjs/lib/editor/managers/SpatialIndexManager/SpatialIndexManager.js +4 -4
- package/dist-cjs/lib/editor/managers/SpatialIndexManager/SpatialIndexManager.js.map +2 -2
- package/dist-cjs/lib/editor/managers/TextManager/TextManager.js +102 -30
- package/dist-cjs/lib/editor/managers/TextManager/TextManager.js.map +2 -2
- package/dist-cjs/lib/editor/managers/UserPreferencesManager/UserPreferencesManager.js.map +2 -2
- package/dist-cjs/lib/editor/shapes/ShapeUtil.js +10 -0
- package/dist-cjs/lib/editor/shapes/ShapeUtil.js.map +2 -2
- package/dist-cjs/lib/editor/types/clipboard-types.js.map +1 -1
- package/dist-cjs/lib/exports/StyleEmbedder.js +1 -1
- package/dist-cjs/lib/exports/StyleEmbedder.js.map +2 -2
- package/dist-cjs/lib/exports/getSvgJsx.js.map +2 -2
- package/dist-cjs/lib/hooks/useEditorComponents.js.map +2 -2
- package/dist-cjs/lib/hooks/useGestureEvents.js +171 -127
- package/dist-cjs/lib/hooks/useGestureEvents.js.map +3 -3
- package/dist-cjs/lib/hooks/useLocalStore.js.map +2 -2
- package/dist-cjs/lib/options.js +3 -0
- package/dist-cjs/lib/options.js.map +2 -2
- package/dist-cjs/lib/primitives/Box.js +1 -1
- package/dist-cjs/lib/primitives/Box.js.map +2 -2
- package/dist-cjs/lib/primitives/geometry/Arc2d.js +2 -2
- package/dist-cjs/lib/primitives/geometry/Arc2d.js.map +2 -2
- package/dist-cjs/lib/primitives/geometry/Circle2d.js +2 -2
- package/dist-cjs/lib/primitives/geometry/Circle2d.js.map +2 -2
- package/dist-cjs/lib/primitives/geometry/Ellipse2d.js +2 -2
- package/dist-cjs/lib/primitives/geometry/Ellipse2d.js.map +2 -2
- package/dist-cjs/lib/primitives/geometry/Geometry2d.js +4 -3
- package/dist-cjs/lib/primitives/geometry/Geometry2d.js.map +2 -2
- package/dist-cjs/lib/primitives/geometry/Polyline2d.js +1 -1
- package/dist-cjs/lib/primitives/geometry/Polyline2d.js.map +2 -2
- package/dist-cjs/lib/primitives/geometry/Stadium2d.js +1 -1
- package/dist-cjs/lib/primitives/geometry/Stadium2d.js.map +2 -2
- package/dist-cjs/lib/utils/getSvgPathFromPoints.js.map +2 -2
- package/dist-cjs/lib/utils/sync/TLLocalSyncClient.js +1 -1
- package/dist-cjs/lib/utils/sync/TLLocalSyncClient.js.map +2 -2
- package/dist-cjs/version.js +3 -3
- package/dist-cjs/version.js.map +1 -1
- package/dist-esm/index.d.mts +184 -24
- package/dist-esm/index.mjs +12 -5
- package/dist-esm/index.mjs.map +2 -2
- package/dist-esm/lib/TldrawEditor.mjs +4 -2
- package/dist-esm/lib/TldrawEditor.mjs.map +2 -2
- package/dist-esm/lib/components/default-components/DefaultCanvas.mjs +1 -1
- package/dist-esm/lib/components/default-components/DefaultCanvas.mjs.map +2 -2
- package/dist-esm/lib/components/default-components/DefaultCollaboratorHint.mjs +1 -1
- package/dist-esm/lib/components/default-components/DefaultCollaboratorHint.mjs.map +2 -2
- package/dist-esm/lib/config/{createTLUser.mjs → createTLCurrentUser.mjs} +6 -6
- package/dist-esm/lib/config/createTLCurrentUser.mjs.map +7 -0
- package/dist-esm/lib/config/createTLStore.mjs +28 -2
- package/dist-esm/lib/config/createTLStore.mjs.map +2 -2
- package/dist-esm/lib/config/defaultShapes.mjs.map +2 -2
- package/dist-esm/lib/editor/Editor.mjs +118 -9
- package/dist-esm/lib/editor/Editor.mjs.map +3 -3
- package/dist-esm/lib/editor/managers/EdgeScrollManager/EdgeScrollManager.mjs +1 -1
- package/dist-esm/lib/editor/managers/EdgeScrollManager/EdgeScrollManager.mjs.map +2 -2
- package/dist-esm/lib/editor/managers/SnapManager/BoundsSnaps.mjs +1 -1
- package/dist-esm/lib/editor/managers/SnapManager/BoundsSnaps.mjs.map +2 -2
- package/dist-esm/lib/editor/managers/SnapManager/HandleSnaps.mjs.map +2 -2
- package/dist-esm/lib/editor/managers/SpatialIndexManager/SpatialIndexManager.mjs +4 -4
- package/dist-esm/lib/editor/managers/SpatialIndexManager/SpatialIndexManager.mjs.map +2 -2
- package/dist-esm/lib/editor/managers/TextManager/TextManager.mjs +102 -30
- package/dist-esm/lib/editor/managers/TextManager/TextManager.mjs.map +2 -2
- package/dist-esm/lib/editor/managers/UserPreferencesManager/UserPreferencesManager.mjs.map +2 -2
- package/dist-esm/lib/editor/shapes/ShapeUtil.mjs +10 -0
- package/dist-esm/lib/editor/shapes/ShapeUtil.mjs.map +2 -2
- package/dist-esm/lib/exports/StyleEmbedder.mjs +1 -1
- package/dist-esm/lib/exports/StyleEmbedder.mjs.map +2 -2
- package/dist-esm/lib/exports/getSvgJsx.mjs.map +2 -2
- package/dist-esm/lib/hooks/useEditorComponents.mjs.map +2 -2
- package/dist-esm/lib/hooks/useGestureEvents.mjs +171 -127
- package/dist-esm/lib/hooks/useGestureEvents.mjs.map +3 -3
- package/dist-esm/lib/hooks/useLocalStore.mjs.map +2 -2
- package/dist-esm/lib/options.mjs +3 -0
- package/dist-esm/lib/options.mjs.map +2 -2
- package/dist-esm/lib/primitives/Box.mjs +1 -1
- package/dist-esm/lib/primitives/Box.mjs.map +2 -2
- package/dist-esm/lib/primitives/geometry/Arc2d.mjs +2 -2
- package/dist-esm/lib/primitives/geometry/Arc2d.mjs.map +2 -2
- package/dist-esm/lib/primitives/geometry/Circle2d.mjs +2 -2
- package/dist-esm/lib/primitives/geometry/Circle2d.mjs.map +2 -2
- package/dist-esm/lib/primitives/geometry/Ellipse2d.mjs +2 -2
- package/dist-esm/lib/primitives/geometry/Ellipse2d.mjs.map +2 -2
- package/dist-esm/lib/primitives/geometry/Geometry2d.mjs +4 -3
- package/dist-esm/lib/primitives/geometry/Geometry2d.mjs.map +2 -2
- package/dist-esm/lib/primitives/geometry/Polyline2d.mjs +1 -1
- package/dist-esm/lib/primitives/geometry/Polyline2d.mjs.map +2 -2
- package/dist-esm/lib/primitives/geometry/Stadium2d.mjs +1 -1
- package/dist-esm/lib/primitives/geometry/Stadium2d.mjs.map +2 -2
- package/dist-esm/lib/utils/getSvgPathFromPoints.mjs.map +2 -2
- package/dist-esm/lib/utils/sync/TLLocalSyncClient.mjs +1 -1
- package/dist-esm/lib/utils/sync/TLLocalSyncClient.mjs.map +2 -2
- package/dist-esm/version.mjs +3 -3
- package/dist-esm/version.mjs.map +1 -1
- package/editor.css +13 -0
- package/package.json +8 -9
- package/src/index.ts +14 -2
- package/src/lib/TldrawEditor.tsx +9 -7
- package/src/lib/components/default-components/DefaultCanvas.tsx +1 -1
- package/src/lib/components/default-components/DefaultCollaboratorHint.tsx +1 -1
- package/src/lib/config/TLEditorSnapshot.test.ts +1 -1
- package/src/lib/config/{createTLUser.ts → createTLCurrentUser.ts} +6 -6
- package/src/lib/config/createTLStore.ts +36 -2
- package/src/lib/config/defaultShapes.ts +1 -1
- package/src/lib/editor/Editor.ts +148 -10
- package/src/lib/editor/managers/EdgeScrollManager/EdgeScrollManager.ts +1 -1
- package/src/lib/editor/managers/SnapManager/BoundsSnaps.ts +1 -1
- package/src/lib/editor/managers/SnapManager/HandleSnaps.ts +1 -1
- package/src/lib/editor/managers/SpatialIndexManager/SpatialIndexManager.ts +5 -5
- package/src/lib/editor/managers/TextManager/TextManager.test.ts +18 -4
- package/src/lib/editor/managers/TextManager/TextManager.ts +140 -34
- package/src/lib/editor/managers/UserPreferencesManager/UserPreferencesManager.test.ts +2 -2
- package/src/lib/editor/managers/UserPreferencesManager/UserPreferencesManager.ts +2 -2
- package/src/lib/editor/shapes/ShapeUtil.ts +13 -2
- package/src/lib/editor/types/clipboard-types.ts +2 -1
- package/src/lib/exports/StyleEmbedder.ts +1 -1
- package/src/lib/exports/getSvgJsx.tsx +1 -1
- package/src/lib/hooks/useEditorComponents.tsx +1 -1
- package/src/lib/hooks/useGestureEvents.ts +240 -168
- package/src/lib/hooks/useLocalStore.ts +1 -1
- package/src/lib/options.ts +108 -0
- package/src/lib/primitives/Box.test.ts +30 -0
- package/src/lib/primitives/Box.ts +1 -1
- package/src/lib/primitives/geometry/Arc2d.ts +2 -2
- package/src/lib/primitives/geometry/Circle2d.ts +2 -2
- package/src/lib/primitives/geometry/Ellipse2d.ts +2 -2
- package/src/lib/primitives/geometry/Geometry2d.test.ts +21 -0
- package/src/lib/primitives/geometry/Geometry2d.ts +4 -3
- package/src/lib/primitives/geometry/Polyline2d.ts +1 -1
- package/src/lib/primitives/geometry/Stadium2d.ts +1 -1
- package/src/lib/utils/getSvgPathFromPoints.ts +1 -1
- package/src/lib/utils/sync/TLLocalSyncClient.test.ts +1 -1
- package/src/lib/utils/sync/TLLocalSyncClient.ts +1 -1
- package/src/version.ts +3 -3
- package/dist-cjs/lib/config/createTLUser.js.map +0 -7
- package/dist-esm/lib/config/createTLUser.mjs.map +0 -7
|
@@ -21,6 +21,23 @@ const textAlignmentsForLtr = {
|
|
|
21
21
|
'end-legacy': 'right',
|
|
22
22
|
}
|
|
23
23
|
|
|
24
|
+
interface PoolItem {
|
|
25
|
+
el: HTMLDivElement
|
|
26
|
+
html: string
|
|
27
|
+
appliedStyleKeys: string[]
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
/** @public */
|
|
31
|
+
export interface BatchMeasurementRequest {
|
|
32
|
+
html: string
|
|
33
|
+
opts: TLMeasureTextOpts
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
/** @public */
|
|
37
|
+
export type TLMeasuredTextSize = BoxModel & {
|
|
38
|
+
scrollWidth: number
|
|
39
|
+
}
|
|
40
|
+
|
|
24
41
|
/** @public */
|
|
25
42
|
export interface TLMeasureTextOpts {
|
|
26
43
|
fontStyle: string
|
|
@@ -73,53 +90,66 @@ const initialDefaultStyles = Object.freeze({
|
|
|
73
90
|
/** @public */
|
|
74
91
|
export class TextManager {
|
|
75
92
|
private elm: HTMLDivElement
|
|
93
|
+
private poolElms: PoolItem[] = []
|
|
76
94
|
|
|
77
95
|
constructor(public editor: Editor) {
|
|
78
|
-
|
|
96
|
+
this.elm = this.createMeasurementEl()
|
|
97
|
+
this.editor.getContainer().appendChild(this.elm)
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
private createMeasurementEl(): HTMLDivElement {
|
|
101
|
+
const elm = this.editor.getContainerDocument().createElement('div')
|
|
79
102
|
elm.classList.add('tl-text')
|
|
80
103
|
elm.classList.add('tl-text-measure')
|
|
81
104
|
elm.setAttribute('dir', 'auto')
|
|
82
105
|
elm.tabIndex = -1
|
|
83
|
-
this.editor.getContainer().appendChild(elm)
|
|
84
|
-
|
|
85
|
-
this.elm = elm
|
|
86
|
-
|
|
87
106
|
for (const key of objectMapKeys(initialDefaultStyles)) {
|
|
88
107
|
elm.style.setProperty(key, initialDefaultStyles[key])
|
|
89
108
|
}
|
|
109
|
+
|
|
110
|
+
return elm
|
|
90
111
|
}
|
|
91
112
|
|
|
92
|
-
private
|
|
93
|
-
const
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
stylesToReinstate[key] = oldValue
|
|
99
|
-
this.elm.style.setProperty(key, styles[key])
|
|
100
|
-
}
|
|
101
|
-
}
|
|
102
|
-
return () => {
|
|
103
|
-
for (const key of objectMapKeys(stylesToReinstate)) {
|
|
104
|
-
this.elm.style.setProperty(key, stylesToReinstate[key])
|
|
113
|
+
private resetElementStyles(el: HTMLElement, appliedStyleKeys: string[]) {
|
|
114
|
+
for (const key of appliedStyleKeys) {
|
|
115
|
+
if (key in initialDefaultStyles) {
|
|
116
|
+
el.style.setProperty(key, initialDefaultStyles[key as keyof typeof initialDefaultStyles])
|
|
117
|
+
} else {
|
|
118
|
+
el.style.removeProperty(key)
|
|
105
119
|
}
|
|
106
120
|
}
|
|
107
121
|
}
|
|
108
122
|
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
123
|
+
private setElementStyles(el: HTMLElement, styles: Record<string, string | undefined | null>) {
|
|
124
|
+
type StyleValue = string | null
|
|
125
|
+
type RestoreEntry = [prop: string, value: StyleValue]
|
|
112
126
|
|
|
113
|
-
|
|
114
|
-
const div = this.editor.getContainerDocument().createElement('div')
|
|
115
|
-
div.textContent = normalizeTextForDom(textToMeasure)
|
|
116
|
-
return this.measureHtml(div.innerHTML, opts)
|
|
117
|
-
}
|
|
127
|
+
const restore: RestoreEntry[] = []
|
|
118
128
|
|
|
119
|
-
|
|
120
|
-
|
|
129
|
+
for (const [key, nextValue] of Object.entries(styles)) {
|
|
130
|
+
const oldValue = el.style.getPropertyValue(key)
|
|
121
131
|
|
|
122
|
-
|
|
132
|
+
if (typeof nextValue === 'string') {
|
|
133
|
+
if (oldValue === nextValue) continue
|
|
134
|
+
restore.push([key, oldValue || null])
|
|
135
|
+
el.style.setProperty(key, nextValue)
|
|
136
|
+
} else {
|
|
137
|
+
if (!oldValue) continue
|
|
138
|
+
restore.push([key, oldValue])
|
|
139
|
+
el.style.removeProperty(key)
|
|
140
|
+
}
|
|
141
|
+
}
|
|
142
|
+
|
|
143
|
+
return () => {
|
|
144
|
+
for (const [key, value] of restore) {
|
|
145
|
+
if (value === null || value === '') el.style.removeProperty(key)
|
|
146
|
+
else el.style.setProperty(key, value)
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
}
|
|
150
|
+
|
|
151
|
+
private getMeasureStyles(opts: TLMeasureTextOpts): Record<string, string | undefined> {
|
|
152
|
+
return {
|
|
123
153
|
'font-family': opts.fontFamily,
|
|
124
154
|
'font-style': opts.fontStyle,
|
|
125
155
|
'font-weight': opts.fontWeight,
|
|
@@ -128,11 +158,87 @@ export class TextManager {
|
|
|
128
158
|
padding: opts.padding,
|
|
129
159
|
'max-width': opts.maxWidth ? opts.maxWidth + 'px' : undefined,
|
|
130
160
|
'min-width': opts.minWidth ? opts.minWidth + 'px' : undefined,
|
|
131
|
-
'overflow-wrap': opts.disableOverflowWrapBreaking ? 'normal' :
|
|
161
|
+
'overflow-wrap': opts.disableOverflowWrapBreaking ? 'normal' : 'break-word',
|
|
132
162
|
...opts.otherStyles,
|
|
133
163
|
}
|
|
164
|
+
}
|
|
165
|
+
|
|
166
|
+
dispose() {
|
|
167
|
+
this.elm.remove()
|
|
168
|
+
for (const { el } of this.poolElms) {
|
|
169
|
+
el.remove()
|
|
170
|
+
}
|
|
171
|
+
this.poolElms.length = 0
|
|
172
|
+
}
|
|
173
|
+
|
|
174
|
+
private ensurePoolSize(size: number) {
|
|
175
|
+
if (this.poolElms.length >= size) return
|
|
176
|
+
|
|
177
|
+
const fragment = this.editor.getContainerDocument().createDocumentFragment()
|
|
178
|
+
while (this.poolElms.length < size) {
|
|
179
|
+
const el = this.createMeasurementEl()
|
|
180
|
+
this.poolElms.push({ el, html: '', appliedStyleKeys: [] })
|
|
181
|
+
fragment.appendChild(el)
|
|
182
|
+
}
|
|
183
|
+
this.editor.getContainer().appendChild(fragment)
|
|
184
|
+
}
|
|
185
|
+
|
|
186
|
+
private getPoolItem(index: number): PoolItem {
|
|
187
|
+
this.ensurePoolSize(index + 1)
|
|
188
|
+
return this.poolElms[index]
|
|
189
|
+
}
|
|
190
|
+
|
|
191
|
+
measureHtmlBatch(requests: BatchMeasurementRequest[]): TLMeasuredTextSize[] {
|
|
192
|
+
if (requests.length === 0) return []
|
|
193
|
+
|
|
194
|
+
while (this.poolElms.length > requests.length) {
|
|
195
|
+
const { el } = this.poolElms.pop()!
|
|
196
|
+
el.remove()
|
|
197
|
+
}
|
|
198
|
+
|
|
199
|
+
for (let i = 0; i < requests.length; i++) {
|
|
200
|
+
const { html, opts } = requests[i]
|
|
201
|
+
const poolItem = this.getPoolItem(i)
|
|
202
|
+
|
|
203
|
+
const { el } = poolItem
|
|
204
|
+
this.resetElementStyles(el, poolItem.appliedStyleKeys)
|
|
205
|
+
const styles = this.getMeasureStyles(opts)
|
|
206
|
+
this.setElementStyles(el, styles)
|
|
207
|
+
poolItem.appliedStyleKeys = Object.keys(styles)
|
|
208
|
+
// Skip innerHTML parsing if the content hasn't changed
|
|
209
|
+
if (poolItem.html !== html) {
|
|
210
|
+
el.innerHTML = html
|
|
211
|
+
poolItem.html = html
|
|
212
|
+
}
|
|
213
|
+
}
|
|
214
|
+
|
|
215
|
+
const results: TLMeasuredTextSize[] = []
|
|
216
|
+
for (let i = 0; i < requests.length; i++) {
|
|
217
|
+
const el = this.getPoolItem(i).el
|
|
218
|
+
const scrollWidth = requests[i].opts.measureScrollWidth ? el.scrollWidth : 0
|
|
219
|
+
const rect = el.getBoundingClientRect()
|
|
220
|
+
results.push({
|
|
221
|
+
x: 0,
|
|
222
|
+
y: 0,
|
|
223
|
+
w: rect.width,
|
|
224
|
+
h: rect.height,
|
|
225
|
+
scrollWidth,
|
|
226
|
+
})
|
|
227
|
+
}
|
|
228
|
+
|
|
229
|
+
return results
|
|
230
|
+
}
|
|
231
|
+
|
|
232
|
+
measureText(textToMeasure: string, opts: TLMeasureTextOpts): TLMeasuredTextSize {
|
|
233
|
+
const div = this.editor.getContainerDocument().createElement('div')
|
|
234
|
+
div.textContent = normalizeTextForDom(textToMeasure)
|
|
235
|
+
return this.measureHtml(div.innerHTML, opts)
|
|
236
|
+
}
|
|
237
|
+
|
|
238
|
+
measureHtml(html: string, opts: TLMeasureTextOpts): TLMeasuredTextSize {
|
|
239
|
+
const { elm } = this
|
|
134
240
|
|
|
135
|
-
const restoreStyles = this.setElementStyles(
|
|
241
|
+
const restoreStyles = this.setElementStyles(elm, this.getMeasureStyles(opts))
|
|
136
242
|
|
|
137
243
|
try {
|
|
138
244
|
elm.innerHTML = html
|
|
@@ -280,11 +386,11 @@ export class TextManager {
|
|
|
280
386
|
width: `${elementWidth}px`,
|
|
281
387
|
height: 'min-content',
|
|
282
388
|
'text-align': textAlignmentsForLtr[opts.textAlign],
|
|
283
|
-
'overflow-wrap': shouldTruncateToFirstLine ? 'anywhere' :
|
|
284
|
-
'word-break': shouldTruncateToFirstLine ? 'break-all' :
|
|
389
|
+
'overflow-wrap': shouldTruncateToFirstLine ? 'anywhere' : 'break-word',
|
|
390
|
+
'word-break': shouldTruncateToFirstLine ? 'break-all' : 'normal',
|
|
285
391
|
...opts.otherStyles,
|
|
286
392
|
}
|
|
287
|
-
const restoreStyles = this.setElementStyles(newStyles)
|
|
393
|
+
const restoreStyles = this.setElementStyles(elm, newStyles)
|
|
288
394
|
|
|
289
395
|
try {
|
|
290
396
|
const normalizedText = normalizeTextForDom(textToMeasure)
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { atom } from '@tldraw/state'
|
|
2
2
|
import { Mocked, vi } from 'vitest'
|
|
3
|
+
import { TLCurrentUser } from '../../../config/createTLCurrentUser'
|
|
3
4
|
import { TLUserPreferences, defaultUserPreferences } from '../../../config/TLUserPreferences'
|
|
4
|
-
import { TLUser } from '../../../config/createTLUser'
|
|
5
5
|
import { UserPreferencesManager } from './UserPreferencesManager'
|
|
6
6
|
|
|
7
7
|
// Mock window.matchMedia
|
|
@@ -9,7 +9,7 @@ const mockMatchMedia = vi.fn()
|
|
|
9
9
|
window.matchMedia = mockMatchMedia
|
|
10
10
|
|
|
11
11
|
describe('UserPreferencesManager', () => {
|
|
12
|
-
let mockUser: Mocked<
|
|
12
|
+
let mockUser: Mocked<TLCurrentUser>
|
|
13
13
|
let mockUserPreferences: TLUserPreferences
|
|
14
14
|
let userPreferencesAtom: any
|
|
15
15
|
let userPreferencesManager: UserPreferencesManager
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { atom, computed } from '@tldraw/state'
|
|
2
|
+
import { TLCurrentUser } from '../../../config/createTLCurrentUser'
|
|
2
3
|
import { TLUserPreferences, defaultUserPreferences } from '../../../config/TLUserPreferences'
|
|
3
|
-
import { TLUser } from '../../../config/createTLUser'
|
|
4
4
|
import { getGlobalWindow } from '../../../utils/dom'
|
|
5
5
|
|
|
6
6
|
/** @public */
|
|
@@ -11,7 +11,7 @@ export class UserPreferencesManager {
|
|
|
11
11
|
this.disposables.forEach((d) => d())
|
|
12
12
|
}
|
|
13
13
|
constructor(
|
|
14
|
-
private readonly user:
|
|
14
|
+
private readonly user: TLCurrentUser,
|
|
15
15
|
private readonly inferDarkMode: boolean
|
|
16
16
|
) {
|
|
17
17
|
if (typeof window === 'undefined' || !getGlobalWindow().matchMedia) return
|
|
@@ -15,15 +15,15 @@ import {
|
|
|
15
15
|
import { IndexKey } from '@tldraw/utils'
|
|
16
16
|
import { ReactElement } from 'react'
|
|
17
17
|
import { Box, SelectionHandle } from '../../primitives/Box'
|
|
18
|
-
import { Vec } from '../../primitives/Vec'
|
|
19
18
|
import { Geometry2d } from '../../primitives/geometry/Geometry2d'
|
|
19
|
+
import { Vec } from '../../primitives/Vec'
|
|
20
20
|
import type { Editor } from '../Editor'
|
|
21
21
|
import { TLFontFace } from '../managers/FontManager/FontManager'
|
|
22
22
|
import { BoundsSnapGeometry } from '../managers/SnapManager/BoundsSnaps'
|
|
23
23
|
import { HandleSnapGeometry } from '../managers/SnapManager/HandleSnaps'
|
|
24
|
-
import { SvgExportContext } from '../types/SvgExportContext'
|
|
25
24
|
import { TLClickEventInfo } from '../types/event-types'
|
|
26
25
|
import { TLResizeHandle } from '../types/selection-types'
|
|
26
|
+
import { SvgExportContext } from '../types/SvgExportContext'
|
|
27
27
|
|
|
28
28
|
/** @public */
|
|
29
29
|
export interface TLShapeUtilConstructor<T extends TLShape, U extends ShapeUtil<T> = ShapeUtil<T>> {
|
|
@@ -590,6 +590,17 @@ export abstract class ShapeUtil<Shape extends TLShape = TLShape> {
|
|
|
590
590
|
return undefined
|
|
591
591
|
}
|
|
592
592
|
|
|
593
|
+
/**
|
|
594
|
+
* Return user IDs referenced in shape-specific props.
|
|
595
|
+
* Used when copying shapes to include referenced users on the clipboard.
|
|
596
|
+
* Override this if your shape stores user IDs in custom props.
|
|
597
|
+
*
|
|
598
|
+
* @public
|
|
599
|
+
*/
|
|
600
|
+
getReferencedUserIds(shape: Shape): string[] {
|
|
601
|
+
return EMPTY_ARRAY
|
|
602
|
+
}
|
|
603
|
+
|
|
593
604
|
getAriaDescriptor(shape: Shape): string | undefined {
|
|
594
605
|
return undefined
|
|
595
606
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { SerializedSchema } from '@tldraw/store'
|
|
2
|
-
import { TLAsset, TLBinding, TLShape, TLShapeId } from '@tldraw/tlschema'
|
|
2
|
+
import { TLAsset, TLBinding, TLShape, TLShapeId, TLUser } from '@tldraw/tlschema'
|
|
3
3
|
|
|
4
4
|
/** @public */
|
|
5
5
|
export interface TLContent {
|
|
@@ -8,4 +8,5 @@ export interface TLContent {
|
|
|
8
8
|
rootShapeIds: TLShapeId[]
|
|
9
9
|
assets: TLAsset[]
|
|
10
10
|
schema: SerializedSchema
|
|
11
|
+
users?: TLUser[]
|
|
11
12
|
}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { assertExists, getOwnProperty, objectMapValues, uniqueId } from '@tldraw/utils'
|
|
2
|
-
import { FontEmbedder } from './FontEmbedder'
|
|
3
2
|
import { ReadonlyStyles, Styles, cssRules } from './cssRules'
|
|
4
3
|
import {
|
|
5
4
|
elementStyle,
|
|
@@ -9,6 +8,7 @@ import {
|
|
|
9
8
|
isElement,
|
|
10
9
|
} from './domUtils'
|
|
11
10
|
import { resourceToDataUrl } from './fetchCache'
|
|
11
|
+
import { FontEmbedder } from './FontEmbedder'
|
|
12
12
|
import { parseCssValueUrls, shouldIncludeCssProperty } from './parseCss'
|
|
13
13
|
|
|
14
14
|
const NO_STYLES = {} as const
|
|
@@ -23,12 +23,12 @@ import { InnerShape, InnerShapeBackground } from '../components/Shape'
|
|
|
23
23
|
import type { Editor, TLRenderingShape } from '../editor/Editor'
|
|
24
24
|
import { TLFontFace } from '../editor/managers/FontManager/FontManager'
|
|
25
25
|
import { ShapeUtil } from '../editor/shapes/ShapeUtil'
|
|
26
|
+
import { TLImageExportOptions } from '../editor/types/misc-types'
|
|
26
27
|
import {
|
|
27
28
|
SvgExportContext,
|
|
28
29
|
SvgExportContextProvider,
|
|
29
30
|
SvgExportDef,
|
|
30
31
|
} from '../editor/types/SvgExportContext'
|
|
31
|
-
import { TLImageExportOptions } from '../editor/types/misc-types'
|
|
32
32
|
import { useEditor } from '../hooks/useEditor'
|
|
33
33
|
import { useEvent } from '../hooks/useEvent'
|
|
34
34
|
import { suffixSafeId, useUniqueSafeId } from '../hooks/useSafeId'
|
|
@@ -19,8 +19,8 @@ import { DefaultShapeWrapper } from '../components/default-components/DefaultSha
|
|
|
19
19
|
import { DefaultSnapIndicator } from '../components/default-components/DefaultSnapIndictor'
|
|
20
20
|
import { DefaultSpinner } from '../components/default-components/DefaultSpinner'
|
|
21
21
|
import { DefaultSvgDefs } from '../components/default-components/DefaultSvgDefs'
|
|
22
|
-
import type { TLEditorComponents } from './EditorComponentsContext'
|
|
23
22
|
import { EditorComponentsContext } from './EditorComponentsContext'
|
|
23
|
+
import type { TLEditorComponents } from './EditorComponentsContext'
|
|
24
24
|
import { useShallowObjectIdentity } from './useIdentity'
|
|
25
25
|
|
|
26
26
|
export { useEditorComponents } from './EditorComponentsContext'
|