@tldraw/editor 4.3.0-next.f13438eb7775 → 4.3.0

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 (195) hide show
  1. package/dist-cjs/index.d.ts +498 -155
  2. package/dist-cjs/index.js +6 -1
  3. package/dist-cjs/index.js.map +2 -2
  4. package/dist-cjs/lib/components/ErrorBoundary.js.map +1 -1
  5. package/dist-cjs/lib/components/GeometryDebuggingView.js +1 -17
  6. package/dist-cjs/lib/components/GeometryDebuggingView.js.map +2 -2
  7. package/dist-cjs/lib/components/default-components/DefaultCanvas.js +3 -3
  8. package/dist-cjs/lib/components/default-components/DefaultCanvas.js.map +2 -2
  9. package/dist-cjs/lib/constants.js +1 -3
  10. package/dist-cjs/lib/constants.js.map +2 -2
  11. package/dist-cjs/lib/editor/Editor.js +292 -286
  12. package/dist-cjs/lib/editor/Editor.js.map +2 -2
  13. package/dist-cjs/lib/editor/bindings/BindingUtil.js.map +2 -2
  14. package/dist-cjs/lib/editor/derivations/bindingsIndex.js.map +2 -2
  15. package/dist-cjs/lib/editor/derivations/notVisibleShapes.js +18 -17
  16. package/dist-cjs/lib/editor/derivations/notVisibleShapes.js.map +3 -3
  17. package/dist-cjs/lib/editor/derivations/parentsToChildren.js +12 -3
  18. package/dist-cjs/lib/editor/derivations/parentsToChildren.js.map +2 -2
  19. package/dist-cjs/lib/editor/managers/ClickManager/ClickManager.js +1 -1
  20. package/dist-cjs/lib/editor/managers/ClickManager/ClickManager.js.map +2 -2
  21. package/dist-cjs/lib/editor/managers/EdgeScrollManager/EdgeScrollManager.js +5 -6
  22. package/dist-cjs/lib/editor/managers/EdgeScrollManager/EdgeScrollManager.js.map +2 -2
  23. package/dist-cjs/lib/editor/managers/InputsManager/InputsManager.js +591 -0
  24. package/dist-cjs/lib/editor/managers/InputsManager/InputsManager.js.map +7 -0
  25. package/dist-cjs/lib/editor/managers/SnapManager/SnapManager.js +1 -1
  26. package/dist-cjs/lib/editor/managers/SnapManager/SnapManager.js.map +2 -2
  27. package/dist-cjs/lib/editor/managers/TickManager/TickManager.js +1 -22
  28. package/dist-cjs/lib/editor/managers/TickManager/TickManager.js.map +2 -2
  29. package/dist-cjs/lib/editor/shapes/BaseBoxShapeUtil.js.map +1 -1
  30. package/dist-cjs/lib/editor/shapes/ShapeUtil.js +31 -23
  31. package/dist-cjs/lib/editor/shapes/ShapeUtil.js.map +2 -2
  32. package/dist-cjs/lib/editor/shapes/group/DashedOutlineBox.js +1 -1
  33. package/dist-cjs/lib/editor/shapes/group/DashedOutlineBox.js.map +2 -2
  34. package/dist-cjs/lib/editor/shapes/group/GroupShapeUtil.js.map +2 -2
  35. package/dist-cjs/lib/editor/tools/BaseBoxShapeTool/BaseBoxShapeTool.js.map +2 -2
  36. package/dist-cjs/lib/editor/tools/BaseBoxShapeTool/children/Pointing.js +3 -3
  37. package/dist-cjs/lib/editor/tools/BaseBoxShapeTool/children/Pointing.js.map +2 -2
  38. package/dist-cjs/lib/editor/types/emit-types.js.map +1 -1
  39. package/dist-cjs/lib/exports/getSvgJsx.js.map +2 -2
  40. package/dist-cjs/lib/exports/parseCss.js +1 -1
  41. package/dist-cjs/lib/exports/parseCss.js.map +2 -2
  42. package/dist-cjs/lib/globals/environment.js +45 -9
  43. package/dist-cjs/lib/globals/environment.js.map +2 -2
  44. package/dist-cjs/lib/globals/menus.js +1 -1
  45. package/dist-cjs/lib/globals/menus.js.map +2 -2
  46. package/dist-cjs/lib/hooks/useCoarsePointer.js +14 -29
  47. package/dist-cjs/lib/hooks/useCoarsePointer.js.map +2 -2
  48. package/dist-cjs/lib/hooks/useEvent.js +1 -1
  49. package/dist-cjs/lib/hooks/useEvent.js.map +2 -2
  50. package/dist-cjs/lib/hooks/useFixSafariDoubleTapZoomPencilEvents.js.map +2 -2
  51. package/dist-cjs/lib/hooks/useGestureEvents.js +1 -1
  52. package/dist-cjs/lib/hooks/useGestureEvents.js.map +2 -2
  53. package/dist-cjs/lib/hooks/usePassThroughMouseOverEvents.js.map +2 -2
  54. package/dist-cjs/lib/hooks/usePassThroughWheelEvents.js.map +2 -2
  55. package/dist-cjs/lib/hooks/useScreenBounds.js.map +2 -2
  56. package/dist-cjs/lib/hooks/useStateAttribute.js +4 -1
  57. package/dist-cjs/lib/hooks/useStateAttribute.js.map +2 -2
  58. package/dist-cjs/lib/hooks/useTransform.js.map +1 -1
  59. package/dist-cjs/lib/hooks/useZoomCss.js +4 -8
  60. package/dist-cjs/lib/hooks/useZoomCss.js.map +2 -2
  61. package/dist-cjs/lib/options.js +6 -1
  62. package/dist-cjs/lib/options.js.map +2 -2
  63. package/dist-cjs/lib/primitives/Box.js +3 -0
  64. package/dist-cjs/lib/primitives/Box.js.map +2 -2
  65. package/dist-cjs/lib/primitives/geometry/Geometry2d.js +1 -0
  66. package/dist-cjs/lib/primitives/geometry/Geometry2d.js.map +2 -2
  67. package/dist-cjs/lib/utils/reparenting.js.map +2 -2
  68. package/dist-cjs/lib/utils/rotation.js +1 -1
  69. package/dist-cjs/lib/utils/rotation.js.map +2 -2
  70. package/dist-cjs/version.js +3 -3
  71. package/dist-cjs/version.js.map +1 -1
  72. package/dist-esm/index.d.mts +498 -155
  73. package/dist-esm/index.mjs +7 -2
  74. package/dist-esm/index.mjs.map +2 -2
  75. package/dist-esm/lib/components/ErrorBoundary.mjs.map +1 -1
  76. package/dist-esm/lib/components/GeometryDebuggingView.mjs +1 -17
  77. package/dist-esm/lib/components/GeometryDebuggingView.mjs.map +2 -2
  78. package/dist-esm/lib/components/default-components/DefaultCanvas.mjs +3 -3
  79. package/dist-esm/lib/components/default-components/DefaultCanvas.mjs.map +2 -2
  80. package/dist-esm/lib/constants.mjs +1 -3
  81. package/dist-esm/lib/constants.mjs.map +2 -2
  82. package/dist-esm/lib/editor/Editor.mjs +293 -289
  83. package/dist-esm/lib/editor/Editor.mjs.map +2 -2
  84. package/dist-esm/lib/editor/bindings/BindingUtil.mjs.map +2 -2
  85. package/dist-esm/lib/editor/derivations/bindingsIndex.mjs.map +2 -2
  86. package/dist-esm/lib/editor/derivations/notVisibleShapes.mjs +18 -17
  87. package/dist-esm/lib/editor/derivations/notVisibleShapes.mjs.map +3 -3
  88. package/dist-esm/lib/editor/derivations/parentsToChildren.mjs +13 -4
  89. package/dist-esm/lib/editor/derivations/parentsToChildren.mjs.map +2 -2
  90. package/dist-esm/lib/editor/managers/ClickManager/ClickManager.mjs +1 -1
  91. package/dist-esm/lib/editor/managers/ClickManager/ClickManager.mjs.map +2 -2
  92. package/dist-esm/lib/editor/managers/EdgeScrollManager/EdgeScrollManager.mjs +5 -6
  93. package/dist-esm/lib/editor/managers/EdgeScrollManager/EdgeScrollManager.mjs.map +2 -2
  94. package/dist-esm/lib/editor/managers/InputsManager/InputsManager.mjs +573 -0
  95. package/dist-esm/lib/editor/managers/InputsManager/InputsManager.mjs.map +7 -0
  96. package/dist-esm/lib/editor/managers/SnapManager/SnapManager.mjs +1 -1
  97. package/dist-esm/lib/editor/managers/SnapManager/SnapManager.mjs.map +2 -2
  98. package/dist-esm/lib/editor/managers/TickManager/TickManager.mjs +1 -22
  99. package/dist-esm/lib/editor/managers/TickManager/TickManager.mjs.map +2 -2
  100. package/dist-esm/lib/editor/shapes/BaseBoxShapeUtil.mjs.map +1 -1
  101. package/dist-esm/lib/editor/shapes/ShapeUtil.mjs +31 -23
  102. package/dist-esm/lib/editor/shapes/ShapeUtil.mjs.map +2 -2
  103. package/dist-esm/lib/editor/shapes/group/DashedOutlineBox.mjs +1 -1
  104. package/dist-esm/lib/editor/shapes/group/DashedOutlineBox.mjs.map +2 -2
  105. package/dist-esm/lib/editor/shapes/group/GroupShapeUtil.mjs.map +2 -2
  106. package/dist-esm/lib/editor/tools/BaseBoxShapeTool/BaseBoxShapeTool.mjs.map +2 -2
  107. package/dist-esm/lib/editor/tools/BaseBoxShapeTool/children/Pointing.mjs +3 -3
  108. package/dist-esm/lib/editor/tools/BaseBoxShapeTool/children/Pointing.mjs.map +2 -2
  109. package/dist-esm/lib/exports/getSvgJsx.mjs.map +2 -2
  110. package/dist-esm/lib/exports/parseCss.mjs +1 -1
  111. package/dist-esm/lib/exports/parseCss.mjs.map +2 -2
  112. package/dist-esm/lib/globals/environment.mjs +45 -9
  113. package/dist-esm/lib/globals/environment.mjs.map +2 -2
  114. package/dist-esm/lib/globals/menus.mjs +1 -1
  115. package/dist-esm/lib/globals/menus.mjs.map +2 -2
  116. package/dist-esm/lib/hooks/useCoarsePointer.mjs +15 -30
  117. package/dist-esm/lib/hooks/useCoarsePointer.mjs.map +2 -2
  118. package/dist-esm/lib/hooks/useEvent.mjs +1 -1
  119. package/dist-esm/lib/hooks/useEvent.mjs.map +2 -2
  120. package/dist-esm/lib/hooks/useFixSafariDoubleTapZoomPencilEvents.mjs.map +2 -2
  121. package/dist-esm/lib/hooks/useGestureEvents.mjs +1 -1
  122. package/dist-esm/lib/hooks/useGestureEvents.mjs.map +2 -2
  123. package/dist-esm/lib/hooks/usePassThroughMouseOverEvents.mjs.map +2 -2
  124. package/dist-esm/lib/hooks/usePassThroughWheelEvents.mjs.map +2 -2
  125. package/dist-esm/lib/hooks/useScreenBounds.mjs.map +2 -2
  126. package/dist-esm/lib/hooks/useStateAttribute.mjs +4 -1
  127. package/dist-esm/lib/hooks/useStateAttribute.mjs.map +2 -2
  128. package/dist-esm/lib/hooks/useTransform.mjs.map +1 -1
  129. package/dist-esm/lib/hooks/useZoomCss.mjs +4 -8
  130. package/dist-esm/lib/hooks/useZoomCss.mjs.map +2 -2
  131. package/dist-esm/lib/options.mjs +6 -1
  132. package/dist-esm/lib/options.mjs.map +2 -2
  133. package/dist-esm/lib/primitives/Box.mjs +3 -0
  134. package/dist-esm/lib/primitives/Box.mjs.map +2 -2
  135. package/dist-esm/lib/primitives/geometry/Geometry2d.mjs +1 -0
  136. package/dist-esm/lib/primitives/geometry/Geometry2d.mjs.map +2 -2
  137. package/dist-esm/lib/utils/reparenting.mjs.map +2 -2
  138. package/dist-esm/lib/utils/rotation.mjs +1 -1
  139. package/dist-esm/lib/utils/rotation.mjs.map +2 -2
  140. package/dist-esm/version.mjs +3 -3
  141. package/dist-esm/version.mjs.map +1 -1
  142. package/editor.css +14 -12
  143. package/package.json +18 -16
  144. package/src/index.ts +4 -1
  145. package/src/lib/components/ErrorBoundary.tsx +1 -1
  146. package/src/lib/components/GeometryDebuggingView.tsx +1 -19
  147. package/src/lib/components/default-components/DefaultCanvas.tsx +4 -3
  148. package/src/lib/config/TLUserPreferences.test.ts +40 -0
  149. package/src/lib/constants.ts +0 -2
  150. package/src/lib/editor/Editor.test.ts +150 -10
  151. package/src/lib/editor/Editor.ts +459 -379
  152. package/src/lib/editor/bindings/BindingUtil.ts +15 -9
  153. package/src/lib/editor/derivations/bindingsIndex.ts +2 -2
  154. package/src/lib/editor/derivations/notVisibleShapes.ts +37 -23
  155. package/src/lib/editor/derivations/parentsToChildren.ts +18 -7
  156. package/src/lib/editor/managers/ClickManager/ClickManager.test.ts +17 -31
  157. package/src/lib/editor/managers/ClickManager/ClickManager.ts +1 -1
  158. package/src/lib/editor/managers/EdgeScrollManager/EdgeScrollManager.test.ts +129 -79
  159. package/src/lib/editor/managers/EdgeScrollManager/EdgeScrollManager.ts +10 -6
  160. package/src/lib/editor/managers/FontManager/FontManager.test.ts +14 -4
  161. package/src/lib/editor/managers/InputsManager/InputsManager.ts +566 -0
  162. package/src/lib/editor/managers/ScribbleManager/ScribbleManager.test.ts +0 -4
  163. package/src/lib/editor/managers/SnapManager/SnapManager.test.ts +12 -0
  164. package/src/lib/editor/managers/SnapManager/SnapManager.ts +4 -4
  165. package/src/lib/editor/managers/TickManager/TickManager.test.ts +40 -107
  166. package/src/lib/editor/managers/TickManager/TickManager.ts +2 -32
  167. package/src/lib/editor/shapes/BaseBoxShapeUtil.tsx +2 -2
  168. package/src/lib/editor/shapes/ShapeUtil.ts +72 -32
  169. package/src/lib/editor/shapes/group/DashedOutlineBox.tsx +1 -1
  170. package/src/lib/editor/shapes/group/GroupShapeUtil.tsx +1 -3
  171. package/src/lib/editor/tools/BaseBoxShapeTool/BaseBoxShapeTool.ts +2 -1
  172. package/src/lib/editor/tools/BaseBoxShapeTool/children/Pointing.ts +6 -6
  173. package/src/lib/editor/types/emit-types.ts +3 -1
  174. package/src/lib/exports/getSvgJsx.test.ts +10 -19
  175. package/src/lib/exports/getSvgJsx.tsx +2 -5
  176. package/src/lib/exports/parseCss.test.ts +1 -0
  177. package/src/lib/exports/parseCss.ts +1 -1
  178. package/src/lib/globals/environment.ts +65 -10
  179. package/src/lib/globals/menus.ts +1 -1
  180. package/src/lib/hooks/useCoarsePointer.ts +16 -59
  181. package/src/lib/hooks/useEvent.tsx +1 -1
  182. package/src/lib/hooks/useFixSafariDoubleTapZoomPencilEvents.ts +1 -1
  183. package/src/lib/hooks/useGestureEvents.ts +2 -2
  184. package/src/lib/hooks/usePassThroughMouseOverEvents.ts +1 -1
  185. package/src/lib/hooks/usePassThroughWheelEvents.ts +1 -1
  186. package/src/lib/hooks/useScreenBounds.ts +1 -1
  187. package/src/lib/hooks/useStateAttribute.ts +4 -1
  188. package/src/lib/hooks/useTransform.ts +1 -1
  189. package/src/lib/hooks/useZoomCss.ts +3 -8
  190. package/src/lib/options.ts +32 -0
  191. package/src/lib/primitives/Box.ts +9 -0
  192. package/src/lib/primitives/geometry/Geometry2d.ts +1 -0
  193. package/src/lib/utils/reparenting.ts +5 -5
  194. package/src/lib/utils/rotation.ts +1 -1
  195. package/src/version.ts +3 -3
@@ -21,6 +21,17 @@ describe('TickManager', () => {
21
21
  let tickManager: TickManager
22
22
  let mockEmit: Mock
23
23
  let mockDisposablesAdd: Mock
24
+ let mockInputs: {
25
+ _currentScreenPoint: Vec
26
+ getCurrentScreenPoint(): Vec
27
+ currentScreenPoint: Vec
28
+ setCurrentScreenPoint(value: Vec): void
29
+ _pointerVelocity: Vec
30
+ getPointerVelocity(): Vec
31
+ pointerVelocity: Vec
32
+ setPointerVelocity(value: Vec): void
33
+ updatePointerVelocity(elapsed: number): void
34
+ }
24
35
 
25
36
  beforeEach(() => {
26
37
  vi.clearAllMocks()
@@ -41,16 +52,40 @@ describe('TickManager', () => {
41
52
  mockEmit = vi.fn()
42
53
  mockDisposablesAdd = vi.fn()
43
54
 
55
+ // Create a mock inputs object with getters and setters
56
+ mockInputs = {
57
+ _currentScreenPoint: new Vec(100, 100),
58
+ getCurrentScreenPoint() {
59
+ return this._currentScreenPoint
60
+ },
61
+ get currentScreenPoint() {
62
+ return this.getCurrentScreenPoint()
63
+ },
64
+ setCurrentScreenPoint(value: Vec) {
65
+ this._currentScreenPoint = value
66
+ },
67
+ _pointerVelocity: new Vec(0, 0),
68
+ getPointerVelocity() {
69
+ return this._pointerVelocity
70
+ },
71
+ get pointerVelocity() {
72
+ return this.getPointerVelocity()
73
+ },
74
+ setPointerVelocity(value: Vec) {
75
+ this._pointerVelocity = value
76
+ },
77
+ updatePointerVelocity(_elapsed: number) {
78
+ // Mock implementation - no-op for tests
79
+ },
80
+ }
81
+
44
82
  editor = {
45
83
  emit: mockEmit,
46
84
  disposables: {
47
85
  add: mockDisposablesAdd,
48
86
  },
49
- inputs: {
50
- currentScreenPoint: new Vec(100, 100),
51
- pointerVelocity: new Vec(0, 0),
52
- },
53
- } as any
87
+ inputs: mockInputs as unknown as Editor['inputs'],
88
+ } as unknown as Mocked<Editor>
54
89
 
55
90
  tickManager = new TickManager(editor)
56
91
  })
@@ -143,16 +178,6 @@ describe('TickManager', () => {
143
178
  expect(mockEmit).toHaveBeenCalledTimes(2)
144
179
  })
145
180
 
146
- it('should update pointer velocity', () => {
147
- const updatePointerVelocitySpy = vi.spyOn(tickManager as any, 'updatePointerVelocity')
148
- tickManager.now = 1000
149
- mockDateNow.mockReturnValue(1016)
150
-
151
- tickManager.tick()
152
-
153
- expect(updatePointerVelocitySpy).toHaveBeenCalledWith(16)
154
- })
155
-
156
181
  it('should schedule next RAF', () => {
157
182
  tickManager.tick()
158
183
  expect(mockRequestAnimationFrame).toHaveBeenCalled()
@@ -192,98 +217,6 @@ describe('TickManager', () => {
192
217
  })
193
218
  })
194
219
 
195
- describe('updatePointerVelocity method', () => {
196
- let updatePointerVelocity: any
197
-
198
- beforeEach(() => {
199
- // Access private method for testing
200
- updatePointerVelocity = (tickManager as any).updatePointerVelocity.bind(tickManager)
201
- // Reset the prevPoint to a known state
202
- ;(tickManager as any).prevPoint = new Vec(50, 50)
203
- })
204
-
205
- it('should return early if elapsed time is 0', () => {
206
- const originalVelocity = editor.inputs.pointerVelocity.clone()
207
-
208
- updatePointerVelocity(0)
209
-
210
- expect(editor.inputs.pointerVelocity).toEqual(originalVelocity)
211
- })
212
-
213
- it('should calculate velocity based on pointer movement', () => {
214
- editor.inputs.currentScreenPoint = new Vec(150, 150)
215
- ;(tickManager as any).prevPoint = new Vec(50, 50)
216
- editor.inputs.pointerVelocity = new Vec(0, 0)
217
-
218
- updatePointerVelocity(100) // 100ms elapsed
219
-
220
- // Delta should be (100, 100), length = ~141.42, direction = (~0.707, ~0.707)
221
- // Velocity should be length/elapsed = ~1.414 per ms in each direction
222
- // But with linear interpolation (lrp factor 0.5), it will be halved
223
- const expectedVelocity = new Vec(0.5, 0.5) // With lrp factor 0.5
224
- expect(editor.inputs.pointerVelocity.x).toBeCloseTo(expectedVelocity.x, 1)
225
- expect(editor.inputs.pointerVelocity.y).toBeCloseTo(expectedVelocity.y, 1)
226
- })
227
-
228
- it('should update prevPoint to current screen point', () => {
229
- const newPoint = new Vec(200, 200)
230
- editor.inputs.currentScreenPoint = newPoint
231
-
232
- updatePointerVelocity(16)
233
-
234
- expect((tickManager as any).prevPoint).toEqual(newPoint)
235
- })
236
-
237
- it('should use linear interpolation to smooth velocity', () => {
238
- editor.inputs.currentScreenPoint = new Vec(150, 50)
239
- ;(tickManager as any).prevPoint = new Vec(50, 50)
240
- editor.inputs.pointerVelocity = new Vec(2, 2)
241
-
242
- updatePointerVelocity(100)
243
-
244
- // Should interpolate between current velocity (2,2) and new velocity (1,0)
245
- // lrp with factor 0.5 should give us something between them
246
- expect(editor.inputs.pointerVelocity.x).toBeGreaterThan(0.5)
247
- expect(editor.inputs.pointerVelocity.x).toBeLessThan(2)
248
- })
249
-
250
- it('should set very small velocity components to 0', () => {
251
- editor.inputs.currentScreenPoint = new Vec(50.005, 50.005)
252
- ;(tickManager as any).prevPoint = new Vec(50, 50)
253
- editor.inputs.pointerVelocity = new Vec(0, 0)
254
-
255
- updatePointerVelocity(1000) // Long elapsed time = very small velocity
256
-
257
- expect(editor.inputs.pointerVelocity.x).toBe(0)
258
- expect(editor.inputs.pointerVelocity.y).toBe(0)
259
- })
260
-
261
- it('should handle zero movement (stationary pointer)', () => {
262
- editor.inputs.currentScreenPoint = new Vec(100, 100)
263
- ;(tickManager as any).prevPoint = new Vec(100, 100)
264
- editor.inputs.pointerVelocity = new Vec(1, 1)
265
-
266
- updatePointerVelocity(16)
267
-
268
- // Should interpolate towards zero velocity
269
- expect(editor.inputs.pointerVelocity.x).toBeLessThan(1)
270
- expect(editor.inputs.pointerVelocity.y).toBeLessThan(1)
271
- })
272
-
273
- it('should only update pointerVelocity if it actually changes', () => {
274
- // Setup scenario where velocity won't change
275
- editor.inputs.currentScreenPoint = new Vec(100, 100)
276
- ;(tickManager as any).prevPoint = new Vec(100, 100)
277
- editor.inputs.pointerVelocity = new Vec(0, 0)
278
-
279
- const originalVelocity = editor.inputs.pointerVelocity
280
- updatePointerVelocity(16)
281
-
282
- // Should still be the same object reference since no change occurred
283
- expect(editor.inputs.pointerVelocity).toBe(originalVelocity)
284
- })
285
- })
286
-
287
220
  describe('RAF throttling behavior', () => {
288
221
  it('should use test-specific RAF behavior in test environment', () => {
289
222
  // The TickManager should detect test environment and use requestAnimationFrame directly
@@ -1,5 +1,4 @@
1
1
  import { throttleToNextFrame as _throttleToNextFrame, bind } from '@tldraw/utils'
2
- import { Vec } from '../../../primitives/Vec'
3
2
  import { Editor } from '../../Editor'
4
3
 
5
4
  const throttleToNextFrame =
@@ -13,6 +12,7 @@ const throttleToNextFrame =
13
12
  }
14
13
  : _throttleToNextFrame
15
14
 
15
+ /** @internal */
16
16
  export class TickManager {
17
17
  constructor(public editor: Editor) {
18
18
  this.editor.disposables.add(this.dispose)
@@ -40,7 +40,7 @@ export class TickManager {
40
40
  const elapsed = now - this.now
41
41
  this.now = now
42
42
 
43
- this.updatePointerVelocity(elapsed)
43
+ this.editor.inputs.updatePointerVelocity(elapsed)
44
44
  this.editor.emit('frame', elapsed)
45
45
  this.editor.emit('tick', elapsed)
46
46
  this.cancelRaf = throttleToNextFrame(this.tick)
@@ -53,34 +53,4 @@ export class TickManager {
53
53
 
54
54
  this.cancelRaf?.()
55
55
  }
56
-
57
- private prevPoint = new Vec()
58
-
59
- updatePointerVelocity(elapsed: number) {
60
- const {
61
- prevPoint,
62
- editor: {
63
- inputs: { currentScreenPoint, pointerVelocity },
64
- },
65
- } = this
66
-
67
- if (elapsed === 0) return
68
-
69
- const delta = Vec.Sub(currentScreenPoint, prevPoint)
70
- this.prevPoint = currentScreenPoint.clone()
71
-
72
- const length = delta.len()
73
- const direction = length ? delta.div(length) : new Vec(0, 0)
74
-
75
- // consider adjusting this with an easing rather than a linear interpolation
76
- const next = pointerVelocity.clone().lrp(direction.mul(length / elapsed), 0.5)
77
-
78
- // if the velocity is very small, just set it to 0
79
- if (Math.abs(next.x) < 0.01) next.x = 0
80
- if (Math.abs(next.y) < 0.01) next.y = 0
81
-
82
- if (!pointerVelocity.equals(next)) {
83
- this.editor.inputs.pointerVelocity = next
84
- }
85
- }
86
56
  }
@@ -1,4 +1,4 @@
1
- import { TLBaseShape } from '@tldraw/tlschema'
1
+ import { ExtractShapeByProps } from '@tldraw/tlschema'
2
2
  import { lerp } from '@tldraw/utils'
3
3
  import { Geometry2d } from '../../primitives/geometry/Geometry2d'
4
4
  import { Rectangle2d } from '../../primitives/geometry/Rectangle2d'
@@ -7,7 +7,7 @@ import { ShapeUtil, TLResizeInfo } from './ShapeUtil'
7
7
  import { resizeBox } from './shared/resizeBox'
8
8
 
9
9
  /** @public */
10
- export type TLBaseBoxShape = TLBaseShape<string, { w: number; h: number }>
10
+ export type TLBaseBoxShape = ExtractShapeByProps<{ w: number; h: number }>
11
11
 
12
12
  /** @public */
13
13
  export abstract class BaseBoxShapeUtil<Shape extends TLBaseBoxShape> extends ShapeUtil<Shape> {
@@ -26,10 +26,7 @@ import { TLClickEventInfo } from '../types/event-types'
26
26
  import { TLResizeHandle } from '../types/selection-types'
27
27
 
28
28
  /** @public */
29
- export interface TLShapeUtilConstructor<
30
- T extends TLUnknownShape,
31
- U extends ShapeUtil<T> = ShapeUtil<T>,
32
- > {
29
+ export interface TLShapeUtilConstructor<T extends TLShape, U extends ShapeUtil<T> = ShapeUtil<T>> {
33
30
  new (editor: Editor): U
34
31
  type: T['type']
35
32
  props?: RecordProps<T>
@@ -42,11 +39,11 @@ export interface TLShapeUtilConstructor<
42
39
  *
43
40
  * @public
44
41
  */
45
- export interface TLShapeUtilCanBindOpts<Shape extends TLUnknownShape = TLUnknownShape> {
42
+ export interface TLShapeUtilCanBindOpts<Shape extends TLShape = TLShape> {
46
43
  /** The type of shape referenced by the `fromId` of the binding. */
47
- fromShapeType: string
44
+ fromShapeType: TLShape['type']
48
45
  /** The type of shape referenced by the `toId` of the binding. */
49
- toShapeType: string
46
+ toShapeType: TLShape['type']
50
47
  /** The type of binding. */
51
48
  bindingType: string
52
49
  }
@@ -79,7 +76,7 @@ export interface TLShapeUtilCanvasSvgDef {
79
76
  }
80
77
 
81
78
  /** @public */
82
- export abstract class ShapeUtil<Shape extends TLUnknownShape = TLUnknownShape> {
79
+ export abstract class ShapeUtil<Shape extends TLShape = TLShape> {
83
80
  /** Configure this shape utils {@link ShapeUtil.options | `options`}. */
84
81
  static configure<T extends TLShapeUtilConstructor<any, any>>(
85
82
  this: T,
@@ -193,7 +190,7 @@ export abstract class ShapeUtil<Shape extends TLUnknownShape = TLUnknownShape> {
193
190
  * @param shape - The shape.
194
191
  * @public
195
192
  */
196
- canSnap(_shape: Shape): boolean {
193
+ canSnap(shape: Shape): boolean {
197
194
  return true
198
195
  }
199
196
 
@@ -203,7 +200,7 @@ export abstract class ShapeUtil<Shape extends TLUnknownShape = TLUnknownShape> {
203
200
  * @param shape - The shape.
204
201
  * @public
205
202
  */
206
- canTabTo(_shape: Shape): boolean {
203
+ canTabTo(shape: Shape): boolean {
207
204
  return true
208
205
  }
209
206
 
@@ -212,7 +209,7 @@ export abstract class ShapeUtil<Shape extends TLUnknownShape = TLUnknownShape> {
212
209
  *
213
210
  * @public
214
211
  */
215
- canScroll(_shape: Shape): boolean {
212
+ canScroll(shape: Shape): boolean {
216
213
  return false
217
214
  }
218
215
 
@@ -230,7 +227,7 @@ export abstract class ShapeUtil<Shape extends TLUnknownShape = TLUnknownShape> {
230
227
  *
231
228
  * @public
232
229
  */
233
- canEdit(_shape: Shape): boolean {
230
+ canEdit(shape: Shape, info: TLEditStartInfo): boolean {
234
231
  return false
235
232
  }
236
233
 
@@ -239,7 +236,7 @@ export abstract class ShapeUtil<Shape extends TLUnknownShape = TLUnknownShape> {
239
236
  *
240
237
  * @public
241
238
  */
242
- canResize(_shape: Shape): boolean {
239
+ canResize(shape: Shape): boolean {
243
240
  return true
244
241
  }
245
242
 
@@ -248,7 +245,7 @@ export abstract class ShapeUtil<Shape extends TLUnknownShape = TLUnknownShape> {
248
245
  *
249
246
  * @public
250
247
  */
251
- canResizeChildren(_shape: Shape): boolean {
248
+ canResizeChildren(shape: Shape): boolean {
252
249
  return true
253
250
  }
254
251
 
@@ -257,7 +254,16 @@ export abstract class ShapeUtil<Shape extends TLUnknownShape = TLUnknownShape> {
257
254
  *
258
255
  * @public
259
256
  */
260
- canEditInReadonly(_shape: Shape): boolean {
257
+ canEditInReadonly(shape: Shape): boolean {
258
+ return false
259
+ }
260
+
261
+ /**
262
+ * Whether the shape can be edited while locked or while an ancestor is locked.
263
+ *
264
+ * @public
265
+ */
266
+ canEditWhileLocked(shape: Shape): boolean {
261
267
  return false
262
268
  }
263
269
 
@@ -266,7 +272,7 @@ export abstract class ShapeUtil<Shape extends TLUnknownShape = TLUnknownShape> {
266
272
  *
267
273
  * @public
268
274
  */
269
- canCrop(_shape: Shape): boolean {
275
+ canCrop(shape: Shape): boolean {
270
276
  return false
271
277
  }
272
278
 
@@ -279,7 +285,7 @@ export abstract class ShapeUtil<Shape extends TLUnknownShape = TLUnknownShape> {
279
285
  *
280
286
  * @public
281
287
  */
282
- canBeLaidOut(_shape: Shape, _info: TLShapeUtilCanBeLaidOutOpts): boolean {
288
+ canBeLaidOut(shape: Shape, info: TLShapeUtilCanBeLaidOutOpts): boolean {
283
289
  return true
284
290
  }
285
291
 
@@ -290,7 +296,7 @@ export abstract class ShapeUtil<Shape extends TLUnknownShape = TLUnknownShape> {
290
296
  *
291
297
  * @param shape - The shape.
292
298
  */
293
- canCull(_shape: Shape): boolean {
299
+ canCull(shape: Shape): boolean {
294
300
  return true
295
301
  }
296
302
 
@@ -303,13 +309,33 @@ export abstract class ShapeUtil<Shape extends TLUnknownShape = TLUnknownShape> {
303
309
  *
304
310
  * @internal
305
311
  */
306
- providesBackgroundForChildren(_shape: Shape): boolean {
312
+ providesBackgroundForChildren(shape: Shape): boolean {
307
313
  return false
308
314
  }
309
315
 
310
316
  /**
311
317
  * Get the clip path to apply to this shape's children.
312
318
  *
319
+ * The returned points should define the **inner** clip boundary - the area where
320
+ * children will be visible. If your shape has a stroke, you should inset the clip
321
+ * path by half the stroke width so children are clipped to the inner edge of the
322
+ * stroke rather than its center line.
323
+ *
324
+ * @example
325
+ * ```ts
326
+ * override getClipPath(shape: MyShape): Vec[] | undefined {
327
+ * const strokeWidth = 2
328
+ * const inset = strokeWidth / 2
329
+ * // Return points inset by half the stroke width
330
+ * return [
331
+ * new Vec(inset, inset),
332
+ * new Vec(shape.props.w - inset, inset),
333
+ * new Vec(shape.props.w - inset, shape.props.h - inset),
334
+ * new Vec(inset, shape.props.h - inset),
335
+ * ]
336
+ * }
337
+ * ```
338
+ *
313
339
  * @param shape - The shape to get the clip path for
314
340
  * @returns Array of points defining the clipping polygon in local coordinates, or undefined if no clipping
315
341
  * @public
@@ -336,14 +362,14 @@ export abstract class ShapeUtil<Shape extends TLUnknownShape = TLUnknownShape> {
336
362
  * @returns boolean indicating if this shape should hide in the minimap
337
363
  * @public
338
364
  */
339
- hideInMinimap?(_shape: Shape): boolean
365
+ hideInMinimap?(shape: Shape): boolean
340
366
 
341
367
  /**
342
368
  * Whether the shape should hide its resize handles when selected.
343
369
  *
344
370
  * @public
345
371
  */
346
- hideResizeHandles(_shape: Shape): boolean {
372
+ hideResizeHandles(shape: Shape): boolean {
347
373
  return false
348
374
  }
349
375
 
@@ -352,7 +378,7 @@ export abstract class ShapeUtil<Shape extends TLUnknownShape = TLUnknownShape> {
352
378
  *
353
379
  * @public
354
380
  */
355
- hideRotateHandle(_shape: Shape): boolean {
381
+ hideRotateHandle(shape: Shape): boolean {
356
382
  return false
357
383
  }
358
384
 
@@ -361,7 +387,7 @@ export abstract class ShapeUtil<Shape extends TLUnknownShape = TLUnknownShape> {
361
387
  *
362
388
  * @public
363
389
  */
364
- hideSelectionBoundsBg(_shape: Shape): boolean {
390
+ hideSelectionBoundsBg(shape: Shape): boolean {
365
391
  return false
366
392
  }
367
393
 
@@ -370,7 +396,7 @@ export abstract class ShapeUtil<Shape extends TLUnknownShape = TLUnknownShape> {
370
396
  *
371
397
  * @public
372
398
  */
373
- hideSelectionBoundsFg(_shape: Shape): boolean {
399
+ hideSelectionBoundsFg(shape: Shape): boolean {
374
400
  return false
375
401
  }
376
402
 
@@ -379,7 +405,7 @@ export abstract class ShapeUtil<Shape extends TLUnknownShape = TLUnknownShape> {
379
405
  *
380
406
  * @public
381
407
  */
382
- isAspectRatioLocked(_shape: Shape): boolean {
408
+ isAspectRatioLocked(shape: Shape): boolean {
383
409
  return false
384
410
  }
385
411
 
@@ -390,10 +416,10 @@ export abstract class ShapeUtil<Shape extends TLUnknownShape = TLUnknownShape> {
390
416
  * useful in cases like annotating on top of an image, where you usually want to avoid extra
391
417
  * padding around the image if you don't need it.
392
418
  *
393
- * @param _shape - The shape to check
419
+ * @param shape - The shape to check
394
420
  * @returns True if this shape should be treated as an export bounds container
395
421
  */
396
- isExportBoundsContainer(_shape: Shape): boolean {
422
+ isExportBoundsContainer(shape: Shape): boolean {
397
423
  return false
398
424
  }
399
425
 
@@ -442,7 +468,7 @@ export abstract class ShapeUtil<Shape extends TLUnknownShape = TLUnknownShape> {
442
468
  * @param type - The shape type.
443
469
  * @public
444
470
  */
445
- canReceiveNewChildrenOfType(_shape: Shape, _type: TLShape['type']) {
471
+ canReceiveNewChildrenOfType(shape: Shape, _type: TLShape['type']) {
446
472
  return false
447
473
  }
448
474
 
@@ -490,7 +516,7 @@ export abstract class ShapeUtil<Shape extends TLUnknownShape = TLUnknownShape> {
490
516
  * Get the geometry to use when snapping to this this shape in translate/resize operations. See
491
517
  * {@link BoundsSnapGeometry} for details.
492
518
  */
493
- getBoundsSnapGeometry(_shape: Shape): BoundsSnapGeometry {
519
+ getBoundsSnapGeometry(shape: Shape): BoundsSnapGeometry {
494
520
  return {}
495
521
  }
496
522
 
@@ -498,15 +524,15 @@ export abstract class ShapeUtil<Shape extends TLUnknownShape = TLUnknownShape> {
498
524
  * Get the geometry to use when snapping handles to this shape. See {@link HandleSnapGeometry}
499
525
  * for details.
500
526
  */
501
- getHandleSnapGeometry(_shape: Shape): HandleSnapGeometry {
527
+ getHandleSnapGeometry(shape: Shape): HandleSnapGeometry {
502
528
  return {}
503
529
  }
504
530
 
505
- getText(_shape: Shape): string | undefined {
531
+ getText(shape: Shape): string | undefined {
506
532
  return undefined
507
533
  }
508
534
 
509
- getAriaDescriptor(_shape: Shape): string | undefined {
535
+ getAriaDescriptor(shape: Shape): string | undefined {
510
536
  return undefined
511
537
  }
512
538
 
@@ -934,3 +960,17 @@ export interface TLHandleDragInfo<T extends TLShape> {
934
960
  isCreatingShape: boolean
935
961
  initial?: T | undefined
936
962
  }
963
+
964
+ /* --------------------------------- Editing -------------------------------- */
965
+
966
+ /** @public */
967
+ export interface TLEditStartInfo {
968
+ type:
969
+ | 'press_enter'
970
+ | 'click'
971
+ | 'double-click'
972
+ | 'double-click-edge'
973
+ | 'double-click-corner'
974
+ | 'click-header'
975
+ | 'unknown'
976
+ }
@@ -6,7 +6,7 @@ import { getPerfectDashProps } from '../shared/getPerfectDashProps'
6
6
  export function DashedOutlineBox({ bounds, className }: { bounds: Box; className: string }) {
7
7
  const editor = useEditor()
8
8
 
9
- const zoomLevel = useValue('zoom level', () => editor.getZoomLevel(), [editor])
9
+ const zoomLevel = useValue('zoom level', () => editor.getEfficientZoomLevel(), [editor])
10
10
 
11
11
  return (
12
12
  <g className={className} pointerEvents="none" strokeLinecap="round" strokeLinejoin="round">
@@ -55,9 +55,7 @@ export class GroupShapeUtil extends ShapeUtil<TLGroupShape> {
55
55
  const isHintingOtherGroup =
56
56
  hintingShapeIds.length > 0 &&
57
57
  hintingShapeIds.some(
58
- (id) =>
59
- id !== shape.id &&
60
- this.editor.isShapeOfType<TLGroupShape>(this.editor.getShape(id)!, 'group')
58
+ (id) => id !== shape.id && this.editor.isShapeOfType(this.editor.getShape(id)!, 'group')
61
59
  )
62
60
 
63
61
  const isFocused = this.editor.getCurrentPageState().focusedGroupId !== shape.id
@@ -1,4 +1,5 @@
1
1
  import { TLShape } from '@tldraw/tlschema'
2
+ import { TLBaseBoxShape } from '../../shapes/BaseBoxShapeUtil'
2
3
  import { StateNode, TLStateNodeConstructor } from '../StateNode'
3
4
  import { Idle } from './children/Idle'
4
5
  import { Pointing } from './children/Pointing'
@@ -11,7 +12,7 @@ export abstract class BaseBoxShapeTool extends StateNode {
11
12
  return [Idle, Pointing]
12
13
  }
13
14
 
14
- abstract override shapeType: string
15
+ abstract override shapeType: TLBaseBoxShape['type']
15
16
 
16
17
  onCreate?(_shape: TLShape | null): void | null
17
18
  }
@@ -12,8 +12,8 @@ export class Pointing extends StateNode {
12
12
 
13
13
  override onPointerMove(info: TLPointerEventInfo) {
14
14
  const { editor } = this
15
- if (editor.inputs.isDragging) {
16
- const { originPagePoint } = editor.inputs
15
+ if (editor.inputs.getIsDragging()) {
16
+ const originPagePoint = editor.inputs.getOriginPagePoint()
17
17
 
18
18
  const shapeType = (this.parent as BaseBoxShapeTool)!.shapeType
19
19
 
@@ -23,7 +23,7 @@ export class Pointing extends StateNode {
23
23
  const newPoint = maybeSnapToGrid(originPagePoint, editor)
24
24
 
25
25
  // Allow this to trigger the max shapes reached alert
26
- this.editor.createShapes<TLBaseBoxShape>([
26
+ this.editor.createShapes([
27
27
  {
28
28
  id,
29
29
  type: shapeType,
@@ -78,7 +78,7 @@ export class Pointing extends StateNode {
78
78
  }
79
79
 
80
80
  complete() {
81
- const { originPagePoint } = this.editor.inputs
81
+ const originPagePoint = this.editor.inputs.getOriginPagePoint()
82
82
 
83
83
  const shapeType = (this.parent as BaseBoxShapeTool)!.shapeType as TLBaseBoxShape['type']
84
84
 
@@ -88,7 +88,7 @@ export class Pointing extends StateNode {
88
88
 
89
89
  // Allow this to trigger the max shapes reached alert
90
90
  // todo: add scale here when dynamic size is enabled (is this still needed?)
91
- this.editor.createShapes<TLBaseBoxShape>([
91
+ this.editor.createShapes([
92
92
  {
93
93
  id,
94
94
  type: shapeType,
@@ -127,7 +127,7 @@ export class Pointing extends StateNode {
127
127
  ;(next as TLBaseBoxShape & { props: { scale: number } }).props.scale = scale
128
128
  }
129
129
 
130
- this.editor.updateShape<TLBaseBoxShape>(next)
130
+ this.editor.updateShape(next)
131
131
 
132
132
  this.editor.setSelectedShapes([id])
133
133
 
@@ -1,5 +1,5 @@
1
1
  import { HistoryEntry } from '@tldraw/store'
2
- import { TLPageId, TLRecord, TLShapeId } from '@tldraw/tlschema'
2
+ import { BoxModel, TLPageId, TLRecord, TLShapeId } from '@tldraw/tlschema'
3
3
  import { TLEventInfo } from './event-types'
4
4
 
5
5
  /** @public */
@@ -16,12 +16,14 @@ export interface TLEventMap {
16
16
  event: [TLEventInfo]
17
17
  tick: [number]
18
18
  frame: [number]
19
+ resize: [BoxModel]
19
20
  'select-all-text': [{ shapeId: TLShapeId }]
20
21
  'place-caret': [{ shapeId: TLShapeId; point: { x: number; y: number } }]
21
22
  'created-shapes': [TLRecord[]]
22
23
  'edited-shapes': [TLRecord[]]
23
24
  'deleted-shapes': [TLShapeId[]]
24
25
  edit: []
26
+ dispose: []
25
27
  }
26
28
 
27
29
  /** @public */
@@ -1,30 +1,21 @@
1
- import {
2
- Geometry2d,
3
- RecordProps,
4
- Rectangle2d,
5
- ShapeUtil,
6
- T,
7
- TLBaseShape,
8
- createShapeId,
9
- } from '../..'
1
+ import { Geometry2d, RecordProps, Rectangle2d, ShapeUtil, T, TLShape, createShapeId } from '../..'
10
2
  import { createTLStore } from '../config/createTLStore'
11
3
  import { Editor } from '../editor/Editor'
12
4
  import { Box } from '../primitives/Box'
13
5
  import { getExportDefaultBounds } from './getSvgJsx'
14
6
 
15
- type ITestShape = TLBaseShape<
16
- 'test-shape',
17
- {
18
- w: number
19
- h: number
20
- x: number
21
- y: number
22
- isContainer?: boolean
7
+ const TEST_SHAPE_TYPE = 'test-shape'
8
+
9
+ declare module '@tldraw/tlschema' {
10
+ export interface TLGlobalShapePropsMap {
11
+ [TEST_SHAPE_TYPE]: { w: number; h: number; x: number; y: number; isContainer?: boolean }
23
12
  }
24
- >
13
+ }
14
+
15
+ type ITestShape = TLShape<typeof TEST_SHAPE_TYPE>
25
16
 
26
17
  class TestShape extends ShapeUtil<ITestShape> {
27
- static override type = 'test-shape' as const
18
+ static override type = TEST_SHAPE_TYPE
28
19
  static override props: RecordProps<ITestShape> = {
29
20
  w: T.number,
30
21
  h: T.number,